From a3192ad33c48bb6e4c6ed64fa4e5f1c6653b9a5f Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Fri, 9 Aug 2019 00:02:11 -0300 Subject: [PATCH 001/120] package/tpm2-totp: bump to version 0.1.2 Drop patches; issues fixed upstream. Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- ...tring-warnings-when-building-for-32b.patch | 60 ------------------- ...ion-failure-due-to-variable-may-be-u.patch | 42 ------------- package/tpm2-totp/tpm2-totp.hash | 2 +- package/tpm2-totp/tpm2-totp.mk | 2 +- 4 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 package/tpm2-totp/0001-src-fix-format-string-warnings-when-building-for-32b.patch delete mode 100644 package/tpm2-totp/0002-src-fix-compilation-failure-due-to-variable-may-be-u.patch diff --git a/package/tpm2-totp/0001-src-fix-format-string-warnings-when-building-for-32b.patch b/package/tpm2-totp/0001-src-fix-format-string-warnings-when-building-for-32b.patch deleted file mode 100644 index 5dce95cc14..0000000000 --- a/package/tpm2-totp/0001-src-fix-format-string-warnings-when-building-for-32b.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 1d39994398a886584c5fb14b3a646c4ae6b0d35c Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 8 Apr 2019 11:03:09 +0200 -Subject: [PATCH] src: fix format string warnings when building for 32bit - architectures -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Building currently gives the following warnings (which fails the build -because of Werror) about format string mismatches: - -src/tpm2-totp.c:343:23: error: format ‘%ld’ expects argument of type ‘long int’, but argument 3 has type ‘uint64_t’ {aka ‘long long unsigned int’} [-Werror=format=] - printf("%s%06ld", timestr, totp); - ~~~~^ ~~~~ - %06lld - -src/libtpm2-totp.c: In function ‘tpm2totp_generateKey’: -src/libtpm2-totp.c:172:13: error: format ‘%li’ expects argument of type ‘long int’, but argument 3 has type ‘size_t’ {aka ‘unsigned int’} [-Werror=format=] - dbg("Calling Esys_GetRandom for %li bytes", SECRETLEN - *secret_size); - ~~^ - %i - -Fix it by using PRIu64 from inttypes.h for uint64_t and %zu for size_t. - -Signed-off-by: Peter Korsgaard ---- - src/libtpm2-totp.c | 2 +- - src/tpm2-totp.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libtpm2-totp.c b/src/libtpm2-totp.c -index e740ab1..6942771 100644 ---- a/src/libtpm2-totp.c -+++ b/src/libtpm2-totp.c -@@ -169,7 +169,7 @@ tpm2totp_generateKey(uint32_t pcrs, uint32_t banks, const char *password, - if (rc != TPM2_RC_INITIALIZE) chkrc(rc, goto error); - - while (*secret_size < SECRETLEN) { -- dbg("Calling Esys_GetRandom for %li bytes", SECRETLEN - *secret_size); -+ dbg("Calling Esys_GetRandom for %zu bytes", SECRETLEN - *secret_size); - rc = Esys_GetRandom(ctx, - ESYS_TR_NONE, ESYS_TR_NONE, ESYS_TR_NONE, - SECRETLEN - *secret_size, &t); -diff --git a/src/tpm2-totp.c b/src/tpm2-totp.c -index 47b661a..d5dcdce 100644 ---- a/src/tpm2-totp.c -+++ b/src/tpm2-totp.c -@@ -340,7 +340,7 @@ main(int argc, char **argv) - localtime (&now)); - chkrc(rc, exit(1)); - } -- printf("%s%06ld", timestr, totp); -+ printf("%s%06" PRIu64, timestr, totp); - break; - case CMD_RESEAL: - rc = tpm2totp_loadKey_nv(opt.nvindex, &keyBlob, &keyBlob_size); --- -2.11.0 - diff --git a/package/tpm2-totp/0002-src-fix-compilation-failure-due-to-variable-may-be-u.patch b/package/tpm2-totp/0002-src-fix-compilation-failure-due-to-variable-may-be-u.patch deleted file mode 100644 index a650ab49f4..0000000000 --- a/package/tpm2-totp/0002-src-fix-compilation-failure-due-to-variable-may-be-u.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 194f41635367452a7a3c9a75ebbada531bf4c58d Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Sun, 26 May 2019 13:39:44 -0300 -Subject: [PATCH] src: fix compilation failure due to "variable may be used - uninitialized" - -Some inline declarations of strtok_r (specifically in Sourcery CodeBench -Lite 2016.11-19) contain code where an '__s' local variable can be used -uninitialized. - -When GCC expands that declaration in 'parse_pcrs', __s becomes an alias -to the local variable 'saveptr', which in fact is not initialized, but -this is not relevant, since the 'str' argument is knowingly not NULL -when passed to strtok_r because it comes from 'optarg' in parse_opts. - -Anyway, initialize saveptr to NULL to prevent the compilation error. - -Fixes: - http://autobuild.buildroot.net/results/5693a35e4d6bc76a1f46fe0e217abc49f7188aad/ - -Change-Id: I03ad3731774c56744f18154ec161c92ba002903d -Signed-off-by: Carlos Santos ---- - src/tpm2-totp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tpm2-totp.c b/src/tpm2-totp.c -index 3f60b4a..f28a4d6 100644 ---- a/src/tpm2-totp.c -+++ b/src/tpm2-totp.c -@@ -93,7 +93,7 @@ int - parse_pcrs(char *str, int *pcrs) - { - char *token; -- char *saveptr; -+ char *saveptr = NULL; - char *endptr; - long pcr; - --- -2.20.1 - diff --git a/package/tpm2-totp/tpm2-totp.hash b/package/tpm2-totp/tpm2-totp.hash index c8bc28ea6c..0449f9513a 100644 --- a/package/tpm2-totp/tpm2-totp.hash +++ b/package/tpm2-totp/tpm2-totp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a6aa41df2d0773e67f5cf853621d46b89ae2181bc3ef5ff91ad597992259c192 tpm2-totp-0.1.1.tar.gz +sha256 2ce2a518c96540942b0e78bc73efaefb76a2784b7e2dd1b3f14e7d31d97b33b7 tpm2-totp-0.1.2.tar.gz sha256 67bc21a0bff2b0890307cfaa883bd3f5337f461eb6d8a612a015cea6d704e9ed LICENSE diff --git a/package/tpm2-totp/tpm2-totp.mk b/package/tpm2-totp/tpm2-totp.mk index 1ce40e20d5..ca557388e6 100644 --- a/package/tpm2-totp/tpm2-totp.mk +++ b/package/tpm2-totp/tpm2-totp.mk @@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TOTP_VERSION = 0.1.1 +TPM2_TOTP_VERSION = 0.1.2 TPM2_TOTP_SITE = https://github.com/tpm2-software/tpm2-totp/releases/download/v$(TPM2_TOTP_VERSION) TPM2_TOTP_LICENSE = BSD-3-Clause TPM2_TOTP_LICENSE_FILES = LICENSE From 8d66bc940d6e4707f9773aeb052e94d45fa439ad Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Aug 2019 10:00:21 +0200 Subject: [PATCH 002/120] package/dav1d: new package Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/dav1d/Config.in | 11 +++++++++++ package/dav1d/dav1d.hash | 3 +++ package/dav1d/dav1d.mk | 28 ++++++++++++++++++++++++++++ 5 files changed, 44 insertions(+) create mode 100644 package/dav1d/Config.in create mode 100644 package/dav1d/dav1d.hash create mode 100644 package/dav1d/dav1d.mk diff --git a/DEVELOPERS b/DEVELOPERS index e8ba6cd985..9ba058e2ee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -294,6 +294,7 @@ F: package/bcg729/ F: package/bluez-tools/ F: package/boinc/ F: package/clamav/ +F: package/dav1d/ F: package/dovecot/ F: package/dovecot-pigeonhole/ F: package/dtv-scan-tables/ diff --git a/package/Config.in b/package/Config.in index 5f2191a554..3f53c20bb3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1504,6 +1504,7 @@ endmenu menu "Multimedia" source "package/bitstream/Config.in" + source "package/dav1d/Config.in" source "package/kvazaar/Config.in" source "package/libaacs/Config.in" source "package/libamcodec/Config.in" diff --git a/package/dav1d/Config.in b/package/dav1d/Config.in new file mode 100644 index 0000000000..00d2fd17f1 --- /dev/null +++ b/package/dav1d/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_DAV1D + bool "dav1d" + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread + help + dav1d is a new AV1 cross-platform decoder, open-source, and + focused on speed and correctness. + + https://code.videolan.org/videolan/dav1d + +comment "dav1d needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash new file mode 100644 index 0000000000..594531100c --- /dev/null +++ b/package/dav1d/dav1d.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 18bf96c5168b8c704422387620fefaa953e8dbd4eacb0f0796c03d6e741f8924 dav1d-0.4.0.tar.bz2 +sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk new file mode 100644 index 0000000000..6c08694f15 --- /dev/null +++ b/package/dav1d/dav1d.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# dav1d +# +################################################################################ + +DAV1D_VERSION = 0.4.0 +DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2 +DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION) +DAV1D_LICENSE = BSD-2-Clause +DAV1D_LICENSE_FILES = COPYING +DAV1D_INSTALL_STAGING = YES + +ifeq ($(BR2_i386)$(BR2_x86_64),y) +DAV1D_DEPENDENCIES += host-nasm +endif + +# ARM assembly requires v6+ ISA +ifeq ($(BR2_ARM_CPU_ARMV4)$(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV7M),y) +DAV1D_CONF_OPTS = -Denable_asm=false +endif + +# Uses __atomic_fetch_add_4 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +DAV1D_LDFLAGS += -latomic +endif + +$(eval $(meson-package)) From 5146f878d528156517299df5be707bd5715f58fa Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Aug 2019 10:00:22 +0200 Subject: [PATCH 003/120] package/ffmpeg: add optional dependency to dav1d Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index b1eb29dfd7..2b459aec18 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -403,6 +403,13 @@ else FFMPEG_CONF_OPTS += --disable-libx265 endif +ifeq ($(BR2_PACKAGE_DAV1D),y) +FFMPEG_CONF_OPTS += --enable-libdav1d +FFMPEG_DEPENDENCIES += dav1d +else +FFMPEG_CONF_OPTS += --disable-libdav1d +endif + ifeq ($(BR2_X86_CPU_HAS_MMX),y) FFMPEG_CONF_OPTS += --enable-x86asm FFMPEG_DEPENDENCIES += host-nasm From a0cf1d15bbd1b47b24f4b9ea5457dc54c0605947 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Sun, 11 Aug 2019 13:15:59 +0200 Subject: [PATCH 004/120] package/tinyxml2: bump to version 7.1.0 Readme file changed due to some modifications (typos, update) Signed-off-by: Pierre-Jean Texier Signed-off-by: Thomas Petazzoni --- package/tinyxml2/tinyxml2.hash | 4 ++-- package/tinyxml2/tinyxml2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tinyxml2/tinyxml2.hash b/package/tinyxml2/tinyxml2.hash index 88291e4f39..bb0f8108f9 100644 --- a/package/tinyxml2/tinyxml2.hash +++ b/package/tinyxml2/tinyxml2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a381729e32b6c2916a23544c04f342682d38b3f6e6c0cad3c25e900c3a7ef1a6 tinyxml2-7.0.1.tar.gz -sha256 35e49ea659da39b72b0e2f38214f9799b548225b0950c8dbb6d183b4c1455263 readme.md +sha256 68ebd396a4220d5a9b5a621c6e9c66349c5cfdf5efaea3f16e3bb92e45f4e2a3 tinyxml2-7.1.0.tar.gz +sha256 beed3466425970b9d970e573947f1fe7d3cbe41ed7e2c39b0daf45f7de053c43 readme.md diff --git a/package/tinyxml2/tinyxml2.mk b/package/tinyxml2/tinyxml2.mk index 7f362f3d33..67f626428a 100644 --- a/package/tinyxml2/tinyxml2.mk +++ b/package/tinyxml2/tinyxml2.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYXML2_VERSION = 7.0.1 +TINYXML2_VERSION = 7.1.0 TINYXML2_SITE = $(call github,leethomason,tinyxml2,$(TINYXML2_VERSION)) TINYXML2_LICENSE = Zlib TINYXML2_LICENSE_FILES = readme.md From 32e9dad7d2e5372ff7aafaae9716a145d6daf183 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Sat, 10 Aug 2019 03:18:31 -0700 Subject: [PATCH 005/120] package/xen: bump to version 4.12.1 Signed-off-by: Alistair Francis Signed-off-by: Thomas Petazzoni --- ...x-build-with-CFLAGS-from-environment.patch | 14 ++-- ...rm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch | 37 --------- ...-32-bit-gcc-8-1-non-debug-build-work.patch | 79 ------------------- package/xen/xen.hash | 2 +- package/xen/xen.mk | 2 +- 5 files changed, 9 insertions(+), 125 deletions(-) delete mode 100644 package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch delete mode 100644 package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch diff --git a/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch b/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch index 0d4e581af6..fb316739b4 100644 --- a/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch +++ b/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch @@ -1,4 +1,4 @@ -From 2a310549aaeaba05f640ade43488bb893101ce4a Mon Sep 17 00:00:00 2001 +From 8aea14bbd20b04b8fffaf35138ebdcbd39e433a3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 29 Oct 2016 16:35:26 +0200 Subject: [PATCH] xen/Rules.mk: fix build with CFLAGS from environment @@ -19,18 +19,18 @@ Signed-off-by: "Yann E. MORIN" 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Rules.mk b/xen/Rules.mk -index a9fda71..09ccbfa 100644 +index 3090ea7828..d535bf9e2f 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk -@@ -49,7 +49,7 @@ ALL_OBJS-$(CONFIG_CRYPTO) += $(BASEDIR)/crypto/built_in.o - CFLAGS += -nostdinc -fno-builtin -fno-common - CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith - CFLAGS += -pipe -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h +@@ -61,7 +61,7 @@ CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith + $(call cc-option-add,CFLAGS,CC,-Wvla) + CFLAGS += -pipe -D__XEN__ -include $(BASEDIR)/include/xen/config.h + CFLAGS-$(CONFIG_DEBUG_INFO) += -g -CFLAGS += '-D__OBJECT_FILE__="$@"' +CFLAGS += -U__OBJECT_FILE__ '-D__OBJECT_FILE__="$@"' ifneq ($(clang),y) # Clang doesn't understand this command line argument, and doesn't appear to -- -2.7.4 +2.22.0 diff --git a/package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch b/package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch deleted file mode 100644 index db2bbe8363..0000000000 --- a/package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c8993743d611ed23ebded3168ac3ac6ff3e5d2fa Mon Sep 17 00:00:00 2001 -From: Christopher Clark -Date: Thu, 16 Aug 2018 13:22:41 -0700 -Subject: [PATCH] libxl/arm: Fix build on arm64 + acpi w/ gcc 8.2 - -Add zero-padding to #defined ACPI table strings that are copied. -Provides sufficient characters to satisfy the length required to -fully populate the destination and prevent array-bounds warnings. -Add BUILD_BUG_ON sizeof checks for compile-time length checking. - -Signed-off-by: Christopher Clark -Reviewed-by: Stefano Stabellini -Acked-by: Wei Liu ---- - tools/libxl/libxl_arm_acpi.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tools/libxl/libxl_arm_acpi.c b/tools/libxl/libxl_arm_acpi.c -index 636f724039..eeca1def06 100644 ---- a/tools/libxl/libxl_arm_acpi.c -+++ b/tools/libxl/libxl_arm_acpi.c -@@ -48,9 +48,9 @@ extern const unsigned char dsdt_anycpu_arm[]; - _hidden - extern const int dsdt_anycpu_arm_len; - --#define ACPI_OEM_ID "Xen" --#define ACPI_OEM_TABLE_ID "ARM" --#define ACPI_ASL_COMPILER_ID "XL" -+#define ACPI_OEM_ID "Xen\0\0" -+#define ACPI_OEM_TABLE_ID "ARM\0\0\0\0" -+#define ACPI_ASL_COMPILER_ID "XL\0" - - enum { - RSDP, --- -2.17.1 - diff --git a/package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch b/package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch deleted file mode 100644 index 9c51c554cd..0000000000 --- a/package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch +++ /dev/null @@ -1,79 +0,0 @@ -From e75c9dc85fdeeeda0b98d8cd8d784e0508c3ffb8 Mon Sep 17 00:00:00 2001 -From: Wei Liu -Date: Thu, 26 Jul 2018 15:58:54 +0100 -Subject: [PATCH] xenpmd: make 32 bit gcc 8.1 non-debug build work - -32 bit gcc 8.1 non-debug build yields: - -xenpmd.c:354:23: error: '%02x' directive output may be truncated writing between 2 and 8 bytes into a region of size 3 [-Werror=format-truncation=] - snprintf(val, 3, "%02x", - ^~~~ -xenpmd.c:354:22: note: directive argument in the range [40, 2147483778] - snprintf(val, 3, "%02x", - ^~~~~~ -xenpmd.c:354:5: note: 'snprintf' output between 3 and 9 bytes into a destination of size 3 - snprintf(val, 3, "%02x", - ^~~~~~~~~~~~~~~~~~~~~~~~ - (unsigned int)(9*4 + - ~~~~~~~~~~~~~~~~~~~~ - strlen(info->model_number) + - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - strlen(info->serial_number) + - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - strlen(info->battery_type) + - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - strlen(info->oem_info) + 4)); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -All info->* used in calculation are 32 bytes long, and the parsing -code makes sure they are null-terminated, so the end result of the -expression won't exceed 255, which should be able to be fit into 3 -bytes in hexadecimal format. - -Add an assertion to make gcc happy. - -Signed-off-by: Wei Liu -Acked-by: Ian Jackson -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/xen-project/xen/commit/e75c9dc85fdeeeda0b98d8cd8d784e0508c3ffb8] ---- - tools/xenpmd/xenpmd.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/tools/xenpmd/xenpmd.c b/tools/xenpmd/xenpmd.c -index 56412a9a81c..1c801caa712 100644 ---- a/tools/xenpmd/xenpmd.c -+++ b/tools/xenpmd/xenpmd.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - /* #define RUN_STANDALONE */ - #define RUN_IN_SIMULATE_MODE -@@ -345,18 +346,17 @@ void write_ulong_lsb_first(char *temp_val, unsigned long val) - void write_battery_info_to_xenstore(struct battery_info *info) - { - char val[1024], string_info[256]; -+ unsigned int len; - - xs_mkdir(xs, XBT_NULL, "/pm"); - - memset(val, 0, 1024); - memset(string_info, 0, 256); - /* write 9 dwords (so 9*4) + length of 4 strings + 4 null terminators */ -- snprintf(val, 3, "%02x", -- (unsigned int)(9*4 + -- strlen(info->model_number) + -- strlen(info->serial_number) + -- strlen(info->battery_type) + -- strlen(info->oem_info) + 4)); -+ len = 9 * 4 + strlen(info->model_number) + strlen(info->serial_number) + -+ strlen(info->battery_type) + strlen(info->oem_info) + 4; -+ assert(len < 255); -+ snprintf(val, 3, "%02x", len); - write_ulong_lsb_first(val+2, info->present); - write_ulong_lsb_first(val+10, info->design_capacity); - write_ulong_lsb_first(val+18, info->last_full_capacity); diff --git a/package/xen/xen.hash b/package/xen/xen.hash index d4232f592e..a15bc7d852 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3f9217f5a7cc240a06f3a03db8c29605d69a64d98330c426611ba5c2ee08b5d8 xen-4.11.2.tar.gz +sha256 5450a85497b84167df1d229b3ab98fb24ef4d6b0510dce522798c13c1b090159 xen-4.12.1.tar.gz sha256 dba0d79260259c013c52e5d4daeaea564a2fbb9ff7fc6778c377a401ec3898de COPYING diff --git a/package/xen/xen.mk b/package/xen/xen.mk index bd8a39f639..b0dc2dfe4c 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.11.2 +XEN_VERSION = 4.12.1 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING From 014c47cfbf014e916efef688ac5f892e5082d188 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sat, 10 Aug 2019 07:23:53 +0200 Subject: [PATCH 006/120] package/restclient-cpp: new package restclient-cpp is a simple REST client library for C++ Signed-off-by: Gilles Talis Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/restclient-cpp/Config.in | 13 +++++++++++++ package/restclient-cpp/restclient-cpp.hash | 3 +++ package/restclient-cpp/restclient-cpp.mk | 18 ++++++++++++++++++ 5 files changed, 36 insertions(+) create mode 100644 package/restclient-cpp/Config.in create mode 100644 package/restclient-cpp/restclient-cpp.hash create mode 100644 package/restclient-cpp/restclient-cpp.mk diff --git a/DEVELOPERS b/DEVELOPERS index 9ba058e2ee..040809f6a5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -946,6 +946,7 @@ F: package/httping/ F: package/iozone/ F: package/leptonica/ F: package/ocrad/ +F: package/restclient-cpp/ F: package/tesseract-ocr/ F: package/webp/ F: package/xapian/ diff --git a/package/Config.in b/package/Config.in index 3f53c20bb3..c984dcea6f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1649,6 +1649,7 @@ menu "Networking" source "package/qdecoder/Config.in" source "package/qpid-proton/Config.in" source "package/rabbitmq-c/Config.in" + source "package/restclient-cpp/Config.in" source "package/rtmpdump/Config.in" source "package/slirp/Config.in" source "package/snmppp/Config.in" diff --git a/package/restclient-cpp/Config.in b/package/restclient-cpp/Config.in new file mode 100644 index 0000000000..9bf2240828 --- /dev/null +++ b/package/restclient-cpp/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_RESTCLIENT_CPP + bool "restclient-cpp" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + select BR2_PACKAGE_LIBCURL + help + restclient-cpp is a C++ client library for + making HTTP/REST requests + + http://code.mrtazz.com/restclient-cpp/ + +comment "restclient-cpp needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/restclient-cpp/restclient-cpp.hash b/package/restclient-cpp/restclient-cpp.hash new file mode 100644 index 0000000000..428ec51f5f --- /dev/null +++ b/package/restclient-cpp/restclient-cpp.hash @@ -0,0 +1,3 @@ +# Computed locally +sha256 6ae98c65333214d13d765d8fde04ec696f88ce349a419df0fbfc4564bc779df3 restclient-cpp-0.5.1.tar.gz +sha256 1c2f79e825a39eb61d8919044776627f4d079ff38975410a3bde340154fc94a4 LICENSE diff --git a/package/restclient-cpp/restclient-cpp.mk b/package/restclient-cpp/restclient-cpp.mk new file mode 100644 index 0000000000..9393333095 --- /dev/null +++ b/package/restclient-cpp/restclient-cpp.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# restclient-cpp +# +################################################################################ + +RESTCLIENT_CPP_VERSION = 0.5.1 +RESTCLIENT_CPP_SITE = $(call github,mrtazz,restclient-cpp,$(RESTCLIENT_CPP_VERSION)) +RESTCLIENT_CPP_LICENSE = MIT +RESTCLIENT_CPP_LICENSE_FILES = LICENSE +RESTCLIENT_CPP_INSTALL_STAGING = YES + +# Source from github, no configure script provided +RESTCLIENT_CPP_AUTORECONF = YES + +RESTCLIENT_CPP_DEPENDENCIES = libcurl + +$(eval $(autotools-package)) From 1f8468c59e3be772bb9fb8052560a6cef5fe6f06 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 10 Aug 2019 00:58:16 +0200 Subject: [PATCH 007/120] package/libinput: bump version to 1.14.0 For details see [1]. [1] https://lists.freedesktop.org/archives/wayland-devel/2019-August/040790.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/libinput/libinput.hash | 10 +++++----- package/libinput/libinput.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index ea9319d663..a54e72f438 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,8 +1,8 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2019-June/040675.html -md5 9ef817774bb5b4006cba95e34103e82c libinput-1.13.4.tar.xz -sha1 14d7a14643d41c2e7512a7b3a6c0c9a3e7ba3242 libinput-1.13.4.tar.xz -sha256 d3eb57c714683b117aae29f6c0be76dd46de259f0a48f20cb43b9fa9f2e1401d libinput-1.13.4.tar.xz -sha512 ccfdfc704dab9ea19a503399ecd4ce3a95b8d9480b8dfddeb80be01236c34c6f2f472be0e12e04dddd68092611470d303351e092141bc7491729639bcf7e64d7 libinput-1.13.4.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2019-August/040790.html +md5 1c33d49fc7985926eab877e3de9c17eb libinput-1.14.0.tar.xz +sha1 3a8f1ea7ba8a23868b2a7d48286924547ba6d108 libinput-1.14.0.tar.xz +sha256 7cb85c24f8920b81bc5360220107e267ab4e0e718704c7690a8c7b03fa14fc67 libinput-1.14.0.tar.xz +sha512 e501c5b8a58bb287c175692af0e59ff766a8613eb576aaa0700686dfbb6c6ab63b7a5d3f148fce75397c8170bc49871068861d93c352355ab5d0d9e7f1b059ec libinput-1.14.0.tar.xz # License files sha256 70d5b1dfe5a9c50a1f2ea91b1c2b1c85d876c5c92339585edbb85cf69e945e14 COPYING diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 4706e8ebfa..d75b042f14 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.13.4 +LIBINPUT_VERSION = 1.14.0 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev From 46151403c858962995efda44166fe8ea8f998942 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 10 Aug 2019 00:54:19 +0200 Subject: [PATCH 008/120] package/evtest: bump version to 1.34 - bump version to 1.34 (for details see [1]) - add hash for license file [1] https://lists.freedesktop.org/archives/input-tools/2019-August/001517.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/evtest/evtest.hash | 5 ++++- package/evtest/evtest.mk | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/evtest/evtest.hash b/package/evtest/evtest.hash index e131318f47..566d423fcd 100644 --- a/package/evtest/evtest.hash +++ b/package/evtest/evtest.hash @@ -1,2 +1,5 @@ # locally computed -sha256 9fb68236a6871c163e52433ba8f2cce142c0f4208163a2962768c13f262d549f evtest-1.33.tar.gz +sha256 73d5b604d57551418d282fedee3deae9f851afb3c355dccc87153364c046efd3 evtest-1.34.tar.gz + +# License files +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/evtest/evtest.mk b/package/evtest/evtest.mk index d00d4cb624..d2fd01c2d9 100644 --- a/package/evtest/evtest.mk +++ b/package/evtest/evtest.mk @@ -4,7 +4,7 @@ # ################################################################################ -EVTEST_VERSION = 1.33 +EVTEST_VERSION = 1.34 EVTEST_SITE = http://cgit.freedesktop.org/evtest/snapshot EVTEST_LICENSE = GPL-2.0+ EVTEST_LICENSE_FILES = COPYING From 3c933748a498cb7cc36aa16798b1276936746b47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 8 Aug 2019 23:26:33 +0200 Subject: [PATCH 009/120] package/luv: bump to version 1.30.1-0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/luv/luv.hash | 2 +- package/luv/luv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luv/luv.hash b/package/luv/luv.hash index a27cb36936..c3a3062e1c 100644 --- a/package/luv/luv.hash +++ b/package/luv/luv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5cc75a012bfa9a5a1543d0167952676474f31c2d7fd8d450b56d8929dbebb5ef luv-1.30.0-0.tar.gz +sha256 420fc299f3b25aff55b839e9fe590982f45045b3e53ebeab2449eca7e23a106a luv-1.30.1-0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luv/luv.mk b/package/luv/luv.mk index e01e46aa99..31288ffca3 100644 --- a/package/luv/luv.mk +++ b/package/luv/luv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUV_VERSION = 1.30.0-0 +LUV_VERSION = 1.30.1-0 LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) LUV_LICENSE = Apache-2.0 LUV_LICENSE_FILES = LICENSE.txt From 8de4291bd2097d8142cd9d77a2b3315d3693443b Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Thu, 8 Aug 2019 20:10:11 -0300 Subject: [PATCH 010/120] support/testing: check ubi image before booting Do the same as other fs tests and minimally check the ubi image before booting. The call to 'file' was already there, but the output wasn't tested for some unknown reason. Add the assert for the output of the command. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/testing/tests/fs/test_ubi.py | 1 + 1 file changed, 1 insertion(+) diff --git a/support/testing/tests/fs/test_ubi.py b/support/testing/tests/fs/test_ubi.py index 015d82f769..e024d417df 100644 --- a/support/testing/tests/fs/test_ubi.py +++ b/support/testing/tests/fs/test_ubi.py @@ -25,6 +25,7 @@ class TestUbi(infra.basetest.BRTest): cwd=self.builddir, env={"LANG": "C"}) out = out.splitlines() + self.assertIn("UBI image, version 1", out[0]) subprocess.call(["truncate", "-s 128M", img]) From 1b2928201f272eb2e817e9be2ebb92bd155b4e71 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Thu, 8 Aug 2019 20:10:12 -0300 Subject: [PATCH 011/120] support/testing: do not print non-utf-8 chars on cbor test The python-cbor sample script to be run on the target dumps a binary variable to the target stdout. This is done for debug purposes-only, in the case the test on test infra fails. This non-utf-8 is currently silently ignored by the Emulator class / pexpect.spawn from the test infra because the infra uses Python 2, that in turn do not differentiate between string and byte data. Make the code Python3-friendly (Python 3 in the host) by doing the right thing and encoding the data before printing it. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/sample_python_cbor_enc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/sample_python_cbor_enc.py b/support/testing/tests/package/sample_python_cbor_enc.py index 1bde92bb9f..31d937d4b8 100644 --- a/support/testing/tests/package/sample_python_cbor_enc.py +++ b/support/testing/tests/package/sample_python_cbor_enc.py @@ -9,6 +9,6 @@ data = { } } serialized = cbor.dumps(data) -print(serialized) +print(serialized.decode(errors="ignore")) with open("/tmp/data.cbor", "wb") as f: f.write(serialized) From 620c98a214dd2acc4b599de46eb959fb4a57b965 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Thu, 8 Aug 2019 20:10:13 -0300 Subject: [PATCH 012/120] support/testing: factor out run_cmd_on_host Currently many test cases call subprocess.check_output on their own. Factor out that code to an infra method so the call get standardized. This will be handful when switching the test infra to use Python 3. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/testing/infra/__init__.py | 13 +++++++++++-- support/testing/tests/core/test_hardening.py | 6 +----- support/testing/tests/fs/test_ext.py | 6 +----- support/testing/tests/fs/test_f2fs.py | 5 +---- support/testing/tests/fs/test_jffs2.py | 6 ++---- support/testing/tests/fs/test_squashfs.py | 4 +--- support/testing/tests/fs/test_ubi.py | 4 +--- 7 files changed, 18 insertions(+), 26 deletions(-) diff --git a/support/testing/infra/__init__.py b/support/testing/infra/__init__.py index 1d4d18bbe9..43045d0173 100644 --- a/support/testing/infra/__init__.py +++ b/support/testing/infra/__init__.py @@ -55,6 +55,15 @@ def download(dldir, filename): return finalpath +def run_cmd_on_host(builddir, cmd): + """Call subprocess.check_output and return the text output.""" + out = subprocess.check_output(cmd, + stderr=open(os.devnull, "w"), + cwd=builddir, + env={"LANG": "C"}) + return out + + def get_elf_arch_tag(builddir, prefix, fpath, tag): """ Runs the cross readelf on 'fpath', then extracts the value of tag 'tag'. @@ -66,7 +75,7 @@ def get_elf_arch_tag(builddir, prefix, fpath, tag): """ cmd = ["host/bin/{}-readelf".format(prefix), "-A", os.path.join("target", fpath)] - out = subprocess.check_output(cmd, cwd=builddir, env={"LANG": "C"}) + out = run_cmd_on_host(builddir, cmd) regexp = re.compile("^ {}: (.*)$".format(tag)) for line in out.splitlines(): m = regexp.match(line) @@ -93,7 +102,7 @@ def get_elf_prog_interpreter(builddir, prefix, fpath): """ cmd = ["host/bin/{}-readelf".format(prefix), "-l", os.path.join("target", fpath)] - out = subprocess.check_output(cmd, cwd=builddir, env={"LANG": "C"}) + out = run_cmd_on_host(builddir, cmd) regexp = re.compile("^ *\[Requesting program interpreter: (.*)\]$") for line in out.splitlines(): m = regexp.match(line) diff --git a/support/testing/tests/core/test_hardening.py b/support/testing/tests/core/test_hardening.py index 4d19b9f96d..edfb3315db 100644 --- a/support/testing/tests/core/test_hardening.py +++ b/support/testing/tests/core/test_hardening.py @@ -1,5 +1,4 @@ import os -import subprocess import json import infra.basetest @@ -30,10 +29,7 @@ class TestHardeningBase(infra.basetest.BRTest): "--file={}".format(filepath)] # Checksec is being used for elf file analysis only. There are no # assumptions of target/run-time checks as part of this testing. - ret = subprocess.check_output(cmd, - stderr=open(os.devnull, "w"), - cwd=self.builddir, - env={"LANG": "C"}) + ret = infra.run_cmd_on_host(self.builddir, cmd) return json.loads(ret) diff --git a/support/testing/tests/fs/test_ext.py b/support/testing/tests/fs/test_ext.py index f5f9e9fdf1..16b308cf6d 100644 --- a/support/testing/tests/fs/test_ext.py +++ b/support/testing/tests/fs/test_ext.py @@ -1,5 +1,4 @@ import os -import subprocess import infra.basetest @@ -15,10 +14,7 @@ CHECK_FS_TYPE_CMD = "mount | grep '/dev/root on / type {}'" def dumpe2fs_run(builddir, image): cmd = ["host/sbin/dumpe2fs", os.path.join("images", image)] - ret = subprocess.check_output(cmd, - stderr=open(os.devnull, "w"), - cwd=builddir, - env={"LANG": "C"}) + ret = infra.run_cmd_on_host(builddir, cmd) return ret.strip().splitlines() diff --git a/support/testing/tests/fs/test_f2fs.py b/support/testing/tests/fs/test_f2fs.py index 819c619a36..950d4cf25b 100644 --- a/support/testing/tests/fs/test_f2fs.py +++ b/support/testing/tests/fs/test_f2fs.py @@ -1,5 +1,4 @@ import os -import subprocess import infra.basetest @@ -29,9 +28,7 @@ class TestF2FS(infra.basetest.BRTest): def test_run(self): img = os.path.join(self.builddir, "images", "rootfs.f2fs") - out = subprocess.check_output(["host/sbin/dump.f2fs", img], - cwd=self.builddir, - env={"LANG": "C"}) + out = infra.run_cmd_on_host(self.builddir, ["host/sbin/dump.f2fs", img]) out = out.splitlines() prop = dumpf2fs_getprop(out, "Info: total sectors") self.assertEqual(prop, "262144 (128 MB)") diff --git a/support/testing/tests/fs/test_jffs2.py b/support/testing/tests/fs/test_jffs2.py index 2ff5099180..f5066ff01f 100644 --- a/support/testing/tests/fs/test_jffs2.py +++ b/support/testing/tests/fs/test_jffs2.py @@ -1,5 +1,4 @@ import os -import subprocess import infra.basetest @@ -30,9 +29,8 @@ class TestJffs2(infra.basetest.BRTest): def test_run(self): img = os.path.join(self.builddir, "images", "rootfs.jffs2") - out = subprocess.check_output(["host/sbin/jffs2dump", "-c", img], - cwd=self.builddir, - env={"LANG": "C"}) + cmd = ["host/sbin/jffs2dump", "-c", img] + out = infra.run_cmd_on_host(self.builddir, cmd) out = out.splitlines() self.assertTrue(jffs2dump_find_file(out, "busybox")) diff --git a/support/testing/tests/fs/test_squashfs.py b/support/testing/tests/fs/test_squashfs.py index 066c054342..234f4944be 100644 --- a/support/testing/tests/fs/test_squashfs.py +++ b/support/testing/tests/fs/test_squashfs.py @@ -15,9 +15,7 @@ class TestSquashfs(infra.basetest.BRTest): def test_run(self): unsquashfs_cmd = ["host/bin/unsquashfs", "-s", "images/rootfs.squashfs"] - out = subprocess.check_output(unsquashfs_cmd, - cwd=self.builddir, - env={"LANG": "C"}) + out = infra.run_cmd_on_host(self.builddir, unsquashfs_cmd) out = out.splitlines() self.assertEqual(out[0], "Found a valid SQUASHFS 4:0 superblock on images/rootfs.squashfs.") diff --git a/support/testing/tests/fs/test_ubi.py b/support/testing/tests/fs/test_ubi.py index e024d417df..7321f83da9 100644 --- a/support/testing/tests/fs/test_ubi.py +++ b/support/testing/tests/fs/test_ubi.py @@ -21,9 +21,7 @@ class TestUbi(infra.basetest.BRTest): # To be investigated. def test_run(self): img = os.path.join(self.builddir, "images", "rootfs.ubi") - out = subprocess.check_output(["file", img], - cwd=self.builddir, - env={"LANG": "C"}) + out = infra.run_cmd_on_host(self.builddir, ["file", img]) out = out.splitlines() self.assertIn("UBI image, version 1", out[0]) From dfcd5b9ff9677b9407ecad502744875302637ef4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 12 Aug 2019 19:58:09 +0200 Subject: [PATCH 013/120] package/systemd: drop host-intltool dependency intltool is not needed since version 236 and https://github.com/systemd/systemd/commit/c81217920effddc93fb780cf8f9eb699d6fe1319 https://github.com/systemd/systemd/commit/9e8f3893e349a68312a817da72b3473b81b6869e So drop it and replace it by TARGET_NLS_DEPENDENCIES Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index e8fd7967bd..b6aac6dc53 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -12,10 +12,10 @@ SYSTEMD_INSTALL_STAGING = YES SYSTEMD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ host-gperf \ - host-intltool \ kmod \ libcap \ - util-linux + util-linux \ + $(TARGET_NLS_DEPENDENCIES) SYSTEMD_PROVIDES = udev From 1b6af91b33094d1b48144c9bfa8ad774a03a3abe Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 11 Aug 2019 22:44:16 -0600 Subject: [PATCH 014/120] package/python-aiohttp-jinja2: bump to version 1.1.2 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash | 4 ++-- package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash b/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash index 390b0e4ed7..28bd2c1ad5 100644 --- a/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash +++ b/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-jinja2/json -md5 de5e02056d1b48dc2fa4fc0c1a8b0e08 aiohttp-jinja2-1.1.0.tar.gz -sha256 aef9b6595f962182ad00c990095fb51d731c280e1d183e2b28cf0bdb5a942d0c aiohttp-jinja2-1.1.0.tar.gz +md5 d8e0f9e824ab62f3bd17abb604f5884e aiohttp-jinja2-1.1.2.tar.gz +sha256 4569ba360dbef2f6e2edfcb1eb34452e85498b7e17740baa5a4adc296ac3973c aiohttp-jinja2-1.1.2.tar.gz # Locally computed sha256 checksums sha256 2a86817fedf0c52baaa47d7dd975073639dfaaebd37312bd279de54d7f841791 LICENSE diff --git a/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk b/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk index 3b5359a06a..059ba72ada 100644 --- a/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk +++ b/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_JINJA2_VERSION = 1.1.0 +PYTHON_AIOHTTP_JINJA2_VERSION = 1.1.2 PYTHON_AIOHTTP_JINJA2_SOURCE = aiohttp-jinja2-$(PYTHON_AIOHTTP_JINJA2_VERSION).tar.gz -PYTHON_AIOHTTP_JINJA2_SITE = https://files.pythonhosted.org/packages/76/9d/68fa1e9ec3bafba572772eb385023de54096663bd6e302a24d7344c6a711 +PYTHON_AIOHTTP_JINJA2_SITE = https://files.pythonhosted.org/packages/65/ff/60a0fc663cb0410f33c2822c274ddb0cdb43985066498aef1b39126f26d2 PYTHON_AIOHTTP_JINJA2_SETUP_TYPE = setuptools PYTHON_AIOHTTP_JINJA2_LICENSE = Apache-2.0 PYTHON_AIOHTTP_JINJA2_LICENSE_FILES = LICENSE From 54736a296b9204ac2e357b5cab7b94bb68581542 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 12 Aug 2019 15:12:21 -0600 Subject: [PATCH 015/120] package/python-aioconsole: bump to version 0.1.14 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-aioconsole/python-aioconsole.hash | 4 ++-- package/python-aioconsole/python-aioconsole.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash index 0e09cfb4ec..a0be541d2b 100644 --- a/package/python-aioconsole/python-aioconsole.hash +++ b/package/python-aioconsole/python-aioconsole.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 212dc49e2f2a995c87ce659ba63e7422 aioconsole-0.1.13.tar.gz -sha256 8b9898f0f6539bdce3bc3720d75189e21813f1a7f8350228fc7fd54bf7327d0f aioconsole-0.1.13.tar.gz +md5 af4835de9fbc97faf8776af99f0b3e38 aioconsole-0.1.14.tar.gz +sha256 f1ddd04050d9be5e93e223a4e9367433436d245f8fe70905f4124bfde2cd3cdd aioconsole-0.1.14.tar.gz diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk index 47245d2038..2cf6d4eafd 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.1.13 +PYTHON_AIOCONSOLE_VERSION = 0.1.14 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/ea/ee/80154d7242c2107d02768c5a848e4cded39ce8cd89b48982c217474c8ddd +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/04/0a/0d86f8af4202a09c2fe91f5d9a8149ddd7cd04bcc638eea08dd10fcd18b1 PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 From bff5ae49ec69efd960f839ff24709f329f08dab8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 7 Aug 2019 16:24:56 +0200 Subject: [PATCH 016/120] configs/stm32mp157_dk: new defconfig This commit adds a minimal defconfig to build a Buildroot system for the STM32MP157 Discovery Kit, which is the low-cost evaluation platform for the new STM32MP157 system-on-chip from ST. This system-on-chip features a single or dual Cortex-A7, a single Cortex-M4, and a wide variety of peripherals. This commit includes a custom linux configuration file, because there is no specific defconfig for this platform in the kernel, only multi_v7_defconfig supports it, which is really a massive defconfig. That's why a custom linux configuration file is added. A small U-Boot config fragment allows to disable the watchdog, so that userspace by default doesn't need to have a watchdog daemon running. The vendor U-Boot and Linux trees are used for the moment, but the platform support is being upstreamed, so switching to upstream versions will be possible in the relatively near future. Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 1 + DEVELOPERS | 2 + .../stm32mp157-dk/genimage.cfg | 24 +++ .../stm32mp157-dk/linux.config | 182 ++++++++++++++++++ .../overlay/boot/extlinux/extlinux.conf | 4 + .../stm32mp157-dk/readme.txt | 38 ++++ .../stm32mp157-dk/uboot-fragment.config | 1 + configs/stm32mp157_dk_defconfig | 30 +++ 8 files changed, 282 insertions(+) create mode 100644 board/stmicroelectronics/stm32mp157-dk/genimage.cfg create mode 100644 board/stmicroelectronics/stm32mp157-dk/linux.config create mode 100644 board/stmicroelectronics/stm32mp157-dk/overlay/boot/extlinux/extlinux.conf create mode 100644 board/stmicroelectronics/stm32mp157-dk/readme.txt create mode 100644 board/stmicroelectronics/stm32mp157-dk/uboot-fragment.config create mode 100644 configs/stm32mp157_dk_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 28824cc722..7ee6e248b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -317,6 +317,7 @@ solidrun_macchiatobin_mainline_defconfig: { extends: .defconfig } solidrun_macchiatobin_marvell_defconfig: { extends: .defconfig } stm32f429_disco_defconfig: { extends: .defconfig } stm32f469_disco_defconfig: { extends: .defconfig } +stm32mp157_dk_defconfig: { extends: .defconfig } toradex_apalis_imx6_defconfig: { extends: .defconfig } ts4800_defconfig: { extends: .defconfig } ts4900_defconfig: { extends: .defconfig } diff --git a/DEVELOPERS b/DEVELOPERS index 040809f6a5..8ad48b95cb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2224,9 +2224,11 @@ F: package/ascii-invaders/ N: Thomas Petazzoni F: arch/Config.in.arm +F: board/stmicroelectronics/stm32mp157-dk/ F: boot/boot-wrapper-aarch64/ F: boot/grub2/ F: boot/gummiboot/ +F: configs/stm32mp157_dk_defconfig F: package/android-tools/ F: package/b43-firmware/ F: package/b43-fwcutter/ diff --git a/board/stmicroelectronics/stm32mp157-dk/genimage.cfg b/board/stmicroelectronics/stm32mp157-dk/genimage.cfg new file mode 100644 index 0000000000..33c418b9a5 --- /dev/null +++ b/board/stmicroelectronics/stm32mp157-dk/genimage.cfg @@ -0,0 +1,24 @@ +image sdcard.img { + hdimage { + gpt = "true" + } + + partition fsbl1 { + image = "u-boot-spl.stm32" + } + + partition fsbl2 { + image = "u-boot-spl.stm32" + } + + partition uboot { + image = "u-boot.img" + } + + partition rootfs { + image = "rootfs.ext4" + partition-type = 0x83 + bootable = "yes" + size = 256M + } +} diff --git a/board/stmicroelectronics/stm32mp157-dk/linux.config b/board/stmicroelectronics/stm32mp157-dk/linux.config new file mode 100644 index 0000000000..878a0c39f1 --- /dev/null +++ b/board/stmicroelectronics/stm32mp157-dk/linux.config @@ -0,0 +1,182 @@ +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_USELIB=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=16 +CONFIG_BLK_DEV_INITRD=y +CONFIG_ARCH_STM32=y +CONFIG_ARM_THUMBEE=y +# CONFIG_CACHE_L2X0 is not set +CONFIG_ARM_ERRATA_430973=y +CONFIG_ARM_ERRATA_720789=y +CONFIG_ARM_ERRATA_754322=y +CONFIG_ARM_ERRATA_754327=y +CONFIG_ARM_ERRATA_764369=y +CONFIG_ARM_ERRATA_775420=y +CONFIG_ARM_ERRATA_798181=y +CONFIG_SMP=y +CONFIG_MCPM=y +CONFIG_HIGHMEM=y +CONFIG_FORCE_MAX_ZONEORDER=12 +CONFIG_SECCOMP=y +# CONFIG_ATAGS is not set +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_VFP=y +CONFIG_NEON=y +CONFIG_KERNEL_MODE_NEON=y +CONFIG_ARM_CRYPTO=y +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_CMDLINE_PARTITION=y +CONFIG_CMA=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_CAN=y +CONFIG_CAN_M_CAN=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_DMA_CMA=y +CONFIG_CMA_SIZE_MBYTES=128 +CONFIG_SIMPLE_PM_BUS=y +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_M25P80=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_STM32_FMC2=y +CONFIG_MTD_SPI_NOR=y +# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set +CONFIG_MTD_UBI=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_SRAM=y +CONFIG_EEPROM_AT24=y +CONFIG_NETDEVICES=y +CONFIG_VIRTIO_NET=y +CONFIG_KS8851=y +CONFIG_SMSC911X=y +CONFIG_STMMAC_ETH=y +CONFIG_DWMAC_DWC_QOS_ETH=y +CONFIG_MDIO_BITBANG=y +CONFIG_INPUT_JOYDEV=y +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_EDT_FT5X06=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_STPMIC1_ONKEY=y +CONFIG_SERIAL_STM32=y +CONFIG_SERIAL_STM32_CONSOLE=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_HW_RANDOM=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX=y +CONFIG_I2C_STM32F7=y +CONFIG_SPI=y +CONFIG_SPI_STM32=y +CONFIG_SPI_STM32_QSPI=y +CONFIG_PINCTRL_SINGLE=y +CONFIG_PINCTRL_STMFX=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO=y +CONFIG_POWER_RESET_GPIO_RESTART=y +CONFIG_POWER_RESET_SYSCON=y +CONFIG_POWER_RESET_SYSCON_POWEROFF=y +CONFIG_SYSCON_REBOOT_MODE=y +CONFIG_WATCHDOG=y +CONFIG_STPMIC1_WATCHDOG=y +CONFIG_MFD_STM32_LPTIMER=y +CONFIG_MFD_STPMIC1=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_STM32_VREFBUF=y +CONFIG_REGULATOR_STM32_PWR=y +CONFIG_REGULATOR_STPMIC1=y +CONFIG_DRM=y +CONFIG_DRM_STM=y +CONFIG_DRM_STM_DSI=y +CONFIG_DRM_PANEL_ORISETECH_OTM8009A=y +CONFIG_DRM_SII902X=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_USB=y +CONFIG_USB_OTG=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PLATFORM=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_DWC2=y +CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_ISP1760=y +CONFIG_USB_HSIC_USB3503=y +CONFIG_USB_GPIO_VBUS=y +CONFIG_USB_ISP1301=y +CONFIG_USB_ULPI=y +CONFIG_TYPEC=y +CONFIG_TYPEC_STUSB=y +CONFIG_MMC=y +CONFIG_MMC_BLOCK_MINORS=16 +CONFIG_MMC_ARMMMCI=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_DW=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_PWM=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_STM32=y +CONFIG_DMADEVICES=y +CONFIG_STM32_DMA=y +CONFIG_STM32_DMAMUX=y +CONFIG_STM32_MDMA=y +CONFIG_HWSPINLOCK=y +CONFIG_HWSPINLOCK_STM32=y +CONFIG_STM32_IPCC=y +CONFIG_REMOTEPROC=y +CONFIG_STM32_RPROC=y +CONFIG_RPMSG_VIRTIO=y +CONFIG_RPMSG_TTY=y +CONFIG_IIO=y +CONFIG_IIO_SW_TRIGGER=y +CONFIG_SD_ADC_MODULATOR=y +CONFIG_STM32_ADC_CORE=y +CONFIG_STM32_ADC=y +CONFIG_STM32_ADC_TEMP=y +CONFIG_STM32_DFSDM_ADC=y +CONFIG_STM32_LPTIMER_CNT=y +CONFIG_STM32_DAC=y +CONFIG_IIO_HRTIMER_TRIGGER=y +CONFIG_IIO_STM32_LPTIMER_TRIGGER=y +CONFIG_PWM=y +CONFIG_PWM_STM32=y +CONFIG_PWM_STM32_LP=y +CONFIG_PHY_STM32_USBPHYC=y +CONFIG_NVMEM_STM32_ROMEM=y +CONFIG_EXT4_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_PRINTK_TIME=y diff --git a/board/stmicroelectronics/stm32mp157-dk/overlay/boot/extlinux/extlinux.conf b/board/stmicroelectronics/stm32mp157-dk/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..325f3fc30e --- /dev/null +++ b/board/stmicroelectronics/stm32mp157-dk/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label stm32mp15-buildroot + kernel /boot/zImage + devicetree /boot/stm32mp157c-dk2.dtb + append root=/dev/mmcblk0p4 rootwait diff --git a/board/stmicroelectronics/stm32mp157-dk/readme.txt b/board/stmicroelectronics/stm32mp157-dk/readme.txt new file mode 100644 index 0000000000..ac2061a234 --- /dev/null +++ b/board/stmicroelectronics/stm32mp157-dk/readme.txt @@ -0,0 +1,38 @@ +STM32MP157 Discovery Kit + +Intro +===== + +This configuration supports the STM32MP157 Discovery Kit 2 (DK2) +platform: + + https://www.st.com/en/evaluation-tools/stm32mp157c-dk2.html + +How to build +============ + + $ make stm32mp157_dk_defconfig + $ make + +How to write the microSD 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 microSD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Boot the board +============== + + (1) Insert the microSD card in connector CN15 + + (2) Plug a micro-USB cable in connector CN11 and run your serial + communication program on /dev/ttyACM0. + + (3) Plug a USB-C cable in CN6 to power-up the board. + + (4) The system will start, with the console on UART, but also visible + on the screen. diff --git a/board/stmicroelectronics/stm32mp157-dk/uboot-fragment.config b/board/stmicroelectronics/stm32mp157-dk/uboot-fragment.config new file mode 100644 index 0000000000..a278ce9e23 --- /dev/null +++ b/board/stmicroelectronics/stm32mp157-dk/uboot-fragment.config @@ -0,0 +1 @@ +# CONFIG_STM32MP_WATCHDOG is not set diff --git a/configs/stm32mp157_dk_defconfig b/configs/stm32mp157_dk_defconfig new file mode 100644 index 0000000000..cb8cfb1693 --- /dev/null +++ b/configs/stm32mp157_dk_defconfig @@ -0,0 +1,30 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157-dk/overlay/" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32mp157-dk/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,STMicroelectronics,linux,v4.19-stm32mp-r1.5)/linux-v4.19-stm32mp-r1.5.tar.gz" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157-dk/linux.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157c-dk2" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR 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,STMicroelectronics,u-boot,v2018.11-stm32mp-r2.5)/u-boot-v2018.11-stm32mp-r2.5.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_basic" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/stm32mp157-dk/uboot-fragment.config" +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.stm32" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157c-dk2" +BR2_PACKAGE_HOST_GENIMAGE=y From 3416488db66dd0848af486d34599587d8047fd84 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 12 Aug 2019 15:28:22 -0600 Subject: [PATCH 017/120] package/python-aiomonitor: bump to version 0.4.4 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-aiomonitor/python-aiomonitor.hash | 4 ++-- package/python-aiomonitor/python-aiomonitor.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiomonitor/python-aiomonitor.hash b/package/python-aiomonitor/python-aiomonitor.hash index ddcfd071e2..14a4466ddd 100644 --- a/package/python-aiomonitor/python-aiomonitor.hash +++ b/package/python-aiomonitor/python-aiomonitor.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiomonitor/json -md5 0f58ac68497a59d104ecb6ba369df784 aiomonitor-0.4.3.tar.gz -sha256 37cd279c26e2c80b4e6ed9d23476c84c0b75fc3794617fceb6f341437b9af5fe aiomonitor-0.4.3.tar.gz +md5 38028c80adf5708ad5f7adadf0fdf404 aiomonitor-0.4.4.tar.gz +sha256 c3e0d79cb637baa06ce50db8070e8db0798e16ea626606b703d9d0e3ca5b30ff aiomonitor-0.4.4.tar.gz # Locally computed sha256 checksums sha256 9b42fe3a288996988c552e387e7877be7525a1649e62086aedd6b32d3cb56365 LICENSE diff --git a/package/python-aiomonitor/python-aiomonitor.mk b/package/python-aiomonitor/python-aiomonitor.mk index 88f28a52dd..4cd7254bdd 100644 --- a/package/python-aiomonitor/python-aiomonitor.mk +++ b/package/python-aiomonitor/python-aiomonitor.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOMONITOR_VERSION = 0.4.3 +PYTHON_AIOMONITOR_VERSION = 0.4.4 PYTHON_AIOMONITOR_SOURCE = aiomonitor-$(PYTHON_AIOMONITOR_VERSION).tar.gz -PYTHON_AIOMONITOR_SITE = https://files.pythonhosted.org/packages/11/27/2d25a3318e57181e04d2694768f0e1e621b64606d8424076790caa29e401 +PYTHON_AIOMONITOR_SITE = https://files.pythonhosted.org/packages/fe/15/ac345a2a55ef106b466347c58ebc5f77ef491aea5a05f700e80a181cda47 PYTHON_AIOMONITOR_SETUP_TYPE = setuptools PYTHON_AIOMONITOR_LICENSE = Apache-2.0 PYTHON_AIOMONITOR_LICENSE_FILES = LICENSE From 2f176b837bbd2eb5ab4d23b7ba0528e548287aa7 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 12 Aug 2019 17:03:45 -0600 Subject: [PATCH 018/120] package/python-brotli: new package Signed-off-by: James Hilliard [Thomas: license is MIT, not Apache-2.0] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-brotli/Config.in | 7 +++++++ package/python-brotli/python-brotli.hash | 5 +++++ package/python-brotli/python-brotli.mk | 20 ++++++++++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 package/python-brotli/Config.in create mode 100644 package/python-brotli/python-brotli.hash create mode 100644 package/python-brotli/python-brotli.mk diff --git a/DEVELOPERS b/DEVELOPERS index 8ad48b95cb..27a98db256 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1087,6 +1087,7 @@ F: package/python-aiomonitor/ F: package/python-aiojobs/ F: package/python-aiorwlock/ F: package/python-async-timeout/ +F: package/python-brotli/ F: package/python-cchardet/ F: package/python-multidict/ F: package/python-pycares/ diff --git a/package/Config.in b/package/Config.in index c984dcea6f..9f544f955c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -844,6 +844,7 @@ menu "External python modules" source "package/python-beautifulsoup4/Config.in" source "package/python-bitstring/Config.in" source "package/python-bottle/Config.in" + source "package/python-brotli/Config.in" source "package/python-cached-property/Config.in" source "package/python-can/Config.in" source "package/python-cbor/Config.in" diff --git a/package/python-brotli/Config.in b/package/python-brotli/Config.in new file mode 100644 index 0000000000..1c09c26866 --- /dev/null +++ b/package/python-brotli/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_BROTLI + bool "python-brotli" + depends on BR2_INSTALL_LIBSTDCPP + help + Python bindings for the Brotli compression library. + + https://github.com/google/brotli diff --git a/package/python-brotli/python-brotli.hash b/package/python-brotli/python-brotli.hash new file mode 100644 index 0000000000..eaf59ae71e --- /dev/null +++ b/package/python-brotli/python-brotli.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/brotli/json +md5 3444b534e86f65f9f229fd123965be87 Brotli-1.0.7.zip +sha256 0538dc1744fd17c314d2adc409ea7d1b779783b89fd95bcfb0c2acc93a6ea5a7 Brotli-1.0.7.zip +# Locally computed sha256 checksums +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 LICENSE diff --git a/package/python-brotli/python-brotli.mk b/package/python-brotli/python-brotli.mk new file mode 100644 index 0000000000..745255f413 --- /dev/null +++ b/package/python-brotli/python-brotli.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# python-brotli +# +################################################################################ + +PYTHON_BROTLI_VERSION = 1.0.7 +PYTHON_BROTLI_SOURCE = Brotli-$(PYTHON_BROTLI_VERSION).zip +PYTHON_BROTLI_SITE = https://files.pythonhosted.org/packages/cd/9c/7955895f5672ecc85270244582c6b53ff95bb4c24bf77bd9271d42351635 +PYTHON_BROTLI_SETUP_TYPE = setuptools +PYTHON_BROTLI_LICENSE = MIT +PYTHON_BROTLI_LICENSE_FILES = LICENSE + +define PYTHON_BROTLI_EXTRACT_CMDS + $(UNZIP) -d $(@D) $(PYTHON_BROTLI_DL_DIR)/$(PYTHON_BROTLI_SOURCE) + mv $(@D)/Brotli-$(PYTHON_BROTLI_VERSION)/* $(@D) + $(RM) -r $(@D)/Brotli-$(PYTHON_BROTLI_VERSION) +endef + +$(eval $(python-package)) From 0213feb8231daceb88d09a47ad915066447a9f95 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Tue, 13 Aug 2019 18:04:57 +0200 Subject: [PATCH 019/120] package/libestr: bump to version 0.1.11 See https://libestr.adiscon.com/uncategorized/libestr-0-1-11-2/ Signed-off-by: Pierre-Jean Texier Signed-off-by: Thomas Petazzoni --- package/libestr/libestr.hash | 4 ++-- package/libestr/libestr.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libestr/libestr.hash b/package/libestr/libestr.hash index dcb504d3e1..6445d01081 100644 --- a/package/libestr/libestr.hash +++ b/package/libestr/libestr.hash @@ -1,5 +1,5 @@ -# From http://libestr.adiscon.com/download/libestr-0-1-10/ -sha256 bd655e126e750edd18544b88eb1568d200a424a0c23f665eb14bbece07ac703c libestr-0.1.10.tar.gz +# From http://libestr.adiscon.com/download/libestr-0-1-11/ +sha256 46632b2785ff4a231dcf241eeb0dcb5fc0c7d4da8ee49cf5687722cdbe8b2024 libestr-0.1.11.tar.gz # Hash for license file: sha256 835b4793da5cbb8965fbd63905b55a4cb4310b7d1b882077d23066b08f901ff8 COPYING diff --git a/package/libestr/libestr.mk b/package/libestr/libestr.mk index dcd209474c..30960f7257 100644 --- a/package/libestr/libestr.mk +++ b/package/libestr/libestr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBESTR_VERSION = 0.1.10 +LIBESTR_VERSION = 0.1.11 LIBESTR_SITE = http://libestr.adiscon.com/files/download LIBESTR_LICENSE = LGPL-2.1+ LIBESTR_LICENSE_FILES = COPYING From 152776b4207bd7f369f8ff7d4e3b1dff7063111f Mon Sep 17 00:00:00 2001 From: Victor Huesca Date: Tue, 13 Aug 2019 09:33:20 +0200 Subject: [PATCH 020/120] support/testing: new test for root password Add support to test that the root passowrd is working as expected. - Buildtime test: Check the hash present in the generated '/etc/shadow'. - Runtime test: Build an armv7 image and try to login with a password. Signed-off-by: Victor Huesca Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 1 + DEVELOPERS | 3 ++ .../testing/tests/core/test_root_password.py | 36 +++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 support/testing/tests/core/test_root_password.py diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ee6e248b1..99940640a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -341,6 +341,7 @@ tests.core.test_hardening.TestRelroPartial: { extends: .runtime_test } tests.core.test_hardening.TestSspNone: { extends: .runtime_test } tests.core.test_hardening.TestSspStrong: { extends: .runtime_test } tests.core.test_post_scripts.TestPostScripts: { extends: .runtime_test } +tests.core.test_root_password.TestRootPassword: { extends: .runtime_test } tests.core.test_rootfs_overlay.TestRootfsOverlay: { extends: .runtime_test } tests.core.test_timezone.TestGlibcAllTimezone: { extends: .runtime_test } tests.core.test_timezone.TestGlibcNonDefaultLimitedTimezone: { extends: .runtime_test } diff --git a/DEVELOPERS b/DEVELOPERS index 27a98db256..5fe244a570 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2308,6 +2308,9 @@ F: package/llvm/ N: Vanya Sergeev F: package/lua-periphery/ +N: Victor Huesca +F: support/testing/tests/core/test_root_password.py + N: Vincent Prince F: package/nss-myhostname/ F: package/utp_com/ diff --git a/support/testing/tests/core/test_root_password.py b/support/testing/tests/core/test_root_password.py new file mode 100644 index 0000000000..aefcd3605c --- /dev/null +++ b/support/testing/tests/core/test_root_password.py @@ -0,0 +1,36 @@ +import os +import infra.basetest +from crypt import crypt + + +class TestRootPassword(infra.basetest.BRTest): + password = "foo" + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ENABLE_ROOT_LOGIN=y + BR2_TARGET_GENERIC_ROOT_PASSWD="{}" + """.format(password) + + def test_run(self): + # 1. Test by looking hash in the /etc/shadow + shadow = os.path.join(self.builddir, "target", "etc", "shadow") + with open(shadow, "r") as f: + users = f.readlines() + for user in users: + s = user.split(":") + n, h = s[0], s[1] + if n == "root": + # Fail if the account is disabled or no password is required + self.assertTrue(h not in ["", "*"]) + # Fail if the hash isn't right + self.assertEqual(crypt(self.password, h), h) + + # 2. Test by attempting to login + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + try: + self.emulator.boot(arch="armv7", kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login(self.password) + except SystemError: + self.fail("Unable to login with the password") From d3bdaf008dddf9a0f5ed2420af6f4b79d63a5019 Mon Sep 17 00:00:00 2001 From: Ilya Averyanov Date: Fri, 9 Aug 2019 13:46:55 +0300 Subject: [PATCH 021/120] package/libvips: bump version to 8.8.1 - Remove patch, as gtk-doc disabling now works correctly. - The XML library in use is now expat, instead of libxml2 Signed-off-by: Ilya Averyanov Signed-off-by: Thomas Petazzoni --- package/libvips/0001-fix-no-gtk-doc.patch | 35 ----------------------- package/libvips/Config.in | 2 +- package/libvips/libvips.hash | 2 +- package/libvips/libvips.mk | 11 +++---- 4 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 package/libvips/0001-fix-no-gtk-doc.patch diff --git a/package/libvips/0001-fix-no-gtk-doc.patch b/package/libvips/0001-fix-no-gtk-doc.patch deleted file mode 100644 index bfaf7c345b..0000000000 --- a/package/libvips/0001-fix-no-gtk-doc.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a3d47be3b6bed845af5e1aa87ca2da2b1e840cbb Mon Sep 17 00:00:00 2001 -From: Pieter De Gendt -Date: Thu, 29 Jan 2015 12:25:35 +0100 -Subject: [PATCH] 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: Pieter De Gendt ---- - doc/reference/gtk-doc.make | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/reference/gtk-doc.make b/doc/reference/gtk-doc.make -index e791656..786803e 100644 ---- a/doc/reference/gtk-doc.make -+++ b/doc/reference/gtk-doc.make -@@ -267,7 +267,7 @@ uninstall-local: - # - # Require gtk-doc when making dist - # --if HAVE_GTK_DOC -+if ENABLE_GTK_DOC - dist-check-gtkdoc: docs - else - dist-check-gtkdoc: --- -2.2.2 - diff --git a/package/libvips/Config.in b/package/libvips/Config.in index e16e5277c0..70d01f0e35 100644 --- a/package/libvips/Config.in +++ b/package/libvips/Config.in @@ -6,8 +6,8 @@ config BR2_PACKAGE_LIBVIPS # C++ support is required to build libvips # https://github.com/jcupitt/libvips/issues/231 depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBXML2 help libvips is a 2D image processing library. Compared to similar libraries, libvips runs quickly and uses little diff --git a/package/libvips/libvips.hash b/package/libvips/libvips.hash index 18c1ae80f9..54d838bb9b 100644 --- a/package/libvips/libvips.hash +++ b/package/libvips/libvips.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 45961855e21c8d5f0983d05bb79a6f3c2427dc6eed8e3ac68c0f62759b8612c6 vips-7.42.2.tar.gz +sha256 a0ee255a2a1ebfea5b2dff2a780824d7157a78c010d7ddd531279aacefbf2539 vips-8.8.1.tar.gz diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk index 72fcf6003e..269b0866c8 100644 --- a/package/libvips/libvips.mk +++ b/package/libvips/libvips.mk @@ -4,14 +4,11 @@ # ################################################################################ -LIBVIPS_VERSION_MAJOR = 7.42 -LIBVIPS_VERSION = $(LIBVIPS_VERSION_MAJOR).2 +LIBVIPS_VERSION = 8.8.1 LIBVIPS_SOURCE = vips-$(LIBVIPS_VERSION).tar.gz -LIBVIPS_SITE = http://www.vips.ecs.soton.ac.uk/supported/$(LIBVIPS_VERSION_MAJOR) +LIBVIPS_SITE = https://github.com/libvips/libvips/releases/download/v$(LIBVIPS_VERSION) LIBVIPS_LICENSE = LGPL-2.1+ LIBVIPS_LICENSE_FILES = COPYING -# We're patching gtk-doc.make, so need to autoreconf -LIBVIPS_AUTORECONF = YES # Sparc64 compile fails, for all optimization levels except -O0. To # fix the problem, use -O0 with no optimization instead. Bug reported @@ -41,8 +38,8 @@ LIBVIPS_CONF_OPTS = \ --without-python LIBVIPS_INSTALL_STAGING = YES LIBVIPS_DEPENDENCIES = \ - host-pkgconf libglib2 \ - libxml2 $(TARGET_NLS_DEPENDENCIES) + host-pkgconf expat libglib2 \ + $(TARGET_NLS_DEPENDENCIES) # --disable-cxx is broken upstream # https://github.com/jcupitt/libvips/issues/231 From e5797e23260581a60dfdbdf17f7724f548a08864 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 15 Aug 2019 13:32:14 +0200 Subject: [PATCH 022/120] package/mutt: bump to version 1.12.1 Remove both patches (already in version) and drop AUTORECONF Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-static-build-with-idn2-and-unistrin.patch | 37 -------------- ...Fix-unistring-library-configure-test.patch | 49 ------------------- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 4 +- 4 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 package/mutt/0001-configure.ac-fix-static-build-with-idn2-and-unistrin.patch delete mode 100644 package/mutt/0002-Fix-unistring-library-configure-test.patch diff --git a/package/mutt/0001-configure.ac-fix-static-build-with-idn2-and-unistrin.patch b/package/mutt/0001-configure.ac-fix-static-build-with-idn2-and-unistrin.patch deleted file mode 100644 index c802cbb365..0000000000 --- a/package/mutt/0001-configure.ac-fix-static-build-with-idn2-and-unistrin.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c53b36698fe4721fb562908ac6119aa9280383af Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 14 Apr 2019 10:22:12 +0200 -Subject: [PATCH] configure.ac: fix static build with idn2 and unistring - -Commit 78db40f25c6479b14da5a73adf7207bfbec5ccc5 did not fix static build -failure - -AC_SEARCH_LIBS prepends the library to LIBS as a result -lunistring is -added before -lidn2. To fix static build, we must set -lunistring after --lidn2 - -Fixes: - - http://autobuild.buildroot.org/results/c9544b4f1a0252e260a2ed19218fa950f4dc2d2d - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://gitlab.com/muttmua/mutt/merge_requests/42] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index bd8beb91..75943eee 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1402,7 +1402,7 @@ if test "x$with_idn2" != "xno"; then - AC_SEARCH_LIBS([idn2_check_version], [idn2], [ - AC_DEFINE([HAVE_LIBIDN2], 1, [Define to 1 if you have the GNU idn2 library]) - dnl -lunistring is needed for static linking -- AC_SEARCH_LIBS([u8_strconv_from_locale], [unistring]) -+ AC_SEARCH_LIBS([u8_strconv_from_locale], [unistring], [LIBS="$LIBS -lunistring"]) - MUTTLIBS="$MUTTLIBS $LIBS" - - dnl libidn2 >= 2.0.0 declares compatibility macros in idn2.h --- -2.20.1 - diff --git a/package/mutt/0002-Fix-unistring-library-configure-test.patch b/package/mutt/0002-Fix-unistring-library-configure-test.patch deleted file mode 100644 index 46c8115c4f..0000000000 --- a/package/mutt/0002-Fix-unistring-library-configure-test.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9da6bde1feafbe886c295027b959be47b4ad55b0 Mon Sep 17 00:00:00 2001 -From: Kevin McCarthy -Date: Sun, 21 Apr 2019 11:00:23 -0700 -Subject: [PATCH] Fix unistring library configure test. - -The "action-if-found" argument of AC_SEARCH_LIBS is run even if the -result is "none required" (i.e. the test function is already in LIBS, -in this case -lidn2). - -This was causing "-lunistring" to be appended on a system without the -library installed, generating a build error. Fix the test to not -append the library for the "none required" case. - -Thanks to Fabrice Fontaine for reporting this issue and helping me -test the fix. - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://gitlab.com/muttmua/mutt/commit/9da6bde1feafbe886c295027b959be47b4ad55b0] ---- - configure.ac | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 75943eee..102ddea2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1401,10 +1401,16 @@ if test "x$with_idn2" != "xno"; then - - AC_SEARCH_LIBS([idn2_check_version], [idn2], [ - AC_DEFINE([HAVE_LIBIDN2], 1, [Define to 1 if you have the GNU idn2 library]) -- dnl -lunistring is needed for static linking -- AC_SEARCH_LIBS([u8_strconv_from_locale], [unistring], [LIBS="$LIBS -lunistring"]) - MUTTLIBS="$MUTTLIBS $LIBS" - -+ dnl -lunistring is needed for static linking, and has to come -+ dnl after the -lidn2 -+ AC_SEARCH_LIBS([u8_strconv_from_locale], [unistring], [ -+ if test "$ac_cv_search_u8_strconv_from_locale" != "none required"; then -+ MUTTLIBS="$MUTTLIBS -lunistring" -+ fi -+ ]) -+ - dnl libidn2 >= 2.0.0 declares compatibility macros in idn2.h - LIBS="$LIBS $LIBICONV" - AC_CHECK_DECL([idna_to_unicode_8z8z], --- -2.18.1 - diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index d0e2d2dd83..376fd8215c 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b651357ea6c8762178080493991c77ecb111d916d171d422500257ab48be2801 mutt-1.11.4.tar.gz +sha256 01c565406ec4ffa85db90b45ece2260b25fac3646cc063bbc20a242c6ed4210c mutt-1.12.1.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 613358abdd..6a52106abc 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,14 +4,12 @@ # ################################################################################ -MUTT_VERSION = 1.11.4 +MUTT_VERSION = 1.12.1 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL MUTT_DEPENDENCIES = ncurses MUTT_CONF_OPTS = --disable-doc --disable-smtp -# We're patching configure.ac -MUTT_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBICONV),y) MUTT_DEPENDENCIES += libiconv From b0fb35230b7819c3c19fbe4233354df945ad10b6 Mon Sep 17 00:00:00 2001 From: Koen Martens Date: Thu, 15 Aug 2019 13:17:55 +0200 Subject: [PATCH 023/120] package/linuxconsoletools: bump version to 1.6.1 Release notes: Version 1.6.1 ------------- * inputattach supports the RainShadow HDMI CEC dongle (this requires kernel 4.12 or later; thanks to Hans Verkuil). * The jscal store and restore tools use udevadm on the path, instead of hard-coding /sbin. Signed-off-by: Koen Martens Signed-off-by: Thomas Petazzoni --- package/linuxconsoletools/linuxconsoletools.hash | 2 +- package/linuxconsoletools/linuxconsoletools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linuxconsoletools/linuxconsoletools.hash b/package/linuxconsoletools/linuxconsoletools.hash index 756c9f434e..3eead201df 100644 --- a/package/linuxconsoletools/linuxconsoletools.hash +++ b/package/linuxconsoletools/linuxconsoletools.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ced2efed00b67b45f82eddc69be07385835d558f658016315ac621fe2eaa8146 linuxconsoletools-1.6.0.tar.bz2 +sha256 e9d6b05a6c57c7eb3ec7f9f017f46b20e4b55d5a02f930eff1823a13921c5934 linuxconsoletools-1.6.1.tar.bz2 diff --git a/package/linuxconsoletools/linuxconsoletools.mk b/package/linuxconsoletools/linuxconsoletools.mk index 82ff4c3133..b22e136d33 100644 --- a/package/linuxconsoletools/linuxconsoletools.mk +++ b/package/linuxconsoletools/linuxconsoletools.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUXCONSOLETOOLS_VERSION = 1.6.0 +LINUXCONSOLETOOLS_VERSION = 1.6.1 LINUXCONSOLETOOLS_SOURCE = linuxconsoletools-$(LINUXCONSOLETOOLS_VERSION).tar.bz2 LINUXCONSOLETOOLS_SITE = https://downloads.sourceforge.net/project/linuxconsole LINUXCONSOLETOOLS_LICENSE = GPL-2.0+ From 338d922a5844a0581d8d935f29d9499f0531eea0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 11 Aug 2019 23:50:28 +0200 Subject: [PATCH 024/120] package/micropython: fix build with gcc 9 Fixes: - http://autobuild.buildroot.org/results/087906ea63875bcea244aa8f1e551aecd8285f65 Signed-off-by: Fabrice Fontaine Reviewed-by: Chris Packham Signed-off-by: Thomas Petazzoni --- ..._vsnprintf-alias-for-gcc-9-and-above.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/micropython/0002-lib-utils-printf-Exclude-__GI_vsnprintf-alias-for-gcc-9-and-above.patch diff --git a/package/micropython/0002-lib-utils-printf-Exclude-__GI_vsnprintf-alias-for-gcc-9-and-above.patch b/package/micropython/0002-lib-utils-printf-Exclude-__GI_vsnprintf-alias-for-gcc-9-and-above.patch new file mode 100644 index 0000000000..161d97e5b9 --- /dev/null +++ b/package/micropython/0002-lib-utils-printf-Exclude-__GI_vsnprintf-alias-for-gcc-9-and-above.patch @@ -0,0 +1,32 @@ +From 7bbde67cb2dc52c04bd7020689a1227bddfa1b06 Mon Sep 17 00:00:00 2001 +From: Damien George +Date: Wed, 6 Feb 2019 01:12:51 +1100 +Subject: [PATCH] lib/utils/printf: Exclude __GI_vsnprintf alias for gcc 9 and + above. + +See issue #4457. + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/micropython/micropython/commit/7bbde67cb2dc52c04bd7020689a1227bddfa1b06] +--- + lib/utils/printf.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/utils/printf.c b/lib/utils/printf.c +index 1ceeea39ff..0c21fc4c0a 100644 +--- a/lib/utils/printf.c ++++ b/lib/utils/printf.c +@@ -99,9 +99,11 @@ STATIC void strn_print_strn(void *data, const char *str, size_t len) { + strn_print_env->remain -= len; + } + +-#if defined(__GNUC__) && !defined(__clang__) ++#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 9 + // uClibc requires this alias to be defined, or there may be link errors + // when linkings against it statically. ++// GCC 9 gives a warning about missing attributes so it's excluded until ++// uClibc+GCC9 support is needed. + int __GI_vsnprintf(char *str, size_t size, const char *fmt, va_list ap) __attribute__((weak, alias ("vsnprintf"))); + #endif + From 033c690e31322df9c3bb6b4403e0f5ca7c043343 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Thu, 15 Aug 2019 20:18:16 +1200 Subject: [PATCH 025/120] package/micropython: bump version to 1.11 Bring in the latest version and remove patch that has been applied upstream. Signed-off-by: Chris Packham Signed-off-by: Thomas Petazzoni --- ..._vsnprintf-alias-for-gcc-9-and-above.patch | 32 ------------------- package/micropython/micropython.hash | 2 +- package/micropython/micropython.mk | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 package/micropython/0002-lib-utils-printf-Exclude-__GI_vsnprintf-alias-for-gcc-9-and-above.patch diff --git a/package/micropython/0002-lib-utils-printf-Exclude-__GI_vsnprintf-alias-for-gcc-9-and-above.patch b/package/micropython/0002-lib-utils-printf-Exclude-__GI_vsnprintf-alias-for-gcc-9-and-above.patch deleted file mode 100644 index 161d97e5b9..0000000000 --- a/package/micropython/0002-lib-utils-printf-Exclude-__GI_vsnprintf-alias-for-gcc-9-and-above.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7bbde67cb2dc52c04bd7020689a1227bddfa1b06 Mon Sep 17 00:00:00 2001 -From: Damien George -Date: Wed, 6 Feb 2019 01:12:51 +1100 -Subject: [PATCH] lib/utils/printf: Exclude __GI_vsnprintf alias for gcc 9 and - above. - -See issue #4457. - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/micropython/micropython/commit/7bbde67cb2dc52c04bd7020689a1227bddfa1b06] ---- - lib/utils/printf.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/utils/printf.c b/lib/utils/printf.c -index 1ceeea39ff..0c21fc4c0a 100644 ---- a/lib/utils/printf.c -+++ b/lib/utils/printf.c -@@ -99,9 +99,11 @@ STATIC void strn_print_strn(void *data, const char *str, size_t len) { - strn_print_env->remain -= len; - } - --#if defined(__GNUC__) && !defined(__clang__) -+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 9 - // uClibc requires this alias to be defined, or there may be link errors - // when linkings against it statically. -+// GCC 9 gives a warning about missing attributes so it's excluded until -+// uClibc+GCC9 support is needed. - int __GI_vsnprintf(char *str, size_t size, const char *fmt, va_list ap) __attribute__((weak, alias ("vsnprintf"))); - #endif - diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash index d0052ba299..1b77bc6efe 100644 --- a/package/micropython/micropython.hash +++ b/package/micropython/micropython.hash @@ -1,2 +1,2 @@ #locally computed -sha256 9a66205d0ba3dff6dcc98119f104cd59c15855c6c030a190ca02354be52836c1 micropython-1.9.4.tar.gz +sha256 2ab6f75b4bff040445f848004d387dbe1bcbdf1188db2334b2bd3eaa173eb744 micropython-1.11.tar.gz diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index cd6f674094..d636d0e869 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -4,7 +4,7 @@ # ################################################################################ -MICROPYTHON_VERSION = 1.9.4 +MICROPYTHON_VERSION = 1.11 MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION)) MICROPYTHON_LICENSE = MIT MICROPYTHON_LICENSE_FILES = LICENSE From 9695f3e06935e28b6737b3509c349433c217d105 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Thu, 15 Aug 2019 20:50:55 +1200 Subject: [PATCH 026/120] package/syslog-ng: bump version to 3.22.1 Import new version an drop two patches that have been applied upstream. Signed-off-by: Chris Packham Signed-off-by: Thomas Petazzoni --- .../0002-build-make-dlsym-optional.patch | 160 ------------------ ...thread-atfork-also-in-libc-nonshared.patch | 49 ------ package/syslog-ng/syslog-ng.hash | 2 +- package/syslog-ng/syslog-ng.mk | 2 +- 4 files changed, 2 insertions(+), 211 deletions(-) delete mode 100644 package/syslog-ng/0002-build-make-dlsym-optional.patch delete mode 100644 package/syslog-ng/0003-look-for-pthread-atfork-also-in-libc-nonshared.patch diff --git a/package/syslog-ng/0002-build-make-dlsym-optional.patch b/package/syslog-ng/0002-build-make-dlsym-optional.patch deleted file mode 100644 index bb29e1ed7c..0000000000 --- a/package/syslog-ng/0002-build-make-dlsym-optional.patch +++ /dev/null @@ -1,160 +0,0 @@ -From d85121c0dc700cad4bd9735b0ee1dab9addf9dd7 Mon Sep 17 00:00:00 2001 -From: Kokan -Date: Thu, 17 Jan 2019 18:44:41 +0100 -Subject: [PATCH] build: make dlsym optional - -In case of static uClibc-ng lib, the does not exists. - -The signal-handler.c solves an issue in case of program src/dst -and Java destination. That combination is really rare if not impossible. - -This patch simply disables own sigaction if is not present. - -Signed-off-by: Kokan - -Downloaded from upstream commit -https://github.com/balabit/syslog-ng/commit/d85121c0dc700cad4bd9735b0ee1dab9addf9dd7 - -Signed-off-by: Chris Packham ---- - CMakeLists.txt | 1 + - configure.ac | 1 + - lib/CMakeLists.txt | 1 - - lib/Makefile.am | 1 - - lib/signal-handler.c | 8 ++++---- - lib/signal-handler.h | 31 ------------------------------- - syslog-ng-config.h.in | 1 + - 7 files changed, 7 insertions(+), 37 deletions(-) - delete mode 100644 lib/signal-handler.h - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c847a547b..dee691388 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,6 +106,7 @@ check_symbol_exists("getrandom" "sys/random.h" SYSLOG_NG_HAVE_GETRANDOM) - - check_include_files(utmp.h SYSLOG_NG_HAVE_UTMP_H) - check_include_files(utmpx.h SYSLOG_NG_HAVE_UTMPX_H) -+check_include_files(dlfcn.h SYSLOG_NG_HAVE_DLFCN_H) - - check_struct_has_member("struct utmpx" "ut_type" "utmpx.h" UTMPX_HAS_UT_TYPE LANGUAGE C) - check_struct_has_member("struct utmp" "ut_type" "utmp.h" UTMP_HAS_UT_TYPE LANGUAGE C) -diff --git a/configure.ac b/configure.ac -index 6bdd8d252..6ef0ad2b4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -627,6 +627,7 @@ dnl *************************************************************************** - - AC_HEADER_STDC - AC_CHECK_HEADER(dmalloc.h) -+AC_CHECK_HEADER(dlfcn.h) - AC_CHECK_HEADERS(strings.h \ - getopt.h \ - stropts.h \ -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index be2da32a4..5268712e9 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -91,7 +91,6 @@ set (LIB_HEADERS - logthrdestdrv.h - logwriter.h - mainloop.h -- signal-handler.h - mainloop-call.h - mainloop-worker.h - mainloop-io-worker.h -diff --git a/lib/Makefile.am b/lib/Makefile.am -index ec1928795..5f9e93d79 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -129,7 +129,6 @@ pkginclude_HEADERS += \ - lib/logthrdestdrv.h \ - lib/logwriter.h \ - lib/mainloop.h \ -- lib/signal-handler.h \ - lib/mainloop-call.h \ - lib/mainloop-worker.h \ - lib/mainloop-io-worker.h \ -diff --git a/lib/signal-handler.c b/lib/signal-handler.c -index 5657ba182..8f52f675b 100644 ---- a/lib/signal-handler.c -+++ b/lib/signal-handler.c -@@ -21,14 +21,15 @@ - * COPYING for details. - * - */ --#include "signal-handler.h" - - #include "syslog-ng.h" - #include "children.h" - --#ifndef _WIN32 -+#include -+ -+#if SYSLOG_NG_HAVE_DLFCN_H -+ - #include --#endif - - static const struct sigaction *sgchld_handler; - -@@ -41,7 +42,6 @@ trigger_sigchld_handler_chain(int signum) - } - } - --#ifndef _WIN32 - static int - call_original_sigaction(int signum, const struct sigaction *act, struct sigaction *oldact) - { -diff --git a/lib/signal-handler.h b/lib/signal-handler.h -deleted file mode 100644 -index 36e5ac293..000000000 ---- a/lib/signal-handler.h -+++ /dev/null -@@ -1,31 +0,0 @@ --/* -- * Copyright (c) 2018 Balabit -- * Copyright (c) 2018 Kokan -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2.1 of the License, or (at your option) any later version. -- * -- * This 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 this library; if not, write to the Free Software -- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -- * -- * As an additional exemption you are allowed to compile & link against the -- * OpenSSL libraries as published by the OpenSSL project. See the file -- * COPYING for details. -- * -- */ --#ifndef SIGNAL_HANDLER_H_INCLUDED --#define SIGNAL_HANDLER_H_INCLUDED -- --#include -- --void trigger_sigchld_handler_chain(int); -- --#endif -diff --git a/syslog-ng-config.h.in b/syslog-ng-config.h.in -index 9e372f103..d8208eedd 100644 ---- a/syslog-ng-config.h.in -+++ b/syslog-ng-config.h.in -@@ -38,6 +38,7 @@ - #cmakedefine SYSLOG_NG_PATH_XSDDIR "@SYSLOG_NG_PATH_XSDDIR@" - #cmakedefine SYSLOG_NG_HAVE_GETUTENT @SYSLOG_NG_HAVE_GETUTENT@ - #cmakedefine SYSLOG_NG_HAVE_GETUTXENT @SYSLOG_NG_HAVE_GETUTXENT@ -+#cmakedefine SYSLOG_NG_HAVE_DLFCN_H @SYSLOG_NG_HAVE_DLFCN_H@ - #cmakedefine SYSLOG_NG_HAVE_UTMPX_H @SYSLOG_NG_HAVE_UTMPX_H@ - #cmakedefine SYSLOG_NG_HAVE_UTMP_H @SYSLOG_NG_HAVE_UTMP_H@ - #cmakedefine SYSLOG_NG_HAVE_MODERN_UTMP @SYSLOG_NG_HAVE_MODERN_UTMP@ --- -2.20.1 - diff --git a/package/syslog-ng/0003-look-for-pthread-atfork-also-in-libc-nonshared.patch b/package/syslog-ng/0003-look-for-pthread-atfork-also-in-libc-nonshared.patch deleted file mode 100644 index 0f8454af97..0000000000 --- a/package/syslog-ng/0003-look-for-pthread-atfork-also-in-libc-nonshared.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a844abca43349739c36a4cdb7ea6f3bce560bd7f Mon Sep 17 00:00:00 2001 -From: Rolf Eike Beer -Date: Thu, 8 Nov 2018 08:14:46 +0100 -Subject: [PATCH] look for pthread_atfork() also in lib c_nonshared - -Newer versions of glibc do not have pthread_nonshared anymore, instead the -symbol is in c_nonshared. This fixes a crash on start on those platforms -(namely with syslog-ng). - -Signed-off-by: Rolf Eike Beer -[ThomasDS: backport from https://github.com/buytenh/ivykis/pull/16, at this -moment not yet merged upstream. -See also: -- https://github.com/buytenh/ivykis/issues/15 -- https://github.com/balabit/syslog-ng/issues/2263 -] -Signed-off-by: Thomas De Schampheleire - ---- - configure.ac | 2 ++ - src/pthr.h | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/ivykis/configure.ac b/lib/ivykis/configure.ac -index e9b10c0..56440d1 100644 ---- a/lib/ivykis/configure.ac -+++ b/lib/ivykis/configure.ac -@@ -88,6 +88,8 @@ esac - # link in libpthread_nonshared.a if it is available. - # - AC_CHECK_LIB([pthread_nonshared], [pthread_atfork]) -+# the lib is gone in glibc 2.28, things are now in c_nonshared -+AC_CHECK_LIB([c_nonshared], [pthread_atfork]) - - # Checks for header files. - AC_CHECK_HEADERS([process.h]) -diff --git a/lib/ivykis/src/pthr.h b/lib/ivykis/src/pthr.h -index a41eaf3..32c1af2 100644 ---- a/lib/ivykis/src/pthr.h -+++ b/lib/ivykis/src/pthr.h -@@ -42,7 +42,7 @@ static inline int pthreads_available(void) - * symbol because that causes it to be undefined even if you link - * libpthread_nonshared.a in explicitly. - */ --#ifndef HAVE_LIBPTHREAD_NONSHARED -+#if !defined(HAVE_LIBPTHREAD_NONSHARED) && !defined(HAVE_LIBC_NONSHARED) - #pragma weak pthread_atfork - #endif - diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash index 1f83e39ff0..1a71224d91 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 5cf931a9d7bead0e6d9a2c65eee8f6005a005878f59aa280f3c4294257ed5178 syslog-ng-3.19.1.tar.gz +sha256 0656443776fa554320cb81bbebeac72bdf871298dd2ebef7413c393aec4d74c8 syslog-ng-3.22.1.tar.gz sha256 835219c8ca76156e6337236d1bcb8e617c0b1c2783b4a8bc478e18a86743d607 COPYING sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index 4ac25a675b..05ccd751e4 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -6,7 +6,7 @@ # When updating the version, please check at runtime if the version in # syslog-ng.conf header needs to be updated -SYSLOG_NG_VERSION = 3.19.1 +SYSLOG_NG_VERSION = 3.22.1 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt From 6eb3c2bf26de17d1392855edaf57341e64bf3235 Mon Sep 17 00:00:00 2001 From: Koen Martens Date: Thu, 15 Aug 2019 14:14:03 +0200 Subject: [PATCH 027/120] package/linuxconsoletools: add sha256 of COPYING Signed-off-by: Koen Martens Signed-off-by: Thomas Petazzoni --- package/linuxconsoletools/linuxconsoletools.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/linuxconsoletools/linuxconsoletools.hash b/package/linuxconsoletools/linuxconsoletools.hash index 3eead201df..d1bb5a39ef 100644 --- a/package/linuxconsoletools/linuxconsoletools.hash +++ b/package/linuxconsoletools/linuxconsoletools.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 e9d6b05a6c57c7eb3ec7f9f017f46b20e4b55d5a02f930eff1823a13921c5934 linuxconsoletools-1.6.1.tar.bz2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING From 06aa19df63532d80daa28229470389cffbfd2cb5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 15 Aug 2019 11:48:50 +0200 Subject: [PATCH 028/120] package/haproxy: bump to version 2.0.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/haproxy/haproxy.hash | 2 +- package/haproxy/haproxy.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index be3451d83b..73bb753f1c 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 ad46312fa1e38763863807d2c9304551c28ad91cff83f0c21a36756913c1c8e1 haproxy-1.9.1.tar.gz +sha256 e2680696032c8b957cd26fd948fff239d2cfc17b00964e6d2dc5adf8155fcef1 haproxy-2.0.4.tar.gz sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 doc/gpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 36ac704222..daae654b4b 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -4,8 +4,8 @@ # ################################################################################ -HAPROXY_VERSION_MAJOR = 1.9 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).1 +HAPROXY_VERSION_MAJOR = 2.0 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).4 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 3316efa8f9189ea144a57798148485972b21550c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 15 Aug 2019 09:54:03 +0200 Subject: [PATCH 029/120] package/libgee: bump to version 0.20.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libgee/libgee.hash | 4 ++-- package/libgee/libgee.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgee/libgee.hash b/package/libgee/libgee.hash index 77f39d6b69..e1861d514a 100644 --- a/package/libgee/libgee.hash +++ b/package/libgee/libgee.hash @@ -1,5 +1,5 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.1.sha256sum -sha256 bb2802d29a518e8c6d2992884691f06ccfcc25792a5686178575c7111fea4630 libgee-0.20.1.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.2.sha256sum +sha256 9e035c4b755f46bfae70ba81cdcf8328b03f554373cec8c816e8b5680f85353c libgee-0.20.2.tar.xz # Hash for license file: sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libgee/libgee.mk b/package/libgee/libgee.mk index 264ba98946..fa4c46e733 100644 --- a/package/libgee/libgee.mk +++ b/package/libgee/libgee.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGEE_VERSION_MAJOR = 0.20 -LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).1 +LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).2 LIBGEE_SITE = http://ftp.gnome.org/pub/gnome/sources/libgee/$(LIBGEE_VERSION_MAJOR) LIBGEE_SOURCE = libgee-$(LIBGEE_VERSION).tar.xz LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2 From 71300b4c20d8b4b48518c7550b9fc833bbbb7ed6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 15 Aug 2019 10:12:37 +0200 Subject: [PATCH 030/120] package/motion: bump to version 4.2.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- 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 4ce70f8640..2b25d0a52c 100644 --- a/package/motion/motion.hash +++ b/package/motion/motion.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d97ec6ae766adfd478b6f7f9cc0da5f2fe21faa9366d98664be255714c1cf81d motion-4.2.1.tar.gz +sha256 c8d40976b41da8eb9f9f7128599403a312fc26b7226bf3787d75f78cb5a6cc6e motion-4.2.2.tar.gz sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/motion/motion.mk b/package/motion/motion.mk index eb7f75e3fb..165e402fc8 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOTION_VERSION = 4.2.1 +MOTION_VERSION = 4.2.2 MOTION_SITE = $(call github,Motion-Project,motion,release-$(MOTION_VERSION)) MOTION_LICENSE = GPL-2.0 MOTION_LICENSE_FILES = COPYING From 9419ff2cf5bba6b37d583e6677aef27597da2e30 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 15 Aug 2019 10:16:44 +0200 Subject: [PATCH 031/120] package/whois: bump to version 5.5.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/whois/whois.hash | 4 ++-- package/whois/whois.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/whois/whois.hash b/package/whois/whois.hash index 4a5c5986d0..ca4c81b3f5 100644 --- a/package/whois/whois.hash +++ b/package/whois/whois.hash @@ -1,5 +1,5 @@ -# From http://snapshot.debian.org/archive/debian/20190622T150200Z/pool/main/w/whois/whois_5.4.3.dsc -sha256 fefa84029f70985db19743e51c4a8b318a169426babeaa824a27110c26090fc3 whois_5.4.3.tar.xz +# From http://snapshot.debian.org/archive/debian/20190719T170739Z/pool/main/w/whois/whois_5.5.0.dsc +sha256 64ec63339d7ad559cd6722bd3141a1e5787817bd921841a813ee17a0a34b6f3d whois_5.5.0.tar.xz # Hash for license file: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/whois/whois.mk b/package/whois/whois.mk index a5f013ab40..7d36ddc76c 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -4,8 +4,8 @@ # ################################################################################ -WHOIS_VERSION = 5.4.3 -WHOIS_SITE = http://snapshot.debian.org/archive/debian/20190622T150200Z/pool/main/w/whois +WHOIS_VERSION = 5.5.0 +WHOIS_SITE = http://snapshot.debian.org/archive/debian/20190719T170739Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz WHOIS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) WHOIS_MAKE_ENV = $(TARGET_MAKE_ENV) From 43d6d92f5b64d7891bfd3aebe54eb42af9864114 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Wed, 14 Aug 2019 21:03:19 +0300 Subject: [PATCH 032/120] package/python-uvloop: bump to version 0.13.0 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-uvloop/python-uvloop.hash | 4 ++-- package/python-uvloop/python-uvloop.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-uvloop/python-uvloop.hash b/package/python-uvloop/python-uvloop.hash index 8cf4a2c9d4..3c274097fe 100644 --- a/package/python-uvloop/python-uvloop.hash +++ b/package/python-uvloop/python-uvloop.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/uvloop/json -md5 43d7986ac163267ab4d61eac950d34de uvloop-0.12.2.tar.gz -sha256 c48692bf4587ce281d641087658eca275a5ad3b63c78297bbded96570ae9ce8f uvloop-0.12.2.tar.gz +md5 11c84a0a62048200a70272ec9a990ff9 uvloop-0.13.0.tar.gz +sha256 942cd07035510b149d6160796f4e972137130ae953871b6a98c2cf5d5ab68c2e uvloop-0.13.0.tar.gz # Locally computed sha256 checksums sha256 2fdc436a67077941295c58647f521fbef8f50e46db0970552fa1a4dd8ae261c6 LICENSE-APACHE sha256 9185f3c77e9f6ef8859a6ba4c94128ac1329876be3e813aad32d7645e51ae409 LICENSE-MIT diff --git a/package/python-uvloop/python-uvloop.mk b/package/python-uvloop/python-uvloop.mk index 58d6e4bb66..d9932b931d 100644 --- a/package/python-uvloop/python-uvloop.mk +++ b/package/python-uvloop/python-uvloop.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVLOOP_VERSION = 0.12.2 +PYTHON_UVLOOP_VERSION = 0.13.0 PYTHON_UVLOOP_SOURCE = uvloop-$(PYTHON_UVLOOP_VERSION).tar.gz -PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/75/99/7a470e4950d8ecb1b561e8483716c414cd51b8ee193de8eb23506275f5a7 +PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/e3/15/dc3276384f4363015d7c72282f37066bae26c77f99158f66c9058ac167cf PYTHON_UVLOOP_SETUP_TYPE = setuptools PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT From 97aaf2963b6d11189ce8bcced4aa188360fb548b Mon Sep 17 00:00:00 2001 From: Ilya Averyanov Date: Thu, 15 Aug 2019 23:08:45 +0300 Subject: [PATCH 033/120] package/exempi: bump to version 2.5.1 Signed-off-by: Ilya Averyanov Signed-off-by: Thomas Petazzoni --- package/exempi/exempi.hash | 2 +- package/exempi/exempi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/exempi/exempi.hash b/package/exempi/exempi.hash index 562a4d9b75..e8b71a483e 100644 --- a/package/exempi/exempi.hash +++ b/package/exempi/exempi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 406185feb88e84ea1d4b4251370be2991205790d7113a7e28e192ff46a4f221e exempi-2.4.5.tar.bz2 +sha256 100b3d5b1b3370bc2e31c0978991716c4a4478246a2ac2df6382054a0ae89bc8 exempi-2.5.1.tar.bz2 sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607 COPYING diff --git a/package/exempi/exempi.mk b/package/exempi/exempi.mk index 91b1d5da1f..2b6bd4fa81 100644 --- a/package/exempi/exempi.mk +++ b/package/exempi/exempi.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXEMPI_VERSION = 2.4.5 +EXEMPI_VERSION = 2.5.1 EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.bz2 EXEMPI_SITE = https://libopenraw.freedesktop.org/download EXEMPI_INSTALL_STAGING = YES From b4da9642c52b4c1fcebdc58970be937f689666cd Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Thu, 15 Aug 2019 16:22:40 +0200 Subject: [PATCH 034/120] package/libmicrohttpd: bump to version 0.9.66 See https://lists.gnu.org/archive/html/libmicrohttpd/2019-08/msg00000.html Signed-off-by: Pierre-Jean Texier Signed-off-by: Thomas Petazzoni --- package/libmicrohttpd/libmicrohttpd.hash | 2 +- package/libmicrohttpd/libmicrohttpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmicrohttpd/libmicrohttpd.hash b/package/libmicrohttpd/libmicrohttpd.hash index 315c70630a..a7fbe92940 100644 --- a/package/libmicrohttpd/libmicrohttpd.hash +++ b/package/libmicrohttpd/libmicrohttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e792d8ed5990823a0baadea0adf94365999e702f6f1314ef9c555018dafc350e libmicrohttpd-0.9.64.tar.gz +sha256 4e66d4db1574f4912fbd2690d10d227cc9cc56df6a10aa8f4fc2da75cea7ab1b libmicrohttpd-0.9.66.tar.gz sha256 7399547209438c93f9b90297954698773d4846cea44cde5ca982c84c45952a3b COPYING diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index 3d96bfc61d..3bc33390c3 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.64 +LIBMICROHTTPD_VERSION = 0.9.66 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_INSTALL_STAGING = YES From 17f536fa6e2ec2f26be8599d09123c91ee09fd7e Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Thu, 15 Aug 2019 09:53:56 -0400 Subject: [PATCH 035/120] package/libsodium: bump to version 1.0.18 Update download location to match installation docs. Update validation comment to reference Minisign signature. Signed-off-by: Frank Hunleth Signed-off-by: Thomas Petazzoni --- package/libsodium/libsodium.hash | 6 +++--- package/libsodium/libsodium.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libsodium/libsodium.hash b/package/libsodium/libsodium.hash index d6867997dc..bc7b02d64f 100644 --- a/package/libsodium/libsodium.hash +++ b/package/libsodium/libsodium.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking pgp signature -# https://download.libsodium.org/libsodium/releases/libsodium-1.0.17.tar.gz.sig -sha256 0cc3dae33e642cc187b5ceb467e0ad0e1b51dcba577de1190e9ffa17766ac2b1 libsodium-1.0.17.tar.gz +# Locally calculated after checking Minisign signature +# https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz.minisig +sha256 6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1 libsodium-1.0.18.tar.gz sha256 dea1855c9809f3faf22aa4a1fba20ec8af5a5587f23115012e5b98279cedc4af LICENSE diff --git a/package/libsodium/libsodium.mk b/package/libsodium/libsodium.mk index 9767c51a22..a94a8271c5 100644 --- a/package/libsodium/libsodium.mk +++ b/package/libsodium/libsodium.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSODIUM_VERSION = 1.0.17 -LIBSODIUM_SITE = https://github.com/jedisct1/libsodium/releases/download/$(LIBSODIUM_VERSION) +LIBSODIUM_VERSION = 1.0.18 +LIBSODIUM_SITE = https://download.libsodium.org/libsodium/releases LIBSODIUM_LICENSE = ISC LIBSODIUM_LICENSE_FILES = LICENSE LIBSODIUM_INSTALL_STAGING = YES From 4dd5cd69eef841e81f573aafbf73b31fb301bc53 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 14 Aug 2019 18:46:13 +0200 Subject: [PATCH 036/120] package/gcc: bump to version 9.2.0 Remove upstream patches https://github.com/gcc-mirror/gcc/commit/472bac30e63ffacecfa5eda813054555f2cc7def https://github.com/gcc-mirror/gcc/commit/869e468112244b6a3812ab181642fcd9df8838d4 Signed-off-by: Romain Naour Cc: Alexey Brodkin Cc: Evgeniy Didin Signed-off-by: Thomas Petazzoni --- .../9.1.0/0001-ARC-Backport-fix-PR89838.patch | 367 ------------------ .../0002-ARC-Fix-emitting-TLS-symbols.patch | 61 --- package/gcc/Config.in.host | 2 +- package/gcc/gcc.hash | 4 +- 4 files changed, 3 insertions(+), 431 deletions(-) delete mode 100644 package/gcc/9.1.0/0001-ARC-Backport-fix-PR89838.patch delete mode 100644 package/gcc/9.1.0/0002-ARC-Fix-emitting-TLS-symbols.patch diff --git a/package/gcc/9.1.0/0001-ARC-Backport-fix-PR89838.patch b/package/gcc/9.1.0/0001-ARC-Backport-fix-PR89838.patch deleted file mode 100644 index 3e8b86d709..0000000000 --- a/package/gcc/9.1.0/0001-ARC-Backport-fix-PR89838.patch +++ /dev/null @@ -1,367 +0,0 @@ -From e5398fbcaa1dc35422958acfdb13074bf4a797a3 Mon Sep 17 00:00:00 2001 -From: claziss -Date: Tue, 25 Jun 2019 11:02:21 +0000 -Subject: [PATCH 1/2] [ARC] Backport fix PR89838 - -Fixes https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89838 -Similar to https://git.buildroot.org/buildroot/commit/?h=dbf7fffb37e25c40fd5c03d0a64e50a1bba86424 -but rebased on upstream stable "gcc-9-branch". - -gcc/ -xxxx-xx-xx Claudiu Zissulescu - - * config/arc/arc.c (arc_symbol_binds_local_p): New function. - (arc_legitimize_pic_address): Simplify and cleanup the function. - (SYMBOLIC_CONST): Remove. - (prepare_pic_move): Likewise. - (prepare_move_operands): Handle complex mov cases here. - (arc_legitimize_address_0): Remove call to - arc_legitimize_pic_address. - (arc_legitimize_address): Remove call to - arc_legitimize_tls_address. - * config/arc/arc.md (movqi_insn): Allow Cm3 match. - (movhi_insn): Likewise. - -/gcc/testsuite -xxxx-xx-xx Claudiu Zissulescu -Signed-off-by: Alexey Brodkin ---- - gcc/config/arc/arc.c | 238 ++++++++++++-------------------------------------- - gcc/config/arc/arc.md | 8 +- - 2 files changed, 60 insertions(+), 186 deletions(-) - -diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c -index 2f5753b02fa..daacc79d0cb 100644 ---- a/gcc/config/arc/arc.c -+++ b/gcc/config/arc/arc.c -@@ -5971,130 +5971,47 @@ arc_legitimize_tls_address (rtx addr, enum tls_model model) - } - } - --/* Legitimize a pic address reference in ORIG. -- The return value is the legitimated address. -- If OLDX is non-zero, it is the target to assign the address to first. */ -+/* Return true if SYMBOL_REF X binds locally. */ - --static rtx --arc_legitimize_pic_address (rtx orig, rtx oldx) -+static bool -+arc_symbol_binds_local_p (const_rtx x) - { -- rtx addr = orig; -- rtx pat = orig; -- rtx base; -+ return (SYMBOL_REF_DECL (x) -+ ? targetm.binds_local_p (SYMBOL_REF_DECL (x)) -+ : SYMBOL_REF_LOCAL_P (x)); -+} - -- if (oldx == orig) -- oldx = NULL; -+/* Legitimize a pic address reference in ADDR. The return value is -+ the legitimated address. */ - -- if (GET_CODE (addr) == LABEL_REF) -- ; /* Do nothing. */ -- else if (GET_CODE (addr) == SYMBOL_REF) -+static rtx -+arc_legitimize_pic_address (rtx addr) -+{ -+ if (!flag_pic) -+ return addr; -+ -+ switch (GET_CODE (addr)) - { -- enum tls_model model = SYMBOL_REF_TLS_MODEL (addr); -- if (model != 0) -- return arc_legitimize_tls_address (addr, model); -- else if (!flag_pic) -- return orig; -- else if (CONSTANT_POOL_ADDRESS_P (addr) || SYMBOL_REF_LOCAL_P (addr)) -- return arc_unspec_offset (addr, ARC_UNSPEC_GOTOFFPC); -+ case SYMBOL_REF: -+ /* TLS symbols are handled in different place. */ -+ if (SYMBOL_REF_TLS_MODEL (addr)) -+ return addr; - - /* This symbol must be referenced via a load from the Global - Offset Table (@GOTPC). */ -- pat = arc_unspec_offset (addr, ARC_UNSPEC_GOT); -- pat = gen_const_mem (Pmode, pat); -- -- if (oldx == NULL) -- oldx = gen_reg_rtx (Pmode); -- -- emit_move_insn (oldx, pat); -- pat = oldx; -- } -- else -- { -- if (GET_CODE (addr) == CONST) -- { -- addr = XEXP (addr, 0); -- if (GET_CODE (addr) == UNSPEC) -- { -- /* Check that the unspec is one of the ones we generate? */ -- return orig; -- } -- /* fwprop is placing in the REG_EQUIV notes constant pic -- unspecs expressions. Then, loop may use these notes for -- optimizations resulting in complex patterns that are not -- supported by the current implementation. The following -- two if-cases are simplifying the complex patters to -- simpler ones. */ -- else if (GET_CODE (addr) == MINUS) -- { -- rtx op0 = XEXP (addr, 0); -- rtx op1 = XEXP (addr, 1); -- gcc_assert (oldx); -- gcc_assert (GET_CODE (op1) == UNSPEC); -- -- emit_move_insn (oldx, -- gen_rtx_CONST (SImode, -- arc_legitimize_pic_address (op1, -- NULL_RTX))); -- emit_insn (gen_rtx_SET (oldx, gen_rtx_MINUS (SImode, op0, oldx))); -- return oldx; -- -- } -- else if (GET_CODE (addr) != PLUS) -- { -- rtx tmp = XEXP (addr, 0); -- enum rtx_code code = GET_CODE (addr); -- -- /* It only works for UNARY operations. */ -- gcc_assert (UNARY_P (addr)); -- gcc_assert (GET_CODE (tmp) == UNSPEC); -- gcc_assert (oldx); -- -- emit_move_insn -- (oldx, -- gen_rtx_CONST (SImode, -- arc_legitimize_pic_address (tmp, -- NULL_RTX))); -- -- emit_insn (gen_rtx_SET (oldx, -- gen_rtx_fmt_ee (code, SImode, -- oldx, const0_rtx))); -- -- return oldx; -- } -- else -- { -- gcc_assert (GET_CODE (addr) == PLUS); -- if (GET_CODE (XEXP (addr, 0)) == UNSPEC) -- return orig; -- } -- } -- -- if (GET_CODE (addr) == PLUS) -- { -- rtx op0 = XEXP (addr, 0), op1 = XEXP (addr, 1); -+ if (!arc_symbol_binds_local_p (addr)) -+ return gen_const_mem (Pmode, arc_unspec_offset (addr, ARC_UNSPEC_GOT)); - -- base = arc_legitimize_pic_address (op0, oldx); -- pat = arc_legitimize_pic_address (op1, -- base == oldx ? NULL_RTX : oldx); -- -- if (base == op0 && pat == op1) -- return orig; -+ /* Local symb: use @pcl to access it. */ -+ /* Fall through. */ -+ case LABEL_REF: -+ return arc_unspec_offset (addr, ARC_UNSPEC_GOTOFFPC); - -- if (GET_CODE (pat) == CONST_INT) -- pat = plus_constant (Pmode, base, INTVAL (pat)); -- else -- { -- if (GET_CODE (pat) == PLUS && CONSTANT_P (XEXP (pat, 1))) -- { -- base = gen_rtx_PLUS (Pmode, base, XEXP (pat, 0)); -- pat = XEXP (pat, 1); -- } -- pat = gen_rtx_PLUS (Pmode, base, pat); -- } -- } -+ default: -+ break; - } - -- return pat; -+ return addr; - } - - /* Output address constant X to FILE, taking PIC into account. */ -@@ -6256,28 +6173,6 @@ arc_output_pic_addr_const (FILE * file, rtx x, int code) - } - } - --#define SYMBOLIC_CONST(X) \ --(GET_CODE (X) == SYMBOL_REF \ -- || GET_CODE (X) == LABEL_REF \ -- || (GET_CODE (X) == CONST && symbolic_reference_mentioned_p (X))) -- --/* Emit insns to move operands[1] into operands[0]. */ -- --static void --prepare_pic_move (rtx *operands, machine_mode) --{ -- if (GET_CODE (operands[0]) == MEM && SYMBOLIC_CONST (operands[1]) -- && flag_pic) -- operands[1] = force_reg (Pmode, operands[1]); -- else -- { -- rtx temp = (reload_in_progress ? operands[0] -- : flag_pic? gen_reg_rtx (Pmode) : NULL_RTX); -- operands[1] = arc_legitimize_pic_address (operands[1], temp); -- } --} -- -- - /* The function returning the number of words, at the beginning of an - argument, must be put in registers. The returned value must be - zero for arguments that are passed entirely in registers or that -@@ -9053,54 +8948,37 @@ prepare_move_operands (rtx *operands, machine_mode mode) - } - } - -- if (mode == SImode && SYMBOLIC_CONST (operands[1])) -+ if (GET_CODE (operands[1]) == SYMBOL_REF) - { -- prepare_pic_move (operands, SImode); -- -- /* Disable any REG_EQUALs associated with the symref -- otherwise the optimization pass undoes the work done -- here and references the variable directly. */ -+ enum tls_model model = SYMBOL_REF_TLS_MODEL (operands[1]); -+ if (MEM_P (operands[0]) && flag_pic) -+ operands[1] = force_reg (mode, operands[1]); -+ else if (model) -+ operands[1] = arc_legitimize_tls_address (operands[1], model); - } - -+ operands[1] = arc_legitimize_pic_address (operands[1]); -+ -+ /* Store instructions are limited, they only accept as address an -+ immediate, a register or a register plus a small immediate. */ - if (MEM_P (operands[0]) -- && !(reload_in_progress || reload_completed)) -+ && !move_dest_operand (operands[0], mode)) - { -- operands[1] = force_reg (mode, operands[1]); -- if (!move_dest_operand (operands[0], mode)) -- { -- rtx addr = copy_to_mode_reg (Pmode, XEXP (operands[0], 0)); -- /* This is like change_address_1 (operands[0], mode, 0, 1) , -- except that we can't use that function because it is static. */ -- rtx pat = change_address (operands[0], mode, addr); -- MEM_COPY_ATTRIBUTES (pat, operands[0]); -- operands[0] = pat; -- } -- if (!cse_not_expected) -- { -- rtx pat = XEXP (operands[0], 0); -- -- pat = arc_legitimize_address_0 (pat, pat, mode); -- if (pat) -- { -- pat = change_address (operands[0], mode, pat); -- MEM_COPY_ATTRIBUTES (pat, operands[0]); -- operands[0] = pat; -- } -- } -+ rtx tmp0 = copy_to_mode_reg (Pmode, XEXP (operands[0], 0)); -+ rtx tmp1 = change_address (operands[0], mode, tmp0); -+ MEM_COPY_ATTRIBUTES (tmp1, operands[0]); -+ operands[0] = tmp1; - } - -- if (MEM_P (operands[1]) && !cse_not_expected) -- { -- rtx pat = XEXP (operands[1], 0); -- -- pat = arc_legitimize_address_0 (pat, pat, mode); -- if (pat) -- { -- pat = change_address (operands[1], mode, pat); -- MEM_COPY_ATTRIBUTES (pat, operands[1]); -- operands[1] = pat; -- } -- } -+ /* Check if it is constant but it is not legitimized. */ -+ if (CONSTANT_P (operands[1]) -+ && !arc_legitimate_constant_p (mode, operands[1])) -+ operands[1] = force_reg (mode, XEXP (operands[1], 0)); -+ else if (MEM_P (operands[0]) -+ && ((CONSTANT_P (operands[1]) -+ && !satisfies_constraint_Cm3 (operands[1])) -+ || MEM_P (operands[1]))) -+ operands[1] = force_reg (mode, operands[1]); - - return false; - } -@@ -9572,11 +9450,10 @@ arc_legitimize_address_0 (rtx x, rtx oldx ATTRIBUTE_UNUSED, - { - rtx addr, inner; - -- if (flag_pic && SYMBOLIC_CONST (x)) -- (x) = arc_legitimize_pic_address (x, 0); - addr = x; - if (GET_CODE (addr) == CONST) - addr = XEXP (addr, 0); -+ - if (GET_CODE (addr) == PLUS - && CONST_INT_P (XEXP (addr, 1)) - && ((GET_CODE (XEXP (addr, 0)) == SYMBOL_REF -@@ -9607,13 +9484,6 @@ arc_legitimize_address_0 (rtx x, rtx oldx ATTRIBUTE_UNUSED, - static rtx - arc_legitimize_address (rtx orig_x, rtx oldx, machine_mode mode) - { -- if (GET_CODE (orig_x) == SYMBOL_REF) -- { -- enum tls_model model = SYMBOL_REF_TLS_MODEL (orig_x); -- if (model != 0) -- return arc_legitimize_tls_address (orig_x, model); -- } -- - rtx new_x = arc_legitimize_address_0 (orig_x, oldx, mode); - - if (new_x) -diff --git a/gcc/config/arc/arc.md b/gcc/config/arc/arc.md -index ce1004c1b56..78e304d4c71 100644 ---- a/gcc/config/arc/arc.md -+++ b/gcc/config/arc/arc.md -@@ -671,7 +671,9 @@ core_3, archs4x, archs4xd, archs4xd_slow" - [(set (match_operand:QI 0 "move_dest_operand" "=Rcq,Rcq#q, w,Rcq#q, h, w, w,???w,h, w,Rcq, S,!*x, r,r, Ucm,m,???m, m,Usc") - (match_operand:QI 1 "move_src_operand" " cL, cP,Rcq#q, P,hCm1,cL, I,?Rac,i,?i, T,Rcq,Usd,Ucm,m,?Rac,c,?Rac,Cm3,i"))] - "register_operand (operands[0], QImode) -- || register_operand (operands[1], QImode)" -+ || register_operand (operands[1], QImode) -+ || (satisfies_constraint_Cm3 (operands[1]) -+ && memory_operand (operands[0], QImode))" - "@ - mov%? %0,%1%& - mov%? %0,%1%& -@@ -713,7 +715,9 @@ core_3, archs4x, archs4xd, archs4xd_slow" - /* Don't use a LIMM that we could load with a single insn - we loose - delay-slot filling opportunities. */ - && !satisfies_constraint_I (operands[1]) -- && satisfies_constraint_Usc (operands[0]))" -+ && satisfies_constraint_Usc (operands[0])) -+ || (satisfies_constraint_Cm3 (operands[1]) -+ && memory_operand (operands[0], HImode))" - "@ - mov%? %0,%1%& - mov%? %0,%1%& --- -2.16.2 - diff --git a/package/gcc/9.1.0/0002-ARC-Fix-emitting-TLS-symbols.patch b/package/gcc/9.1.0/0002-ARC-Fix-emitting-TLS-symbols.patch deleted file mode 100644 index 15df921290..0000000000 --- a/package/gcc/9.1.0/0002-ARC-Fix-emitting-TLS-symbols.patch +++ /dev/null @@ -1,61 +0,0 @@ -From d17cd0f88ed986be4046b2eb70240dc95b2958cd Mon Sep 17 00:00:00 2001 -From: Claudiu Zissulescu -Date: Wed, 26 Jun 2019 17:53:51 +0300 -Subject: [PATCH 2/2] [ARC] Fix emitting TLS symbols. - -When storing a TLS symbol to memory, always use an intermediate register -to load it. Otherwise compiler generates instruction which couldn't be -encoded and we see: ------------------------------>8--------------------------- -In file included from gethstent_r.c:34: -../nss/getXXent_r.c: In function '__gethostent_r': -../nss/getXXent_r.c:168:1: error: unrecognizable insn: - } - ^ -(insn 25 24 26 5 (set (mem:SI (plus:SI (reg/f:SI 149 virtual-outgoing-args) - (const_int 16 [0x10])) [0 S4 A32]) - (plus:SI (reg:SI 25 r25) - (reg:SI 174))) "../nss/getXXent_r.c":160 -1 - (nil)) -during RTL pass: vregs -../nss/getXXent_r.c:168:1: internal compiler error: in extract_insn, at recog.c:2304 -In file included from getnetent_r.c:34: -../nss/getXXent_r.c: In function '__getnetent_r': -../nss/getXXent_r.c:168:1: error: unrecognizable insn: - } - ^ -(insn 25 24 26 5 (set (mem:SI (plus:SI (reg/f:SI 149 virtual-outgoing-args) - (const_int 16 [0x10])) [0 S4 A32]) - (plus:SI (reg:SI 25 r25) - (reg:SI 174))) "../nss/getXXent_r.c":160 -1 - (nil)) -during RTL pass: vregs -../nss/getXXent_r.c:168:1: internal compiler error: in extract_insn, at recog.c:2304 ------------------------------>8--------------------------- - -Note this patch is not yet submitted to the GCC's master and gcc-9-branch but -will be submitted soon. That said with bump of GCC this patch won't be -needed any longer. - -Signed-off-by: Claudiu Zissulescu -Signed-off-by: Alexey Brodkin ---- - gcc/config/arc/arc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c -index daacc79d0cb..ee1f70bbb51 100644 ---- a/gcc/config/arc/arc.c -+++ b/gcc/config/arc/arc.c -@@ -8951,7 +8951,7 @@ prepare_move_operands (rtx *operands, machine_mode mode) - if (GET_CODE (operands[1]) == SYMBOL_REF) - { - enum tls_model model = SYMBOL_REF_TLS_MODEL (operands[1]); -- if (MEM_P (operands[0]) && flag_pic) -+ if (MEM_P (operands[0])) - operands[1] = force_reg (mode, operands[1]); - else if (model) - operands[1] = arc_legitimize_tls_address (operands[1], model); --- -2.16.2 - diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index cff8134333..990b7964c6 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -79,7 +79,7 @@ config BR2_GCC_VERSION default "5.5.0" if BR2_GCC_VERSION_5_X default "7.4.0" if BR2_GCC_VERSION_7_X default "8.3.0" if BR2_GCC_VERSION_8_X - default "9.1.0" if BR2_GCC_VERSION_9_X + default "9.2.0" if BR2_GCC_VERSION_9_X default "arc-2019.03-release" if BR2_GCC_VERSION_ARC default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K default "48152afb96c59733d5bc79e3399bb7b3d4b44266" if BR2_GCC_VERSION_CSKY diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 20f5145be6..5be1ec1a1d 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -4,8 +4,8 @@ sha512 670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe7 sha512 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6833c03fa454c17b0ac35b15e1d284881e6971035948ac6100f3aa45e gcc-7.4.0.tar.xz # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-8.3.0/sha512.sum sha512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802 gcc-8.3.0.tar.xz -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-9.1.0/sha512.sum -sha512 b6134df027e734cee5395afd739fcfa4ea319a6017d662e54e89df927dea19d3fff7a6e35d676685383034e3db01c9d0b653f63574c274eeb15a2cb0bc7a1f28 gcc-9.1.0.tar.xz +# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-9.2.0/sha512.sum +sha512 a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040 gcc-9.2.0.tar.xz # Locally calculated (fetched from Github) sha512 c3f63fb601140f92d2dbef96b2dcc025ef754d2f049bfcc3d33e746c7b218b5138f2d8768cd580134858a8d347d234cf3ead276638f6de409f8f07c986e136b6 gcc-arc-2019.03-release.tar.gz From 9728190cd8abab5aea99614c14996cefb6587ecb Mon Sep 17 00:00:00 2001 From: Valentin Korenblit Date: Fri, 16 Aug 2019 20:58:08 +0200 Subject: [PATCH 037/120] package/llvm: bump to 8.0.1 Project moved to github, updated project URL Signed-off-by: Valentin Korenblit Signed-off-by: Thomas Petazzoni --- package/llvm/llvm.hash | 2 +- package/llvm/llvm.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/llvm/llvm.hash b/package/llvm/llvm.hash index 4c5cea17ff..3e74706dfd 100644 --- a/package/llvm/llvm.hash +++ b/package/llvm/llvm.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 8872be1b12c61450cacc82b3d153eab02be2546ef34fa3580ed14137bb26224c llvm-8.0.0.src.tar.xz +sha256 44787a6d02f7140f145e2250d56c9f849334e11f9ae379827510ed72f12b75e7 llvm-8.0.1.src.tar.xz sha256 24b67da19b1422a819395738cb83ea34eee3fdce52870b0d1758524ba1615069 LICENSE.TXT diff --git a/package/llvm/llvm.mk b/package/llvm/llvm.mk index 1106a07877..f14b537d94 100644 --- a/package/llvm/llvm.mk +++ b/package/llvm/llvm.mk @@ -5,8 +5,8 @@ ################################################################################ # LLVM and Clang should be version bumped together -LLVM_VERSION = 8.0.0 -LLVM_SITE = http://llvm.org/releases/$(LLVM_VERSION) +LLVM_VERSION = 8.0.1 +LLVM_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_VERSION) LLVM_SOURCE = llvm-$(LLVM_VERSION).src.tar.xz LLVM_LICENSE = NCSA LLVM_LICENSE_FILES = LICENSE.TXT From 3135ae75e31f82a6087fbb632173463baddc972d Mon Sep 17 00:00:00 2001 From: Valentin Korenblit Date: Fri, 16 Aug 2019 20:58:09 +0200 Subject: [PATCH 038/120] package/clang: bump to 8.0.1 Project moved to github, updated project URL Signed-off-by: Valentin Korenblit Signed-off-by: Thomas Petazzoni --- package/clang/clang.hash | 2 +- package/clang/clang.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/clang/clang.hash b/package/clang/clang.hash index 405e22ce22..209ff0cb30 100644 --- a/package/clang/clang.hash +++ b/package/clang/clang.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 084c115aab0084e63b23eee8c233abb6739c399e29966eaeccfc6e088e0b736b cfe-8.0.0.src.tar.xz +sha256 70effd69f7a8ab249f66b0a68aba8b08af52aa2ab710dfb8a0fba102685b1646 cfe-8.0.1.src.tar.xz sha256 bdc41b826a9a50c7a31c1b613ca5d46415be68d5cc6da06f91f5bc1db8ad87aa LICENSE.TXT diff --git a/package/clang/clang.mk b/package/clang/clang.mk index 07e7fced2a..3796ca8605 100644 --- a/package/clang/clang.mk +++ b/package/clang/clang.mk @@ -5,8 +5,8 @@ ################################################################################ # LLVM and Clang should be version bumped together -CLANG_VERSION = 8.0.0 -CLANG_SITE = http://llvm.org/releases/$(CLANG_VERSION) +CLANG_VERSION = 8.0.1 +CLANG_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(CLANG_VERSION) CLANG_SOURCE = cfe-$(CLANG_VERSION).src.tar.xz CLANG_LICENSE = NCSA CLANG_LICENSE_FILES = LICENSE.TXT From bd9cf604b56bf04ff1961e1c6759664505905fe4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 16 Aug 2019 11:13:15 +0200 Subject: [PATCH 039/120] package/autofs: bump to version 5.1.5 Add hash for license files Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/autofs/autofs.hash | 6 +++++- package/autofs/autofs.mk | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/autofs/autofs.hash b/package/autofs/autofs.hash index 1f2060bdef..e4c1ecaeb2 100644 --- a/package/autofs/autofs.hash +++ b/package/autofs/autofs.hash @@ -1,2 +1,6 @@ # From https://www.kernel.org/pub/linux/daemons/autofs/v5/sha256sums.asc -sha256 8fce30ee51ffd528fe1a4e8374ef57f43367e1f123030e175fb1b1cf15bc1722 autofs-5.1.4.tar.xz +sha256 23afdad9e2fd6d41b1900be8cfecfd5aae0ad174c7708ff685ec27e280f9c0da autofs-5.1.5.tar.xz + +# Hash for license files +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING +sha256 2ac2e352a92629e3abcdddbd3eeec64e7c2f5b58b6e819ff2c1444fb6e249fa3 COPYRIGHT diff --git a/package/autofs/autofs.mk b/package/autofs/autofs.mk index e7c65ef4b0..12c7733d01 100644 --- a/package/autofs/autofs.mk +++ b/package/autofs/autofs.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOFS_VERSION = 5.1.4 +AUTOFS_VERSION = 5.1.5 AUTOFS_SOURCE = autofs-$(AUTOFS_VERSION).tar.xz AUTOFS_SITE = $(BR2_KERNEL_MIRROR)/linux/daemons/autofs/v5 AUTOFS_LICENSE = GPL-2.0+ From c63dc23b87724635b0d90aad1a52b337f5e95d99 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 16 Aug 2019 10:24:30 +0300 Subject: [PATCH 040/120] package/openipmi: bump to version 2.0.27 Bundled editline has been removed; readline is a mandatory dependency now. Add patch fixing build with editline is not installed. Add license files hashes. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...ine-include-in-ipmi_serial_bmc_emu.c.patch | 31 +++++++++++++++++++ package/openipmi/Config.in | 1 + package/openipmi/openipmi.hash | 7 +++-- package/openipmi/openipmi.mk | 4 +-- 4 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 package/openipmi/0002-sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch diff --git a/package/openipmi/0002-sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch b/package/openipmi/0002-sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch new file mode 100644 index 0000000000..112d63854c --- /dev/null +++ b/package/openipmi/0002-sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch @@ -0,0 +1,31 @@ +From 6a051666b50ae1df24b24312a7a56a03e343c15d Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Fri, 16 Aug 2019 09:48:21 +0300 +Subject: [PATCH] sample: fix readline include in ipmi_serial_bmc_emu.c + +Bundled editline has been removed. Use the readline headers instead. Fix +the build when editline is not installed on host. + +Signed-off-by: Baruch Siach +--- +Upstream status: sent to openipmi-developer@lists.sourceforge.net (moderated) + + sample/ipmi_serial_bmc_emu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sample/ipmi_serial_bmc_emu.c b/sample/ipmi_serial_bmc_emu.c +index e0ae0197688b..1b8bb9ac201f 100644 +--- a/sample/ipmi_serial_bmc_emu.c ++++ b/sample/ipmi_serial_bmc_emu.c +@@ -42,7 +42,7 @@ + #include + #include + #include +-#include ++#include + + #define _GNU_SOURCE + #include +-- +2.23.0.rc1 + diff --git a/package/openipmi/Config.in b/package/openipmi/Config.in index d8c94b307c..22fb9fa7bb 100644 --- a/package/openipmi/Config.in +++ b/package/openipmi/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_OPENIPMI depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_POPT select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_READLINE help IPMI allows remote monitoring and remote management of devices. OpenIPMI provides a library and command line tools diff --git a/package/openipmi/openipmi.hash b/package/openipmi/openipmi.hash index 37048ca2a3..756ea539f1 100644 --- a/package/openipmi/openipmi.hash +++ b/package/openipmi/openipmi.hash @@ -1,4 +1,7 @@ # From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/ -sha1 f37656813a826a3147ed557c32408f8daa399c28 OpenIPMI-2.0.24.tar.gz +sha1 043738af9e1aaa6ae4f372d4af7870683e68faf8 OpenIPMI-2.0.27.tar.gz # Locally computed -sha256 bca39a27071278a8b74610181ede8df51e155e5e9031bc8eaa3699d1720292b4 OpenIPMI-2.0.24.tar.gz +sha256 f3b1fafaaec2e2bac32fec5a86941ad8b8cb64543470bd6d819d7b166713d20b OpenIPMI-2.0.27.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 8e91e4ed03..9590b446ef 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -4,12 +4,12 @@ # ################################################################################ -OPENIPMI_VERSION = 2.0.24 +OPENIPMI_VERSION = 2.0.27 OPENIPMI_SITE = http://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 host-pkgconf +OPENIPMI_DEPENDENCIES = popt ncurses readline host-pkgconf # Patching Makefile.am OPENIPMI_AUTORECONF = YES OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)" From 471ea6a77147178e1f81968d1e2d9f03450a90ee Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Fri, 16 Aug 2019 09:16:17 +0200 Subject: [PATCH 041/120] package/autoconf-archive: bump version to v2019.01.06 Update the version of autoconf-archive and drop the backported patch. Signed-off-by: Bartosz Golaszewski Signed-off-by: Thomas Petazzoni --- .../0001-AX_TLS-fix-syntax-error.patch | 48 ------------------- .../autoconf-archive/autoconf-archive.hash | 2 +- package/autoconf-archive/autoconf-archive.mk | 2 +- 3 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch diff --git a/package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch b/package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch deleted file mode 100644 index c0efeb3359..0000000000 --- a/package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1870301013d79be781ead2b0e62fc08f91715ca9 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 3 May 2015 23:02:34 +0200 -Subject: [PATCH] AX_TLS: fix syntax error - -The commit e012eb17b3d67f31dee477592328207437206c33 introduce -a syntax error due to an empty "else" statement. - -confifure: -if test "$ac_cv_tls" != "none"; then : -cat >>confdefs.h <<_ACEOF -_ACEOF -else - -fi - -Remove the [] on the third part of AS_IF. - -Signed-off-by: Romain Naour -(rebased against version 2017.03.21) -Signed-off-by: Bernd Kuhls ---- - m4/ax_tls.m4 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/m4/ax_tls.m4 b/m4/ax_tls.m4 -index 809b761..2135dd2 100644 ---- a/m4/ax_tls.m4 -+++ b/m4/ax_tls.m4 -@@ -44,7 +44,7 @@ - # modified version of the Autoconf Macro, you may extend this special - # exception to the GPL to apply to your modified version as well. - --#serial 13 -+#serial 14 - - AC_DEFUN([AX_TLS], [ - AC_MSG_CHECKING([for thread local storage (TLS) class]) -@@ -70,5 +70,5 @@ AC_DEFUN([AX_TLS], [ - AS_IF([test "$ac_cv_tls" != "none"], - [AC_DEFINE_UNQUOTED([TLS],[$ac_cv_tls],[If the compiler supports a TLS storage class define it to that here]) - m4_ifnblank([$1],[$1])], -- [m4_ifnblank([$2],[$2])]) -+ m4_ifnblank([$2],[$2])) - ]) --- -1.9.3 - diff --git a/package/autoconf-archive/autoconf-archive.hash b/package/autoconf-archive/autoconf-archive.hash index 2c537b33a2..fadda54e86 100644 --- a/package/autoconf-archive/autoconf-archive.hash +++ b/package/autoconf-archive/autoconf-archive.hash @@ -1,2 +1,2 @@ # Computed locally -sha256 386ad455f12bdeb3a7d19280441a5ab77355142349200ff11040a8d9d455d765 autoconf-archive-2017.03.21.tar.xz +sha256 17195c833098da79de5778ee90948f4c5d90ed1a0cf8391b4ab348e2ec511e3f autoconf-archive-2019.01.06.tar.xz diff --git a/package/autoconf-archive/autoconf-archive.mk b/package/autoconf-archive/autoconf-archive.mk index 8a6d59578e..3f1f0a5b3c 100644 --- a/package/autoconf-archive/autoconf-archive.mk +++ b/package/autoconf-archive/autoconf-archive.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOCONF_ARCHIVE_VERSION = 2017.03.21 +AUTOCONF_ARCHIVE_VERSION = 2019.01.06 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 e792c74e777f5421638d68454d41acd91fc0b530 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 16 Aug 2019 09:05:09 +0200 Subject: [PATCH 042/120] package/argparse: bump to version 0.7 this module has moved under the luarocks organization diff LICENSE: + 2019 Paul Ouellette Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/argparse/Config.in | 2 +- package/argparse/argparse.hash | 4 ++-- package/argparse/argparse.mk | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/argparse/Config.in b/package/argparse/Config.in index d207b0482c..d02b191254 100644 --- a/package/argparse/Config.in +++ b/package/argparse/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_ARGPARSE subcommands and more. Argparse automatically generates usage, help and error messages. - https://github.com/mpeterv/argparse + https://github.com/luarocks/argparse diff --git a/package/argparse/argparse.hash b/package/argparse/argparse.hash index fa99609cc8..1b01e4b6f9 100644 --- a/package/argparse/argparse.hash +++ b/package/argparse/argparse.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 e4029f42d61cbdde1540e0a098a24b1fed0bc8a2803efe2a0d0d3e7f2f2f2c82 argparse-0.6.0-1.src.rock -sha256 c9b9a9667934d50f028a99b2617469db66663dc3b09d289b82e73e950b2b85eb argparse/LICENSE +sha256 47b3ca9e734971ba24ef26b0beff692ce6008f53aaf78c303f3d883648c96acb argparse-0.7.0-1.src.rock +sha256 9a918f21485b2a4529c901491d9101392f03586d65ad5b024a4445ebc1dc37b4 argparse-0.7.0/LICENSE diff --git a/package/argparse/argparse.mk b/package/argparse/argparse.mk index 04c46b5279..a9b7a2f719 100644 --- a/package/argparse/argparse.mk +++ b/package/argparse/argparse.mk @@ -4,8 +4,7 @@ # ################################################################################ -ARGPARSE_VERSION = 0.6.0-1 -ARGPARSE_SUBDIR = argparse +ARGPARSE_VERSION = 0.7.0-1 ARGPARSE_LICENSE = MIT ARGPARSE_LICENSE_FILES = $(ARGPARSE_SUBDIR)/LICENSE From b0d2bee4f4e5caed12c2845246902b20220675b6 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 16 Aug 2019 09:05:10 +0200 Subject: [PATCH 043/120] package/luaossl: bump to version 20190731 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/luaossl/luaossl.hash | 4 ++-- package/luaossl/luaossl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/luaossl/luaossl.hash b/package/luaossl/luaossl.hash index 25b1bfa71c..9b959f6fcf 100644 --- a/package/luaossl/luaossl.hash +++ b/package/luaossl/luaossl.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 9a2c8ed215eaeb9533a949556b2baf869922a92d525099f25a79742b9dce8760 luaossl-20190612-0.src.rock -sha256 7bd585fba3ae52943e0915e4c8ca049acde9f1e5cea101ef6b294427c8f0ee7d luaossl-rel-20190612/LICENSE +sha256 b558790c0d1c965bd98b98a91a44eef9f72a0b784dbb4978810a1e52206d593d luaossl-20190731-0.src.rock +sha256 7bd585fba3ae52943e0915e4c8ca049acde9f1e5cea101ef6b294427c8f0ee7d luaossl-rel-20190731/LICENSE diff --git a/package/luaossl/luaossl.mk b/package/luaossl/luaossl.mk index d6400d45da..128c320d1e 100644 --- a/package/luaossl/luaossl.mk +++ b/package/luaossl/luaossl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAOSSL_VERSION_UPSTREAM = 20190612 +LUAOSSL_VERSION_UPSTREAM = 20190731 LUAOSSL_VERSION = $(LUAOSSL_VERSION_UPSTREAM)-0 LUAOSSL_SUBDIR = luaossl-rel-$(LUAOSSL_VERSION_UPSTREAM) LUAOSSL_LICENSE = MIT From ae40f383c6cc72705a73f78c760d439b28ba5f95 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Sat, 17 Aug 2019 14:55:23 +0200 Subject: [PATCH 044/120] package/libuv: bump to version 1.31.0 Signed-off-by: Pierre-Jean Texier Signed-off-by: Thomas Petazzoni --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index d7f4437293..126caa244a 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d85566c2c4eae7d8e2c2d27d40e728fea29f9086e98e795c5cdce1a790f43de5 libuv-1.30.1.tar.gz +sha256 ab041ea5d1965a33d4e03ea87718b8922ba4e54abb46c71cf9e040edef2556c0 libuv-1.31.0.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 0825d7e390..d40ed2f01a 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUV_VERSION = 1.30.1 +LIBUV_VERSION = 1.31.0 LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES From a7914499b80e70f4a0039fe7922617b13772427b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 16 Aug 2019 17:07:52 +0200 Subject: [PATCH 045/120] package/glibc: bump to version 2.30 With Glibc 2.30, GCC 6.2 or later is required to build the GNU C Library. Disable Glibc for GCC 5.x. CVE-2019-7309, CVE-2019-9169. See: https://sourceware.org/ml/libc-alpha/2019-08/msg00029.html Tested with toolchain-builder: https://gitlab.com/kubu93/toolchains-builder/pipelines/76423684 Signed-off-by: Romain Naour Cc: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/gcc/Config.in.host | 4 ++-- .../glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename package/glibc/{2.29-30-g2d3fefd7ce64ac1015701c96916fffacc073a877 => 2.30-1-gbe9a328c93834648e0bec106a1f86357d1a8c7e1}/glibc.hash (70%) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 990b7964c6..f99cafe7ed 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -36,8 +36,8 @@ config BR2_GCC_VERSION_5_X # musl on ppc64 and mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le)) depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) - # glibc >= 2.26 needs gcc >= 6.2 - depends on !(BR2_TOOLCHAIN_USES_GLIBC && BR2_powerpc64le) + # glibc >= 2.30 needs gcc >= 6.2 on all architectures. + depends on !BR2_TOOLCHAIN_USES_GLIBC select BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_GCC_VERSION_7_X diff --git a/package/glibc/2.29-30-g2d3fefd7ce64ac1015701c96916fffacc073a877/glibc.hash b/package/glibc/2.30-1-gbe9a328c93834648e0bec106a1f86357d1a8c7e1/glibc.hash similarity index 70% rename from package/glibc/2.29-30-g2d3fefd7ce64ac1015701c96916fffacc073a877/glibc.hash rename to package/glibc/2.30-1-gbe9a328c93834648e0bec106a1f86357d1a8c7e1/glibc.hash index 6273151471..276cd6f7c0 100644 --- a/package/glibc/2.29-30-g2d3fefd7ce64ac1015701c96916fffacc073a877/glibc.hash +++ b/package/glibc/2.30-1-gbe9a328c93834648e0bec106a1f86357d1a8c7e1/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 bd9fa9932c374b5256a976b543992c20de23338d08879df70a0a2502d17e671d glibc-2.29-30-g2d3fefd7ce64ac1015701c96916fffacc073a877.tar.gz +sha256 5abb12ac8b756ec900c9d800860041a7920c6b335338af1cba15bab20d54119f glibc-2.30-1-gbe9a328c93834648e0bec106a1f86357d1a8c7e1.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 68c6670007..9421f9fd81 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -16,7 +16,7 @@ GLIBC_SITE = $(call github,c-sky,glibc,$(GLIBC_VERSION)) else # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -GLIBC_VERSION = 2.29-30-g2d3fefd7ce64ac1015701c96916fffacc073a877 +GLIBC_VERSION = 2.30-1-gbe9a328c93834648e0bec106a1f86357d1a8c7e1 # 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. From 9ef3e072bdb1f9632a58406c1f7a80228a791a65 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 16 Aug 2019 09:06:22 +0300 Subject: [PATCH 046/120] package/socat: bump to version 1.7.3.3 Drop if_tun.h kernel header removal patch; current musl doesn't need it. Don't disable termios_ispeed; commit 1c25119a9360 ("socat: convert to AUTOTARGETS") disabled it for no apparent reason. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...io-tun-remove-if_tun.h-kernel-header.patch | 91 ------------------- package/socat/socat.hash | 6 +- package/socat/socat.mk | 4 +- 3 files changed, 4 insertions(+), 97 deletions(-) delete mode 100644 package/socat/0004-xio-tun-remove-if_tun.h-kernel-header.patch diff --git a/package/socat/0004-xio-tun-remove-if_tun.h-kernel-header.patch b/package/socat/0004-xio-tun-remove-if_tun.h-kernel-header.patch deleted file mode 100644 index 7704123f30..0000000000 --- a/package/socat/0004-xio-tun-remove-if_tun.h-kernel-header.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 1c141194e3587cc8124e5f4512dc3030e5a104b1 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 28 Aug 2016 22:06:09 +0200 -Subject: [PATCH] xio-tun: remove if_tun.h kernel header - -xio-tun mixes userspace and kernel headers. - -http://wiki.musl-libc.org/wiki/FAQ#Q:_why_am_i_getting_.22error:_redefinition_of_struct_ethhdr.2Ftcphdr.2Fetc.22_.3F - -Signed-off-by: Romain Naour ---- - config.h.in | 3 --- - configure.in | 8 +------- - sysincludes.h | 3 --- - xio-tun.c | 6 ++++++ - 4 files changed, 7 insertions(+), 13 deletions(-) - -diff --git a/config.h.in b/config.h.in -index 9058bf8..ed0962c 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -258,9 +258,6 @@ - /* Define if you have the header file. */ - #undef HAVE_LINUX_ERRQUEUE_H - --/* Define if you have the header file. */ --#undef HAVE_LINUX_IF_TUN_H -- - /* Define if you have the header file. */ - #undef HAVE_NETPACKET_PACKET_H - -diff --git a/configure.in b/configure.in -index 1d2e76f..27bb3d5 100644 ---- a/configure.in -+++ b/configure.in -@@ -78,7 +78,7 @@ AC_CHECK_HEADERS(arpa/nameser.h) - - AC_HEADER_RESOLV() - --AC_CHECK_HEADERS(termios.h linux/if_tun.h) -+AC_CHECK_HEADERS(termios.h) - AC_CHECK_HEADERS(net/if_dl.h) - AC_CHECK_HEADERS(linux/types.h) - AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include -@@ -680,12 +680,6 @@ AC_ARG_ENABLE(tun, [ --disable-tun disable TUN/TAP support], - esac], - [AC_MSG_RESULT(yes); WITH_TUN=1 ]) - --# --if ! test "$ac_cv_header_linux_if_tun_h" = 'yes'; then -- AC_MSG_WARN(include file linux/if_tun.h not found, disabling TUN) -- WITH_TUN= --fi --# - if test -n "$WITH_TUN"; then - AC_DEFINE(WITH_TUN) - fi -diff --git a/sysincludes.h b/sysincludes.h -index 98dff77..28067f4 100644 ---- a/sysincludes.h -+++ b/sysincludes.h -@@ -142,9 +142,6 @@ - #if HAVE_NETINET_IF_ETHER_H - #include - #endif --#if HAVE_LINUX_IF_TUN_H --#include --#endif - - #if HAVE_TERMIOS_H && _WITH_TERMIOS - #include -diff --git a/xio-tun.c b/xio-tun.c -index 0628d27..f965a7e 100644 ---- a/xio-tun.c -+++ b/xio-tun.c -@@ -14,6 +14,12 @@ - - #include "xio-tun.h" - -+/* TUNSETIFF flags from if_tun.h kernel header */ -+#define IFF_TUN 0x0001 -+#define IFF_TAP 0x0002 -+#define IFF_NO_PI 0x1000 -+ -+#define TUNSETIFF _IOW('T', 202, int) - - static int xioopen_tun(int argc, const char *argv[], struct opt *opts, int xioflags, xiofile_t *fd, unsigned groups, int dummy1, int dummy2, int dummy3); - --- -2.5.5 - diff --git a/package/socat/socat.hash b/package/socat/socat.hash index 77abcf29a9..92d62ab716 100644 --- a/package/socat/socat.hash +++ b/package/socat/socat.hash @@ -1,7 +1,7 @@ # From http://www.dest-unreach.org/socat/download.md5sum -md5 607a24c15bd2cb54e9328bfbbd3a1ae9 socat-1.7.3.2.tar.bz2 -# Calculated based on the hash above -sha256 e3561f808739383eb10fada1e5d4f26883f0311b34fd0af7837d0c95ef379251 socat-1.7.3.2.tar.bz2 +md5 b2a032a47b8b89a18485697fa975154f socat-1.7.3.3.tar.bz2 +# From http://www.dest-unreach.org/socat/download.sha256sum +sha256 0dd63ffe498168a4aac41d307594c5076ff307aa0ac04b141f8f1cec6594d04a socat-1.7.3.3.tar.bz2 # Locally calculated sha256 4846488cea98a2905dc75b7aa5eea721568e372447efe06b85bd896ee8c54f10 README sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/socat/socat.mk b/package/socat/socat.mk index 5fea067d82..c6f99c2afa 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -4,14 +4,12 @@ # ################################################################################ -SOCAT_VERSION = 1.7.3.2 +SOCAT_VERSION = 1.7.3.3 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 SOCAT_SITE = http://www.dest-unreach.org/socat/download SOCAT_LICENSE = GPL-2.0 with OpenSSL exception SOCAT_LICENSE_FILES = README COPYING COPYING.OpenSSL -SOCAT_CONF_ENV = sc_cv_termios_ispeed=no - ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) SOCAT_CONF_ENV += \ sc_cv_sys_crdly_shift=12 \ From 82dfe1a2f00763e7e4687dadfbca600df96acf62 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 16 Aug 2019 09:04:27 +0200 Subject: [PATCH 047/120] package/4th: bump to version 3.62.5 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/4th/4th.hash | 2 +- package/4th/4th.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/4th/4th.hash b/package/4th/4th.hash index 97083da8f6..6e0eff16ad 100644 --- a/package/4th/4th.hash +++ b/package/4th/4th.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 1c7adbb1a56dad4c4c781e6e023d77ac862842560c05246b691d07e9a4460ab2 4th-3.62.4-unix.tar.gz +sha256 f822f7dd8cfb0b1744a62d653c6efe933578ae1789ec60a088509a38bca4b4fc 4th-3.62.5-unix.tar.gz diff --git a/package/4th/4th.mk b/package/4th/4th.mk index f272e02808..aee59c463f 100644 --- a/package/4th/4th.mk +++ b/package/4th/4th.mk @@ -4,7 +4,7 @@ # ################################################################################ -4TH_VERSION = 3.62.4 +4TH_VERSION = 3.62.5 4TH_SOURCE = 4th-$(4TH_VERSION)-unix.tar.gz 4TH_SITE = http://downloads.sourceforge.net/project/forth-4th/4th-$(4TH_VERSION) 4TH_LICENSE = GPL-3.0+, LGPL-3.0+ From fb9d76500e4eb96861ea8ea89a60cdee8045854f Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 16 Aug 2019 09:04:56 +0200 Subject: [PATCH 048/120] package/chipmunk: bump to version 7.0.3 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/chipmunk/chipmunk.hash | 2 +- package/chipmunk/chipmunk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/chipmunk/chipmunk.hash b/package/chipmunk/chipmunk.hash index 7bd9b15692..fc34639aa0 100644 --- a/package/chipmunk/chipmunk.hash +++ b/package/chipmunk/chipmunk.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6b6d8d5d910c4442fb9c8c4c46a178126d8c21d075cdb3ce439a7f8d8757b0ca Chipmunk-7.0.2.tar.gz +sha256 1e6f093812d6130e45bdf4cb80280cb3c93d1e1833d8cf989d554d7963b7899a Chipmunk-7.0.3.tar.gz # Hash for license file: sha256 109cedb0301cba4e05fa99241f162bdad015c9541ae84b420b0148ac1ea588e2 LICENSE.txt diff --git a/package/chipmunk/chipmunk.mk b/package/chipmunk/chipmunk.mk index a84af22823..e85af5d123 100644 --- a/package/chipmunk/chipmunk.mk +++ b/package/chipmunk/chipmunk.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHIPMUNK_VERSION = 7.0.2 +CHIPMUNK_VERSION = 7.0.3 CHIPMUNK_SITE = https://github.com/slembcke/Chipmunk2D/archive CHIPMUNK_SOURCE = Chipmunk-$(CHIPMUNK_VERSION).tar.gz CHIPMUNK_INSTALL_STAGING = YES From c0e3254990c113ec734dd939c7ec6ef2bb11763c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 16 Aug 2019 06:54:37 +0300 Subject: [PATCH 049/120] package/strace: bump to version 5.2 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- 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 bcd09315f1..51436cf850 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/5.0/strace-5.0.tar.xz.asc -sha256 3b7ad77eb2b81dc6078046a9cc56eed5242b67b63748e7fc28f7c2daf4e647da strace-5.0.tar.xz +# https://strace.io/files/5.2/strace-5.2.tar.xz.asc +sha256 d513bc085609a9afd64faf2ce71deb95b96faf46cd7bc86048bc655e4e4c24d2 strace-5.2.tar.xz sha256 739b2725197137a04ab48ee6b19da3fdf7e497249e0dedd9f51c11a570401ede COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index f957144160..9ec81728e2 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 5.0 +STRACE_VERSION = 5.2 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ From 4d5f3984aea606fb5671f877542b2c858f9bb9cb Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 16 Aug 2019 06:54:38 +0300 Subject: [PATCH 050/120] package/strace: reenable bpf for m68k Kernel commit 0472301a28f ("bpf: fix uapi bpf_prog_info fields alignment") fixed the issue causing build failure in bpf support code. The fix has been applied to all kernel versions that are affected and supported (v4.19, v5.1, v5.2). Enable back bpf for m68k. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/strace/strace.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 9ec81728e2..9049e52d4a 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -19,12 +19,6 @@ STRACE_CONF_OPTS += st_cv_m32_mpers=no \ st_cv_mx32_mpers=no endif -# struct bpf_prog_info fields offset mismatch -# https://lists.strace.io/pipermail/strace-devel/2019-May/thread.html#8750 -ifeq ($(BR2_m68k),y) -STRACE_CONF_OPTS += ac_cv_header_linux_bpf_h=no -endif - ifeq ($(BR2_PACKAGE_LIBUNWIND),y) STRACE_DEPENDENCIES += libunwind STRACE_CONF_OPTS += --with-libunwind From 2d2d296e0fd1824e0de31218c27865436fac8bec Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 17 Aug 2019 21:32:08 +0200 Subject: [PATCH 051/120] package/libevent: drop patch Drop patch and autoreconf, instead use existing --disable-libevent-regress option to disable tests Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Disable-building-test-programs.patch | 31 ------------------- package/libevent/libevent.mk | 11 ++++--- 2 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 package/libevent/0001-Disable-building-test-programs.patch diff --git a/package/libevent/0001-Disable-building-test-programs.patch b/package/libevent/0001-Disable-building-test-programs.patch deleted file mode 100644 index cac05ecdd9..0000000000 --- a/package/libevent/0001-Disable-building-test-programs.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4b5a135fa681e85eb6988a379f59f3c7a41cc48c Mon Sep 17 00:00:00 2001 -From: Gilles Talis -Date: Fri, 21 Jun 2013 15:25:11 -0700 -Subject: [PATCH] Disable building test programs - -We are not really interested in building test programs. -Moreover, these programs use fork() function that is -not available on MMU-less architectures. - -Signed-off-by: Gilles Talis -[aduskett@gmail.com: Updated for 2.1.8] -Signed-off-by: Adam Duskett ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 42879a3..dc90359 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -144,7 +144,6 @@ - BUILT_SOURCES = - include include/include.am - include sample/include.am --include test/include.am - - if BUILD_WIN32 - --- -2.1.1 - diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index f4d2a4c0ab..a5ba7fdf6a 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -10,10 +10,13 @@ LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz LIBEVENT_INSTALL_STAGING = YES LIBEVENT_LICENSE = BSD-3-Clause, OpenBSD LIBEVENT_LICENSE_FILES = LICENSE -# For 0001-Disable-building-test-programs.patch -LIBEVENT_AUTORECONF = YES -LIBEVENT_CONF_OPTS = --disable-samples -HOST_LIBEVENT_CONF_OPTS = --disable-samples --disable-openssl +LIBEVENT_CONF_OPTS = \ + --disable-libevent-regress \ + --disable-samples +HOST_LIBEVENT_CONF_OPTS = \ + --disable-libevent-regress \ + --disable-samples \ + --disable-openssl define LIBEVENT_REMOVE_PYSCRIPT rm $(TARGET_DIR)/usr/bin/event_rpcgen.py From 7ba47d1ccaa62eb3d63a64bf88d93e6595007ec0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 17 Aug 2019 14:48:17 +0200 Subject: [PATCH 052/120] toolchain/wrapper: also dump args it was called with Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Thomas De Schampheleire Reviewed-by: Thomas De Schampheleire Tested-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-wrapper.c | 49 +++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 7a4b9c4007..b7705a4cbf 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -240,7 +240,24 @@ int main(int argc, char **argv) char *env_debug; char *paranoid_wrapper; int paranoid; - int ret, i, count = 0, debug, found_shared = 0; + int ret, i, count = 0, debug = 0, found_shared = 0; + + /* Debug the wrapper to see arguments it was called with. + * If environment variable BR2_DEBUG_WRAPPER is: + * unset, empty, or 0: do not trace + * set to 1 : trace all arguments on a single line + * set to 2 : trace one argument per line + */ + if ((env_debug = getenv("BR2_DEBUG_WRAPPER"))) { + debug = atoi(env_debug); + } + if (debug > 0) { + fprintf(stderr, "Toolchain wrapper was called with:"); + for (i = 0; i < argc; i++) + fprintf(stderr, "%s'%s'", + (debug == 2) ? "\n " : " ", argv[i]); + fprintf(stderr, "\n"); + } /* Calculate the relative paths */ basename = strrchr(progpath, '/'); @@ -483,29 +500,21 @@ int main(int argc, char **argv) exec_args++; #endif - /* Debug the wrapper to see actual arguments passed to - * the compiler: - * unset, empty, or 0: do not trace - * set to 1 : trace all arguments on a single line - * set to 2 : trace one argument per line - */ - if ((env_debug = getenv("BR2_DEBUG_WRAPPER"))) { - debug = atoi(env_debug); - if (debug > 0) { - fprintf(stderr, "Toolchain wrapper executing:"); + /* Debug the wrapper to see final arguments passed to the real compiler. */ + if (debug > 0) { + fprintf(stderr, "Toolchain wrapper executing:"); #ifdef BR_CCACHE_HASH - fprintf(stderr, "%sCCACHE_COMPILERCHECK='string:" BR_CCACHE_HASH "'", - (debug == 2) ? "\n " : " "); + 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 " : " "); + fprintf(stderr, "%sCCACHE_BASEDIR='" BR_CCACHE_BASEDIR "'", + (debug == 2) ? "\n " : " "); #endif - for (i = 0; exec_args[i]; i++) - fprintf(stderr, "%s'%s'", - (debug == 2) ? "\n " : " ", exec_args[i]); - fprintf(stderr, "\n"); - } + for (i = 0; exec_args[i]; i++) + fprintf(stderr, "%s'%s'", + (debug == 2) ? "\n " : " ", exec_args[i]); + fprintf(stderr, "\n"); } #ifdef BR_CCACHE_HASH From 2a75bf31820e59ea13ce9e0cf508864954bc716a Mon Sep 17 00:00:00 2001 From: Koen Martens Date: Sun, 18 Aug 2019 09:32:01 +0200 Subject: [PATCH 053/120] package/capnproto: bump version to 0.7.0 The patch against 0.6.1 has been merged upstream, and has been removed from this package. A small change has been made to the LICENSE file: "Cloudflare, Inc." was added in the copyright declaration. Signed-off-by: Koen Martens Signed-off-by: Thomas Petazzoni --- ...01-Do-not-use-execinfo-h-with-uclibc.patch | 30 ------------------- package/capnproto/capnproto.hash | 4 +-- package/capnproto/capnproto.mk | 2 +- 3 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 package/capnproto/0001-Do-not-use-execinfo-h-with-uclibc.patch diff --git a/package/capnproto/0001-Do-not-use-execinfo-h-with-uclibc.patch b/package/capnproto/0001-Do-not-use-execinfo-h-with-uclibc.patch deleted file mode 100644 index 6bb7702a58..0000000000 --- a/package/capnproto/0001-Do-not-use-execinfo-h-with-uclibc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e651ac5febc59e3e2b5d3365ededbe5362756da2 Mon Sep 17 00:00:00 2001 -From: Koen Martens -Date: Wed, 12 Jul 2017 18:49:32 +0200 -Subject: [PATCH] Do not use execinfo.h with uclibc (#511) - -Upstream commit: https://github.com/capnproto/capnproto/commit/e651ac5febc59e3e2b5d3365ededbe5362756da2 - -Signed-off-by: Koen Martens -Signed-off-by: Joel Carlson - ---- - c++/src/kj/exception.c++ | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/c++/src/kj/exception.c++ b/c++/src/kj/exception.c++ -index 218f1db..339601a 100644 ---- a/c++/src/kj/exception.c++ -+++ b/c++/src/kj/exception.c++ -@@ -33,7 +33,7 @@ - #endif - #include "io.h" - --#if (__linux__ && __GLIBC__) || __APPLE__ -+#if (__linux__ && __GLIBC__ && !__UCLIBC__) || __APPLE__ - #define KJ_HAS_BACKTRACE 1 - #include - #endif --- -2.7.4 - diff --git a/package/capnproto/capnproto.hash b/package/capnproto/capnproto.hash index bc6a27684b..98467f8634 100644 --- a/package/capnproto/capnproto.hash +++ b/package/capnproto/capnproto.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 85210424c09693d8fe158c1970a2bca37af3a0424f02b263f566a1b8a5451a2d capnproto-0.6.1.tar.gz -sha256 16194222e9412c3aa14d2287953f7fc89a1dcbcdd266d1534ba35060d4cde5b6 LICENSE +sha256 76c7114a3d142ad08b7208b3964a26e72a6320ee81331d3f0b87569fc9c47a28 capnproto-0.7.0.tar.gz +sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE diff --git a/package/capnproto/capnproto.mk b/package/capnproto/capnproto.mk index 3c7965d60c..34fb885914 100644 --- a/package/capnproto/capnproto.mk +++ b/package/capnproto/capnproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAPNPROTO_VERSION = 0.6.1 +CAPNPROTO_VERSION = 0.7.0 CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION)) CAPNPROTO_LICENSE = MIT CAPNPROTO_LICENSE_FILES = LICENSE From 867312ccb77b33897f58a49a8613adc4de3735b2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 18 Aug 2019 11:05:17 +0200 Subject: [PATCH 054/120] package/openldap: bump to version 2.4.48 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/openldap/openldap.hash | 10 +++++----- package/openldap/openldap.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/openldap/openldap.hash b/package/openldap/openldap.hash index 0b33b8d724..9ea1e7a55d 100644 --- a/package/openldap/openldap.hash +++ b/package/openldap/openldap.hash @@ -1,7 +1,7 @@ -# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.47.md5 -md5 e508f97bfd778fec7799f286e5c07176 openldap-2.4.47.tgz -# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.47.sha1 -sha1 c59d52dd75f7d1c7b02f83725da36c322d439674 openldap-2.4.47.tgz +# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.48.md5 +md5 0729a0711fe096831dedc159e0bbe73f openldap-2.4.48.tgz +# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.48.sha1 +sha1 c1984e80f6db038b317bf931866adb38e5537dcd openldap-2.4.48.tgz # Locally computed -sha256 f54c5877865233d9ada77c60c0f69b3e0bfd8b1b55889504c650047cc305520b openldap-2.4.47.tgz +sha256 d9523ffcab5cd14b709fcf3cb4d04e8bc76bb8970113255f372bc74954c6074d openldap-2.4.48.tgz sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/openldap/openldap.mk b/package/openldap/openldap.mk index 9dbab731c3..4417bb659b 100644 --- a/package/openldap/openldap.mk +++ b/package/openldap/openldap.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLDAP_VERSION = 2.4.47 +OPENLDAP_VERSION = 2.4.48 OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz OPENLDAP_SITE = http://www.openldap.org/software/download/OpenLDAP/openldap-release OPENLDAP_LICENSE = OpenLDAP Public License From 73e836e1398293abc1ec2b4297e1e680d2b29e32 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 18 Aug 2019 12:12:25 +0200 Subject: [PATCH 055/120] package/gauche: bump to version 0.9.8 - Remove second, third and fourth patches (already in version) - Update first patch and sent it upstream - Add AUTORECONF=YES to avoid patching configure in first patch - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gauche/0001-fix-so-suffix.patch | 43 ++++++------- ...d-check-for-NO_GETCONTEXT-definition.patch | 62 ------------------- ...-version.h-build-error-uClibc-x86-_6.patch | 46 -------------- package/gauche/0004-rfc-needs-srfi.patch | 35 ----------- package/gauche/gauche.hash | 7 ++- package/gauche/gauche.mk | 4 +- 6 files changed, 29 insertions(+), 168 deletions(-) delete mode 100644 package/gauche/0002-gc-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch delete mode 100644 package/gauche/0003-Fix-missing-libc-version.h-build-error-uClibc-x86-_6.patch delete mode 100644 package/gauche/0004-rfc-needs-srfi.patch diff --git a/package/gauche/0001-fix-so-suffix.patch b/package/gauche/0001-fix-so-suffix.patch index b65e269981..8a0937681c 100644 --- a/package/gauche/0001-fix-so-suffix.patch +++ b/package/gauche/0001-fix-so-suffix.patch @@ -1,31 +1,32 @@ +From cefd57f76f7faec4143bf1e42ed148cad973c1f4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 12 Aug 2019 23:17:21 +0200 +Subject: [PATCH] configure.ac: fix so suffix + With uclibc or musl configuration, $host does not match to '*-linux-gnu*'. -I touch configure directly instead of configure.ac because autoreconf -failed by version mismatch of autotools. Signed-off-by: Hiroshi Kawashima +[Retrieved (and slightly updated) from: +https://git.buildroot.net/buildroot/tree/package/gauche/0001-fix-so-suffix.patch] +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/shirok/Gauche/pull/508] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff -ur a/configure b/configure ---- a/configure 2014-07-20 15:15:05.000000000 +0900 -+++ b/configure 2015-10-20 21:52:32.791442291 +0900 -@@ -6843,7 +6843,7 @@ +diff --git a/configure.ac b/configure.ac +index 15092a2d6..b82b762a9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -641,7 +641,7 @@ AS_CASE([$host], SHLIB_MAIN_LDFLAGS="" SHLIB_OK=ok - ;; -- *-linux-gnu*|*-*-gnu*|*freebsd*|*dragonfly*) -+ *-linux-*|*-*-gnu*|*freebsd*|*dragonfly*) + ], +- [*-linux-gnu*|*-*-gnu*|*freebsd*|*dragonfly*], [ ++ [*-linux-*|*-*-gnu*|*freebsd*|*dragonfly*], [ SHLIB_SO_CFLAGS="-fPIC" SHLIB_SO_LDFLAGS="$rpath -shared -o" SHLIB_SO_SUFFIX="so" +-- +2.20.1 -diff -ur a/configure.ac b/configure.ac ---- a/configure.ac 2015-10-21 21:33:17.370000200 +0900 -+++ b/configure.ac 2015-10-21 21:33:39.784110527 +0900 -@@ -572,7 +572,7 @@ - SHLIB_MAIN_LDFLAGS="" - SHLIB_OK=ok - ;; -- *-linux-gnu*|*-*-gnu*|*freebsd*|*dragonfly*) -+ *-linux-*|*-*-gnu*|*freebsd*|*dragonfly*) - SHLIB_SO_CFLAGS="-fPIC" - SHLIB_SO_LDFLAGS="$rpath -shared -o" - SHLIB_SO_SUFFIX="so" diff --git a/package/gauche/0002-gc-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch b/package/gauche/0002-gc-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch deleted file mode 100644 index 6cc065693f..0000000000 --- a/package/gauche/0002-gc-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch +++ /dev/null @@ -1,62 +0,0 @@ -gc/configure.ac: add check for NO_GETCONTEXT definition - -This patch is ported from bdwgc package. Since Gauche uses an internal -copy of the boehm gc code, it is affected by the same problem. - -Both configure and configure.ac are modified because autoreconf fails -due to an incompatibility with the version of the autotools used by -Buildroot. - -Signed-off-by: Hiroshi Kawashima - -Original credits of patch in bdwgc package: -Signed-off-by: Samuel Martin -[yann.morin.1998@free.fr: add a comment, change variable name, use - AS_IF, remove debug traces, use AC_CHECK_FUNCS (as suggested by - Thomas)] -Signed-off-by: "Yann E. MORIN" -Cc: Thomas Petazzoni - -diff -ur a/gc/configure b/gc/configure ---- a/gc/configure 2015-11-12 21:41:02.394822056 +0900 -+++ b/gc/configure 2015-11-12 22:04:14.655157423 +0900 -@@ -16153,6 +16153,23 @@ - $as_echo "$ac_cv_fno_strict_aliasing" >&6; } - fi - -+# Check for getcontext (uClibc can be configured without it, for example) -+for ac_func in getcontext -+do : -+ ac_fn_c_check_func "$LINENO" "getcontext" "ac_cv_func_getcontext" -+if test "x$ac_cv_func_getcontext" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_GETCONTEXT 1 -+_ACEOF -+ -+fi -+done -+ -+if test "$ac_cv_func_getcontext" = "no"; then : -+ CFLAGS="$CFLAGS -DNO_GETCONTEXT" -+ CPPFLAGS="$CPPFLAGS -DNO_GETCONTEXT" -+fi -+ - case "$host" in - # While IRIX 6 has libdl for the O32 and N32 ABIs, it's missing for N64 - # and unnecessary everywhere. -diff -ur a/gc/configure.ac b/gc/configure.ac ---- a/gc/configure.ac 2015-11-12 22:31:44.851510997 +0900 -+++ b/gc/configure.ac 2015-11-12 22:33:39.292191227 +0900 -@@ -459,6 +459,12 @@ - AC_MSG_RESULT($ac_cv_fno_strict_aliasing) - fi - -+# Check for getcontext (uClibc can be configured without it, for example) -+AC_CHECK_FUNCS([getcontext]) -+AS_IF([test "$ac_cv_func_getcontext" = "no"], -+ [CFLAGS="$CFLAGS -DNO_GETCONTEXT" -+ CPPFLAGS="$CPPFLAGS -DNO_GETCONTEXT"]) -+ - case "$host" in - # While IRIX 6 has libdl for the O32 and N32 ABIs, it's missing for N64 - # and unnecessary everywhere. diff --git a/package/gauche/0003-Fix-missing-libc-version.h-build-error-uClibc-x86-_6.patch b/package/gauche/0003-Fix-missing-libc-version.h-build-error-uClibc-x86-_6.patch deleted file mode 100644 index 61a3f1aadb..0000000000 --- a/package/gauche/0003-Fix-missing-libc-version.h-build-error-uClibc-x86-_6.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4b9692c93d658015087f19016b2bd0c9dfbccee6 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 28 May 2017 20:21:09 +0200 -Subject: [PATCH] Fix 'missing libc-version.h' build error (uClibc/x86[_64]) - (fix commit 3d34255) - -uClibc defines __GLIBC__ but does not contain libc-version.h file. - -* include/private/gcconfig.h [(I386 || X86_64) && LINUX && __GLIBC__] -(GLIBC_2_19_TSX_BUG): Do not define (and do not include -gnu/libc-version.h) if __UCLIBC__. - -[baruch: cherry pick from upstream bdwgc commit 047230b71d42140] -Signed-off-by: Baruch Siach ---- -Upstream status: patch applied to bdwgc; will propagate to gauche on the next -synch of its bundled bdwgc - - gc/include/private/gcconfig.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gc/include/private/gcconfig.h b/gc/include/private/gcconfig.h -index 80920e5af570..f063664c3f52 100644 ---- a/gc/include/private/gcconfig.h -+++ b/gc/include/private/gcconfig.h -@@ -1420,7 +1420,7 @@ - # define GC_PREFETCH_FOR_WRITE(x) \ - __asm__ __volatile__ ("prefetchw %0" : : "m"(*(char *)(x))) - # endif --# if defined(__GLIBC__) -+# if defined(__GLIBC__) && !defined(__UCLIBC__) - /* Workaround lock elision implementation for some glibc. */ - # define GLIBC_2_19_TSX_BUG - # include /* for gnu_get_libc_version() */ -@@ -2431,7 +2431,7 @@ - /* FIXME: This seems to be fixed in GLibc v2.14. */ - # define GETCONTEXT_FPU_EXCMASK_BUG - # endif --# if defined(__GLIBC__) -+# if defined(__GLIBC__) && !defined(__UCLIBC__) - /* Workaround lock elision implementation for some glibc. */ - # define GLIBC_2_19_TSX_BUG - # include /* for gnu_get_libc_version() */ --- -2.11.0 - diff --git a/package/gauche/0004-rfc-needs-srfi.patch b/package/gauche/0004-rfc-needs-srfi.patch deleted file mode 100644 index 8b83b7872b..0000000000 --- a/package/gauche/0004-rfc-needs-srfi.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 33ba5e73ec09f1308f897128334e955debd9ea43 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 21 Nov 2018 08:58:25 +0100 -Subject: [PATCH] rfc: needs srfi - -ext/rfc needs srfi-19 since version 0.9.5 and -https://github.com/shirok/Gauche/commit/bd22bc82361c5eeb5d3b58c3836236566746bb96 - -So add a dependency on srfi for rfc target in Makefile.in - -Fixes: - - http://autobuild.buildroot.org/results/f4935e29ce6aaebdaa47d46c56120b7e97145d1b - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/shirok/Gauche/pull/397] ---- - ext/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ext/Makefile.in b/ext/Makefile.in -index 57ddf457e..de8d59a4d 100644 ---- a/ext/Makefile.in -+++ b/ext/Makefile.in -@@ -54,7 +54,7 @@ bcrypt: mt-random - - dbm : threads - --rfc: gauche util -+rfc: gauche srfi util - - test : check - --- -2.14.1 - diff --git a/package/gauche/gauche.hash b/package/gauche/gauche.hash index 8f45ef997b..600c46fbdc 100644 --- a/package/gauche/gauche.hash +++ b/package/gauche/gauche.hash @@ -1,5 +1,6 @@ # From https://sourceforge.net/projects/gauche/files/Gauche/ -sha1 c3e1ea21f3acc66fd26eced117caab3f86531db4 Gauche-0.9.5.tgz -md5 8bac7cbd99a91f6f2c037ac6988db14d Gauche-0.9.5.tgz +sha1 ff7878ab19c56b49b4b6d77009300a3592cc903c Gauche-0.9.8.tgz +md5 efd1b12cd5708d9e1e4358ab2d2e1e32 Gauche-0.9.8.tgz # Locally calculated -sha256 4c8a53213de112708bbda5fa9648c21497d43ebf809ed5b32b15f21266b4e73c Gauche-0.9.5.tgz +sha256 3eb30d1051d8b48999fe46511c9f6983057735312c9832b7db13f9db140db74b Gauche-0.9.8.tgz +sha256 d537f80c0bb3cc203bc2675b766b9de9573243026fa3e8ad78368abd4b14aac8 COPYING diff --git a/package/gauche/gauche.mk b/package/gauche/gauche.mk index 0b4185f5bf..1f66e28de7 100644 --- a/package/gauche/gauche.mk +++ b/package/gauche/gauche.mk @@ -4,12 +4,14 @@ # ################################################################################ -GAUCHE_VERSION = 0.9.5 +GAUCHE_VERSION = 0.9.8 GAUCHE_SOURCE = Gauche-$(GAUCHE_VERSION).tgz GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche GAUCHE_LICENSE = BSD-3-Clause, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm) GAUCHE_LICENSE_FILES = COPYING GAUCHE_DEPENDENCIES = host-gauche +# We're patching configure.ac +GAUCHE_AUTORECONF = YES HOST_GAUCHE_CONF_OPTS = --without-zlib GAUCHE_CONF_OPTS = --without-libatomic-ops From 4035aca23937800de53b74e05c8a34ae85576703 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 18 Aug 2019 12:12:26 +0200 Subject: [PATCH 056/120] package/gauche: add optional mbedtls dependency mbedtls support has been added in version 0.9.6 with https://github.com/shirok/Gauche/commit/d449f013fae79639bb300d783962328c6b6b1bd0 So enable it if mbedtls is enabled and always enable embedded axTLS support to keep existing behavior Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gauche/gauche.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/gauche/gauche.mk b/package/gauche/gauche.mk index 1f66e28de7..2a30a2b39a 100644 --- a/package/gauche/gauche.mk +++ b/package/gauche/gauche.mk @@ -16,6 +16,16 @@ GAUCHE_AUTORECONF = YES HOST_GAUCHE_CONF_OPTS = --without-zlib GAUCHE_CONF_OPTS = --without-libatomic-ops +# Enable embedded axTLS +GAUCHE_TLS_LIBS = axtls + +ifeq ($(BR2_PACKAGE_MBEDTLS),y) +GAUCHE_TLS_LIBS += mbedtls +GAUCHE_DEPENDENCIES += mbedtls +endif + +GAUCHE_CONF_OPTS += --with-tls="$(GAUCHE_TLS_LIBS)" + ifeq ($(BR2_PACKAGE_ZLIB),y) GAUCHE_CONF_OPTS += --with-zlib=$(STAGING_DIR) GAUCHE_DEPENDENCIES += zlib From 19e2a2aba7377483f19a73e1b859d174030e1e69 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Mon, 19 Aug 2019 11:43:46 +0200 Subject: [PATCH 057/120] package/libgit2: bump version to 0.28.3 Remove the cURL dependency, since they reimplemented a HTTP client. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni --- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 54e309172a..f445e4cf0f 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8313873d49dc01e8b880ec334d7430ae67496a89aaa8c6e7bbd3affb47a00c76 libgit2-0.27.8.tar.gz +sha256 ee5344730fe11ce7c86646e19c2d257757be293f5a567548d398fb3af8b8e53b libgit2-0.28.3.tar.gz sha256 d9a8038088df84fde493fa33a0f1e537252eeb9642122aa4b862690197152813 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index b8880fea81..e4d887d9b2 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 0.27.8 +LIBGIT2_VERSION = 0.28.3 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = GPL-2.0 with linking exception LIBGIT2_LICENSE_FILES = COPYING @@ -41,11 +41,4 @@ else LIBGIT2_CONF_OPTS += -DUSE_HTTPS=OFF endif -ifeq ($(BR2_PACKAGE_LIBCURL),y) -LIBGIT2_DEPENDENCIES += libcurl -LIBGIT2_CONF_OPTS += -DCURL=ON -else -LIBGIT2_CONF_OPTS += -DCURL=OFF -endif - $(eval $(cmake-package)) From e7aef9e9d6faa323e5e4fd0b8c87020ec14d1c9f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 18 Aug 2019 10:23:10 +0300 Subject: [PATCH 058/120] package/evtest: fix build with musl libc Add a patch adding missing limits.h header include. Fixes: http://autobuild.buildroot.net/results/c5f1b95741b37f6d949b3407fff901a960c6b781/ http://autobuild.buildroot.net/results/b09a6b340f0a96081a55764b5dad0c2c31240cef/ http://autobuild.buildroot.net/results/90c7a092a5492699406d3f46e0039d253146b6b7/ Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- .../0001-Add-missing-limits.h-include.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/evtest/0001-Add-missing-limits.h-include.patch diff --git a/package/evtest/0001-Add-missing-limits.h-include.patch b/package/evtest/0001-Add-missing-limits.h-include.patch new file mode 100644 index 0000000000..6c7fc90482 --- /dev/null +++ b/package/evtest/0001-Add-missing-limits.h-include.patch @@ -0,0 +1,38 @@ +From 7d7c5a81b0e2f3321d269b7acc450d1eec7a910b Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Sun, 18 Aug 2019 09:57:23 +0300 +Subject: [PATCH] Add missing limits.h include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes build with musl libc that does not include limits.h indirectly via +other headers. + +evtest.c: In function ‘scan_devices’: +evtest.c:886:14: error: ‘PATH_MAX’ undeclared (first use in this function); did you mean INT8_MAX’? + char fname[PATH_MAX]; + ^~~~~~~~ + +Signed-off-by: Baruch Siach +--- +Upstream status: sent to input-tools@lists.freedesktop.org (moderated) + + evtest.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/evtest.c b/evtest.c +index 37d4f8540333..548c203564d3 100644 +--- a/evtest.c ++++ b/evtest.c +@@ -56,6 +56,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.23.0.rc1 + From 4d0f5c28b6ff9a676e374af13386c4637c46ffe1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 19 Aug 2019 18:47:13 +0200 Subject: [PATCH 059/120] package/librsync: bump to version 2.1.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/librsync/librsync.hash | 2 +- package/librsync/librsync.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/librsync/librsync.hash b/package/librsync/librsync.hash index 4367c92b5d..95206c39a7 100644 --- a/package/librsync/librsync.hash +++ b/package/librsync/librsync.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e67b9520ee84f7239be6e948795803bd95495091cc00bf6d0e8c6976032a4af1 librsync-2.0.2.tar.gz +sha256 f701d2bab3d7471dfea60d29e9251f8bb7567222957f7195af55142cb207c653 librsync-2.1.0.tar.gz sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/package/librsync/librsync.mk b/package/librsync/librsync.mk index 1c408c3b17..4e42f77344 100644 --- a/package/librsync/librsync.mk +++ b/package/librsync/librsync.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRSYNC_VERSION = 2.0.2 +LIBRSYNC_VERSION = 2.1.0 LIBRSYNC_SITE = $(call github,librsync,librsync,v$(LIBRSYNC_VERSION)) LIBRSYNC_LICENSE = LGPL-2.1+ LIBRSYNC_LICENSE_FILES = COPYING From cbfee0ad53f574e73ed7daa3c2870cf540723657 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 19 Aug 2019 23:21:20 +0200 Subject: [PATCH 060/120] package/giflib: add two upstream security fixes - Fix CVE-2018-11490: The DGifDecompressLine function in dgif_lib.c in GIFLIB (possibly version 3.0.x), as later shipped in cgif.c in sam2p 0.49.4, has a heap-based buffer overflow because a certain "Private->RunningCode - 2" array index is not checked. This will lead to a denial of service or possibly unspecified other impact. - Fix CVE-2019-15133: In GIFLIB before 2019-02-16, a malformed GIF file triggers a divide-by-zero exception in the decoder function DGifSlurp in dgif_lib.c if the height field of the ImageSize data structure is equal to zero. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...13-Heap-Buffer-Overflow-2-in-functio.patch | 31 +++++++++++++++++++ ...19-MemorySanitizer-FPE-on-unknown-ad.patch | 28 +++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 package/giflib/0001-Address-SF-bug-113-Heap-Buffer-Overflow-2-in-functio.patch create mode 100644 package/giflib/0002-Address-SF-bug-119-MemorySanitizer-FPE-on-unknown-ad.patch diff --git a/package/giflib/0001-Address-SF-bug-113-Heap-Buffer-Overflow-2-in-functio.patch b/package/giflib/0001-Address-SF-bug-113-Heap-Buffer-Overflow-2-in-functio.patch new file mode 100644 index 0000000000..9c6f344be8 --- /dev/null +++ b/package/giflib/0001-Address-SF-bug-113-Heap-Buffer-Overflow-2-in-functio.patch @@ -0,0 +1,31 @@ +From 08438a5098f3bb1de23a29334af55eba663f75bd Mon Sep 17 00:00:00 2001 +From: "Eric S. Raymond" +Date: Sat, 9 Feb 2019 10:52:21 -0500 +Subject: [PATCH] Address SF bug #113: Heap Buffer Overflow-2 in function + DGifDecompressLine()... + +This was CVE-2018-11490 + +[Retrieved from: +https://sourceforge.net/p/giflib/code/ci/08438a5098f3bb1de23a29334af55eba663f75bd] +Signed-off-by: Fabrice Fontaine +--- + lib/dgif_lib.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c +index 15c1460..c4aee5f 100644 +--- a/lib/dgif_lib.c ++++ b/lib/dgif_lib.c +@@ -930,7 +930,7 @@ DGifDecompressLine(GifFileType *GifFile, GifPixelType *Line, int LineLen) + while (StackPtr != 0 && i < LineLen) + Line[i++] = Stack[--StackPtr]; + } +- if (LastCode != NO_SUCH_CODE && Prefix[Private->RunningCode - 2] == NO_SUCH_CODE) { ++ if (LastCode != NO_SUCH_CODE && Private->RunningCode - 2 < LZ_MAX_CODE && Prefix[Private->RunningCode - 2] == NO_SUCH_CODE) { + Prefix[Private->RunningCode - 2] = LastCode; + + if (CrntCode == Private->RunningCode - 2) { +-- +2.20.1 + diff --git a/package/giflib/0002-Address-SF-bug-119-MemorySanitizer-FPE-on-unknown-ad.patch b/package/giflib/0002-Address-SF-bug-119-MemorySanitizer-FPE-on-unknown-ad.patch new file mode 100644 index 0000000000..60e9a324a2 --- /dev/null +++ b/package/giflib/0002-Address-SF-bug-119-MemorySanitizer-FPE-on-unknown-ad.patch @@ -0,0 +1,28 @@ +From 799eb6a3af8a3dd81e2429bf11a72a57e541f908 Mon Sep 17 00:00:00 2001 +From: "Eric S. Raymond" +Date: Sun, 17 Mar 2019 12:37:21 -0400 +Subject: [PATCH] Address SF bug #119: MemorySanitizer: FPE on unknown address + +[Retrieved (and backported) from: +https://sourceforge.net/p/giflib/code/ci/08438a5098f3bb1de23a29334af55eba663f75bd] +Signed-off-by: Fabrice Fontaine +--- + dgif_lib.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c +index 3a52467..179bd84 100644 +--- a/lib/dgif_lib.c ++++ b/lib/dgif_lib.c +@@ -1143,7 +1143,7 @@ DGifSlurp(GifFileType *GifFile) + + sp = &GifFile->SavedImages[GifFile->ImageCount - 1]; + /* Allocate memory for the image */ +- if (sp->ImageDesc.Width < 0 && sp->ImageDesc.Height < 0 && ++ if (sp->ImageDesc.Width <= 0 || sp->ImageDesc.Height <= 0 || + sp->ImageDesc.Width > (INT_MAX / sp->ImageDesc.Height)) { + return GIF_ERROR; + } +-- +2.20.1 + From bf16f14e6bf078454724ff2a5d299e29f914f7f0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 19 Aug 2019 23:21:21 +0200 Subject: [PATCH 061/120] package/giflib: bump to version 5.2.1 - Switch to generic-package (autotools has been dropped since version 5.1.5) - Remove hook and instead use dedicated makefile targets to build only shared or static library and not binaries or documentation (added by an upstreamble patch) - ac_cv_prog_have_xmlto=no can be removed as doc is not built anymore Signed-off-by: Fabrice Fontaine [Peter: drop redundant GIFLIB_SOURCE] Signed-off-by: Peter Korsgaard --- ...13-Heap-Buffer-Overflow-2-in-functio.patch | 31 --------- ...dd-targets-to-manage-static-building.patch | 69 +++++++++++++++++++ ...19-MemorySanitizer-FPE-on-unknown-ad.patch | 28 -------- package/giflib/giflib.hash | 4 +- package/giflib/giflib.mk | 48 +++++++++---- 5 files changed, 104 insertions(+), 76 deletions(-) delete mode 100644 package/giflib/0001-Address-SF-bug-113-Heap-Buffer-Overflow-2-in-functio.patch create mode 100644 package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch delete mode 100644 package/giflib/0002-Address-SF-bug-119-MemorySanitizer-FPE-on-unknown-ad.patch diff --git a/package/giflib/0001-Address-SF-bug-113-Heap-Buffer-Overflow-2-in-functio.patch b/package/giflib/0001-Address-SF-bug-113-Heap-Buffer-Overflow-2-in-functio.patch deleted file mode 100644 index 9c6f344be8..0000000000 --- a/package/giflib/0001-Address-SF-bug-113-Heap-Buffer-Overflow-2-in-functio.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 08438a5098f3bb1de23a29334af55eba663f75bd Mon Sep 17 00:00:00 2001 -From: "Eric S. Raymond" -Date: Sat, 9 Feb 2019 10:52:21 -0500 -Subject: [PATCH] Address SF bug #113: Heap Buffer Overflow-2 in function - DGifDecompressLine()... - -This was CVE-2018-11490 - -[Retrieved from: -https://sourceforge.net/p/giflib/code/ci/08438a5098f3bb1de23a29334af55eba663f75bd] -Signed-off-by: Fabrice Fontaine ---- - lib/dgif_lib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c -index 15c1460..c4aee5f 100644 ---- a/lib/dgif_lib.c -+++ b/lib/dgif_lib.c -@@ -930,7 +930,7 @@ DGifDecompressLine(GifFileType *GifFile, GifPixelType *Line, int LineLen) - while (StackPtr != 0 && i < LineLen) - Line[i++] = Stack[--StackPtr]; - } -- if (LastCode != NO_SUCH_CODE && Prefix[Private->RunningCode - 2] == NO_SUCH_CODE) { -+ if (LastCode != NO_SUCH_CODE && Private->RunningCode - 2 < LZ_MAX_CODE && Prefix[Private->RunningCode - 2] == NO_SUCH_CODE) { - Prefix[Private->RunningCode - 2] = LastCode; - - if (CrntCode == Private->RunningCode - 2) { --- -2.20.1 - diff --git a/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch new file mode 100644 index 0000000000..384457d0bd --- /dev/null +++ b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch @@ -0,0 +1,69 @@ +From 487407d722714f13e8a06d1a9d89f48a5738191e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 12 Jul 2019 12:20:38 +0200 +Subject: [PATCH] Makefile: add targets to manage static building + +Add static-lib, shared-lib, install-static-lib and install-shared-lib +targets to allow the user to build giflib when dynamic library support +is not available or enable on the toolchain + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://sourceforge.net/p/giflib/code/merge-requests/7] +--- + Makefile | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index b2bf6de..111f52f 100644 +--- a/Makefile ++++ b/Makefile +@@ -61,10 +61,17 @@ UTILS = $(INSTALLABLE) \ + + LDLIBS=libgif.a -lm + +-all: libgif.so libgif.a libutil.so libutil.a $(UTILS) ++SHARED_LIBS = libgif.so libutil.so ++STATIC_LIBS = libgif.a libutil.a ++ ++all: shared-lib static-lib $(UTILS) + $(MAKE) -C doc + +-$(UTILS):: libgif.a libutil.a ++$(UTILS):: $(STATIC_LIBS) ++ ++shared-lib: $(SHARED_LIBS) ++ ++static-lib: $(STATIC_LIBS) + + libgif.so: $(OBJECTS) $(HEADERS) + $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) +@@ -79,7 +86,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS) + $(AR) rcs libutil.a $(UOBJECTS) + + clean: +- rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a libgif.so libutil.a libutil.so *.o ++ rm -f $(UTILS) $(TARGET) libgetarg.a $(SHARED_LIBS) $(STATIC_LIBS) *.o + rm -f libgif.so.$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT) + rm -f libgif.so.$(LIBMAJOR) + rm -fr doc/*.1 *.html doc/staging +@@ -96,12 +103,15 @@ install-bin: $(INSTALLABLE) + install-include: + $(INSTALL) -d "$(DESTDIR)$(INCDIR)" + $(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)" +-install-lib: ++install-static-lib: + $(INSTALL) -d "$(DESTDIR)$(LIBDIR)" + $(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a" ++install-shared-lib: ++ $(INSTALL) -d "$(DESTDIR)$(LIBDIR)" + $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)" + ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)" + ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so" ++install-lib: install-static-lib install-shared-lib + install-man: + $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" + $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1" +-- +2.20.1 + diff --git a/package/giflib/0002-Address-SF-bug-119-MemorySanitizer-FPE-on-unknown-ad.patch b/package/giflib/0002-Address-SF-bug-119-MemorySanitizer-FPE-on-unknown-ad.patch deleted file mode 100644 index 60e9a324a2..0000000000 --- a/package/giflib/0002-Address-SF-bug-119-MemorySanitizer-FPE-on-unknown-ad.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 799eb6a3af8a3dd81e2429bf11a72a57e541f908 Mon Sep 17 00:00:00 2001 -From: "Eric S. Raymond" -Date: Sun, 17 Mar 2019 12:37:21 -0400 -Subject: [PATCH] Address SF bug #119: MemorySanitizer: FPE on unknown address - -[Retrieved (and backported) from: -https://sourceforge.net/p/giflib/code/ci/08438a5098f3bb1de23a29334af55eba663f75bd] -Signed-off-by: Fabrice Fontaine ---- - dgif_lib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c -index 3a52467..179bd84 100644 ---- a/lib/dgif_lib.c -+++ b/lib/dgif_lib.c -@@ -1143,7 +1143,7 @@ DGifSlurp(GifFileType *GifFile) - - sp = &GifFile->SavedImages[GifFile->ImageCount - 1]; - /* Allocate memory for the image */ -- if (sp->ImageDesc.Width < 0 && sp->ImageDesc.Height < 0 && -+ if (sp->ImageDesc.Width <= 0 || sp->ImageDesc.Height <= 0 || - sp->ImageDesc.Width > (INT_MAX / sp->ImageDesc.Height)) { - return GIF_ERROR; - } --- -2.20.1 - diff --git a/package/giflib/giflib.hash b/package/giflib/giflib.hash index 189dca9f19..f7db1626df 100644 --- a/package/giflib/giflib.hash +++ b/package/giflib/giflib.hash @@ -1,5 +1,5 @@ # From http://sourceforge.net/projects/giflib/files -md5 2c171ced93c0e83bb09e6ccad8e3ba2b giflib-5.1.4.tar.bz2 -sha1 5f1157cfc377916280849e247b8e34fa0446513f giflib-5.1.4.tar.bz2 +md5 6f03aee4ebe54ac2cc1ab3e4b0a049e5 giflib-5.2.1.tar.gz +sha1 c3f774dcbdf26afded7788979c8081d33c6426dc giflib-5.2.1.tar.gz # Locally computed sha256 0c9b7990ecdca88b676db232c226548ac408b279f550d424d996f0d83591dd8e COPYING diff --git a/package/giflib/giflib.mk b/package/giflib/giflib.mk index 29666eebea..3dd17972e0 100644 --- a/package/giflib/giflib.mk +++ b/package/giflib/giflib.mk @@ -4,27 +4,45 @@ # ################################################################################ -GIFLIB_VERSION = 5.1.4 -GIFLIB_SOURCE = giflib-$(GIFLIB_VERSION).tar.bz2 +GIFLIB_VERSION = 5.2.1 GIFLIB_SITE = http://downloads.sourceforge.net/project/giflib GIFLIB_INSTALL_STAGING = YES GIFLIB_LICENSE = MIT GIFLIB_LICENSE_FILES = COPYING -GIFLIB_BINS = \ - gif2epsn gif2ps gif2rgb gif2x11 gifasm gifbg gifbuild gifburst gifclip \ - gifclrmp gifcolor gifcomb gifcompose gifecho giffiltr giffix gifflip \ - gifhisto gifinfo gifinter gifinto gifovly gifpos gifrotat \ - gifrsize gifspnge giftext giftool gifwedge icon2gif raw2gif rgb2gif \ - text2gif +ifeq ($(BR2_STATIC_LIBS),y) +GIFLIB_BUILD_LIBS = static-lib +GIFLIB_INSTALL_LIBS = install-static-lib +else ifeq ($(BR2_SHARED_LIBS),y) +GIFLIB_BUILD_LIBS = shared-lib +GIFLIB_INSTALL_LIBS = install-shared-lib +else +GIFLIB_BUILD_LIBS = static-lib shared-lib +GIFLIB_INSTALL_LIBS = install-lib +endif -GIFLIB_CONF_ENV = ac_cv_prog_have_xmlto=no - -define GIFLIB_BINS_CLEANUP - rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(GIFLIB_BINS)) +define GIFLIB_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(GIFLIB_BUILD_LIBS) endef -GIFLIB_POST_INSTALL_TARGET_HOOKS += GIFLIB_BINS_CLEANUP +define HOST_GIFLIB_BUILD_CMDS + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) +endef -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +define GIFLIB_INSTALL_STAGING_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) \ + PREFIX=/usr install-include $(GIFLIB_INSTALL_LIBS) +endef + +define GIFLIB_INSTALL_TARGET_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \ + PREFIX=/usr install-include $(GIFLIB_INSTALL_LIBS) +endef + +define HOST_GIFLIB_INSTALL_CMDS + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) \ + PREFIX=/usr install +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) From 335c77b667c68975b65edd0ac0d6ec214a9cb1c6 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 9 May 2019 19:04:03 -0300 Subject: [PATCH 062/120] package/util-linux: build programs and libraries in separate packages The findmount and lsblk utilities need udev to work correctly but cannot be built with udev support because the packages providing libudev (eudev and systemd) depend on util-linux, creating a chicken-egg problem. Solve it by means of the following changes: - Split util-linux into three packages: - util-linux-libs, providing lib{blkid,fdisk,mount,smartcols,uuid}. - util-linux-programs, providing both the aforementioned libs and the programs. - util-linux, a dummy package that drives configuration and building of the other ones. - Add blind selections for -libs and -programs, i.e. they are indirectly selected according to the util-linux options. - Make util-linux have build dependencies on util-linux-{libs,programs} if they are selected. - host-util-linux has a build dependency on either host-util-linux-libs or host-util-linux-programs (not on both, since they are installed on the same destination). - Make eudev and systemd have build dependencies on util-linux-libs. This can be extended to other packages in the future but is not needed right now because the configuration options are backward-compatible. - Make util-linux-programs have an optional build dependency on the package that provides libudev (either eudev or systemd), if it is selected. util-linux-libs is installed on STAGING_DIR by default and on TARGET_DIR if util-linux-programs is not selected. Conversely, util-linux-programs installs on TARGET_DIR by default and on STAGING_DIR if util-linux-libs is not selected. This prevents installing the libraries twice on the same destination, which would confuse check-uniq-files. With this approach we don't need to patch configuration files neither change other packages besides eudev and systemd. Other packages that require util-linux libraries and whose libraries can be used by util-linux programs can be updated later. We also don't need to change any existing defcconfig, since all configuration options are kept in the dummy util-linux package. The main drawback of this approach is that util-linux-rebuild, as wel as -reinstall, -reconfigure and even -dirclean targets do not have real effect. It's necessary to use util-linux-libs-rebuild, for instance, but this is a reasonable price to pay for the solution. Fixes: https://bugs.busybox.net/show_bug.cgi?id=11811 Signed-off-by: Carlos Santos Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/eudev/Config.in | 1 + package/eudev/eudev.mk | 3 +- package/systemd/Config.in | 1 + package/systemd/systemd.mk | 4 +- package/util-linux/Config.in | 59 ++++ .../util-linux-libs/util-linux-libs.hash | 1 + .../util-linux-libs/util-linux-libs.mk | 91 ++++++ .../{ => util-linux-programs}/su.pam | 0 .../util-linux-programs.hash | 1 + .../util-linux-programs.mk | 265 ++++++++++++++++++ package/util-linux/util-linux.mk | 261 ++--------------- 11 files changed, 440 insertions(+), 247 deletions(-) create mode 120000 package/util-linux/util-linux-libs/util-linux-libs.hash create mode 100644 package/util-linux/util-linux-libs/util-linux-libs.mk rename package/util-linux/{ => util-linux-programs}/su.pam (100%) create mode 120000 package/util-linux/util-linux-programs/util-linux-programs.hash create mode 100644 package/util-linux/util-linux-programs/util-linux-programs.mk diff --git a/package/eudev/Config.in b/package/eudev/Config.in index 2220265a55..2df94fb68c 100644 --- a/package/eudev/Config.in +++ b/package/eudev/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_EUDEV depends on !BR2_STATIC_LIBS # kmod select BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBS select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_KMOD help diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index 78d0ea670e..21860643ae 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -18,7 +18,8 @@ EUDEV_CONF_OPTS = \ --enable-kmod \ --enable-blkid -EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod +# eudev requires only the util-linux libraries at build time +EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux-libs kmod EUDEV_PROVIDES = udev ifeq ($(BR2_ROOTFS_MERGED_USR),) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index ad72a269ef..e8444e4e0b 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -23,6 +23,7 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_DBUS # runtime dependency only select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBS select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_BINARIES diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b6aac6dc53..20a6c1b714 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -9,12 +9,14 @@ SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README) SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README SYSTEMD_INSTALL_STAGING = YES + +# systemd requires only the util-linux libraries at build time SYSTEMD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ host-gperf \ kmod \ libcap \ - util-linux \ + util-linux-libs \ $(TARGET_NLS_DEPENDENCIES) SYSTEMD_PROVIDES = udev diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 39eb2c03a0..a76ffeb518 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -9,6 +9,9 @@ menuconfig BR2_PACKAGE_UTIL_LINUX if BR2_PACKAGE_UTIL_LINUX +config BR2_PACKAGE_UTIL_LINUX_LIBS + bool + config BR2_PACKAGE_UTIL_LINUX_LIBBLKID bool "libblkid" depends on BR2_USE_MMU # fork() @@ -41,6 +44,9 @@ config BR2_PACKAGE_UTIL_LINUX_LIBUUID help Install libuuid. +config BR2_PACKAGE_UTIL_LINUX_PROGRAMS + bool + config BR2_PACKAGE_UTIL_LINUX_BINARIES bool "basic set" depends on BR2_USE_MMU # fork() @@ -49,6 +55,7 @@ config BR2_PACKAGE_UTIL_LINUX_BINARIES select BR2_PACKAGE_UTIL_LINUX_LIBFDISK select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS select BR2_PACKAGE_UTIL_LINUX_LIBUUID + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Install the basic set of util-linux binaries. @@ -67,16 +74,19 @@ config BR2_PACKAGE_UTIL_LINUX_BINARIES config BR2_PACKAGE_UTIL_LINUX_AGETTY bool "agetty" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Alternative linux getty config BR2_PACKAGE_UTIL_LINUX_BFS bool "bfs" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help SCO bfs filesystem support config BR2_PACKAGE_UTIL_LINUX_CAL bool "cal" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Display a calendar, or some part of it @@ -87,6 +97,7 @@ config BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # linux-pam select BR2_PACKAGE_LINUX_PAM + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Change login shell, real user name and information @@ -96,11 +107,13 @@ comment "chfn/chsh needs a uClibc or glibc toolchain w/ wchar, locale, dynamic l config BR2_PACKAGE_UTIL_LINUX_CHMEM bool "chmem" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Sets a particular size or range of memory online or offline config BR2_PACKAGE_UTIL_LINUX_CRAMFS bool "cramfs utilities" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS select BR2_PACKAGE_ZLIB help Utilities for compressed ROM file system (fsck.cramfs, @@ -112,16 +125,19 @@ config BR2_PACKAGE_UTIL_LINUX_EJECT select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_LIBUUID + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Eject removable media config BR2_PACKAGE_UTIL_LINUX_FALLOCATE bool "fallocate" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Preallocate space to a file config BR2_PACKAGE_UTIL_LINUX_FDFORMAT bool "fdformat" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Low-level format a floppy disk @@ -131,6 +147,7 @@ config BR2_PACKAGE_UTIL_LINUX_FSCK select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_LIBUUID + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Check and repair a linux filesystem @@ -141,36 +158,43 @@ config BR2_PACKAGE_UTIL_LINUX_HARDLINK config BR2_PACKAGE_UTIL_LINUX_HWCLOCK bool "hwclock" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Query or set the hardware clock (RTC) config BR2_PACKAGE_UTIL_LINUX_IPCRM bool "ipcrm" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Remove certain IPC resources config BR2_PACKAGE_UTIL_LINUX_IPCS bool "ipcs" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Show information on IPC facilities config BR2_PACKAGE_UTIL_LINUX_KILL bool "kill" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Send a signal to a process config BR2_PACKAGE_UTIL_LINUX_LAST bool "last" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Show a listing of last logged in users config BR2_PACKAGE_UTIL_LINUX_LINE bool "line" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Read one line config BR2_PACKAGE_UTIL_LINUX_LOGGER bool "logger" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Enter messages into the system log @@ -182,6 +206,7 @@ config BR2_PACKAGE_UTIL_LINUX_LOGIN depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # fork(), linux-pam select BR2_PACKAGE_LINUX_PAM + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Begin a session on the system @@ -193,6 +218,7 @@ config BR2_PACKAGE_UTIL_LINUX_LOSETUP bool "losetup" depends on BR2_USE_MMU # libsmartcols select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Set up and control loop devices @@ -200,6 +226,7 @@ config BR2_PACKAGE_UTIL_LINUX_LSLOGINS bool "lslogins" depends on BR2_USE_MMU # libsmartcols select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Display information about known users in the system @@ -207,17 +234,20 @@ config BR2_PACKAGE_UTIL_LINUX_LSMEM bool "lsmem" depends on BR2_USE_MMU # libsmartcols select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help List the ranges of available memory with their online status config BR2_PACKAGE_UTIL_LINUX_MESG bool "mesg" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Control write access to your terminal config BR2_PACKAGE_UTIL_LINUX_MINIX bool "minix" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Minix filesystem support @@ -225,6 +255,7 @@ config BR2_PACKAGE_UTIL_LINUX_MORE bool "more" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help File perusal filter for crt viewing @@ -234,6 +265,7 @@ config BR2_PACKAGE_UTIL_LINUX_MOUNT select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_LIBUUID + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Mount/unmount filesystems @@ -243,16 +275,19 @@ config BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_LIBUUID + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help See if a directory is a mountpoint config BR2_PACKAGE_UTIL_LINUX_NEWGRP bool "newgrp" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Log in to a new group config BR2_PACKAGE_UTIL_LINUX_NOLOGIN bool "nologin" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Politely refuse a login @@ -260,6 +295,7 @@ config BR2_PACKAGE_UTIL_LINUX_NSENTER bool "nsenter" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Enter the namespaces of another process @@ -270,6 +306,7 @@ config BR2_PACKAGE_UTIL_LINUX_PG bool "pg" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Browse pagewise through text files @@ -279,21 +316,25 @@ config BR2_PACKAGE_UTIL_LINUX_PARTX select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS select BR2_PACKAGE_UTIL_LINUX_LIBUUID + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Partition utilities (addpart, delpart, partx) config BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT bool "pivot_root" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Change the root filesystem config BR2_PACKAGE_UTIL_LINUX_RAW bool "raw" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Build a linux raw character device config BR2_PACKAGE_UTIL_LINUX_RENAME bool "rename" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Rename files @@ -301,6 +342,7 @@ config BR2_PACKAGE_UTIL_LINUX_RFKILL bool "rfkill" depends on BR2_USE_MMU # libsmartcols select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Tool for enabling and disabling wireless devices. This new implementation is based upon, and backward compatible with, @@ -313,6 +355,7 @@ config BR2_PACKAGE_UTIL_LINUX_RUNUSER depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # fork(), linux-pam select BR2_PACKAGE_LINUX_PAM + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Run a command with substitute user and group ID (does not need to ask for a password, because it may be executed by the root @@ -324,18 +367,21 @@ comment "runuser needs a uClibc or glibc toolchain w/ wchar, locale, dynamic lib config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS bool "scheduling utilities" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Scheduling utilities (chrt, ionice, taskset) config BR2_PACKAGE_UTIL_LINUX_SETPRIV bool "setpriv" select BR2_PACKAGE_LIBCAP_NG + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Run a program with different Linux privilege settings config BR2_PACKAGE_UTIL_LINUX_SETTERM bool "setterm" select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Set terminal attributes @@ -346,6 +392,7 @@ config BR2_PACKAGE_UTIL_LINUX_SU depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # fork(), linux-pam select BR2_PACKAGE_LINUX_PAM + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Run a command with substitute user and group ID @@ -356,35 +403,41 @@ comment "su needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" config BR2_PACKAGE_UTIL_LINUX_SULOGIN bool "sulogin" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Single-user login config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT bool "switch_root" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Switch to another filesystem as the root of the mount tree config BR2_PACKAGE_UTIL_LINUX_TUNELP bool "tunelp" select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Set various parameters for the lp device config BR2_PACKAGE_UTIL_LINUX_UL bool "ul" select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Do underlining config BR2_PACKAGE_UTIL_LINUX_UNSHARE bool "unshare" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Run program with some namespaces unshared from parent config BR2_PACKAGE_UTIL_LINUX_UTMPDUMP bool "utmpdump" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Dump UTMP and WTMP files in raw format @@ -392,18 +445,21 @@ config BR2_PACKAGE_UTIL_LINUX_UUIDD bool "uuidd" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_UTIL_LINUX_LIBUUID + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help UUID generation daemon config BR2_PACKAGE_UTIL_LINUX_VIPW bool "vipw" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Edit the password, group, shadow-password or shadow-group file config BR2_PACKAGE_UTIL_LINUX_WALL bool "wall" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Send a message to everybody's terminal @@ -411,11 +467,13 @@ config BR2_PACKAGE_UTIL_LINUX_WDCTL bool "wdctl" depends on BR2_USE_MMU # libsmartcols select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Shows hardware watchdog status config BR2_PACKAGE_UTIL_LINUX_WRITE bool "write" + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Send a message to another user @@ -423,6 +481,7 @@ config BR2_PACKAGE_UTIL_LINUX_ZRAMCTL bool "zramctl" depends on BR2_USE_MMU # libsmartcols select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS + select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Set up and control zram devices diff --git a/package/util-linux/util-linux-libs/util-linux-libs.hash b/package/util-linux/util-linux-libs/util-linux-libs.hash new file mode 120000 index 0000000000..dc1b2f866a --- /dev/null +++ b/package/util-linux/util-linux-libs/util-linux-libs.hash @@ -0,0 +1 @@ +../util-linux.hash \ No newline at end of file diff --git a/package/util-linux/util-linux-libs/util-linux-libs.mk b/package/util-linux/util-linux-libs/util-linux-libs.mk new file mode 100644 index 0000000000..48d3373bb4 --- /dev/null +++ b/package/util-linux/util-linux-libs/util-linux-libs.mk @@ -0,0 +1,91 @@ +################################################################################ +# +# util-linux-libs +# +################################################################################ + +UTIL_LINUX_LIBS_VERSION = $(UTIL_LINUX_VERSION) +UTIL_LINUX_LIBS_SOURCE = $(UTIL_LINUX_SOURCE) +UTIL_LINUX_LIBS_SITE = $(UTIL_LINUX_SITE) +UTIL_LINUX_LIBS_DL_SUBDIR = $(UTIL_LINUX_DL_SUBDIR) + +# README.licensing claims that some files are GPL-2.0 only, but this is not true. +# Some files are GPL-3.0+ but only in tests. rfkill uses an ISC-style license. +UTIL_LINUX_LIBS_LICENSE = LGPL-2.1+ (libblkid, libfdisk, libmount, libsmartcols), BSD-3-Clause (libuuid) +UTIL_LINUX_LIBS_LICENSE_FILES = README.licensing \ + Documentation/licenses/COPYING.BSD-3-Clause \ + Documentation/licenses/COPYING.LGPL-2.1-or-later +UTIL_LINUX_LIBS_INSTALL_STAGING = YES +# Prevent installing the libraries twice on TARGET_DIR +UTIL_LINUX_LIBS_INSTALL_TARGET = $(if $(BR2_PACKAGE_UTIL_LINUX_PROGRAMS),NO,YES) +UTIL_LINUX_LIBS_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) +UTIL_LINUX_LIBS_CONF_OPTS += \ + --disable-rpath \ + --disable-makeinstall-chown +UTIL_LINUX_LIBS_LINK_LIBS = $(TARGET_NLS_LIBS) + +# systemd depends on util-linux so we enable systemd support +# (which needs systemd to be installed) +UTIL_LINUX_LIBS_CONF_OPTS += \ + --without-systemd \ + --with-systemdsystemunitdir=no + +HOST_UTIL_LINUX_LIBS_DEPENDENCIES = host-pkgconf +HOST_UTIL_LINUX_LIBS_CONF_OPTS = --disable-makeinstall-chown + +# We also don't want the host-python dependency +HOST_UTIL_LINUX_LIBS_CONF_OPTS += --without-python + +# Prevent the installation from attempting to move shared libraries from +# ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are +# the same when merged usr is in use. +ifeq ($(BR2_ROOTFS_MERGED_USR),y) +UTIL_LINUX_LIBS_CONF_OPTS += --bindir=/usr/bin --sbindir=/usr/sbin --libdir=/usr/lib +endif + +# Unfortunately, the util-linux does LIBS="" at the end of its +# configure script. So we have to pass the proper LIBS value when +# calling the configure script to make configure tests pass properly, +# and then pass it again at build time. +UTIL_LINUX_LIBS_CONF_ENV += LIBS="$(UTIL_LINUX_LIBS_LINK_LIBS)" +UTIL_LINUX_LIBS_MAKE_OPTS += LIBS="$(UTIL_LINUX_LIBS_LINK_LIBS)" + +# libmount optionally uses selinux +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT)$(BR2_PACKAGE_LIBSELINUX),yy) +UTIL_LINUX_LIBS_DEPENDENCIES += libselinux +UTIL_LINUX_LIBS_CONF_OPTS += --with-selinux +else +UTIL_LINUX_LIBS_CONF_OPTS += --without-selinux +endif + +# Disable utilities +UTIL_LINUX_LIBS_CONF_OPTS += \ + --disable-all-programs \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),--enable-libblkid,--disable-libblkid) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBFDISK),--enable-libfdisk,--disable-libfdisk) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),--enable-libmount,--disable-libmount) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS),--enable-libsmartcols,--disable-libsmartcols) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),--enable-libuuid,--disable-libuuid) + +# In the host version of util-linux-libs, we only require libuuid and libmount +# (plus libblkid as an indirect dependency of libmount). So disable libfdisk +# and libsmartcols, unless BR2_PACKAGE_HOST_UTIL_LINUX is set. +HOST_UTIL_LINUX_LIBS_CONF_OPTS += \ + --enable-libblkid \ + $(if $(BR2_PACKAGE_HOST_UTIL_LINUX),--enable-libfdisk,--disable-libfdisk) \ + --enable-libmount \ + $(if $(BR2_PACKAGE_HOST_UTIL_LINUX),--enable-libsmartcols,--disable-libsmartcols) \ + --enable-libuuid \ + --without-ncurses \ + --without-ncursesw \ + --without-tinfo + +# Install libmount Python bindings +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT)$(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),yy) +UTIL_LINUX_LIBS_CONF_OPTS += --with-python --enable-pylibmount +UTIL_LINUX_LIBS_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +UTIL_LINUX_LIBS_CONF_OPTS += --without-python --disable-pylibmount +endif + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/package/util-linux/su.pam b/package/util-linux/util-linux-programs/su.pam similarity index 100% rename from package/util-linux/su.pam rename to package/util-linux/util-linux-programs/su.pam diff --git a/package/util-linux/util-linux-programs/util-linux-programs.hash b/package/util-linux/util-linux-programs/util-linux-programs.hash new file mode 120000 index 0000000000..dc1b2f866a --- /dev/null +++ b/package/util-linux/util-linux-programs/util-linux-programs.hash @@ -0,0 +1 @@ +../util-linux.hash \ No newline at end of file diff --git a/package/util-linux/util-linux-programs/util-linux-programs.mk b/package/util-linux/util-linux-programs/util-linux-programs.mk new file mode 100644 index 0000000000..20335e9eb6 --- /dev/null +++ b/package/util-linux/util-linux-programs/util-linux-programs.mk @@ -0,0 +1,265 @@ +################################################################################ +# +# util-linux-programs +# +################################################################################ + +UTIL_LINUX_PROGRAMS_VERSION = $(UTIL_LINUX_VERSION) +UTIL_LINUX_PROGRAMS_SOURCE = $(UTIL_LINUX_SOURCE) +UTIL_LINUX_PROGRAMS_SITE = $(UTIL_LINUX_SITE) +UTIL_LINUX_PROGRAMS_DL_SUBDIR = $(UTIL_LINUX_DL_SUBDIR) + +# README.licensing claims that some files are GPL-2.0 only, but this is not true. +# Some files are GPL-3.0+ but only in tests. rfkill uses an ISC-style license. +UTIL_LINUX_PROGRAMS_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount, libsmartcols), BSD-3-Clause (libuuid) ISC (rfkill) +UTIL_LINUX_PROGRAMS_LICENSE_FILES = README.licensing \ + Documentation/licenses/COPYING.BSD-3-Clause \ + Documentation/licenses/COPYING.BSD-4-Clause-UC \ + Documentation/licenses/COPYING.GPL-2.0-or-later \ + Documentation/licenses/COPYING.ISC \ + Documentation/licenses/COPYING.LGPL-2.1-or-later +# Prevent installing the libraries twice on STAGING_DIR +UTIL_LINUX_PROGRAMS_INSTALL_STAGING = $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),NO,YES) +UTIL_LINUX_PROGRAMS_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) +UTIL_LINUX_PROGRAMS_CONF_OPTS += \ + --disable-rpath \ + --disable-makeinstall-chown +UTIL_LINUX_PROGRAMS_LINK_LIBS = $(TARGET_NLS_LIBS) + +# udev support, provided by either eudev or systemd +ifeq ($(BR2_PACKAGE_EUDEV),y) +UTIL_LINUX_PROGRAMS_DEPENDENCIES += eudev +endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +UTIL_LINUX_PROGRAMS_CONF_OPTS += --with-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system +UTIL_LINUX_PROGRAMS_DEPENDENCIES += systemd +else +UTIL_LINUX_PROGRAMS_CONF_OPTS += --without-systemd --with-systemdsystemunitdir=no +endif +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +UTIL_LINUX_PROGRAMS_CONF_OPTS += --with-udev +else +UTIL_LINUX_PROGRAMS_CONF_OPTS += --without-udev +endif + +HOST_UTIL_LINUX_PROGRAMS_DEPENDENCIES = host-pkgconf + +# We also don't want the host-python dependency +HOST_UTIL_LINUX_PROGRAMS_CONF_OPTS = --without-python + +# Prevent the installation from attempting to move shared libraries from +# ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are +# the same when merged usr is in use. +ifeq ($(BR2_ROOTFS_MERGED_USR),y) +UTIL_LINUX_PROGRAMS_CONF_OPTS += --bindir=/usr/bin --sbindir=/usr/sbin --libdir=/usr/lib +endif + +ifeq ($(BR2_PACKAGE_NCURSES),y) +UTIL_LINUX_PROGRAMS_DEPENDENCIES += ncurses +ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) +UTIL_LINUX_PROGRAMS_CONF_OPTS += --with-ncursesw +UTIL_LINUX_PROGRAMS_CONF_ENV += NCURSESW6_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) +else +UTIL_LINUX_PROGRAMS_CONF_OPTS += --without-ncursesw --with-ncurses --disable-widechar +UTIL_LINUX_PROGRAMS_CONF_ENV += NCURSES6_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) +endif +else +ifeq ($(BR2_USE_WCHAR),y) +UTIL_LINUX_PROGRAMS_CONF_OPTS += --enable-widechar +else +UTIL_LINUX_PROGRAMS_CONF_OPTS += --disable-widechar +endif +UTIL_LINUX_PROGRAMS_CONF_OPTS += --without-ncursesw --without-ncurses +endif + +ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) +UTIL_LINUX_PROGRAMS_DEPENDENCIES += libcap-ng +endif + +# Unfortunately, the util-linux does LIBS="" at the end of its +# configure script. So we have to pass the proper LIBS value when +# calling the configure script to make configure tests pass properly, +# and then pass it again at build time. +UTIL_LINUX_PROGRAMS_CONF_ENV += LIBS="$(UTIL_LINUX_PROGRAMS_LINK_LIBS)" +UTIL_LINUX_PROGRAMS_MAKE_OPTS += LIBS="$(UTIL_LINUX_PROGRAMS_LINK_LIBS)" + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +UTIL_LINUX_PROGRAMS_DEPENDENCIES += libselinux +UTIL_LINUX_PROGRAMS_CONF_OPTS += --with-selinux +define UTIL_LINUX_PROGRAMS_SELINUX_PAMFILES_TWEAK + $(foreach f,su su-l, + $(SED) 's/^# \(.*pam_selinux.so.*\)$$/\1/' \ + $(TARGET_DIR)/etc/pam.d/$(f) + ) +endef +else +UTIL_LINUX_PROGRAMS_CONF_OPTS += --without-selinux +endif + +# Used by cramfs utils +UTIL_LINUX_PROGRAMS_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) + +# Used by login-utils +UTIL_LINUX_PROGRAMS_DEPENDENCIES += $(if $(BR2_PACKAGE_LINUX_PAM),linux-pam) + +# Used by hardlink +UTIL_LINUX_PROGRAMS_DEPENDENCIES += $(if $(BR2_PACKAGE_PCRE2),pcre2) + +# Disable/Enable utilities +UTIL_LINUX_PROGRAMS_CONF_OPTS += \ + $(if $(BR2_PACKAGE_UTIL_LINUX_BINARIES),--enable-all-programs,--disable-all-programs) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_AGETTY),--enable-agetty,--disable-agetty) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_BFS),--enable-bfs,--disable-bfs) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_CAL),--enable-cal,--disable-cal) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH),--enable-chfn-chsh,--disable-chfn-chsh) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_CHMEM),--enable-chmem,--disable-chmem) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_CRAMFS),--enable-cramfs,--disable-cramfs) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_EJECT),--enable-eject,--disable-eject) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),--enable-fallocate,--disable-fallocate) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_FDFORMAT),--enable-fdformat,--disable-fdformat) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),--enable-fsck,--disable-fsck) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_HARDLINK),--enable-hardlink,--disable-hardlink) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_HWCLOCK),--enable-hwclock,--disable-hwclock) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_IPCRM),--enable-ipcrm,--disable-ipcrm) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_IPCS),--enable-ipcs,--disable-ipcs) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill,--disable-kill) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LAST),--enable-last,--disable-last) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),--enable-libblkid,--disable-libblkid) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBFDISK),--enable-libfdisk,--disable-libfdisk) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),--enable-libmount,--disable-libmount) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS),--enable-libsmartcols,--disable-libsmartcols) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),--enable-libuuid,--disable-libuuid) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LINE),--enable-line,--disable-line) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LOGGER),--enable-logger,--disable-logger) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN),--enable-login,--disable-login) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LOSETUP),--enable-losetup,--disable-losetup) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LSLOGINS),--enable-lslogins,--disable-lslogins) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LSMEM),--enable-lsmem,--disable-lsmem) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_MINIX),--enable-minix,--disable-minix) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_MORE),--enable-more,--disable-more) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_MOUNT),--enable-mount,--disable-mount) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT),--enable-mountpoint,--disable-mountpoint) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_NEWGRP),--enable-newgrp,--disable-newgrp) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_NOLOGIN),--enable-nologin,--disable-nologin) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_NSENTER),--enable-nsenter,--disable-nsenter) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),--enable-partx,--disable-partx) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_PG),--enable-pg,--disable-pg) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT),--enable-pivot_root,--disable-pivot_root) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw,--disable-raw) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),--enable-rename,--disable-rename) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_RFKILL),--enable-rfkill,--disable-rfkill) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_RUNUSER),--enable-runuser,--disable-runuser) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),--enable-schedutils,--disable-schedutils) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_SETPRIV),--enable-setpriv,--disable-setpriv) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_SETTERM),--enable-setterm,--disable-setterm) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_SU),--enable-su,--disable-su) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_SULOGIN),--enable-sulogin,--disable-sulogin) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT),--enable-switch_root,--disable-switch_root) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_TUNELP),--enable-tunelp,--disable-tunelp) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_UL),--enable-ul,--disable-ul) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_UNSHARE),--enable-unshare,--disable-unshare) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_UTMPDUMP),--enable-utmpdump,--disable-utmpdump) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_UUIDD),--enable-uuidd,--disable-uuidd) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_VIPW),--enable-vipw,--disable-vipw) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_WALL),--enable-wall,--disable-wall) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_WDCTL),--enable-wdctl,--disable-wdctl) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_ZRAMCTL),--enable-zramctl,--disable-zramctl) + +# In the host version of util-linux, we only require libuuid and +# libmount (plus libblkid as an indirect dependency of libmount). +# So disable all of the programs, unless BR2_PACKAGE_HOST_UTIL_LINUX is set + +HOST_UTIL_LINUX_PROGRAMS_CONF_OPTS += \ + --enable-libblkid \ + --enable-libmount \ + --enable-libuuid \ + --without-ncurses \ + --without-ncursesw \ + --without-tinfo + +ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) +HOST_UTIL_LINUX_PROGRAMS_CONF_OPTS += --disable-makeinstall-chown +# disable commands that have ncurses dependency, as well as +# other ones that are useless on the host +HOST_UTIL_LINUX_PROGRAMS_CONF_OPTS += \ + --disable-agetty \ + --disable-chfn-chsh \ + --disable-chmem \ + --disable-login \ + --disable-lslogins \ + --disable-mesg \ + --disable-more \ + --disable-newgrp \ + --disable-nologin \ + --disable-nsenter \ + --disable-pg \ + --disable-rfkill \ + --disable-schedutils \ + --disable-setpriv \ + --disable-setterm \ + --disable-su \ + --disable-sulogin \ + --disable-tunelp \ + --disable-ul \ + --disable-unshare \ + --disable-uuidd \ + --disable-vipw \ + --disable-wall \ + --disable-wdctl \ + --disable-write \ + --disable-zramctl +# Used by cramfs utils +HOST_UTIL_LINUX_PROGRAMS_PROGRAMS_DEPENDENCIES += host-zlib +else +HOST_UTIL_LINUX_PROGRAMS_CONF_OPTS += --disable-all-programs +endif + +# Install libmount Python bindings +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT)$(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),yy) +UTIL_LINUX_PROGRAMS_CONF_OPTS += --with-python --enable-pylibmount +UTIL_LINUX_PROGRAMS_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +UTIL_LINUX_PROGRAMS_CONF_OPTS += --without-python --disable-pylibmount +endif + +ifeq ($(BR2_PACKAGE_READLINE),y) +UTIL_LINUX_PROGRAMS_CONF_OPTS += --with-readline +UTIL_LINUX_PROGRAMS_LINK_LIBS += $(if $(BR2_STATIC_LIBS),-lcurses) +UTIL_LINUX_PROGRAMS_DEPENDENCIES += readline +else +UTIL_LINUX_PROGRAMS_CONF_OPTS += --without-readline +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +UTIL_LINUX_PROGRAMS_CONF_OPTS += --with-audit +UTIL_LINUX_PROGRAMS_DEPENDENCIES += audit +else +UTIL_LINUX_PROGRAMS_CONF_OPTS += --without-audit +endif + +# Install PAM configuration files +ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy) +define UTIL_LINUX_PROGRAMS_INSTALL_PAMFILES + $(INSTALL) -D -m 0644 $(UTIL_LINUX_PROGRAMS_PKGDIR)su.pam \ + $(TARGET_DIR)/etc/pam.d/su + $(INSTALL) -m 0644 $(UTIL_LINUX_PROGRAMS_PKGDIR)su.pam \ + $(TARGET_DIR)/etc/pam.d/su-l + $(UTIL_LINUX_PROGRAMS_SELINUX_PAMFILES_TWEAK) +endef +UTIL_LINUX_PROGRAMS_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_PROGRAMS_INSTALL_PAMFILES +endif + +# Install agetty->getty symlink to avoid breakage when there's no busybox +ifeq ($(BR2_PACKAGE_UTIL_LINUX_AGETTY),y) +ifeq ($(BR2_PACKAGE_BUSYBOX),) +define UTIL_LINUX_PROGRAMS_GETTY_SYMLINK + ln -sf agetty $(TARGET_DIR)/sbin/getty +endef +endif +endif + +UTIL_LINUX_PROGRAMS_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_PROGRAMS_GETTY_SYMLINK + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 99ec39467f..bf22219878 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -9,252 +9,23 @@ UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR) UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) -# README.licensing claims that some files are GPL-2.0 only, but this is not true. -# Some files are GPL-3.0+ but only in tests. rfkill uses an ISC-style license. -UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid) ISC (rfkill) -UTIL_LINUX_LICENSE_FILES = README.licensing \ - Documentation/licenses/COPYING.BSD-3-Clause \ - Documentation/licenses/COPYING.BSD-4-Clause-UC \ - Documentation/licenses/COPYING.GPL-2.0-or-later \ - Documentation/licenses/COPYING.ISC \ - Documentation/licenses/COPYING.LGPL-2.1-or-later -UTIL_LINUX_INSTALL_STAGING = YES -UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) -UTIL_LINUX_CONF_OPTS += \ - --disable-rpath \ - --disable-makeinstall-chown -UTIL_LINUX_LIBS = $(TARGET_NLS_LIBS) +UTIL_LINUX_EXTRACT_CMDS = +HOST_UTIL_LINUX_EXTRACT_CMDS = -# system depends on util-linux so we enable systemd support -# (which needs systemd to be installed) -UTIL_LINUX_CONF_OPTS += \ - --without-systemd \ - --with-systemdsystemunitdir=no +# util-linux-libs installs on STAGING_DIR only, for build time, +# util-linux-programs installs on TARGET_DIR only, for run time. +# We may need both. +UTIL_LINUX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_PROGRAMS),util-linux-programs) -HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf +# In the host version we need either host-util-linux-programs or +# host-util-linux-libs, only. +HOST_UTIL_LINUX_DEPENDENCIES = \ + host-util-linux-$(if $(BR2_PACKAGE_HOST_UTIL_LINUX),programs,libs) -# We also don't want the host-python dependency -HOST_UTIL_LINUX_CONF_OPTS = --without-python +$(eval $(generic-package)) +$(eval $(host-generic-package)) -# Prevent the installation from attempting to move shared libraries from -# ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are -# the same when merged usr is in use. -ifeq ($(BR2_ROOTFS_MERGED_USR),y) -UTIL_LINUX_CONF_OPTS += --bindir=/usr/bin --sbindir=/usr/sbin --libdir=/usr/lib -endif - -ifeq ($(BR2_PACKAGE_NCURSES),y) -UTIL_LINUX_DEPENDENCIES += ncurses -ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) -UTIL_LINUX_CONF_OPTS += --with-ncursesw -UTIL_LINUX_CONF_ENV += NCURSESW6_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) -else -UTIL_LINUX_CONF_OPTS += --without-ncursesw --with-ncurses --disable-widechar -UTIL_LINUX_CONF_ENV += NCURSES6_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) -endif -else -ifeq ($(BR2_USE_WCHAR),y) -UTIL_LINUX_CONF_OPTS += --enable-widechar -else -UTIL_LINUX_CONF_OPTS += --disable-widechar -endif -UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses -endif - -ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) -UTIL_LINUX_DEPENDENCIES += libcap-ng -endif - -# Unfortunately, the util-linux does LIBS="" at the end of its -# configure script. So we have to pass the proper LIBS value when -# calling the configure script to make configure tests pass properly, -# and then pass it again at build time. -UTIL_LINUX_CONF_ENV += LIBS="$(UTIL_LINUX_LIBS)" -UTIL_LINUX_MAKE_OPTS += LIBS="$(UTIL_LINUX_LIBS)" - -ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -UTIL_LINUX_DEPENDENCIES += libselinux -UTIL_LINUX_CONF_OPTS += --with-selinux -define UTIL_LINUX_SELINUX_PAMFILES_TWEAK - $(foreach f,su su-l, - $(SED) 's/^# \(.*pam_selinux.so.*\)$$/\1/' \ - $(TARGET_DIR)/etc/pam.d/$(f) - ) -endef -else -UTIL_LINUX_CONF_OPTS += --without-selinux -endif - -# Used by cramfs utils -UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) - -# Used by login-utils -UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_LINUX_PAM),linux-pam) - -# Used by hardlink -UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_PCRE2),pcre2) - -# Disable/Enable utilities -UTIL_LINUX_CONF_OPTS += \ - $(if $(BR2_PACKAGE_UTIL_LINUX_BINARIES),--enable-all-programs,--disable-all-programs) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_AGETTY),--enable-agetty,--disable-agetty) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_BFS),--enable-bfs,--disable-bfs) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_CAL),--enable-cal,--disable-cal) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH),--enable-chfn-chsh,--disable-chfn-chsh) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_CHMEM),--enable-chmem,--disable-chmem) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_CRAMFS),--enable-cramfs,--disable-cramfs) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_EJECT),--enable-eject,--disable-eject) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),--enable-fallocate,--disable-fallocate) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_FDFORMAT),--enable-fdformat,--disable-fdformat) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),--enable-fsck,--disable-fsck) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_HARDLINK),--enable-hardlink,--disable-hardlink) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_HWCLOCK),--enable-hwclock,--disable-hwclock) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_IPCRM),--enable-ipcrm,--disable-ipcrm) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_IPCS),--enable-ipcs,--disable-ipcs) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill,--disable-kill) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LAST),--enable-last,--disable-last) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),--enable-libblkid,--disable-libblkid) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBFDISK),--enable-libfdisk,--disable-libfdisk) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),--enable-libmount,--disable-libmount) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS),--enable-libsmartcols,--disable-libsmartcols) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),--enable-libuuid,--disable-libuuid) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LINE),--enable-line,--disable-line) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LOGGER),--enable-logger,--disable-logger) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN),--enable-login,--disable-login) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LOSETUP),--enable-losetup,--disable-losetup) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LSLOGINS),--enable-lslogins,--disable-lslogins) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LSMEM),--enable-lsmem,--disable-lsmem) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_MINIX),--enable-minix,--disable-minix) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_MORE),--enable-more,--disable-more) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_MOUNT),--enable-mount,--disable-mount) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT),--enable-mountpoint,--disable-mountpoint) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_NEWGRP),--enable-newgrp,--disable-newgrp) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_NOLOGIN),--enable-nologin,--disable-nologin) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_NSENTER),--enable-nsenter,--disable-nsenter) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),--enable-partx,--disable-partx) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_PG),--enable-pg,--disable-pg) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT),--enable-pivot_root,--disable-pivot_root) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw,--disable-raw) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),--enable-rename,--disable-rename) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_RFKILL),--enable-rfkill,--disable-rfkill) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_RUNUSER),--enable-runuser,--disable-runuser) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),--enable-schedutils,--disable-schedutils) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_SETPRIV),--enable-setpriv,--disable-setpriv) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_SETTERM),--enable-setterm,--disable-setterm) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_SU),--enable-su,--disable-su) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_SULOGIN),--enable-sulogin,--disable-sulogin) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT),--enable-switch_root,--disable-switch_root) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_TUNELP),--enable-tunelp,--disable-tunelp) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_UL),--enable-ul,--disable-ul) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_UNSHARE),--enable-unshare,--disable-unshare) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_UTMPDUMP),--enable-utmpdump,--disable-utmpdump) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_UUIDD),--enable-uuidd,--disable-uuidd) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_VIPW),--enable-vipw,--disable-vipw) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_WALL),--enable-wall,--disable-wall) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_WDCTL),--enable-wdctl,--disable-wdctl) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_ZRAMCTL),--enable-zramctl,--disable-zramctl) - -# In the host version of util-linux, we only require libuuid and -# libmount (plus libblkid as an indirect dependency of libmount). -# So disable all of the programs, unless BR2_PACKAGE_HOST_UTIL_LINUX is set - -HOST_UTIL_LINUX_CONF_OPTS += \ - --enable-libblkid \ - --enable-libmount \ - --enable-libuuid \ - --without-ncurses \ - --without-ncursesw \ - --without-tinfo - -ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) -HOST_UTIL_LINUX_CONF_OPTS += --disable-makeinstall-chown -# disable commands that have ncurses dependency, as well as -# other ones that are useless on the host -HOST_UTIL_LINUX_CONF_OPTS += \ - --disable-agetty \ - --disable-chfn-chsh \ - --disable-chmem \ - --disable-login \ - --disable-lslogins \ - --disable-mesg \ - --disable-more \ - --disable-newgrp \ - --disable-nologin \ - --disable-nsenter \ - --disable-pg \ - --disable-rfkill \ - --disable-schedutils \ - --disable-setpriv \ - --disable-setterm \ - --disable-su \ - --disable-sulogin \ - --disable-tunelp \ - --disable-ul \ - --disable-unshare \ - --disable-uuidd \ - --disable-vipw \ - --disable-wall \ - --disable-wdctl \ - --disable-write \ - --disable-zramctl -# Used by cramfs utils -HOST_UTIL_LINUX_DEPENDENCIES += host-zlib -else -HOST_UTIL_LINUX_CONF_OPTS += --disable-all-programs -endif - -# Install libmount Python bindings -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -UTIL_LINUX_CONF_OPTS += --with-python -UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y) -UTIL_LINUX_CONF_OPTS += --enable-pylibmount -else -UTIL_LINUX_CONF_OPTS += --disable-pylibmount -endif -else -UTIL_LINUX_CONF_OPTS += --without-python -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -UTIL_LINUX_CONF_OPTS += --with-readline -UTIL_LINUX_LIBS += $(if $(BR2_STATIC_LIBS),-lcurses) -UTIL_LINUX_DEPENDENCIES += readline -else -UTIL_LINUX_CONF_OPTS += --without-readline -endif - -ifeq ($(BR2_PACKAGE_AUDIT),y) -UTIL_LINUX_CONF_OPTS += --with-audit -UTIL_LINUX_DEPENDENCIES += audit -else -UTIL_LINUX_CONF_OPTS += --without-audit -endif - -# Install PAM configuration files -ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy) -define UTIL_LINUX_INSTALL_PAMFILES - $(INSTALL) -m 0644 package/util-linux/su.pam \ - $(TARGET_DIR)/etc/pam.d/su - $(INSTALL) -m 0644 package/util-linux/su.pam \ - $(TARGET_DIR)/etc/pam.d/su-l - $(UTIL_LINUX_SELINUX_PAMFILES_TWEAK) -endef -UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_INSTALL_PAMFILES -endif - -# Install agetty->getty symlink to avoid breakage when there's no busybox -ifeq ($(BR2_PACKAGE_UTIL_LINUX_AGETTY),y) -ifeq ($(BR2_PACKAGE_BUSYBOX),) -define UTIL_LINUX_GETTY_SYMLINK - ln -sf agetty $(TARGET_DIR)/sbin/getty -endef -endif -endif - -UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_GETTY_SYMLINK - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +include package/util-linux/util-linux-libs/util-linux-libs.mk +include package/util-linux/util-linux-programs/util-linux-programs.mk From 7935a754592ee1018981c94fe3e56d20bff705b1 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 17 Aug 2019 13:26:36 +0200 Subject: [PATCH 063/120] package/uclibc: remove UCLIBC_LARGEFILE_CONFIG UCLIBC_LARGEFILE_CONFIG was removed with the bump to uClibc-ng 1.0.20 (commit a44d7f2dbb19a54a8f2beb5c0f0adb0680999319) Signed-off-by: Romain Naour Cc: Waldemar Brodkorb Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/uclibc/uclibc.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index afc4872b65..b9ed8b9290 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -388,7 +388,6 @@ define UCLIBC_KCONFIG_FIXUP_CMDS $(UCLIBC_X86_TYPE_CONFIG) $(UCLIBC_DEBUG_CONFIG) $(UCLIBC_ENDIAN_CONFIG) - $(UCLIBC_LARGEFILE_CONFIG) $(UCLIBC_IPV6_CONFIG) $(UCLIBC_FLOAT_CONFIG) $(UCLIBC_SSP_CONFIG) From 1fa9b0d26717db17518e07932fc16da93279175b Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Fri, 23 Aug 2019 00:29:51 +0200 Subject: [PATCH 064/120] Revert "package/util-linux: build programs and libraries in separate packages" This commit was pushed accidentally, it was not yet ready for prime time. A better way to implement it was proposed. In addition, it still introduces a circular dependency: systemd -> polkit -> libglib2 -> util-linux -> systemd This reverts commit 335c77b667c68975b65edd0ac0d6ec214a9cb1c6. --- package/eudev/Config.in | 1 - package/eudev/eudev.mk | 3 +- package/systemd/Config.in | 1 - package/systemd/systemd.mk | 4 +- package/util-linux/Config.in | 59 ---- .../{util-linux-programs => }/su.pam | 0 .../util-linux-libs/util-linux-libs.hash | 1 - .../util-linux-libs/util-linux-libs.mk | 91 ------ .../util-linux-programs.hash | 1 - .../util-linux-programs.mk | 265 ------------------ package/util-linux/util-linux.mk | 261 +++++++++++++++-- 11 files changed, 247 insertions(+), 440 deletions(-) rename package/util-linux/{util-linux-programs => }/su.pam (100%) delete mode 120000 package/util-linux/util-linux-libs/util-linux-libs.hash delete mode 100644 package/util-linux/util-linux-libs/util-linux-libs.mk delete mode 120000 package/util-linux/util-linux-programs/util-linux-programs.hash delete mode 100644 package/util-linux/util-linux-programs/util-linux-programs.mk diff --git a/package/eudev/Config.in b/package/eudev/Config.in index 2df94fb68c..2220265a55 100644 --- a/package/eudev/Config.in +++ b/package/eudev/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_EUDEV depends on !BR2_STATIC_LIBS # kmod select BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBS select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_KMOD help diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index 21860643ae..78d0ea670e 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -18,8 +18,7 @@ EUDEV_CONF_OPTS = \ --enable-kmod \ --enable-blkid -# eudev requires only the util-linux libraries at build time -EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux-libs kmod +EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod EUDEV_PROVIDES = udev ifeq ($(BR2_ROOTFS_MERGED_USR),) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index e8444e4e0b..ad72a269ef 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -23,7 +23,6 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_DBUS # runtime dependency only select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBS select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_BINARIES diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 20a6c1b714..b6aac6dc53 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -9,14 +9,12 @@ SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README) SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README SYSTEMD_INSTALL_STAGING = YES - -# systemd requires only the util-linux libraries at build time SYSTEMD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ host-gperf \ kmod \ libcap \ - util-linux-libs \ + util-linux \ $(TARGET_NLS_DEPENDENCIES) SYSTEMD_PROVIDES = udev diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index a76ffeb518..39eb2c03a0 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -9,9 +9,6 @@ menuconfig BR2_PACKAGE_UTIL_LINUX if BR2_PACKAGE_UTIL_LINUX -config BR2_PACKAGE_UTIL_LINUX_LIBS - bool - config BR2_PACKAGE_UTIL_LINUX_LIBBLKID bool "libblkid" depends on BR2_USE_MMU # fork() @@ -44,9 +41,6 @@ config BR2_PACKAGE_UTIL_LINUX_LIBUUID help Install libuuid. -config BR2_PACKAGE_UTIL_LINUX_PROGRAMS - bool - config BR2_PACKAGE_UTIL_LINUX_BINARIES bool "basic set" depends on BR2_USE_MMU # fork() @@ -55,7 +49,6 @@ config BR2_PACKAGE_UTIL_LINUX_BINARIES select BR2_PACKAGE_UTIL_LINUX_LIBFDISK select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Install the basic set of util-linux binaries. @@ -74,19 +67,16 @@ config BR2_PACKAGE_UTIL_LINUX_BINARIES config BR2_PACKAGE_UTIL_LINUX_AGETTY bool "agetty" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Alternative linux getty config BR2_PACKAGE_UTIL_LINUX_BFS bool "bfs" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help SCO bfs filesystem support config BR2_PACKAGE_UTIL_LINUX_CAL bool "cal" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Display a calendar, or some part of it @@ -97,7 +87,6 @@ config BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # linux-pam select BR2_PACKAGE_LINUX_PAM - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Change login shell, real user name and information @@ -107,13 +96,11 @@ comment "chfn/chsh needs a uClibc or glibc toolchain w/ wchar, locale, dynamic l config BR2_PACKAGE_UTIL_LINUX_CHMEM bool "chmem" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Sets a particular size or range of memory online or offline config BR2_PACKAGE_UTIL_LINUX_CRAMFS bool "cramfs utilities" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS select BR2_PACKAGE_ZLIB help Utilities for compressed ROM file system (fsck.cramfs, @@ -125,19 +112,16 @@ config BR2_PACKAGE_UTIL_LINUX_EJECT select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Eject removable media config BR2_PACKAGE_UTIL_LINUX_FALLOCATE bool "fallocate" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Preallocate space to a file config BR2_PACKAGE_UTIL_LINUX_FDFORMAT bool "fdformat" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Low-level format a floppy disk @@ -147,7 +131,6 @@ config BR2_PACKAGE_UTIL_LINUX_FSCK select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Check and repair a linux filesystem @@ -158,43 +141,36 @@ config BR2_PACKAGE_UTIL_LINUX_HARDLINK config BR2_PACKAGE_UTIL_LINUX_HWCLOCK bool "hwclock" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Query or set the hardware clock (RTC) config BR2_PACKAGE_UTIL_LINUX_IPCRM bool "ipcrm" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Remove certain IPC resources config BR2_PACKAGE_UTIL_LINUX_IPCS bool "ipcs" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Show information on IPC facilities config BR2_PACKAGE_UTIL_LINUX_KILL bool "kill" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Send a signal to a process config BR2_PACKAGE_UTIL_LINUX_LAST bool "last" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Show a listing of last logged in users config BR2_PACKAGE_UTIL_LINUX_LINE bool "line" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Read one line config BR2_PACKAGE_UTIL_LINUX_LOGGER bool "logger" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Enter messages into the system log @@ -206,7 +182,6 @@ config BR2_PACKAGE_UTIL_LINUX_LOGIN depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # fork(), linux-pam select BR2_PACKAGE_LINUX_PAM - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Begin a session on the system @@ -218,7 +193,6 @@ config BR2_PACKAGE_UTIL_LINUX_LOSETUP bool "losetup" depends on BR2_USE_MMU # libsmartcols select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Set up and control loop devices @@ -226,7 +200,6 @@ config BR2_PACKAGE_UTIL_LINUX_LSLOGINS bool "lslogins" depends on BR2_USE_MMU # libsmartcols select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Display information about known users in the system @@ -234,20 +207,17 @@ config BR2_PACKAGE_UTIL_LINUX_LSMEM bool "lsmem" depends on BR2_USE_MMU # libsmartcols select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help List the ranges of available memory with their online status config BR2_PACKAGE_UTIL_LINUX_MESG bool "mesg" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Control write access to your terminal config BR2_PACKAGE_UTIL_LINUX_MINIX bool "minix" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Minix filesystem support @@ -255,7 +225,6 @@ config BR2_PACKAGE_UTIL_LINUX_MORE bool "more" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help File perusal filter for crt viewing @@ -265,7 +234,6 @@ config BR2_PACKAGE_UTIL_LINUX_MOUNT select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Mount/unmount filesystems @@ -275,19 +243,16 @@ config BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help See if a directory is a mountpoint config BR2_PACKAGE_UTIL_LINUX_NEWGRP bool "newgrp" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Log in to a new group config BR2_PACKAGE_UTIL_LINUX_NOLOGIN bool "nologin" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Politely refuse a login @@ -295,7 +260,6 @@ config BR2_PACKAGE_UTIL_LINUX_NSENTER bool "nsenter" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Enter the namespaces of another process @@ -306,7 +270,6 @@ config BR2_PACKAGE_UTIL_LINUX_PG bool "pg" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Browse pagewise through text files @@ -316,25 +279,21 @@ config BR2_PACKAGE_UTIL_LINUX_PARTX select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Partition utilities (addpart, delpart, partx) config BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT bool "pivot_root" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Change the root filesystem config BR2_PACKAGE_UTIL_LINUX_RAW bool "raw" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Build a linux raw character device config BR2_PACKAGE_UTIL_LINUX_RENAME bool "rename" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Rename files @@ -342,7 +301,6 @@ config BR2_PACKAGE_UTIL_LINUX_RFKILL bool "rfkill" depends on BR2_USE_MMU # libsmartcols select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Tool for enabling and disabling wireless devices. This new implementation is based upon, and backward compatible with, @@ -355,7 +313,6 @@ config BR2_PACKAGE_UTIL_LINUX_RUNUSER depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # fork(), linux-pam select BR2_PACKAGE_LINUX_PAM - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Run a command with substitute user and group ID (does not need to ask for a password, because it may be executed by the root @@ -367,21 +324,18 @@ comment "runuser needs a uClibc or glibc toolchain w/ wchar, locale, dynamic lib config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS bool "scheduling utilities" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Scheduling utilities (chrt, ionice, taskset) config BR2_PACKAGE_UTIL_LINUX_SETPRIV bool "setpriv" select BR2_PACKAGE_LIBCAP_NG - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Run a program with different Linux privilege settings config BR2_PACKAGE_UTIL_LINUX_SETTERM bool "setterm" select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Set terminal attributes @@ -392,7 +346,6 @@ config BR2_PACKAGE_UTIL_LINUX_SU depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # fork(), linux-pam select BR2_PACKAGE_LINUX_PAM - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Run a command with substitute user and group ID @@ -403,41 +356,35 @@ comment "su needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" config BR2_PACKAGE_UTIL_LINUX_SULOGIN bool "sulogin" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Single-user login config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT bool "switch_root" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Switch to another filesystem as the root of the mount tree config BR2_PACKAGE_UTIL_LINUX_TUNELP bool "tunelp" select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Set various parameters for the lp device config BR2_PACKAGE_UTIL_LINUX_UL bool "ul" select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Do underlining config BR2_PACKAGE_UTIL_LINUX_UNSHARE bool "unshare" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Run program with some namespaces unshared from parent config BR2_PACKAGE_UTIL_LINUX_UTMPDUMP bool "utmpdump" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Dump UTMP and WTMP files in raw format @@ -445,21 +392,18 @@ config BR2_PACKAGE_UTIL_LINUX_UUIDD bool "uuidd" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help UUID generation daemon config BR2_PACKAGE_UTIL_LINUX_VIPW bool "vipw" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Edit the password, group, shadow-password or shadow-group file config BR2_PACKAGE_UTIL_LINUX_WALL bool "wall" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Send a message to everybody's terminal @@ -467,13 +411,11 @@ config BR2_PACKAGE_UTIL_LINUX_WDCTL bool "wdctl" depends on BR2_USE_MMU # libsmartcols select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Shows hardware watchdog status config BR2_PACKAGE_UTIL_LINUX_WRITE bool "write" - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Send a message to another user @@ -481,7 +423,6 @@ config BR2_PACKAGE_UTIL_LINUX_ZRAMCTL bool "zramctl" depends on BR2_USE_MMU # libsmartcols select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS - select BR2_PACKAGE_UTIL_LINUX_PROGRAMS help Set up and control zram devices diff --git a/package/util-linux/util-linux-programs/su.pam b/package/util-linux/su.pam similarity index 100% rename from package/util-linux/util-linux-programs/su.pam rename to package/util-linux/su.pam diff --git a/package/util-linux/util-linux-libs/util-linux-libs.hash b/package/util-linux/util-linux-libs/util-linux-libs.hash deleted file mode 120000 index dc1b2f866a..0000000000 --- a/package/util-linux/util-linux-libs/util-linux-libs.hash +++ /dev/null @@ -1 +0,0 @@ -../util-linux.hash \ No newline at end of file diff --git a/package/util-linux/util-linux-libs/util-linux-libs.mk b/package/util-linux/util-linux-libs/util-linux-libs.mk deleted file mode 100644 index 48d3373bb4..0000000000 --- a/package/util-linux/util-linux-libs/util-linux-libs.mk +++ /dev/null @@ -1,91 +0,0 @@ -################################################################################ -# -# util-linux-libs -# -################################################################################ - -UTIL_LINUX_LIBS_VERSION = $(UTIL_LINUX_VERSION) -UTIL_LINUX_LIBS_SOURCE = $(UTIL_LINUX_SOURCE) -UTIL_LINUX_LIBS_SITE = $(UTIL_LINUX_SITE) -UTIL_LINUX_LIBS_DL_SUBDIR = $(UTIL_LINUX_DL_SUBDIR) - -# README.licensing claims that some files are GPL-2.0 only, but this is not true. -# Some files are GPL-3.0+ but only in tests. rfkill uses an ISC-style license. -UTIL_LINUX_LIBS_LICENSE = LGPL-2.1+ (libblkid, libfdisk, libmount, libsmartcols), BSD-3-Clause (libuuid) -UTIL_LINUX_LIBS_LICENSE_FILES = README.licensing \ - Documentation/licenses/COPYING.BSD-3-Clause \ - Documentation/licenses/COPYING.LGPL-2.1-or-later -UTIL_LINUX_LIBS_INSTALL_STAGING = YES -# Prevent installing the libraries twice on TARGET_DIR -UTIL_LINUX_LIBS_INSTALL_TARGET = $(if $(BR2_PACKAGE_UTIL_LINUX_PROGRAMS),NO,YES) -UTIL_LINUX_LIBS_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) -UTIL_LINUX_LIBS_CONF_OPTS += \ - --disable-rpath \ - --disable-makeinstall-chown -UTIL_LINUX_LIBS_LINK_LIBS = $(TARGET_NLS_LIBS) - -# systemd depends on util-linux so we enable systemd support -# (which needs systemd to be installed) -UTIL_LINUX_LIBS_CONF_OPTS += \ - --without-systemd \ - --with-systemdsystemunitdir=no - -HOST_UTIL_LINUX_LIBS_DEPENDENCIES = host-pkgconf -HOST_UTIL_LINUX_LIBS_CONF_OPTS = --disable-makeinstall-chown - -# We also don't want the host-python dependency -HOST_UTIL_LINUX_LIBS_CONF_OPTS += --without-python - -# Prevent the installation from attempting to move shared libraries from -# ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are -# the same when merged usr is in use. -ifeq ($(BR2_ROOTFS_MERGED_USR),y) -UTIL_LINUX_LIBS_CONF_OPTS += --bindir=/usr/bin --sbindir=/usr/sbin --libdir=/usr/lib -endif - -# Unfortunately, the util-linux does LIBS="" at the end of its -# configure script. So we have to pass the proper LIBS value when -# calling the configure script to make configure tests pass properly, -# and then pass it again at build time. -UTIL_LINUX_LIBS_CONF_ENV += LIBS="$(UTIL_LINUX_LIBS_LINK_LIBS)" -UTIL_LINUX_LIBS_MAKE_OPTS += LIBS="$(UTIL_LINUX_LIBS_LINK_LIBS)" - -# libmount optionally uses selinux -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT)$(BR2_PACKAGE_LIBSELINUX),yy) -UTIL_LINUX_LIBS_DEPENDENCIES += libselinux -UTIL_LINUX_LIBS_CONF_OPTS += --with-selinux -else -UTIL_LINUX_LIBS_CONF_OPTS += --without-selinux -endif - -# Disable utilities -UTIL_LINUX_LIBS_CONF_OPTS += \ - --disable-all-programs \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),--enable-libblkid,--disable-libblkid) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBFDISK),--enable-libfdisk,--disable-libfdisk) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),--enable-libmount,--disable-libmount) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS),--enable-libsmartcols,--disable-libsmartcols) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),--enable-libuuid,--disable-libuuid) - -# In the host version of util-linux-libs, we only require libuuid and libmount -# (plus libblkid as an indirect dependency of libmount). So disable libfdisk -# and libsmartcols, unless BR2_PACKAGE_HOST_UTIL_LINUX is set. -HOST_UTIL_LINUX_LIBS_CONF_OPTS += \ - --enable-libblkid \ - $(if $(BR2_PACKAGE_HOST_UTIL_LINUX),--enable-libfdisk,--disable-libfdisk) \ - --enable-libmount \ - $(if $(BR2_PACKAGE_HOST_UTIL_LINUX),--enable-libsmartcols,--disable-libsmartcols) \ - --enable-libuuid \ - --without-ncurses \ - --without-ncursesw \ - --without-tinfo - -# Install libmount Python bindings -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT)$(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),yy) -UTIL_LINUX_LIBS_CONF_OPTS += --with-python --enable-pylibmount -UTIL_LINUX_LIBS_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) -UTIL_LINUX_LIBS_CONF_OPTS += --without-python --disable-pylibmount -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package/util-linux/util-linux-programs/util-linux-programs.hash b/package/util-linux/util-linux-programs/util-linux-programs.hash deleted file mode 120000 index dc1b2f866a..0000000000 --- a/package/util-linux/util-linux-programs/util-linux-programs.hash +++ /dev/null @@ -1 +0,0 @@ -../util-linux.hash \ No newline at end of file diff --git a/package/util-linux/util-linux-programs/util-linux-programs.mk b/package/util-linux/util-linux-programs/util-linux-programs.mk deleted file mode 100644 index 20335e9eb6..0000000000 --- a/package/util-linux/util-linux-programs/util-linux-programs.mk +++ /dev/null @@ -1,265 +0,0 @@ -################################################################################ -# -# util-linux-programs -# -################################################################################ - -UTIL_LINUX_PROGRAMS_VERSION = $(UTIL_LINUX_VERSION) -UTIL_LINUX_PROGRAMS_SOURCE = $(UTIL_LINUX_SOURCE) -UTIL_LINUX_PROGRAMS_SITE = $(UTIL_LINUX_SITE) -UTIL_LINUX_PROGRAMS_DL_SUBDIR = $(UTIL_LINUX_DL_SUBDIR) - -# README.licensing claims that some files are GPL-2.0 only, but this is not true. -# Some files are GPL-3.0+ but only in tests. rfkill uses an ISC-style license. -UTIL_LINUX_PROGRAMS_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount, libsmartcols), BSD-3-Clause (libuuid) ISC (rfkill) -UTIL_LINUX_PROGRAMS_LICENSE_FILES = README.licensing \ - Documentation/licenses/COPYING.BSD-3-Clause \ - Documentation/licenses/COPYING.BSD-4-Clause-UC \ - Documentation/licenses/COPYING.GPL-2.0-or-later \ - Documentation/licenses/COPYING.ISC \ - Documentation/licenses/COPYING.LGPL-2.1-or-later -# Prevent installing the libraries twice on STAGING_DIR -UTIL_LINUX_PROGRAMS_INSTALL_STAGING = $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),NO,YES) -UTIL_LINUX_PROGRAMS_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) -UTIL_LINUX_PROGRAMS_CONF_OPTS += \ - --disable-rpath \ - --disable-makeinstall-chown -UTIL_LINUX_PROGRAMS_LINK_LIBS = $(TARGET_NLS_LIBS) - -# udev support, provided by either eudev or systemd -ifeq ($(BR2_PACKAGE_EUDEV),y) -UTIL_LINUX_PROGRAMS_DEPENDENCIES += eudev -endif -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -UTIL_LINUX_PROGRAMS_CONF_OPTS += --with-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system -UTIL_LINUX_PROGRAMS_DEPENDENCIES += systemd -else -UTIL_LINUX_PROGRAMS_CONF_OPTS += --without-systemd --with-systemdsystemunitdir=no -endif -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -UTIL_LINUX_PROGRAMS_CONF_OPTS += --with-udev -else -UTIL_LINUX_PROGRAMS_CONF_OPTS += --without-udev -endif - -HOST_UTIL_LINUX_PROGRAMS_DEPENDENCIES = host-pkgconf - -# We also don't want the host-python dependency -HOST_UTIL_LINUX_PROGRAMS_CONF_OPTS = --without-python - -# Prevent the installation from attempting to move shared libraries from -# ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are -# the same when merged usr is in use. -ifeq ($(BR2_ROOTFS_MERGED_USR),y) -UTIL_LINUX_PROGRAMS_CONF_OPTS += --bindir=/usr/bin --sbindir=/usr/sbin --libdir=/usr/lib -endif - -ifeq ($(BR2_PACKAGE_NCURSES),y) -UTIL_LINUX_PROGRAMS_DEPENDENCIES += ncurses -ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) -UTIL_LINUX_PROGRAMS_CONF_OPTS += --with-ncursesw -UTIL_LINUX_PROGRAMS_CONF_ENV += NCURSESW6_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) -else -UTIL_LINUX_PROGRAMS_CONF_OPTS += --without-ncursesw --with-ncurses --disable-widechar -UTIL_LINUX_PROGRAMS_CONF_ENV += NCURSES6_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) -endif -else -ifeq ($(BR2_USE_WCHAR),y) -UTIL_LINUX_PROGRAMS_CONF_OPTS += --enable-widechar -else -UTIL_LINUX_PROGRAMS_CONF_OPTS += --disable-widechar -endif -UTIL_LINUX_PROGRAMS_CONF_OPTS += --without-ncursesw --without-ncurses -endif - -ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) -UTIL_LINUX_PROGRAMS_DEPENDENCIES += libcap-ng -endif - -# Unfortunately, the util-linux does LIBS="" at the end of its -# configure script. So we have to pass the proper LIBS value when -# calling the configure script to make configure tests pass properly, -# and then pass it again at build time. -UTIL_LINUX_PROGRAMS_CONF_ENV += LIBS="$(UTIL_LINUX_PROGRAMS_LINK_LIBS)" -UTIL_LINUX_PROGRAMS_MAKE_OPTS += LIBS="$(UTIL_LINUX_PROGRAMS_LINK_LIBS)" - -ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -UTIL_LINUX_PROGRAMS_DEPENDENCIES += libselinux -UTIL_LINUX_PROGRAMS_CONF_OPTS += --with-selinux -define UTIL_LINUX_PROGRAMS_SELINUX_PAMFILES_TWEAK - $(foreach f,su su-l, - $(SED) 's/^# \(.*pam_selinux.so.*\)$$/\1/' \ - $(TARGET_DIR)/etc/pam.d/$(f) - ) -endef -else -UTIL_LINUX_PROGRAMS_CONF_OPTS += --without-selinux -endif - -# Used by cramfs utils -UTIL_LINUX_PROGRAMS_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) - -# Used by login-utils -UTIL_LINUX_PROGRAMS_DEPENDENCIES += $(if $(BR2_PACKAGE_LINUX_PAM),linux-pam) - -# Used by hardlink -UTIL_LINUX_PROGRAMS_DEPENDENCIES += $(if $(BR2_PACKAGE_PCRE2),pcre2) - -# Disable/Enable utilities -UTIL_LINUX_PROGRAMS_CONF_OPTS += \ - $(if $(BR2_PACKAGE_UTIL_LINUX_BINARIES),--enable-all-programs,--disable-all-programs) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_AGETTY),--enable-agetty,--disable-agetty) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_BFS),--enable-bfs,--disable-bfs) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_CAL),--enable-cal,--disable-cal) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH),--enable-chfn-chsh,--disable-chfn-chsh) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_CHMEM),--enable-chmem,--disable-chmem) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_CRAMFS),--enable-cramfs,--disable-cramfs) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_EJECT),--enable-eject,--disable-eject) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),--enable-fallocate,--disable-fallocate) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_FDFORMAT),--enable-fdformat,--disable-fdformat) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),--enable-fsck,--disable-fsck) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_HARDLINK),--enable-hardlink,--disable-hardlink) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_HWCLOCK),--enable-hwclock,--disable-hwclock) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_IPCRM),--enable-ipcrm,--disable-ipcrm) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_IPCS),--enable-ipcs,--disable-ipcs) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill,--disable-kill) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LAST),--enable-last,--disable-last) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),--enable-libblkid,--disable-libblkid) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBFDISK),--enable-libfdisk,--disable-libfdisk) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),--enable-libmount,--disable-libmount) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS),--enable-libsmartcols,--disable-libsmartcols) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),--enable-libuuid,--disable-libuuid) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LINE),--enable-line,--disable-line) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LOGGER),--enable-logger,--disable-logger) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN),--enable-login,--disable-login) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LOSETUP),--enable-losetup,--disable-losetup) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LSLOGINS),--enable-lslogins,--disable-lslogins) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LSMEM),--enable-lsmem,--disable-lsmem) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_MINIX),--enable-minix,--disable-minix) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_MORE),--enable-more,--disable-more) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_MOUNT),--enable-mount,--disable-mount) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT),--enable-mountpoint,--disable-mountpoint) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_NEWGRP),--enable-newgrp,--disable-newgrp) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_NOLOGIN),--enable-nologin,--disable-nologin) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_NSENTER),--enable-nsenter,--disable-nsenter) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),--enable-partx,--disable-partx) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_PG),--enable-pg,--disable-pg) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT),--enable-pivot_root,--disable-pivot_root) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw,--disable-raw) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),--enable-rename,--disable-rename) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_RFKILL),--enable-rfkill,--disable-rfkill) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_RUNUSER),--enable-runuser,--disable-runuser) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),--enable-schedutils,--disable-schedutils) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_SETPRIV),--enable-setpriv,--disable-setpriv) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_SETTERM),--enable-setterm,--disable-setterm) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_SU),--enable-su,--disable-su) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_SULOGIN),--enable-sulogin,--disable-sulogin) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT),--enable-switch_root,--disable-switch_root) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_TUNELP),--enable-tunelp,--disable-tunelp) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_UL),--enable-ul,--disable-ul) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_UNSHARE),--enable-unshare,--disable-unshare) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_UTMPDUMP),--enable-utmpdump,--disable-utmpdump) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_UUIDD),--enable-uuidd,--disable-uuidd) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_VIPW),--enable-vipw,--disable-vipw) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_WALL),--enable-wall,--disable-wall) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_WDCTL),--enable-wdctl,--disable-wdctl) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_ZRAMCTL),--enable-zramctl,--disable-zramctl) - -# In the host version of util-linux, we only require libuuid and -# libmount (plus libblkid as an indirect dependency of libmount). -# So disable all of the programs, unless BR2_PACKAGE_HOST_UTIL_LINUX is set - -HOST_UTIL_LINUX_PROGRAMS_CONF_OPTS += \ - --enable-libblkid \ - --enable-libmount \ - --enable-libuuid \ - --without-ncurses \ - --without-ncursesw \ - --without-tinfo - -ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) -HOST_UTIL_LINUX_PROGRAMS_CONF_OPTS += --disable-makeinstall-chown -# disable commands that have ncurses dependency, as well as -# other ones that are useless on the host -HOST_UTIL_LINUX_PROGRAMS_CONF_OPTS += \ - --disable-agetty \ - --disable-chfn-chsh \ - --disable-chmem \ - --disable-login \ - --disable-lslogins \ - --disable-mesg \ - --disable-more \ - --disable-newgrp \ - --disable-nologin \ - --disable-nsenter \ - --disable-pg \ - --disable-rfkill \ - --disable-schedutils \ - --disable-setpriv \ - --disable-setterm \ - --disable-su \ - --disable-sulogin \ - --disable-tunelp \ - --disable-ul \ - --disable-unshare \ - --disable-uuidd \ - --disable-vipw \ - --disable-wall \ - --disable-wdctl \ - --disable-write \ - --disable-zramctl -# Used by cramfs utils -HOST_UTIL_LINUX_PROGRAMS_PROGRAMS_DEPENDENCIES += host-zlib -else -HOST_UTIL_LINUX_PROGRAMS_CONF_OPTS += --disable-all-programs -endif - -# Install libmount Python bindings -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT)$(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),yy) -UTIL_LINUX_PROGRAMS_CONF_OPTS += --with-python --enable-pylibmount -UTIL_LINUX_PROGRAMS_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) -UTIL_LINUX_PROGRAMS_CONF_OPTS += --without-python --disable-pylibmount -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -UTIL_LINUX_PROGRAMS_CONF_OPTS += --with-readline -UTIL_LINUX_PROGRAMS_LINK_LIBS += $(if $(BR2_STATIC_LIBS),-lcurses) -UTIL_LINUX_PROGRAMS_DEPENDENCIES += readline -else -UTIL_LINUX_PROGRAMS_CONF_OPTS += --without-readline -endif - -ifeq ($(BR2_PACKAGE_AUDIT),y) -UTIL_LINUX_PROGRAMS_CONF_OPTS += --with-audit -UTIL_LINUX_PROGRAMS_DEPENDENCIES += audit -else -UTIL_LINUX_PROGRAMS_CONF_OPTS += --without-audit -endif - -# Install PAM configuration files -ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy) -define UTIL_LINUX_PROGRAMS_INSTALL_PAMFILES - $(INSTALL) -D -m 0644 $(UTIL_LINUX_PROGRAMS_PKGDIR)su.pam \ - $(TARGET_DIR)/etc/pam.d/su - $(INSTALL) -m 0644 $(UTIL_LINUX_PROGRAMS_PKGDIR)su.pam \ - $(TARGET_DIR)/etc/pam.d/su-l - $(UTIL_LINUX_PROGRAMS_SELINUX_PAMFILES_TWEAK) -endef -UTIL_LINUX_PROGRAMS_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_PROGRAMS_INSTALL_PAMFILES -endif - -# Install agetty->getty symlink to avoid breakage when there's no busybox -ifeq ($(BR2_PACKAGE_UTIL_LINUX_AGETTY),y) -ifeq ($(BR2_PACKAGE_BUSYBOX),) -define UTIL_LINUX_PROGRAMS_GETTY_SYMLINK - ln -sf agetty $(TARGET_DIR)/sbin/getty -endef -endif -endif - -UTIL_LINUX_PROGRAMS_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_PROGRAMS_GETTY_SYMLINK - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index bf22219878..99ec39467f 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -9,23 +9,252 @@ UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR) UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) -UTIL_LINUX_EXTRACT_CMDS = -HOST_UTIL_LINUX_EXTRACT_CMDS = +# README.licensing claims that some files are GPL-2.0 only, but this is not true. +# Some files are GPL-3.0+ but only in tests. rfkill uses an ISC-style license. +UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid) ISC (rfkill) +UTIL_LINUX_LICENSE_FILES = README.licensing \ + Documentation/licenses/COPYING.BSD-3-Clause \ + Documentation/licenses/COPYING.BSD-4-Clause-UC \ + Documentation/licenses/COPYING.GPL-2.0-or-later \ + Documentation/licenses/COPYING.ISC \ + Documentation/licenses/COPYING.LGPL-2.1-or-later +UTIL_LINUX_INSTALL_STAGING = YES +UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) +UTIL_LINUX_CONF_OPTS += \ + --disable-rpath \ + --disable-makeinstall-chown +UTIL_LINUX_LIBS = $(TARGET_NLS_LIBS) -# util-linux-libs installs on STAGING_DIR only, for build time, -# util-linux-programs installs on TARGET_DIR only, for run time. -# We may need both. -UTIL_LINUX_DEPENDENCIES = \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_PROGRAMS),util-linux-programs) +# system depends on util-linux so we enable systemd support +# (which needs systemd to be installed) +UTIL_LINUX_CONF_OPTS += \ + --without-systemd \ + --with-systemdsystemunitdir=no -# In the host version we need either host-util-linux-programs or -# host-util-linux-libs, only. -HOST_UTIL_LINUX_DEPENDENCIES = \ - host-util-linux-$(if $(BR2_PACKAGE_HOST_UTIL_LINUX),programs,libs) +HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf -$(eval $(generic-package)) -$(eval $(host-generic-package)) +# We also don't want the host-python dependency +HOST_UTIL_LINUX_CONF_OPTS = --without-python -include package/util-linux/util-linux-libs/util-linux-libs.mk -include package/util-linux/util-linux-programs/util-linux-programs.mk +# Prevent the installation from attempting to move shared libraries from +# ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are +# the same when merged usr is in use. +ifeq ($(BR2_ROOTFS_MERGED_USR),y) +UTIL_LINUX_CONF_OPTS += --bindir=/usr/bin --sbindir=/usr/sbin --libdir=/usr/lib +endif + +ifeq ($(BR2_PACKAGE_NCURSES),y) +UTIL_LINUX_DEPENDENCIES += ncurses +ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) +UTIL_LINUX_CONF_OPTS += --with-ncursesw +UTIL_LINUX_CONF_ENV += NCURSESW6_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) +else +UTIL_LINUX_CONF_OPTS += --without-ncursesw --with-ncurses --disable-widechar +UTIL_LINUX_CONF_ENV += NCURSES6_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) +endif +else +ifeq ($(BR2_USE_WCHAR),y) +UTIL_LINUX_CONF_OPTS += --enable-widechar +else +UTIL_LINUX_CONF_OPTS += --disable-widechar +endif +UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses +endif + +ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) +UTIL_LINUX_DEPENDENCIES += libcap-ng +endif + +# Unfortunately, the util-linux does LIBS="" at the end of its +# configure script. So we have to pass the proper LIBS value when +# calling the configure script to make configure tests pass properly, +# and then pass it again at build time. +UTIL_LINUX_CONF_ENV += LIBS="$(UTIL_LINUX_LIBS)" +UTIL_LINUX_MAKE_OPTS += LIBS="$(UTIL_LINUX_LIBS)" + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +UTIL_LINUX_DEPENDENCIES += libselinux +UTIL_LINUX_CONF_OPTS += --with-selinux +define UTIL_LINUX_SELINUX_PAMFILES_TWEAK + $(foreach f,su su-l, + $(SED) 's/^# \(.*pam_selinux.so.*\)$$/\1/' \ + $(TARGET_DIR)/etc/pam.d/$(f) + ) +endef +else +UTIL_LINUX_CONF_OPTS += --without-selinux +endif + +# Used by cramfs utils +UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) + +# Used by login-utils +UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_LINUX_PAM),linux-pam) + +# Used by hardlink +UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_PCRE2),pcre2) + +# Disable/Enable utilities +UTIL_LINUX_CONF_OPTS += \ + $(if $(BR2_PACKAGE_UTIL_LINUX_BINARIES),--enable-all-programs,--disable-all-programs) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_AGETTY),--enable-agetty,--disable-agetty) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_BFS),--enable-bfs,--disable-bfs) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_CAL),--enable-cal,--disable-cal) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH),--enable-chfn-chsh,--disable-chfn-chsh) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_CHMEM),--enable-chmem,--disable-chmem) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_CRAMFS),--enable-cramfs,--disable-cramfs) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_EJECT),--enable-eject,--disable-eject) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),--enable-fallocate,--disable-fallocate) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_FDFORMAT),--enable-fdformat,--disable-fdformat) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),--enable-fsck,--disable-fsck) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_HARDLINK),--enable-hardlink,--disable-hardlink) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_HWCLOCK),--enable-hwclock,--disable-hwclock) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_IPCRM),--enable-ipcrm,--disable-ipcrm) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_IPCS),--enable-ipcs,--disable-ipcs) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill,--disable-kill) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LAST),--enable-last,--disable-last) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),--enable-libblkid,--disable-libblkid) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBFDISK),--enable-libfdisk,--disable-libfdisk) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),--enable-libmount,--disable-libmount) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS),--enable-libsmartcols,--disable-libsmartcols) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),--enable-libuuid,--disable-libuuid) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LINE),--enable-line,--disable-line) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LOGGER),--enable-logger,--disable-logger) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN),--enable-login,--disable-login) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LOSETUP),--enable-losetup,--disable-losetup) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LSLOGINS),--enable-lslogins,--disable-lslogins) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LSMEM),--enable-lsmem,--disable-lsmem) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_MINIX),--enable-minix,--disable-minix) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_MORE),--enable-more,--disable-more) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_MOUNT),--enable-mount,--disable-mount) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT),--enable-mountpoint,--disable-mountpoint) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_NEWGRP),--enable-newgrp,--disable-newgrp) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_NOLOGIN),--enable-nologin,--disable-nologin) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_NSENTER),--enable-nsenter,--disable-nsenter) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),--enable-partx,--disable-partx) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_PG),--enable-pg,--disable-pg) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT),--enable-pivot_root,--disable-pivot_root) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw,--disable-raw) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),--enable-rename,--disable-rename) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_RFKILL),--enable-rfkill,--disable-rfkill) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_RUNUSER),--enable-runuser,--disable-runuser) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),--enable-schedutils,--disable-schedutils) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_SETPRIV),--enable-setpriv,--disable-setpriv) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_SETTERM),--enable-setterm,--disable-setterm) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_SU),--enable-su,--disable-su) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_SULOGIN),--enable-sulogin,--disable-sulogin) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT),--enable-switch_root,--disable-switch_root) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_TUNELP),--enable-tunelp,--disable-tunelp) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_UL),--enable-ul,--disable-ul) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_UNSHARE),--enable-unshare,--disable-unshare) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_UTMPDUMP),--enable-utmpdump,--disable-utmpdump) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_UUIDD),--enable-uuidd,--disable-uuidd) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_VIPW),--enable-vipw,--disable-vipw) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_WALL),--enable-wall,--disable-wall) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_WDCTL),--enable-wdctl,--disable-wdctl) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_ZRAMCTL),--enable-zramctl,--disable-zramctl) + +# In the host version of util-linux, we only require libuuid and +# libmount (plus libblkid as an indirect dependency of libmount). +# So disable all of the programs, unless BR2_PACKAGE_HOST_UTIL_LINUX is set + +HOST_UTIL_LINUX_CONF_OPTS += \ + --enable-libblkid \ + --enable-libmount \ + --enable-libuuid \ + --without-ncurses \ + --without-ncursesw \ + --without-tinfo + +ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) +HOST_UTIL_LINUX_CONF_OPTS += --disable-makeinstall-chown +# disable commands that have ncurses dependency, as well as +# other ones that are useless on the host +HOST_UTIL_LINUX_CONF_OPTS += \ + --disable-agetty \ + --disable-chfn-chsh \ + --disable-chmem \ + --disable-login \ + --disable-lslogins \ + --disable-mesg \ + --disable-more \ + --disable-newgrp \ + --disable-nologin \ + --disable-nsenter \ + --disable-pg \ + --disable-rfkill \ + --disable-schedutils \ + --disable-setpriv \ + --disable-setterm \ + --disable-su \ + --disable-sulogin \ + --disable-tunelp \ + --disable-ul \ + --disable-unshare \ + --disable-uuidd \ + --disable-vipw \ + --disable-wall \ + --disable-wdctl \ + --disable-write \ + --disable-zramctl +# Used by cramfs utils +HOST_UTIL_LINUX_DEPENDENCIES += host-zlib +else +HOST_UTIL_LINUX_CONF_OPTS += --disable-all-programs +endif + +# Install libmount Python bindings +ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +UTIL_LINUX_CONF_OPTS += --with-python +UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y) +UTIL_LINUX_CONF_OPTS += --enable-pylibmount +else +UTIL_LINUX_CONF_OPTS += --disable-pylibmount +endif +else +UTIL_LINUX_CONF_OPTS += --without-python +endif + +ifeq ($(BR2_PACKAGE_READLINE),y) +UTIL_LINUX_CONF_OPTS += --with-readline +UTIL_LINUX_LIBS += $(if $(BR2_STATIC_LIBS),-lcurses) +UTIL_LINUX_DEPENDENCIES += readline +else +UTIL_LINUX_CONF_OPTS += --without-readline +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +UTIL_LINUX_CONF_OPTS += --with-audit +UTIL_LINUX_DEPENDENCIES += audit +else +UTIL_LINUX_CONF_OPTS += --without-audit +endif + +# Install PAM configuration files +ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy) +define UTIL_LINUX_INSTALL_PAMFILES + $(INSTALL) -m 0644 package/util-linux/su.pam \ + $(TARGET_DIR)/etc/pam.d/su + $(INSTALL) -m 0644 package/util-linux/su.pam \ + $(TARGET_DIR)/etc/pam.d/su-l + $(UTIL_LINUX_SELINUX_PAMFILES_TWEAK) +endef +UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_INSTALL_PAMFILES +endif + +# Install agetty->getty symlink to avoid breakage when there's no busybox +ifeq ($(BR2_PACKAGE_UTIL_LINUX_AGETTY),y) +ifeq ($(BR2_PACKAGE_BUSYBOX),) +define UTIL_LINUX_GETTY_SYMLINK + ln -sf agetty $(TARGET_DIR)/sbin/getty +endef +endif +endif + +UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_GETTY_SYMLINK + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) From cecaf7001f0c9fa2089800dbd19541d70130fd18 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 17 Aug 2019 19:18:22 +0200 Subject: [PATCH 065/120] support/graph-size: fix flake8 warnings There are three E501 warnings returned by flake8, when run locally, because we enforce a local 80-char limit, but that are not reported by the gitlab-ci jobs because only a 132-char limit is required there. Signed-off-by: Yann E. MORIN Cc: Ricardo Martincoski Cc: Arnout Vandecappelle Cc: Thomas De Schampheleire Reviewed-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/size-stats | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/support/scripts/size-stats b/support/scripts/size-stats index deea92e278..8dfa391e24 100755 --- a/support/scripts/size-stats +++ b/support/scripts/size-stats @@ -66,8 +66,8 @@ def add_file(filesdict, relpath, abspath, pkg): # def build_package_dict(builddir): filesdict = {} - with open(os.path.join(builddir, "build", "packages-file-list.txt")) as filelistf: - for l in filelistf.readlines(): + with open(os.path.join(builddir, "build", "packages-file-list.txt")) as f: + for l in f.readlines(): pkg, fpath = l.split(",", 1) # remove the initial './' in each file path fpath = fpath.strip()[2:] @@ -151,7 +151,8 @@ def draw_graph(pkgsize, outputf): plt.setp(texts, fontproperties=proptease) plt.suptitle("Filesystem size per package", fontsize=18, y=.97) - plt.title("Total filesystem size: %d kB" % (total / 1000.), fontsize=10, y=.96) + plt.title("Total filesystem size: %d kB" % (total / 1000.), fontsize=10, + y=.96) plt.savefig(outputf) @@ -209,7 +210,8 @@ def gen_packages_csv(pkgsizes, outputf): total = sum(pkgsizes.values()) with open(outputf, 'w') as csvfile: wr = csv.writer(csvfile, delimiter=',', quoting=csv.QUOTE_MINIMAL) - wr.writerow(["Package name", "Package size", "Package size in system (%)"]) + wr.writerow(["Package name", "Package size", + "Package size in system (%)"]) for (pkg, size) in pkgsizes.items(): wr.writerow([pkg, size, "%.1f" % (float(size) / total * 100)]) From a2d20ca6132556af87837e25f7c3d58a1c2f091e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 17 Aug 2019 19:18:23 +0200 Subject: [PATCH 066/120] support/graph-size: introduce main() It is nicer overall to have a main() function, like all our other scripts tend to have too. Signed-off-by: Yann E. MORIN Cc: Thomas De Schampheleire Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/size-stats | 45 +++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/support/scripts/size-stats b/support/scripts/size-stats index 8dfa391e24..bd10fbfb68 100755 --- a/support/scripts/size-stats +++ b/support/scripts/size-stats @@ -216,27 +216,32 @@ def gen_packages_csv(pkgsizes, outputf): wr.writerow([pkg, size, "%.1f" % (float(size) / total * 100)]) -parser = argparse.ArgumentParser(description='Draw size statistics graphs') +def main(): + parser = argparse.ArgumentParser(description='Draw size statistics graphs') -parser.add_argument("--builddir", '-i', metavar="BUILDDIR", required=True, - help="Buildroot output directory") -parser.add_argument("--graph", '-g', metavar="GRAPH", - help="Graph output file (.pdf or .png extension)") -parser.add_argument("--file-size-csv", '-f', metavar="FILE_SIZE_CSV", - help="CSV output file with file size statistics") -parser.add_argument("--package-size-csv", '-p', metavar="PKG_SIZE_CSV", - help="CSV output file with package size statistics") -args = parser.parse_args() + parser.add_argument("--builddir", '-i', metavar="BUILDDIR", required=True, + help="Buildroot output directory") + parser.add_argument("--graph", '-g', metavar="GRAPH", + help="Graph output file (.pdf or .png extension)") + parser.add_argument("--file-size-csv", '-f', metavar="FILE_SIZE_CSV", + help="CSV output file with file size statistics") + parser.add_argument("--package-size-csv", '-p', metavar="PKG_SIZE_CSV", + help="CSV output file with package size statistics") + args = parser.parse_args() -# Find out which package installed what files -pkgdict = build_package_dict(args.builddir) + # Find out which package installed what files + pkgdict = build_package_dict(args.builddir) -# Collect the size installed by each package -pkgsize = build_package_size(pkgdict, args.builddir) + # Collect the size installed by each package + pkgsize = build_package_size(pkgdict, args.builddir) -if args.graph: - draw_graph(pkgsize, args.graph) -if args.file_size_csv: - gen_files_csv(pkgdict, pkgsize, args.file_size_csv) -if args.package_size_csv: - gen_packages_csv(pkgsize, args.package_size_csv) + if args.graph: + draw_graph(pkgsize, args.graph) + if args.file_size_csv: + gen_files_csv(pkgdict, pkgsize, args.file_size_csv) + if args.package_size_csv: + gen_packages_csv(pkgsize, args.package_size_csv) + + +if __name__ == "__main__": + main() From c68ee73924c6860dc1f01b84f1a12b88039b2f4d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 17 Aug 2019 19:18:24 +0200 Subject: [PATCH 067/120] support/graph-size: don't report "Others" if size is zero Signed-off-by: Yann E. MORIN Cc: Thomas De Schampheleire Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/size-stats | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/support/scripts/size-stats b/support/scripts/size-stats index bd10fbfb68..398c256e8b 100755 --- a/support/scripts/size-stats +++ b/support/scripts/size-stats @@ -137,8 +137,9 @@ def draw_graph(pkgsize, outputf): else: labels.append("%s (%d kB)" % (p, sz / 1000.)) values.append(sz) - labels.append("Other (%d kB)" % (other_value / 1000.)) - values.append(other_value) + if other_value != 0: + labels.append("Other (%d kB)" % (other_value / 1000.)) + values.append(other_value) plt.figure() patches, texts, autotexts = plt.pie(values, labels=labels, From e8de561436fff18a07d95ed95c985fa26c97941e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 17 Aug 2019 19:18:25 +0200 Subject: [PATCH 068/120] support/graph-size: report 'Unknown" after all packages, but before "Others" Currently, the "unknown" category may be reported anywhere, so it does not really stand out when there are a lot of packages in the graph. Move it towards the end, but right before the "other" category, so that it is a bit more visible. Like for Others, don't report it if its size is zero. Also, make it title case (i.e. "Unknown" instead of "unknown"). Signed-off-by: Yann E. MORIN Cc: Thomas De Schampheleire Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/size-stats | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/support/scripts/size-stats b/support/scripts/size-stats index 398c256e8b..82258e4606 100755 --- a/support/scripts/size-stats +++ b/support/scripts/size-stats @@ -131,12 +131,18 @@ def draw_graph(pkgsize, outputf): labels = [] values = [] other_value = 0 + unknown_value = 0 for (p, sz) in sorted(pkgsize.items(), key=lambda x: x[1]): if sz < (total * 0.01): other_value += sz + elif p == "unknown": + unknown_value = sz else: labels.append("%s (%d kB)" % (p, sz / 1000.)) values.append(sz) + if unknown_value != 0: + labels.append("Unknown (%d kB)" % (unknown_value / 1000.)) + values.append(unknown_value) if other_value != 0: labels.append("Other (%d kB)" % (other_value / 1000.)) values.append(other_value) From 3fc3c4ac99a81d5f473239e3b254ace5d4dfadcf Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 17 Aug 2019 19:18:26 +0200 Subject: [PATCH 069/120] support/graph-size: display human-readable size Currently, we forcibly report sizes in multiple of Kilobytes. In some big configurations, the sizes of the system as a whole, as well as that of individual packages, may exceed megabytes, and when some artistic assets get used, even the gigabyte may get exceed. These big sizes are not easy to read when expressed in kilobytes. Additionally, some very small packages might have sizes below the kilobyte (and when we can specify the cut-off grouping size, they may get reported), and thus the size displayed for those would be 0 kB. Add a helper function that can format a floating-point size into a string with all the appropriate formatting: - there are at least 3 meaningfull digits visible, i.e. we display "3.14" or "10.4" instead of just "3" or "10", but for big number we don't care about too many precision either, so we report "100" or "1000", not "100.42" or "1000.27"; - the proper SI prefix is appended, if needed. Signed-off-by: Yann E. MORIN Cc: Thomas De Schampheleire Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/size-stats | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/support/scripts/size-stats b/support/scripts/size-stats index 82258e4606..eb09e0dc60 100755 --- a/support/scripts/size-stats +++ b/support/scripts/size-stats @@ -22,6 +22,7 @@ import os.path import argparse import csv import collections +import math try: import matplotlib @@ -127,6 +128,17 @@ def build_package_size(filesdict, builddir): # outputf: output file for the graph # def draw_graph(pkgsize, outputf): + def size2string(sz): + divider = 1000.0 + prefixes = ['', 'k', 'M', 'G', 'T'] + while sz > divider and len(prefixes) > 1: + prefixes = prefixes[1:] + sz = sz/divider + # precision is made so that there are always at least three meaningful + # digits displayed (e.g. '3.14' and '10.4', not just '3' and '10') + precision = int(2-math.floor(math.log10(sz))) if sz < 1000 else 0 + return '{:.{prec}f} {}B'.format(sz, prefixes[0], prec=precision) + total = sum(pkgsize.values()) labels = [] values = [] @@ -138,13 +150,13 @@ def draw_graph(pkgsize, outputf): elif p == "unknown": unknown_value = sz else: - labels.append("%s (%d kB)" % (p, sz / 1000.)) + labels.append("%s (%s)" % (p, size2string(sz))) values.append(sz) if unknown_value != 0: - labels.append("Unknown (%d kB)" % (unknown_value / 1000.)) + labels.append("Unknown (%s)" % (size2string(unknown_value))) values.append(unknown_value) if other_value != 0: - labels.append("Other (%d kB)" % (other_value / 1000.)) + labels.append("Other (%s)" % (size2string(other_value))) values.append(other_value) plt.figure() @@ -158,7 +170,7 @@ def draw_graph(pkgsize, outputf): plt.setp(texts, fontproperties=proptease) plt.suptitle("Filesystem size per package", fontsize=18, y=.97) - plt.title("Total filesystem size: %d kB" % (total / 1000.), fontsize=10, + plt.title("Total filesystem size: %s" % (size2string(total)), fontsize=10, y=.96) plt.savefig(outputf) From e9cdabee71378243680ac43b5f1655567483dd1d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 17 Aug 2019 19:18:27 +0200 Subject: [PATCH 070/120] support/graph-size: add option to change percentage to group in Others Currently, we group packages that contribute less then 1%, into the "Other" category. However, in some cases, there can be a lot of very comparatively small packages, and they may not exceed this limit, and so only the "Others" category would be displayed, which is not nice. Conversely, if there are a lot of packages, most of which only so slightly exceeding this limit, then we get all of them in the graph, which is not nice either. Add a way for the developers to pass a different cut-off limit. As for the dependency graph which has BR2_GRAPH_DEPS_OPTS, add the environment variable BR2_GRAPH_SIZE_OPTS to carry those extra option (in preparation for more to come, later). Signed-off-by: Yann E. MORIN Cc: Thomas De Schampheleire [Arnout: - remove empty base class definition from Config; - use parser.error instead of ValueError for invalid argument.] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Makefile | 3 ++- docs/manual/common-usage.txt | 12 ++++++++++++ support/scripts/size-stats | 19 +++++++++++++++---- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 406efd1ab6..e4aa074e4a 100644 --- a/Makefile +++ b/Makefile @@ -892,7 +892,8 @@ graph-size: $(Q)$(TOPDIR)/support/scripts/size-stats --builddir $(BASE_DIR) \ --graph $(GRAPHS_DIR)/graph-size.$(BR_GRAPH_OUT) \ --file-size-csv $(GRAPHS_DIR)/file-size-stats.csv \ - --package-size-csv $(GRAPHS_DIR)/package-size-stats.csv + --package-size-csv $(GRAPHS_DIR)/package-size-stats.csv \ + $(BR2_GRAPH_SIZE_OPTS) .PHONY: check-dependencies check-dependencies: diff --git a/docs/manual/common-usage.txt b/docs/manual/common-usage.txt index e3d7578c85..6a6ec19552 100644 --- a/docs/manual/common-usage.txt +++ b/docs/manual/common-usage.txt @@ -102,6 +102,8 @@ to +make+ or set in the environment: xref:graph-depends[] for the accepted options * +BR2_GRAPH_DOT_OPTS+ is passed verbatim as options to the +dot+ utility to draw the dependency graph. +* +BR2_GRAPH_SIZE_OPTS+ to pass extra options to the size graph; see + xref:graph-size[] for the acepted options An example that uses config files located in the toplevel directory and in your $HOME: @@ -278,6 +280,7 @@ only other format supported is PNG: BR2_GRAPH_OUT=png make graph-build ---------------- +[[graph-size]] === Graphing the filesystem size contribution of packages When your target system grows, it is sometimes useful to understand @@ -314,6 +317,15 @@ Just like for the duration graph, a +BR2_GRAPH_OUT+ environment is supported to adjust the output file format. See xref:graph-depends[] for details about this environment variable. +Additionally, one may set the environment variable +BR2_GRAPH_SIZE_OPTS+ +to further control the generated graph. Accepted options are: + +* `--size-limit X`, `-l X`, will group all packages which individual + contribution is below `X` percent, to a single entry labelled _Others_ + in the graph. By default, `X=0.01`, which means packages each + contributing less than 1% are grouped under _Others_. Accepted values + are in the range `[0.0..1.0]`. + .Note The collected filesystem size data is only meaningful after a complete clean rebuild. Be sure to run +make clean all+ before using +make diff --git a/support/scripts/size-stats b/support/scripts/size-stats index eb09e0dc60..d197ac154b 100755 --- a/support/scripts/size-stats +++ b/support/scripts/size-stats @@ -33,8 +33,11 @@ except ImportError: sys.stderr.write("You need python-matplotlib to generate the size graph\n") exit(1) -colors = ['#e60004', '#009836', '#2e1d86', '#ffed00', - '#0068b5', '#f28e00', '#940084', '#97c000'] + +class Config: + size_limit = 0.01 + colors = ['#e60004', '#009836', '#2e1d86', '#ffed00', + '#0068b5', '#f28e00', '#940084', '#97c000'] # @@ -145,7 +148,7 @@ def draw_graph(pkgsize, outputf): other_value = 0 unknown_value = 0 for (p, sz) in sorted(pkgsize.items(), key=lambda x: x[1]): - if sz < (total * 0.01): + if sz < (total * Config.size_limit): other_value += sz elif p == "unknown": unknown_value = sz @@ -162,7 +165,7 @@ def draw_graph(pkgsize, outputf): plt.figure() patches, texts, autotexts = plt.pie(values, labels=labels, autopct='%1.1f%%', shadow=True, - colors=colors) + colors=Config.colors) # Reduce text size proptease = fm.FontProperties() proptease.set_size('xx-small') @@ -246,8 +249,16 @@ def main(): help="CSV output file with file size statistics") parser.add_argument("--package-size-csv", '-p', metavar="PKG_SIZE_CSV", help="CSV output file with package size statistics") + parser.add_argument("--size-limit", "-l", type=float, + help='Under this size ratio, files are accounted to ' + + 'the generic "Other" package. Default: 0.01 (1%%)') args = parser.parse_args() + if args.size_limit is not None: + if args.size_limit < 0.0 or args.size_limit > 1.0: + parser.error("--size-limit must be in [0.0..1.0]") + Config.size_limit = args.size_limit + # Find out which package installed what files pkgdict = build_package_dict(args.builddir) From 1dbce133dbc4655d25aa3372f445857ae3348523 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 17 Aug 2019 19:18:28 +0200 Subject: [PATCH 071/120] support/graph-size: add option to report size with IEC prefixes When dealing with embedded devices, storage is more often than not some kind of flash device, on which the memory is usually counted as powers of 1024 instead of powers of 1000. As such, people may prefer reports using IEC prefixes [0] instead of the SI prefixes. Add an option to that effect. We use argparse's ability to use custom actions [1] [2], to provide a set of options that act on a boolean, but has a single help entry and internally ensures consistency of the settings. We could have been using the more conventional store_true/store_false actions instead, but that would have meant either two help entries, one for each set of options, and/or some logic after parse_args() to check the validity of the settings. [0] https://en.wikipedia.org/wiki/Binary_prefix [1] https://docs.python.org/2/library/argparse.html#action [2] https://docs.python.org/2/library/argparse.html#argparse.Action Signed-off-by: Yann E. MORIN Cc: Thomas De Schampheleire Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/common-usage.txt | 3 +++ support/scripts/size-stats | 29 +++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/docs/manual/common-usage.txt b/docs/manual/common-usage.txt index 6a6ec19552..7af8d54a64 100644 --- a/docs/manual/common-usage.txt +++ b/docs/manual/common-usage.txt @@ -326,6 +326,9 @@ to further control the generated graph. Accepted options are: contributing less than 1% are grouped under _Others_. Accepted values are in the range `[0.0..1.0]`. +* `--iec`, `--binary`, `--si`, `--decimal`, to use IEC (binary, powers + of 1024) or SI (decimal, powers of 1000; the default) prefixes. + .Note The collected filesystem size data is only meaningful after a complete clean rebuild. Be sure to run +make clean all+ before using +make diff --git a/support/scripts/size-stats b/support/scripts/size-stats index d197ac154b..040f4017f8 100755 --- a/support/scripts/size-stats +++ b/support/scripts/size-stats @@ -35,6 +35,7 @@ except ImportError: class Config: + iec = False size_limit = 0.01 colors = ['#e60004', '#009836', '#2e1d86', '#ffed00', '#0068b5', '#f28e00', '#940084', '#97c000'] @@ -132,8 +133,12 @@ def build_package_size(filesdict, builddir): # def draw_graph(pkgsize, outputf): def size2string(sz): - divider = 1000.0 - prefixes = ['', 'k', 'M', 'G', 'T'] + if Config.iec: + divider = 1024.0 + prefixes = ['', 'Ki', 'Mi', 'Gi', 'Ti'] + else: + divider = 1000.0 + prefixes = ['', 'k', 'M', 'G', 'T'] while sz > divider and len(prefixes) > 1: prefixes = prefixes[1:] sz = sz/divider @@ -238,6 +243,21 @@ def gen_packages_csv(pkgsizes, outputf): wr.writerow([pkg, size, "%.1f" % (float(size) / total * 100)]) +# +# Our special action for --iec, --binary, --si, --decimal +# +class PrefixAction(argparse.Action): + def __init__(self, option_strings, dest, **kwargs): + for key in ["type", "nargs"]: + if key in kwargs: + raise ValueError('"{}" not allowed'.format(key)) + super(PrefixAction, self).__init__(option_strings, dest, nargs=0, + type=bool, **kwargs) + + def __call__(self, parser, namespace, values, option_string=None): + setattr(namespace, self.dest, option_string in ["--iec", "--binary"]) + + def main(): parser = argparse.ArgumentParser(description='Draw size statistics graphs') @@ -249,11 +269,16 @@ def main(): help="CSV output file with file size statistics") parser.add_argument("--package-size-csv", '-p', metavar="PKG_SIZE_CSV", help="CSV output file with package size statistics") + parser.add_argument("--iec", "--binary", "--si", "--decimal", + action=PrefixAction, + help="Use IEC (binary, powers of 1024) or SI (decimal, " + "powers of 1000, the default) prefixes") parser.add_argument("--size-limit", "-l", type=float, help='Under this size ratio, files are accounted to ' + 'the generic "Other" package. Default: 0.01 (1%%)') args = parser.parse_args() + Config.iec = args.iec if args.size_limit is not None: if args.size_limit < 0.0 or args.size_limit > 1.0: parser.error("--size-limit must be in [0.0..1.0]") From 33c1ef88f8f851da0e2b68363adde6673cfb3d96 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 17 Aug 2019 19:18:29 +0200 Subject: [PATCH 072/120] support/graph-size: add option to sort packages in reverse size order Currently, the packages are sorted smallest first, and biggest last (with unknown and others second-to-last and last, resp.). Add an option to invert the ordering (but keeping unknown and others at their current positions). This has the nice side effect that we can now control the colours assigned to the biggest package(s), as the colours are cycled from the first to the last. Currently, the biggest packages gets a redish colour, which is appropriate, but the second gets a greenish one, which is not as appropriate (but changing that can come later). Signed-off-by: Yann E. MORIN Cc: Thomas De Schampheleire Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/common-usage.txt | 3 +++ support/scripts/size-stats | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/manual/common-usage.txt b/docs/manual/common-usage.txt index 7af8d54a64..d9f086234c 100644 --- a/docs/manual/common-usage.txt +++ b/docs/manual/common-usage.txt @@ -329,6 +329,9 @@ to further control the generated graph. Accepted options are: * `--iec`, `--binary`, `--si`, `--decimal`, to use IEC (binary, powers of 1024) or SI (decimal, powers of 1000; the default) prefixes. +* `--biggest-first`, to sort packages in decreasing size order, rather + than in increasing size order. + .Note The collected filesystem size data is only meaningful after a complete clean rebuild. Be sure to run +make clean all+ before using +make diff --git a/support/scripts/size-stats b/support/scripts/size-stats index 040f4017f8..996c0d660e 100755 --- a/support/scripts/size-stats +++ b/support/scripts/size-stats @@ -35,6 +35,7 @@ except ImportError: class Config: + biggest_first = False iec = False size_limit = 0.01 colors = ['#e60004', '#009836', '#2e1d86', '#ffed00', @@ -152,7 +153,8 @@ def draw_graph(pkgsize, outputf): values = [] other_value = 0 unknown_value = 0 - for (p, sz) in sorted(pkgsize.items(), key=lambda x: x[1]): + for (p, sz) in sorted(pkgsize.items(), key=lambda x: x[1], + reverse=Config.biggest_first): if sz < (total * Config.size_limit): other_value += sz elif p == "unknown": @@ -269,6 +271,9 @@ def main(): help="CSV output file with file size statistics") parser.add_argument("--package-size-csv", '-p', metavar="PKG_SIZE_CSV", help="CSV output file with package size statistics") + parser.add_argument("--biggest-first", action='store_true', + help="Sort packages in decreasing size order, " + + "rather than in increasing size order") parser.add_argument("--iec", "--binary", "--si", "--decimal", action=PrefixAction, help="Use IEC (binary, powers of 1024) or SI (decimal, " @@ -278,6 +283,7 @@ def main(): 'the generic "Other" package. Default: 0.01 (1%%)') args = parser.parse_args() + Config.biggest_first = args.biggest_first Config.iec = args.iec if args.size_limit is not None: if args.size_limit < 0.0 or args.size_limit > 1.0: From 20cbf17e0a89dbe9aa8d488a7e06a0c4103a4877 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 17 Aug 2019 19:18:30 +0200 Subject: [PATCH 073/120] support/graph-size: reorder colours assigned to sizes Now that we can order packages from biggest to smallest, it makes sense to assign the most aggressive colours to the biggest packages. As such, reorder the current colours so that we have, in order: - red-ish - orange-ish - yellow-ish - purple-ish - eggplant-ish (is that even a colour? :-] ) - some-indeterminate-blue-ish - dark-green-ish - light-green-ish For the previous, smallest-first ordering, it does not matter much what the ordering is: the actual colours are still somewhat-unpredictably assigned to packages, depending on the cut-off limit... Signed-off-by: Yann E. MORIN Cc: Thomas De Schampheleire Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/size-stats | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/scripts/size-stats b/support/scripts/size-stats index 996c0d660e..dea3a6007c 100755 --- a/support/scripts/size-stats +++ b/support/scripts/size-stats @@ -38,8 +38,8 @@ class Config: biggest_first = False iec = False size_limit = 0.01 - colors = ['#e60004', '#009836', '#2e1d86', '#ffed00', - '#0068b5', '#f28e00', '#940084', '#97c000'] + colors = ['#e60004', '#f28e00', '#ffed00', '#940084', + '#2e1d86', '#0068b5', '#009836', '#97c000'] # From eb3ed2af54b0a93a8af42f22d4a95d80fa2cea72 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 27 Aug 2019 11:47:00 +0300 Subject: [PATCH 074/120] package/strace: fix build with v5.2 kernel headers Add upstream patch with a workaround to incompatible change in kernel headers. Regenerate the v4l2_pix_fmts.h header which is pre-generated from v4l2_pix_fmts.in in the strace tarball. Fixes: http://autobuild.buildroot.net/results/5494c9e21e623a9b7d87e06d86ed5e95d696c21a/ Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...ts.in-work-around-V4L2_PIX_FMT_BGRA4.patch | 42 +++++++++++++++++++ package/strace/strace.mk | 7 ++++ 2 files changed, 49 insertions(+) create mode 100644 package/strace/0001-xlat-v4l2_pix_fmts.in-work-around-V4L2_PIX_FMT_BGRA4.patch diff --git a/package/strace/0001-xlat-v4l2_pix_fmts.in-work-around-V4L2_PIX_FMT_BGRA4.patch b/package/strace/0001-xlat-v4l2_pix_fmts.in-work-around-V4L2_PIX_FMT_BGRA4.patch new file mode 100644 index 0000000000..3057b6ee0c --- /dev/null +++ b/package/strace/0001-xlat-v4l2_pix_fmts.in-work-around-V4L2_PIX_FMT_BGRA4.patch @@ -0,0 +1,42 @@ +From 60da39553ff92cf741bf7f54daff636bb28cbb3c Mon Sep 17 00:00:00 2001 +From: Eugene Syromyatnikov +Date: Wed, 24 Jul 2019 00:32:53 +0200 +Subject: [PATCH] xlat/v4l2_pix_fmts.in: work around V4L2_PIX_FMT_BGRA444 value + change + +* xlat/v4l2_pix_fmts.in: Undefine V4L2_PIX_FMT_BGRA444 as it has changed +its value in Linux commit v5.2-rc5-403-g22be8233b34f. + +Signed-off-by: Baruch Siach +--- +Upstream status: commit 60da39553ff92 + + xlat/v4l2_pix_fmts.in | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/xlat/v4l2_pix_fmts.in b/xlat/v4l2_pix_fmts.in +index 3276d3818a12..e742d07ac51c 100644 +--- a/xlat/v4l2_pix_fmts.in ++++ b/xlat/v4l2_pix_fmts.in +@@ -37,8 +37,17 @@ V4L2_PIX_FMT_RGB332 v4l2_fourcc('R', 'G', 'B', '1') /* 8 RGB-3-3-2 */ + V4L2_PIX_FMT_H264_NO_SC v4l2_fourcc('A', 'V', 'C', '1') /* H264 without start codes */ + V4L2_PIX_FMT_PWC1 v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */ + V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES */ +-V4L2_PIX_FMT_BGRA444 v4l2_fourcc('B', 'A', '1', '2') /* 16 bbbbgggg rrrraaaa */ + V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12 GRGR.. BGBG.. */ ++#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444 ++# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444 ++/* ++ * V4L2_PIX_FMT_BGRA444 was introduced in Linux commit v5.2-rc1~33^2~24 with ++ * the value of v4l2_fourcc('B', 'A', '1', '2') and changed in commit ++ * v5.2-rc5-403-g22be8233b34f as it clashed with V4L2_PIX_FMT_SGRBG12. ++ */ ++# undef V4L2_PIX_FMT_BGRA444 ++#endif ++V4L2_PIX_FMT_BGRA444 v4l2_fourcc('G', 'A', '1', '2') /* 16 bbbbgggg rrrraaaa */ + V4L2_PIX_FMT_RGBA444 v4l2_fourcc('R', 'A', '1', '2') /* 16 rrrrgggg bbbbaaaa */ + V4L2_PIX_FMT_ABGR444 v4l2_fourcc('A', 'B', '1', '2') /* 16 aaaabbbb ggggrrrr */ + V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12 GBGB.. RGRG.. */ +-- +2.23.0.rc1 + diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 9049e52d4a..0fdd7d66ff 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -11,6 +11,13 @@ STRACE_LICENSE = LGPL-2.1+ STRACE_LICENSE_FILES = COPYING LGPL-2.1-or-later STRACE_CONF_OPTS = --enable-mpers=check +# Regenerate v4l2_pix_fmts.h since we patch v4l2_pix_fmts.in +define STRACE_GEN_V4L2_PIX_FMT + $(@D)/xlat/gen.sh $(@D)/xlat/v4l2_pix_fmts.in $(@D)/xlat/v4l2_pix_fmts.h +endef + +STRACE_POST_PATCH_HOOKS += STRACE_GEN_V4L2_PIX_FMT + # strace bundle some kernel headers to build libmpers, this mixes userspace # headers and kernel headers which break the build with musl. # The stddef.h from gcc is used instead of the one from musl. From ed835efe20d3b44c1d11292c74976e62897bfcef Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 27 Aug 2019 19:40:04 +0200 Subject: [PATCH 075/120] package/joe: bump version to 4.6 Added license hash. Release notes: https://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/joe/joe.hash | 9 +++++---- package/joe/joe.mk | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/joe/joe.hash b/package/joe/joe.hash index 0a9c1fb8df..1e2de4225e 100644 --- a/package/joe/joe.hash +++ b/package/joe/joe.hash @@ -1,5 +1,6 @@ -# From https://sourceforge.net/projects/joe-editor/files/JOE%20sources/joe-4.4/ -sha1 aedf1ac9e6b91053aa26c70e7bba5bbd8136f033 joe-4.4.tar.gz -md5 59e63debe60b456a6ee5c0c27a756a47 joe-4.4.tar.gz +# From https://sourceforge.net/projects/joe-editor/files/JOE%20sources/joe-4.6/ +sha1 da7712333f676cfb5ae9f3565fd2225c5a2185ca joe-4.6.tar.gz +md5 9017484e6116830d846678b625ea5c43 joe-4.6.tar.gz # Locally computed: -sha256 a5704828bbca29acb9e200414fef522c66cdf9ce28150f402d6767da43460979 joe-4.4.tar.gz +sha256 495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de joe-4.6.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/joe/joe.mk b/package/joe/joe.mk index 3d0e9f7769..9a3215c4e1 100644 --- a/package/joe/joe.mk +++ b/package/joe/joe.mk @@ -4,7 +4,7 @@ # ################################################################################ -JOE_VERSION = 4.4 +JOE_VERSION = 4.6 JOE_SITE = http://downloads.sourceforge.net/project/joe-editor/JOE%20sources/joe-$(JOE_VERSION) JOE_LICENSE = GPL-1.0+ JOE_LICENSE_FILES = COPYING From 04869ca17f8859808b26bfd551447244e4071b5d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 27 Aug 2019 19:44:51 +0200 Subject: [PATCH 076/120] package/libatomic_ops: bump version to 7.6.10 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libatomic_ops/libatomic_ops.hash | 2 +- package/libatomic_ops/libatomic_ops.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libatomic_ops/libatomic_ops.hash b/package/libatomic_ops/libatomic_ops.hash index 902bd10332..3fca4a8c5e 100644 --- a/package/libatomic_ops/libatomic_ops.hash +++ b/package/libatomic_ops/libatomic_ops.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 61754aa60bb8052ea64175794df2afae8baacca5420e06eb150230681e71ff5e libatomic_ops-7.6.6.tar.gz +sha256 e6b0909cf4e63cec693fe6c48191ce864c32c5113e16c3f517aa2a244b46992f libatomic_ops-7.6.10.tar.gz sha256 f0e630c0ca489767033da5a0c869fb4231db522c5ff479ce55a853a923a00f69 doc/LICENSING.txt sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk index b298be1ea5..cc890a7f28 100644 --- a/package/libatomic_ops/libatomic_ops.mk +++ b/package/libatomic_ops/libatomic_ops.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBATOMIC_OPS_VERSION = 7.6.6 +LIBATOMIC_OPS_VERSION = 7.6.10 LIBATOMIC_OPS_SITE = $(call github,ivmai,libatomic_ops,v$(LIBATOMIC_OPS_VERSION)) LIBATOMIC_OPS_AUTORECONF = YES From c31258e6e73c503100adc78e369916ea50821476 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Tue, 27 Aug 2019 20:43:05 +0200 Subject: [PATCH 077/120] package/links: bump to version 2.19 Signed-off-by: Petr Vorel Signed-off-by: Peter Korsgaard --- package/links/links.hash | 2 +- package/links/links.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/links/links.hash b/package/links/links.hash index a63af4c808..190b41f7a2 100644 --- a/package/links/links.hash +++ b/package/links/links.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f70d0678ef1c5550953bdc27b12e72d5de86e53b05dd59b0fc7f07c507f244b8 links-2.14.tar.bz2 +sha256 70758c7dd9bb70f045407900e0a90f1114947fce832c2f9bdefd5c0158089a0a links-2.19.tar.bz2 diff --git a/package/links/links.mk b/package/links/links.mk index 651a089fda..ad3af6c7ba 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINKS_VERSION = 2.14 +LINKS_VERSION = 2.19 LINKS_SOURCE = links-$(LINKS_VERSION).tar.bz2 LINKS_SITE = http://links.twibright.com/download LINKS_DEPENDENCIES = host-pkgconf From a8f7e0b3e660582e2b3d80d01cc63561194019e1 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Tue, 27 Aug 2019 20:43:45 +0200 Subject: [PATCH 078/120] package/feh: bump to version 3.2.1 Signed-off-by: Petr Vorel Signed-off-by: Peter Korsgaard --- package/feh/feh.hash | 2 +- package/feh/feh.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/feh/feh.hash b/package/feh/feh.hash index 02a88fbda9..2bfe5e48a8 100644 --- a/package/feh/feh.hash +++ b/package/feh/feh.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 9fe840fbc6ce66dcf1e99296c90eb6fc44a4c2fad9a1069dfc7e0fad88eb56ef feh-3.1.3.tar.bz2 +sha256 8f9741399b4b184ba28698c0fd7722638e79abac8e6c27eb526cc52b11ee0a1c feh-3.2.1.tar.bz2 sha256 a289176a74d8e5d071456df5d4ee629aeb86f8eeeb6570076fe126f182c6b91d COPYING diff --git a/package/feh/feh.mk b/package/feh/feh.mk index ac79a7da64..973eed60b0 100644 --- a/package/feh/feh.mk +++ b/package/feh/feh.mk @@ -4,7 +4,7 @@ # ################################################################################ -FEH_VERSION = 3.1.3 +FEH_VERSION = 3.2.1 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2 FEH_SITE = http://feh.finalrewind.org FEH_DEPENDENCIES = imlib2 libpng xlib_libXt From ec29cbd2ddcce861b9118d27b9050e47407ed73f Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Tue, 27 Aug 2019 20:41:45 +0200 Subject: [PATCH 079/120] package/libmbim: bump to version 1.18.2 Signed-off-by: Petr Vorel Signed-off-by: Peter Korsgaard --- 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 9e8629f341..3cb1245ec9 100644 --- a/package/libmbim/libmbim.hash +++ b/package/libmbim/libmbim.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 6cf40128d83d087946a7d8577e735526202e034d52f90047735329609097b282 libmbim-1.18.0.tar.xz +sha256 7723f2ca2286c5286ffba7331cb4520099982e55355a7af6f45bdce6b5d39268 libmbim-1.18.2.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index 748d215537..1e2f7fc162 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMBIM_VERSION = 1.18.0 +LIBMBIM_VERSION = 1.18.2 LIBMBIM_SITE = https://www.freedesktop.org/software/libmbim LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) From 14044441f05e2fff0439dab9e4af0b45e4ad086f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 27 Aug 2019 22:54:28 +0200 Subject: [PATCH 080/120] package/faketime: bump to version 0.9.8 - Remove first patch (already in version) - Remove second patch (not needed since merge of https://github.com/wolfcw/libfaketime/pull/161) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...e-the-non-null-compare-warning-error.patch | 32 ------------------- .../0002-src-Makefile-disable-Werror.patch | 32 ------------------- package/faketime/faketime.hash | 3 +- package/faketime/faketime.mk | 2 +- 4 files changed, 3 insertions(+), 66 deletions(-) delete mode 100644 package/faketime/0001-Disable-the-non-null-compare-warning-error.patch delete mode 100644 package/faketime/0002-src-Makefile-disable-Werror.patch diff --git a/package/faketime/0001-Disable-the-non-null-compare-warning-error.patch b/package/faketime/0001-Disable-the-non-null-compare-warning-error.patch deleted file mode 100644 index f8c7484452..0000000000 --- a/package/faketime/0001-Disable-the-non-null-compare-warning-error.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e85a157b51b1276c91c736d8624d9f3e876e9189 Mon Sep 17 00:00:00 2001 -From: Andreas Rammhold -Date: Tue, 20 Dec 2016 19:25:32 +0100 -Subject: [PATCH] Disable the non-null compare warning/error. - -We rely on the provided local library definitions for the hooked -functions which in some cases (GCC >6) carry a non-null-attribute flag -which causes compile errors on `!= NULL` checks. - -[Romain: rebase on 0.9.6] -(cherry picked from commit 47e958b753fc15098a2b7d0e9ef26b83ee255874) -Signed-off-by: Romain Naour ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 51634b0..bbbd476 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -67,7 +67,7 @@ INSTALL ?= install - PREFIX ?= /usr/local - LIBDIRNAME ?= /lib/faketime - --CFLAGS += -std=gnu99 -Wall -Wextra -Werror -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' -+CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' - LIB_LDFLAGS += -shared - LDFLAGS += -Wl,--version-script=libfaketime.map -lpthread - LDADD += -ldl -lm -lrt --- -2.9.3 - diff --git a/package/faketime/0002-src-Makefile-disable-Werror.patch b/package/faketime/0002-src-Makefile-disable-Werror.patch deleted file mode 100644 index e1e3b321b8..0000000000 --- a/package/faketime/0002-src-Makefile-disable-Werror.patch +++ /dev/null @@ -1,32 +0,0 @@ -From bcde6e6f34c3cf78a254315c5caa530db91802fb Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 17 May 2018 23:41:03 +0200 -Subject: [PATCH] src/Makefile: disable -Werror - -gcc 8.x has enabled additional warnings that break the build due to --Werror, so let's drop -Werror for now. A set of patches has been -submitted upstream (https://github.com/wolfcw/libfaketime/pull/161) to -properly fix the gcc 8.x issues, but in the mean time, disabling --Werror is a simpler option. - -Signed-off-by: Thomas Petazzoni ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index bbbd476..6b0d2cd 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -67,7 +67,7 @@ INSTALL ?= install - PREFIX ?= /usr/local - LIBDIRNAME ?= /lib/faketime - --CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' -+CFLAGS += -std=gnu99 -Wall -Wextra -Wno-nonnull-compare -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' - LIB_LDFLAGS += -shared - LDFLAGS += -Wl,--version-script=libfaketime.map -lpthread - LDADD += -ldl -lm -lrt --- -2.14.3 - diff --git a/package/faketime/faketime.hash b/package/faketime/faketime.hash index 5203fdb12a..bdb003aa69 100644 --- a/package/faketime/faketime.hash +++ b/package/faketime/faketime.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 56bc32006f4c5b021ff648cc1fd458c5316f40aadfd2031879229a234189b031 faketime-0.9.6.tar.gz +sha256 06288237cd5890eca148489e5b904ed852ed0ffa8424bfb479342f4daa8442a3 faketime-0.9.8.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/faketime/faketime.mk b/package/faketime/faketime.mk index 0a72feb866..85ce9a90d8 100644 --- a/package/faketime/faketime.mk +++ b/package/faketime/faketime.mk @@ -4,7 +4,7 @@ # ################################################################################ -FAKETIME_VERSION = 0.9.6 +FAKETIME_VERSION = 0.9.8 FAKETIME_SITE = $(call github,wolfcw,libfaketime,v$(FAKETIME_VERSION)) FAKETIME_LICENSE = GPL-2.0 FAKETIME_LICENSE_FILES = COPYING From 9aca253656b0e91354a7dfaec4d5ca5b4a3e2a57 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Aug 2019 21:28:42 +0200 Subject: [PATCH 081/120] package/hostapd: security bump version to 2.9 Fixes https://w1.fi/security/2019-6/ Release notes: http://lists.infradead.org/pipermail/hostap/2019-April/039979.html http://lists.infradead.org/pipermail/hostap/2019-August/040373.html This release includes all patches from https://w1.fi/security/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/hostapd/hostapd.hash | 20 ++------------------ package/hostapd/hostapd.mk | 19 +------------------ 2 files changed, 3 insertions(+), 36 deletions(-) diff --git a/package/hostapd/hostapd.hash b/package/hostapd/hostapd.hash index 8901aa43be..50225cf6d7 100644 --- a/package/hostapd/hostapd.hash +++ b/package/hostapd/hostapd.hash @@ -1,20 +1,4 @@ # Locally calculated -sha256 21b0dda3cc3abe75849437f6b9746da461f88f0ea49dd621216936f87440a141 hostapd-2.7.tar.gz -sha256 86979655f1c5a9578acbf83e8acdf69a36dcc0966a8819f3b6918530ad3e0c67 0001-OpenSSL-Use-constant-time-operations-for-private-big.patch -sha256 5663da175ecc344c90bea8c95ab831ad47a8002ccbb834f6c091705b92e90e71 0002-Add-helper-functions-for-constant-time-operations.patch -sha256 e5a6bc9f587351d4495740239ceb0a64958a59b3e875722dcaeb4c93fa517f64 0003-OpenSSL-Use-constant-time-selection-for-crypto_bignu.patch -sha256 aa5b722bebbaf175ff89a3653c3d048afe0d0f866989fca6b4c8e882a864392a 0004-EAP-pwd-Use-constant-time-and-memory-access-for-find.patch -sha256 bad9eeaeb118f88303a7a718820b3ba03d705e99b6183b3c44556bedf99db423 0005-SAE-Minimize-timing-differences-in-PWE-derivation.patch -sha256 ae7be450f652f6f77ad868856ab61ba6cb6d7e768585cf5f9f9f674a66e05b40 0006-SAE-Avoid-branches-in-is_quadratic_residue_blind.patch -sha256 86b731c787ca58ac001d20fb769b136e2ca76bf81a8465a8e72c50573cfc4b09 0007-SAE-Mask-timing-of-MODP-groups-22-23-24.patch -sha256 ff7305005217a34818dae247886b9fb1b1db781ab31fb5eac9ebdd9cb0d1edfe 0008-SAE-Use-const_time-selection-for-PWE-in-FFC.patch -sha256 707057cc0e60fe763350f82135dbe407bc289a4958879c8ff1e9413243a1caa4 0009-SAE-Use-constant-time-operations-in-sae_test_pwd_see.patch -sha256 82d8ae4fabfe3674bcb5412befe3a74e40d6485906589c219be72e4fd1e70baa 0010-SAE-Fix-confirm-message-validation-in-error-cases.patch -sha256 ff8d6d92ad4b01987be63cdaf67a24d2eba5b3cd654f37664a8a198e501c0e3b 0011-EAP-pwd-server-Verify-received-scalar-and-element.patch -sha256 d5ebf4e5a810e9a0c035f9268195c542273998ea70fd58697ee25965094062cc 0012-EAP-pwd-server-Detect-reflection-attacks.patch -sha256 7156656498f03b24a0b69a26a59d17a9fcc8e76761f1dabe6d13b4176ffd2ef8 0013-EAP-pwd-client-Verify-received-scalar-and-element.patch -sha256 69926854ec2a79dada290f79f04202764c5d6400d232e3a567ebe633a02c1c66 0014-EAP-pwd-Check-element-x-y-coordinates-explicitly.patch -sha256 cba82a051a39c48872250b2e85ca8ebc628cfe75a9ccec29f3e994abd4156152 0001-EAP-pwd-server-Fix-reassembly-buffer-handling.patch -sha256 dc0e015463e1fd1f230795e1a49ddd1b9d00e726cd9f38846d0f4892d7978162 0003-EAP-pwd-peer-Fix-reassembly-buffer-handling.patch +sha256 881d7d6a90b2428479288d64233151448f8990ab4958e0ecaca7eeb3c9db2bd7 hostapd-2.9.tar.gz sha256 e204da659d0583c71af23cb9b55536fe99598ee26a44104344f456e4d17350c6 rtlxdrv.patch -sha256 76eeecd8fc291a71f29189ea20e6a34387b8048a959cbc6a65c41b98194643a2 README +sha256 9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761 README diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index e6542c879c..f55e716a7c 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -4,25 +4,8 @@ # ################################################################################ -HOSTAPD_VERSION = 2.7 +HOSTAPD_VERSION = 2.9 HOSTAPD_SITE = http://w1.fi/releases -HOSTAPD_PATCH = \ - https://w1.fi/security/2019-1/0001-OpenSSL-Use-constant-time-operations-for-private-big.patch \ - https://w1.fi/security/2019-1/0002-Add-helper-functions-for-constant-time-operations.patch \ - https://w1.fi/security/2019-1/0003-OpenSSL-Use-constant-time-selection-for-crypto_bignu.patch \ - https://w1.fi/security/2019-2/0004-EAP-pwd-Use-constant-time-and-memory-access-for-find.patch \ - https://w1.fi/security/2019-1/0005-SAE-Minimize-timing-differences-in-PWE-derivation.patch \ - https://w1.fi/security/2019-1/0006-SAE-Avoid-branches-in-is_quadratic_residue_blind.patch \ - https://w1.fi/security/2019-1/0007-SAE-Mask-timing-of-MODP-groups-22-23-24.patch \ - https://w1.fi/security/2019-1/0008-SAE-Use-const_time-selection-for-PWE-in-FFC.patch \ - https://w1.fi/security/2019-1/0009-SAE-Use-constant-time-operations-in-sae_test_pwd_see.patch \ - https://w1.fi/security/2019-3/0010-SAE-Fix-confirm-message-validation-in-error-cases.patch \ - https://w1.fi/security/2019-4/0011-EAP-pwd-server-Verify-received-scalar-and-element.patch \ - https://w1.fi/security/2019-4/0012-EAP-pwd-server-Detect-reflection-attacks.patch \ - https://w1.fi/security/2019-4/0013-EAP-pwd-client-Verify-received-scalar-and-element.patch \ - https://w1.fi/security/2019-4/0014-EAP-pwd-Check-element-x-y-coordinates-explicitly.patch \ - https://w1.fi/security/2019-5/0001-EAP-pwd-server-Fix-reassembly-buffer-handling.patch \ - https://w1.fi/security/2019-5/0003-EAP-pwd-peer-Fix-reassembly-buffer-handling.patch HOSTAPD_SUBDIR = hostapd HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config HOSTAPD_DEPENDENCIES = host-pkgconf From f2ffdbee2aca0ca2bde469475c180d60cb934beb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Aug 2019 21:28:43 +0200 Subject: [PATCH 082/120] package/wpa_supplicant: security bump version to 2.9 Fixes https://w1.fi/security/2019-6/ Removed patch applied upstream: http://w1.fi/cgit/hostap/commit/?id=f2973fa39d6109f0f34969e91551a98dc340d537 Removed all other upstream patches which are included in this release. Release notes: http://lists.infradead.org/pipermail/hostap/2019-April/039979.html http://lists.infradead.org/pipermail/hostap/2019-August/040373.html Support for the old dbus interface was removed upstream: http://w1.fi/cgit/hostap/commit/?id=6a8dee76d4090287c016680c009b1334e01b5fbd Removed Config.in option, removed _NEW from remaining dbus option, select BR2_PACKAGE_DBUS when needed and added Config.in.legacy options. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- Config.in.legacy | 15 +++++++ ...pplicant-2.7-fix-undefined-remove-ie.patch | 43 ------------------- package/wpa_supplicant/Config.in | 20 ++++----- package/wpa_supplicant/wpa_supplicant.hash | 20 +-------- package/wpa_supplicant/wpa_supplicant.mk | 35 ++------------- 5 files changed, 29 insertions(+), 104 deletions(-) delete mode 100644 package/wpa_supplicant/0001-wpa_supplicant-2.7-fix-undefined-remove-ie.patch diff --git a/Config.in.legacy b/Config.in.legacy index de05b07c97..ac3697b870 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,21 @@ endif ############################################################################### +comment "Legacy options removed in 2019.11" + +config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW + bool "new dbus support option in wpa_supplicant was renamed" + select BR2_PACKAGE_WPA_SUPPLICANT_DBUS if BR2_TOOLCHAIN_HAS_THREADS + select BR2_LEGACY + help + The new dbus support option was renamed. + +config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD + bool "old dbus support in wpa_supplicant was removed" + select BR2_LEGACY + help + The old dbus support was removed. + comment "Legacy options removed in 2019.08" config BR2_GCC_VERSION_6_X diff --git a/package/wpa_supplicant/0001-wpa_supplicant-2.7-fix-undefined-remove-ie.patch b/package/wpa_supplicant/0001-wpa_supplicant-2.7-fix-undefined-remove-ie.patch deleted file mode 100644 index eb00d9c150..0000000000 --- a/package/wpa_supplicant/0001-wpa_supplicant-2.7-fix-undefined-remove-ie.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f2973fa39d6109f0f34969e91551a98dc340d537 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Mon, 3 Dec 2018 12:00:26 +0200 -Subject: FT: Fix CONFIG_IEEE80211X=y build without CONFIG_FILS=y - -remove_ie() was defined within an ifdef CONFIG_FILS block while it is -now needed even without CONFIG_FILS=y. Remove the CONFIG_FILS condition -there. - -Fixes 8c41734e5de1 ("FT: Fix Reassociation Request IEs during FT protocol") -Signed-off-by: Jouni Malinen - -Downloaded from upstream commit -http://w1.fi/cgit/hostap/commit/?id=f2973fa39d6109f0f34969e91551a98dc340d537 - -Signed-off-by: Bernd Kuhls ---- - wpa_supplicant/sme.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c -index 39c8069..f77f751 100644 ---- a/wpa_supplicant/sme.c -+++ b/wpa_supplicant/sme.c -@@ -1386,7 +1386,6 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data) - } - - --#ifdef CONFIG_FILS - #ifdef CONFIG_IEEE80211R - static void remove_ie(u8 *buf, size_t *len, u8 eid) - { -@@ -1401,7 +1400,6 @@ static void remove_ie(u8 *buf, size_t *len, u8 eid) - } - } - #endif /* CONFIG_IEEE80211R */ --#endif /* CONFIG_FILS */ - - - void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode, --- -cgit v0.12 - diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index 58a074fae8..1594b877c6 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -100,23 +100,19 @@ config BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE help Install wpa_passphrase command line utility. -config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD - bool "Enable support for old DBus control interface" - depends on BR2_PACKAGE_DBUS +config BR2_PACKAGE_WPA_SUPPLICANT_DBUS + bool "Enable support for the DBus control interface" + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus + select BR2_PACKAGE_DBUS help - Enable support for old DBus control interface - (fi.epitest.hostap.WPASupplicant). + Enable support for the DBus control interface. -config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW - bool "Enable support for new DBus control interface" - depends on BR2_PACKAGE_DBUS - help - Enable support for new DBus control interface - (fi.w1.wpa_supplicant1). +comment "dbus support needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION bool "Introspection support" - depends on BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW + depends on BR2_PACKAGE_WPA_SUPPLICANT_DBUS help Add introspection support for new DBus control interface. diff --git a/package/wpa_supplicant/wpa_supplicant.hash b/package/wpa_supplicant/wpa_supplicant.hash index 2da15f7f5d..ff5a2edb34 100644 --- a/package/wpa_supplicant/wpa_supplicant.hash +++ b/package/wpa_supplicant/wpa_supplicant.hash @@ -1,19 +1,3 @@ # Locally calculated -sha256 76ea6b06b7a2ea8e6d9eb1a9166166f1656e6d48c7508914f592100c95c73074 wpa_supplicant-2.7.tar.gz -sha256 86979655f1c5a9578acbf83e8acdf69a36dcc0966a8819f3b6918530ad3e0c67 0001-OpenSSL-Use-constant-time-operations-for-private-big.patch -sha256 5663da175ecc344c90bea8c95ab831ad47a8002ccbb834f6c091705b92e90e71 0002-Add-helper-functions-for-constant-time-operations.patch -sha256 e5a6bc9f587351d4495740239ceb0a64958a59b3e875722dcaeb4c93fa517f64 0003-OpenSSL-Use-constant-time-selection-for-crypto_bignu.patch -sha256 aa5b722bebbaf175ff89a3653c3d048afe0d0f866989fca6b4c8e882a864392a 0004-EAP-pwd-Use-constant-time-and-memory-access-for-find.patch -sha256 bad9eeaeb118f88303a7a718820b3ba03d705e99b6183b3c44556bedf99db423 0005-SAE-Minimize-timing-differences-in-PWE-derivation.patch -sha256 ae7be450f652f6f77ad868856ab61ba6cb6d7e768585cf5f9f9f674a66e05b40 0006-SAE-Avoid-branches-in-is_quadratic_residue_blind.patch -sha256 86b731c787ca58ac001d20fb769b136e2ca76bf81a8465a8e72c50573cfc4b09 0007-SAE-Mask-timing-of-MODP-groups-22-23-24.patch -sha256 ff7305005217a34818dae247886b9fb1b1db781ab31fb5eac9ebdd9cb0d1edfe 0008-SAE-Use-const_time-selection-for-PWE-in-FFC.patch -sha256 707057cc0e60fe763350f82135dbe407bc289a4958879c8ff1e9413243a1caa4 0009-SAE-Use-constant-time-operations-in-sae_test_pwd_see.patch -sha256 82d8ae4fabfe3674bcb5412befe3a74e40d6485906589c219be72e4fd1e70baa 0010-SAE-Fix-confirm-message-validation-in-error-cases.patch -sha256 ff8d6d92ad4b01987be63cdaf67a24d2eba5b3cd654f37664a8a198e501c0e3b 0011-EAP-pwd-server-Verify-received-scalar-and-element.patch -sha256 d5ebf4e5a810e9a0c035f9268195c542273998ea70fd58697ee25965094062cc 0012-EAP-pwd-server-Detect-reflection-attacks.patch -sha256 7156656498f03b24a0b69a26a59d17a9fcc8e76761f1dabe6d13b4176ffd2ef8 0013-EAP-pwd-client-Verify-received-scalar-and-element.patch -sha256 69926854ec2a79dada290f79f04202764c5d6400d232e3a567ebe633a02c1c66 0014-EAP-pwd-Check-element-x-y-coordinates-explicitly.patch -sha256 cba82a051a39c48872250b2e85ca8ebc628cfe75a9ccec29f3e994abd4156152 0001-EAP-pwd-server-Fix-reassembly-buffer-handling.patch -sha256 dc0e015463e1fd1f230795e1a49ddd1b9d00e726cd9f38846d0f4892d7978162 0003-EAP-pwd-peer-Fix-reassembly-buffer-handling.patch -sha256 76eeecd8fc291a71f29189ea20e6a34387b8048a959cbc6a65c41b98194643a2 README +sha256 fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17 wpa_supplicant-2.9.tar.gz +sha256 9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761 README diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index a518ecc217..0a7a5072dc 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -4,25 +4,8 @@ # ################################################################################ -WPA_SUPPLICANT_VERSION = 2.7 +WPA_SUPPLICANT_VERSION = 2.9 WPA_SUPPLICANT_SITE = http://w1.fi/releases -WPA_SUPPLICANT_PATCH = \ - https://w1.fi/security/2019-1/0001-OpenSSL-Use-constant-time-operations-for-private-big.patch \ - https://w1.fi/security/2019-1/0002-Add-helper-functions-for-constant-time-operations.patch \ - https://w1.fi/security/2019-1/0003-OpenSSL-Use-constant-time-selection-for-crypto_bignu.patch \ - https://w1.fi/security/2019-2/0004-EAP-pwd-Use-constant-time-and-memory-access-for-find.patch \ - https://w1.fi/security/2019-1/0005-SAE-Minimize-timing-differences-in-PWE-derivation.patch \ - https://w1.fi/security/2019-1/0006-SAE-Avoid-branches-in-is_quadratic_residue_blind.patch \ - https://w1.fi/security/2019-1/0007-SAE-Mask-timing-of-MODP-groups-22-23-24.patch \ - https://w1.fi/security/2019-1/0008-SAE-Use-const_time-selection-for-PWE-in-FFC.patch \ - https://w1.fi/security/2019-1/0009-SAE-Use-constant-time-operations-in-sae_test_pwd_see.patch \ - https://w1.fi/security/2019-3/0010-SAE-Fix-confirm-message-validation-in-error-cases.patch \ - https://w1.fi/security/2019-4/0011-EAP-pwd-server-Verify-received-scalar-and-element.patch \ - https://w1.fi/security/2019-4/0012-EAP-pwd-server-Detect-reflection-attacks.patch \ - https://w1.fi/security/2019-4/0013-EAP-pwd-client-Verify-received-scalar-and-element.patch \ - https://w1.fi/security/2019-4/0014-EAP-pwd-Check-element-x-y-coordinates-explicitly.patch \ - https://w1.fi/security/2019-5/0001-EAP-pwd-server-Fix-reassembly-buffer-handling.patch \ - https://w1.fi/security/2019-5/0003-EAP-pwd-peer-Fix-reassembly-buffer-handling.patch WPA_SUPPLICANT_LICENSE = BSD-3-Clause WPA_SUPPLICANT_LICENSE_FILES = README WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config @@ -115,34 +98,24 @@ WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP_PWD WPA_SUPPLICANT_CONFIG_EDITS += 's/\#\(CONFIG_TLS=\).*/\1internal/' endif -ifeq ($(BR2_PACKAGE_DBUS),y) +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" - -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD),y) -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS= -define WPA_SUPPLICANT_INSTALL_DBUS_OLD - $(INSTALL) -m 0644 -D \ - $(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_OLD_SERVICE).service \ - $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_OLD_SERVICE).service -endef -endif - -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW),y) WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS_NEW define WPA_SUPPLICANT_INSTALL_DBUS_NEW $(INSTALL) -m 0644 -D \ $(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_NEW_SERVICE).service \ $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_NEW_SERVICE).service endef -endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION),y) WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS_INTRO endif +else +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_CTRL_IFACE_DBUS_NEW endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG),y) From fade4c28ad60bcad9c764b7a77c50ce2ea6fb68f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Aug 2019 20:20:04 +0200 Subject: [PATCH 083/120] package/hdparm: bump version to 9.58 Release notes: https://sourceforge.net/p/hdparm/news/2018/10/hdparm-957-is-released/ https://sourceforge.net/p/hdparm/news/2018/10/hdparm-958-is-released/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/hdparm/hdparm.hash | 6 +++--- package/hdparm/hdparm.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/hdparm/hdparm.hash b/package/hdparm/hdparm.hash index 2ce23cf84e..4251b5a65c 100644 --- a/package/hdparm/hdparm.hash +++ b/package/hdparm/hdparm.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/hdparm/files/hdparm/ -md5 7900608e32834f65d2654fdb696e71a0 hdparm-9.56.tar.gz -sha1 9e143065115229c4f929530157627dc92e5f6deb hdparm-9.56.tar.gz +md5 4652c49cf096a64683c05f54b4fa4679 hdparm-9.58.tar.gz +sha1 b3425a141f1c0fe9f53b18631437129c2155ee45 hdparm-9.58.tar.gz # Locally computed -sha256 6ff9ed695f1017396eec4101f990f114b7b0e0a04c5aa6369c0394053d16e4da hdparm-9.56.tar.gz +sha256 9ae78e883f3ce071d32ee0f1b9a2845a634fc4dd94a434e653fdbef551c5e10f hdparm-9.58.tar.gz sha256 eae572b06d2733f5c65fbe81680ce2b8a109afee2bdd1a161343c772af0e82e1 LICENSE.TXT diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk index 7ed1ed8624..9826dde010 100644 --- a/package/hdparm/hdparm.mk +++ b/package/hdparm/hdparm.mk @@ -4,7 +4,7 @@ # ################################################################################ -HDPARM_VERSION = 9.56 +HDPARM_VERSION = 9.58 HDPARM_SITE = http://downloads.sourceforge.net/project/hdparm/hdparm HDPARM_LICENSE = BSD-Style HDPARM_LICENSE_FILES = LICENSE.TXT From 92cda2a137423f7a072178797a7c3db4d8e1a8f1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Aug 2019 21:31:48 +0200 Subject: [PATCH 084/120] package/hwdata: bump version to 0.326 Signed-off-by: Bernd Kuhls 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 0b52c11004..80e61e212d 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 986d919c20a0c7f8b669a63830f6d2f4cb5c4cddcfc944c5e2ae05c2e9e5ec9f hwdata-0.308.tar.gz +sha256 d90de6eb0937ad4c667e5f0edcc4ab3d6d91d2d2dbc08f70b5b99be3800ed836 hwdata-0.326.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 6e8971ad6e..f32a0ef939 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.308 +HWDATA_VERSION = 0.326 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 a9c509934e067716b0cf210b87c968ba69834d9f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Aug 2019 20:13:01 +0200 Subject: [PATCH 085/120] package/gnutls: bump version to 3.6.9 Release notes: https://lists.gnupg.org/pipermail/gnutls-help/2019-July/004556.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 5ab913ad6e..0149e4a277 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.8.tar.xz.sig -sha256 aa81944e5635de981171772857e72be231a7e0f559ae0292d2737de475383e83 gnutls-3.6.8.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.9.tar.xz.sig +sha256 4331fca55817ecdd74450b908a6c29b4f05bb24dd13144c6284aa34d872e1fcb gnutls-3.6.9.tar.xz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 4f40b896ff..ecbedec5c8 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.6 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).8 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).9 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library), GPL-3.0+ (gnutls-openssl library) From 89337e4f39343b3cba0e9f77b3a198fa8ea340af Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Aug 2019 19:37:58 +0200 Subject: [PATCH 086/120] package/flac: bump version to 1.3.3 Changelog: https://xiph.org/flac/changelog.html Removed patch applied upstream, removed autoreconf: https://git.xiph.org/?p=flac.git;a=commitdiff;h=55721556161e6ab209f940f5023bc44b4051524a Added all hashes provided by upstream and license hashes. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...onfigure.ac-relax-linux-OS-detection.patch | 35 ------------------- package/flac/flac.hash | 10 +++++- package/flac/flac.mk | 4 +-- 3 files changed, 10 insertions(+), 39 deletions(-) delete mode 100644 package/flac/0001-configure.ac-relax-linux-OS-detection.patch diff --git a/package/flac/0001-configure.ac-relax-linux-OS-detection.patch b/package/flac/0001-configure.ac-relax-linux-OS-detection.patch deleted file mode 100644 index baf07bc16e..0000000000 --- a/package/flac/0001-configure.ac-relax-linux-OS-detection.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8589b44c573d4228a9df3ba7bffdfdf584e7b033 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 9 Jan 2017 21:38:29 +0100 -Subject: [PATCH] configure.ac: relax linux OS detection - -Not all linux hosts match the *-pc-linux-gnu wildcard, causing build -failures for older glibc versions where we need to link with -lrt for -clock_gettime - E.G.: - - - arm-unknown-linux-musleabihf - - powerpc-unknown-linux-gnuspe - - bfin-linux-linux-uclibc - .. - -Signed-off-by: Peter Korsgaard ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 070ab357..235d2717 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -186,7 +186,7 @@ esac - AM_CONDITIONAL(OS_IS_WINDOWS, test "x$os_is_windows" = xyes) - - case "$host" in -- *-pc-linux-gnu) -+ *-linux-*) - sys_linux=true - AC_DEFINE(FLAC__SYS_LINUX) - AH_TEMPLATE(FLAC__SYS_LINUX, [define if building for Linux]) --- -2.11.0 - diff --git a/package/flac/flac.hash b/package/flac/flac.hash index 7ce76f107c..df7c2d1b95 100644 --- a/package/flac/flac.hash +++ b/package/flac/flac.hash @@ -1,2 +1,10 @@ +# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS +md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz +# From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS +sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt -sha256 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f flac-1.3.2.tar.xz +sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz +# Locally computed +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph diff --git a/package/flac/flac.mk b/package/flac/flac.mk index 34482133d9..a2cf186d10 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -4,15 +4,13 @@ # ################################################################################ -FLAC_VERSION = 1.3.2 +FLAC_VERSION = 1.3.3 FLAC_SITE = http://downloads.xiph.org/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) FLAC_LICENSE = Xiph BSD-like (libFLAC), GPL-2.0+ (tools), LGPL-2.1+ (other libraries) FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL -# 0001-configure.ac-relax-linux-OS-detection.patch patches configure.ac -FLAC_AUTORECONF = YES FLAC_CONF_OPTS = \ --disable-cpplibs \ --disable-xmms-plugin \ From a5f4a457923f9564b2d3cae389c756c0aa59e9b3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Aug 2019 18:41:30 +0200 Subject: [PATCH 087/120] package/x265: bump version to 3.1.2 Release notes: https://bitbucket.org/multicoreware/x265/src/Release_3.1/doc/reST/releasenotes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x265/x265.hash | 2 +- package/x265/x265.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x265/x265.hash b/package/x265/x265.hash index 16ca5d3ce6..7cdb02be02 100644 --- a/package/x265/x265.hash +++ b/package/x265/x265.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 c5b9fc260cabbc4a81561a448f4ce9cad7218272b4011feabc3a6b751b2f0662 x265_3.0.tar.gz +sha256 6f785f1c9a42e00a56402da88463bb861c49d9af108be53eb3ef10295f2a59aa x265_3.1.2.tar.gz sha256 d8afb1bcc7a2cfc603683b168d6987ef0a48e59e0da3693bf55c5d33b67e2b49 COPYING diff --git a/package/x265/x265.mk b/package/x265/x265.mk index 4e3b3bfa8e..74a46e37a2 100644 --- a/package/x265/x265.mk +++ b/package/x265/x265.mk @@ -4,7 +4,7 @@ # ################################################################################ -X265_VERSION = 3.0 +X265_VERSION = 3.1.2 X265_SOURCE = x265_$(X265_VERSION).tar.gz X265_SITE = https://bitbucket.org/multicoreware/x265/downloads X265_LICENSE = GPL-2.0+ From 85f4b77123e1a166eb0ecb4f8f94496be34d9f5c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Aug 2019 18:45:56 +0200 Subject: [PATCH 088/120] package/apr: bump version to 1.7.0 Release notes: http://www.apache.org/dist/apr/CHANGES-APR-1.7 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/apr/apr.hash | 4 ++-- package/apr/apr.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/apr/apr.hash b/package/apr/apr.hash index be130a5d78..0a3f5c8527 100644 --- a/package/apr/apr.hash +++ b/package/apr/apr.hash @@ -1,4 +1,4 @@ -# From http://www.apache.org/dist/apr/apr-1.6.3.tar.bz2.sha256 -sha256 131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172 apr-1.6.3.tar.bz2 +# From http://archive.apache.org/dist/apr/apr-1.7.0.tar.bz2.sha256 +sha256 e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea apr-1.7.0.tar.bz2 # Locally calculated sha256 f854aeef66ecd55a126226e82b3f26793fc3b1c584647f6a0edc5639974c38ad LICENSE diff --git a/package/apr/apr.mk b/package/apr/apr.mk index 8f29e57c59..2a57f854f9 100644 --- a/package/apr/apr.mk +++ b/package/apr/apr.mk @@ -4,7 +4,7 @@ # ################################################################################ -APR_VERSION = 1.6.3 +APR_VERSION = 1.7.0 APR_SOURCE = apr-$(APR_VERSION).tar.bz2 APR_SITE = http://archive.apache.org/dist/apr APR_LICENSE = Apache-2.0 From 45ea73584b32a2ffd21315ed14798441014ff296 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Aug 2019 18:47:28 +0200 Subject: [PATCH 089/120] package/asterisk: bump version to 16.5.0 Release notes: https://downloads.asterisk.org/pub/telephony/asterisk/asterisk-16-current-summary.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 dd1e1db327..588550a000 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 8cabb7a6ad2c35b7fb5c520977f2b2c18b471e5b825b65dc411744c6bed2b9f8 asterisk-16.4.1.tar.gz +sha256 f950da848c387be9e3de24f1d0f4fa7b3924471c382192424dbe0997a5e3a3f7 asterisk-16.5.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 53dd593678..cfe50c969c 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 16.4.1 +ASTERISK_VERSION = 16.5.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)) From 3cf36896ee514ac83629e6d1b0da4c13f5619574 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Aug 2019 18:49:30 +0200 Subject: [PATCH 090/120] package/boinc: bump version to 7.16.1 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/boinc/boinc.hash | 2 +- package/boinc/boinc.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/boinc/boinc.hash b/package/boinc/boinc.hash index eeaaf68edd..df30a5c508 100644 --- a/package/boinc/boinc.hash +++ b/package/boinc/boinc.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 970aedb9e25afa20be67f125ab05435df8eb2e66a3ac30ad316c54085e397c88 boinc-7.14.2.tar.gz +sha256 a886257cdf6beeb39536849bb21d8c0731a8e551b15c56f6949c65b140c6febf boinc-7.16.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk index dd468c7678..789a01ffef 100644 --- a/package/boinc/boinc.mk +++ b/package/boinc/boinc.mk @@ -4,8 +4,8 @@ # ################################################################################ -BOINC_VERSION_MAJOR = 7.14 -BOINC_VERSION = $(BOINC_VERSION_MAJOR).2 +BOINC_VERSION_MAJOR = 7.16 +BOINC_VERSION = $(BOINC_VERSION_MAJOR).1 # client_release can be used to build the Client and Manager but not the Server # part. The Server currently has no versioning (see # https://github.com/BOINC/boinc/pull/1798). From e0b08703046ecd2e3eb71beb867ab87d23e6c789 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Aug 2019 19:31:44 +0200 Subject: [PATCH 091/120] package/file: bump version to 5.37 Changelog: https://github.com/file/file/blob/master/ChangeLog Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/file/file.hash | 4 ++-- package/file/file.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/file/file.hash b/package/file/file.hash index 7948e856ee..241820d0fb 100644 --- a/package/file/file.hash +++ b/package/file/file.hash @@ -1,7 +1,7 @@ # Locally calculated after verifying signature -# ftp://ftp.astron.com/pub/file/file-5.36.tar.gz.asc +# ftp://ftp.astron.com/pub/file/file-5.37.tar.gz.asc # using key BE04995BA8F90ED0C0C176C471112AB16CB33B3A -sha256 fb608290c0fd2405a8f63e5717abf6d03e22e183fb21884413d1edd918184379 file-5.36.tar.gz +sha256 e9c13967f7dd339a3c241b7710ba093560b9a33013491318e88e6b8b57bae07f file-5.37.tar.gz sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462 src/mygetopt.h sha256 7ac061e1a1c840c4dfa0573aec6f3497676c9295b5ec4190d3576646eb1646bf src/vasprintf.c diff --git a/package/file/file.mk b/package/file/file.mk index 1a835015a7..a13acbc47c 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -4,7 +4,7 @@ # ################################################################################ -FILE_VERSION = 5.36 +FILE_VERSION = 5.37 FILE_SITE = ftp://ftp.astron.com/pub/file FILE_DEPENDENCIES = host-file zlib HOST_FILE_DEPENDENCIES = host-zlib From cea0941d1f3db4c337efce8c428a24e0a8bdddd5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Aug 2019 18:31:53 +0200 Subject: [PATCH 092/120] package/libvpx: bump version to 1.8.1 Rebased patch. Changelog: https://github.com/webmproject/libvpx/blob/master/CHANGELOG Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch | 2 +- package/libvpx/libvpx.hash | 2 +- package/libvpx/libvpx.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch b/package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch index e17ff71717..12960a6266 100644 --- a/package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch +++ b/package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch @@ -16,7 +16,7 @@ index c14f288..82df745 100644 --- a/vpx_mem/vpx_mem.h +++ b/vpx_mem/vpx_mem.h @@ -12,9 +12,6 @@ - #define VPX_MEM_VPX_MEM_H_ + #define VPX_VPX_MEM_VPX_MEM_H_ #include "vpx_config.h" -#if defined(__uClinux__) diff --git a/package/libvpx/libvpx.hash b/package/libvpx/libvpx.hash index dde2f98a63..bbcde3a47b 100644 --- a/package/libvpx/libvpx.hash +++ b/package/libvpx/libvpx.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 86df18c694e1c06cc8f83d2d816e9270747a0ce6abe316e93a4f4095689373f6 libvpx-1.8.0.tar.gz +sha256 df19b8f24758e90640e1ab228ab4a4676ec3df19d23e4593375e6f3847dee03e libvpx-1.8.1.tar.gz sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 LICENSE sha256 cc3273e0694ea5896145e0677699b53471b03ea43021ddc50e7923fbb9f5023c PATENTS diff --git a/package/libvpx/libvpx.mk b/package/libvpx/libvpx.mk index 73fe2057de..aaef708416 100644 --- a/package/libvpx/libvpx.mk +++ b/package/libvpx/libvpx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVPX_VERSION = 1.8.0 +LIBVPX_VERSION = 1.8.1 LIBVPX_SITE = $(call github,webmproject,libvpx,v$(LIBVPX_VERSION)) LIBVPX_LICENSE = BSD-3-Clause LIBVPX_LICENSE_FILES = LICENSE PATENTS From 41f8c443b34d854a8f3e3fe548a30483c5c61055 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Aug 2019 18:38:09 +0200 Subject: [PATCH 093/120] package/pngquant: bump version to 2.12.5 Upstream now provides a sha256 hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/pngquant/pngquant.hash | 3 +-- package/pngquant/pngquant.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/pngquant/pngquant.hash b/package/pngquant/pngquant.hash index 00dd5cd93f..f67807cb8f 100644 --- a/package/pngquant/pngquant.hash +++ b/package/pngquant/pngquant.hash @@ -1,5 +1,4 @@ # From https://pngquant.org/releases.html -sha1 e160eade5897b1c3d991e57b528b4f338674af88 pngquant-2.12.3-src.tar.gz +sha256 3638936cf6270eeeaabcee42e10768d78e4dc07cac9310307835c1f58b140808 pngquant-2.12.5-src.tar.gz # Locally computed -sha256 8bb076832a3f1c826393f4be62df8b637dfd6493b13d5839ad697a8a80ccf95b pngquant-2.12.3-src.tar.gz sha256 e4f467f7abf860b4e620f5f60fdd88bc3a63a0fdb98a481fb002b5e511c9b826 COPYRIGHT diff --git a/package/pngquant/pngquant.mk b/package/pngquant/pngquant.mk index 801290807b..a8845c7972 100644 --- a/package/pngquant/pngquant.mk +++ b/package/pngquant/pngquant.mk @@ -4,7 +4,7 @@ # ################################################################################ -PNGQUANT_VERSION = 2.12.3 +PNGQUANT_VERSION = 2.12.5 PNGQUANT_SOURCE = pngquant-$(PNGQUANT_VERSION)-src.tar.gz PNGQUANT_SITE = https://pngquant.org PNGQUANT_LICENSE = GPL-3.0+ From 1ca7cdc2bf0e37fc713a4e32dd03b7d7a9e62be3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Aug 2019 18:49:36 +0200 Subject: [PATCH 094/120] package/vdr: bump version to 2.4.1 Release notes: https://www.linuxtv.org/pipermail/vdr/2019-June/029497.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/vdr/vdr.hash | 6 +++--- package/vdr/vdr.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/vdr/vdr.hash b/package/vdr/vdr.hash index e9cee9a5b5..99f6ba822d 100644 --- a/package/vdr/vdr.hash +++ b/package/vdr/vdr.hash @@ -1,5 +1,5 @@ -# From https://www.linuxtv.org/pipermail/vdr/2018-April/029407.html -md5 12c6a3abeadfa915fcfe736bb047a3ab vdr-2.4.0.tar.bz2 +# From https://www.linuxtv.org/pipermail/vdr/2019-June/029497.html +md5 b2897fe6b6e6711d512a69642b1b8ec1 vdr-2.4.1.tar.bz2 # Locally computed -sha256 93af49fe87048073dc38ef5e6c71e9704344d730f21c261afac69e3c937f8cce vdr-2.4.0.tar.bz2 +sha256 25c3f835c4f3ff92cd2db10c004439ef22c2e895193c77fbe8cc7eac4858a1dc vdr-2.4.1.tar.bz2 sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk index 67e160c8f0..83cdede307 100644 --- a/package/vdr/vdr.mk +++ b/package/vdr/vdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -VDR_VERSION = 2.4.0 +VDR_VERSION = 2.4.1 VDR_SOURCE = vdr-$(VDR_VERSION).tar.bz2 VDR_SITE = ftp://ftp.tvdr.de/vdr VDR_LICENSE = GPL-2.0+ From a465dd54fc22423b4140441d8f29d55e249d5848 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Wed, 28 Aug 2019 18:54:52 +0200 Subject: [PATCH 095/120] package/ofono: bump to version 1.30 Removed included in 1.30, refresh patch. Signed-off-by: Petr Vorel Signed-off-by: Peter Korsgaard --- package/ofono/0001-uclibc-backtrace.patch | 4 +-- ...Add-check-for-explicit_bzero-support.patch | 28 ------------------- package/ofono/ofono.hash | 2 +- package/ofono/ofono.mk | 2 +- 4 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 package/ofono/0003-build-Add-check-for-explicit_bzero-support.patch diff --git a/package/ofono/0001-uclibc-backtrace.patch b/package/ofono/0001-uclibc-backtrace.patch index 3ce7bf8cbc..3fa2414978 100644 --- a/package/ofono/0001-uclibc-backtrace.patch +++ b/package/ofono/0001-uclibc-backtrace.patch @@ -29,7 +29,7 @@ Signed-off-by: Petr Vorel static void print_backtrace(unsigned int offset) { void *frames[99]; -@@ -309,7 +310,7 @@ +@@ -312,7 +313,7 @@ if (detach == FALSE) option |= LOG_PERROR; @@ -38,7 +38,7 @@ Signed-off-by: Petr Vorel signal_setup(signal_handler); #endif -@@ -326,7 +327,7 @@ +@@ -329,7 +330,7 @@ closelog(); diff --git a/package/ofono/0003-build-Add-check-for-explicit_bzero-support.patch b/package/ofono/0003-build-Add-check-for-explicit_bzero-support.patch deleted file mode 100644 index b2507df3ff..0000000000 --- a/package/ofono/0003-build-Add-check-for-explicit_bzero-support.patch +++ /dev/null @@ -1,28 +0,0 @@ -From dff595671bf5a46f7c9231966a6cd7d2a0183076 Mon Sep 17 00:00:00 2001 -From: Marcel Holtmann -Date: Wed, 15 May 2019 09:39:44 +0200 -Subject: [PATCH] build: Add check for explicit_bzero support - -Upstream: dff595671bf5a46f7c9231966a6cd7d2a0183076 - -Signed-off-by: Petr Vorel ---- - configure.ac | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure.ac b/configure.ac -index bacb7ac5..cad35c5d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -54,6 +54,8 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie], - fi - ]) - -+AC_CHECK_FUNCS(explicit_bzero) -+ - AC_CHECK_FUNC(signalfd, dummy=yes, - AC_MSG_ERROR(signalfd support is required)) - --- -2.21.0 - diff --git a/package/ofono/ofono.hash b/package/ofono/ofono.hash index 5204bb4fca..e8e972af21 100644 --- a/package/ofono/ofono.hash +++ b/package/ofono/ofono.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/ofono/sha256sums.asc -sha256 67f0f8e5740dea5b46309e40667d1e560be39c90ef08dd01ff9e9ce8e61f0679 ofono-1.29.tar.xz +sha256 8079735efc5d7f33be9e792e791f2f7ff75c31ce67d477b994673e32319eec5c ofono-1.30.tar.xz # Locally computed sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk index 176d23ae05..ce05dfcadf 100644 --- a/package/ofono/ofono.mk +++ b/package/ofono/ofono.mk @@ -4,7 +4,7 @@ # ################################################################################ -OFONO_VERSION = 1.29 +OFONO_VERSION = 1.30 OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono OFONO_LICENSE = GPL-2.0 From 95990d54813763788c724efc655ae88038d3f6ec Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 28 Aug 2019 19:19:23 +0200 Subject: [PATCH 096/120] DEVELOPERS: add Giulio Benetti to at package Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5fe244a570..3c1ebcad2a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -952,6 +952,7 @@ F: package/webp/ F: package/xapian/ N: Giulio Benetti +F: package/at/ F: package/minicom/ F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline-driver/ From 3c961b8e772525090cafd3f26a0351951eb114a0 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 28 Aug 2019 22:17:38 +0200 Subject: [PATCH 097/120] package/at: bump version Mainly this allows to drop 3 patches because they have been upstreamed. Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- ...akefile.in-replace-IROOT-by-DESTDIR.patch} | 0 ...vert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch | 34 ----------- ...> 0002-Makefile.in-make-install-fix.patch} | 0 ...-fix.patch => 0003-getloadavg.c-fix.patch} | 0 .../0005-parsetime.l-include-config-h.patch | 16 ----- ...006-remove-glibc-__isleap-assumption.patch | 59 ------------------- package/at/at.hash | 2 +- package/at/at.mk | 2 +- 8 files changed, 2 insertions(+), 111 deletions(-) rename package/at/{0002-Makefile.in-replace-IROOT-by-DESTDIR.patch => 0001-Makefile.in-replace-IROOT-by-DESTDIR.patch} (100%) delete mode 100644 package/at/0001-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch rename package/at/{0003-Makefile.in-make-install-fix.patch => 0002-Makefile.in-make-install-fix.patch} (100%) rename package/at/{0004-getloadavg.c-fix.patch => 0003-getloadavg.c-fix.patch} (100%) delete mode 100644 package/at/0005-parsetime.l-include-config-h.patch delete mode 100644 package/at/0006-remove-glibc-__isleap-assumption.patch diff --git a/package/at/0002-Makefile.in-replace-IROOT-by-DESTDIR.patch b/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch similarity index 100% rename from package/at/0002-Makefile.in-replace-IROOT-by-DESTDIR.patch rename to package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch diff --git a/package/at/0001-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch b/package/at/0001-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch deleted file mode 100644 index e4276ac208..0000000000 --- a/package/at/0001-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e12c96cccab550eda31cf7bb1dedddd3670ffe69 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde -Date: Tue, 1 Dec 2009 17:22:22 +0100 -Subject: [PATCH 2/5] configure.ac: convert AC_TRY_COMPILE -> AC_COMPILE_IFELSE - -Signed-off-by: Marc Kleine-Budde ---- - configure.ac | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 997a37f..cab80ed 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -40,11 +40,11 @@ case "$host" in - esac - - AC_MSG_CHECKING(__attribute__((noreturn))) --AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);], -- AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_ATTRIBUTE_NORETURN, 1, -- [Define to 1 if compiler supports __attribute__((noreturn))]), -- AC_MSG_RESULT(no) -+AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([[]], [[void __attribute__((noreturn)) panic(void);]])], -+ [AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_ATTRIBUTE_NORETURN, 1, Define to 1 if compiler supports __attribute__((noreturn)))], -+ [AC_MSG_RESULT(no)] - ) - dnl Checks for libraries. - --- -1.6.5.3 - diff --git a/package/at/0003-Makefile.in-make-install-fix.patch b/package/at/0002-Makefile.in-make-install-fix.patch similarity index 100% rename from package/at/0003-Makefile.in-make-install-fix.patch rename to package/at/0002-Makefile.in-make-install-fix.patch diff --git a/package/at/0004-getloadavg.c-fix.patch b/package/at/0003-getloadavg.c-fix.patch similarity index 100% rename from package/at/0004-getloadavg.c-fix.patch rename to package/at/0003-getloadavg.c-fix.patch diff --git a/package/at/0005-parsetime.l-include-config-h.patch b/package/at/0005-parsetime.l-include-config-h.patch deleted file mode 100644 index f4111ebf67..0000000000 --- a/package/at/0005-parsetime.l-include-config-h.patch +++ /dev/null @@ -1,16 +0,0 @@ -Make sure to include config.h so that NEEDS_* macros are properly -taken into account. This was a problem for NEEDS_YYWRAP, which was set -to 1 in config.h, but the corresponding code wasn't compiled in. - -Index: at-3.1.13/parsetime.l -=================================================================== ---- at-3.1.13.orig/parsetime.l -+++ at-3.1.13/parsetime.l -@@ -4,6 +4,7 @@ - #include - #include "y.tab.h" - #include "parsetime.h" -+#include "config.h" - - char *last_token = NULL; - char **my_argv; diff --git a/package/at/0006-remove-glibc-__isleap-assumption.patch b/package/at/0006-remove-glibc-__isleap-assumption.patch deleted file mode 100644 index 21522492c8..0000000000 --- a/package/at/0006-remove-glibc-__isleap-assumption.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 7f811d9c4ebc9444e613e251c31d6bf537a24dc1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 13 Apr 2015 16:35:30 -0700 -Subject: [PATCH] remove glibc assumption - -glibc time.h header has an undocumented __isleap macro -that we are using anf musl is missing it. -Since it is undocumented & does not appear -on any other libc, stop using it and just define the macro in -locally instead. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj -[patch from: http://patchwork.openembedded.org/patch/91893/ ] -Signed-off-by: "Yann E. MORIN" - ---- - parsetime.y | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/parsetime.y b/parsetime.y -index 7005e88..324e6d3 100644 ---- a/parsetime.y -+++ b/parsetime.y -@@ -8,6 +8,9 @@ - - #define YYDEBUG 1 - -+#define is_leap_year(y) \ -+ ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) -+ - struct tm exectm; - static int isgmt; - static int yearspec; -@@ -217,8 +220,8 @@ date : month_name day_number - mnum == 12) && dnum > 31) - || ((mnum == 4 || mnum == 6 || mnum == 9 || - mnum == 11) && dnum > 30) -- || (mnum == 2 && dnum > 29 && __isleap(ynum+1900)) -- || (mnum == 2 && dnum > 28 && !__isleap(ynum+1900)) -+ || (mnum == 2 && dnum > 29 && is_leap_year(ynum+1900)) -+ || (mnum == 2 && dnum > 28 && !is_leap_year(ynum+1900)) - ) - { - yyerror("Error in day of month"); -@@ -261,8 +264,8 @@ date : month_name day_number - mnum == 12) && dnum > 31) - || ((mnum == 4 || mnum == 6 || mnum == 9 || - mnum == 11) && dnum > 30) -- || (mnum == 2 && dnum > 29 && __isleap(ynum+1900)) -- || (mnum == 2 && dnum > 28 && !__isleap(ynum+1900)) -+ || (mnum == 2 && dnum > 29 && is_leap_year(ynum+1900)) -+ || (mnum == 2 && dnum > 28 && !is_leap_year(ynum+1900)) - ) - { - yyerror("Error in day of month"); --- -2.1.4 diff --git a/package/at/at.hash b/package/at/at.hash index 530b1257c1..e20c00b3cd 100644 --- a/package/at/at.hash +++ b/package/at/at.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 f5c7c8226fab0bc4e2d16a55e04d4026f3452db51fc5cbcc4bb5a3c79a79f7ef at-release_3.1.23.tar.gz +sha256 9ae5761a1fb897cda3a6f14439bed33cda33c0eedfcee6866e3d2ebad67fbd2f at-7c74fa1aece6bc6db351763dc012193d5d634b7e.tar.gz sha256 01dccc0975aa9ba1a9f83e7c5e04f16077353d3c72a0a759b8846ee7a5b2b616 Copyright sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/at/at.mk b/package/at/at.mk index 36aa8c7a42..e0517af294 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -4,7 +4,7 @@ # ################################################################################ -AT_VERSION = release/3.1.23 +AT_VERSION = 7c74fa1aece6bc6db351763dc012193d5d634b7e AT_SITE = https://salsa.debian.org/debian/at.git AT_SITE_METHOD = git # Tried to add missing deps for parsetime.l but still parallel build fails From ed0c94d94dccc83e5e189960e10ab209a4a80211 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Aug 2019 18:14:21 +0200 Subject: [PATCH 098/120] package/x11r7/xapp_viewres: bump version to 1.0.6 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_viewres/xapp_viewres.hash | 10 +++++----- package/x11r7/xapp_viewres/xapp_viewres.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_viewres/xapp_viewres.hash b/package/x11r7/xapp_viewres/xapp_viewres.hash index 539bb431ee..9b40c0a533 100644 --- a/package/x11r7/xapp_viewres/xapp_viewres.hash +++ b/package/x11r7/xapp_viewres/xapp_viewres.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002849.html -md5 08def461f135832136624855763b20fa viewres-1.0.5.tar.bz2 -sha1 d03832456dde6c2a91086e6563d52fd936425948 viewres-1.0.5.tar.bz2 -sha256 5ed818e84c39bcf26dadc885c9860432b85843caad3621e26d99edea660ae3d7 viewres-1.0.5.tar.bz2 -sha512 fe573e9b5ae679b65eee95733cbea20c86c92089c3a2dadfe977bc9c54d1f58c5e5f4663e51a1cf206543a43592b3a3c266da1769279f08be85c66b0aa5b0f7f viewres-1.0.5.tar.bz2 +# 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 # Locally computed sha256 aefb540c54bc95c68702cd2ae668c559e63cc1a84f55ae5c0e78547e7d75d2d5 COPYING diff --git a/package/x11r7/xapp_viewres/xapp_viewres.mk b/package/x11r7/xapp_viewres/xapp_viewres.mk index e32de0f732..2e05a6e7d9 100644 --- a/package/x11r7/xapp_viewres/xapp_viewres.mk +++ b/package/x11r7/xapp_viewres/xapp_viewres.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_VIEWRES_VERSION = 1.0.5 +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_LICENSE = MIT From 627730e174849efbccb0182c8fab2cf2213115f4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Aug 2019 18:15:29 +0200 Subject: [PATCH 099/120] package/x11r7/xapp_xrandr: bump version to 1.5.1 Switched _SOURCE to .xz, added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xrandr/xapp_xrandr.hash | 9 +++++++-- package/x11r7/xapp_xrandr/xapp_xrandr.mk | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.hash b/package/x11r7/xapp_xrandr/xapp_xrandr.hash index b1db30dcd8..408b070dd9 100644 --- a/package/x11r7/xapp_xrandr/xapp_xrandr.hash +++ b/package/x11r7/xapp_xrandr/xapp_xrandr.hash @@ -1,2 +1,7 @@ -# From https://lists.freedesktop.org/archives/xorg-announce/2016-February/002677.html -sha256 c1cfd4e1d4d708c031d60801e527abc9b6d34b85f2ffa2cadd21f75ff38151cd xrandr-1.5.0.tar.bz2 +# 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 +# Locally computed +sha256 0dd9a3d62c48dd7b87790029e39fb5e11756d33fded3bc1644e11585c87b2038 COPYING diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk index 583a501e4a..8586c6feb3 100644 --- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk +++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XRANDR_VERSION = 1.5.0 -XAPP_XRANDR_SOURCE = xrandr-$(XAPP_XRANDR_VERSION).tar.bz2 +XAPP_XRANDR_VERSION = 1.5.1 +XAPP_XRANDR_SOURCE = xrandr-$(XAPP_XRANDR_VERSION).tar.xz XAPP_XRANDR_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XRANDR_LICENSE = MIT XAPP_XRANDR_LICENSE_FILES = COPYING From 96c9052d60066e478e8383bc4ed3b79ae2137cf7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Aug 2019 18:17:58 +0200 Subject: [PATCH 100/120] package/x11r7/xdriver_xf86-video-sis: bump version to 0.11.0 Removed all patches after they were applied upstream: https://cgit.freedesktop.org/xorg/driver/xf86-video-sis/commit/?id=9e42918588b65860422cb296a92ecede15db7419 https://cgit.freedesktop.org/xorg/driver/xf86-video-sis/commit/?id=4b1356a2b7fd06e9a05d134caa4033681c939737 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-video-sis/0001-cross.patch | 21 ------------ ...0002-Remove-reference-to-virtualFrom.patch | 33 ------------------- .../xdriver_xf86-video-sis.hash | 9 +++-- .../xdriver_xf86-video-sis.mk | 3 +- 4 files changed, 8 insertions(+), 58 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-sis/0001-cross.patch delete mode 100644 package/x11r7/xdriver_xf86-video-sis/0002-Remove-reference-to-virtualFrom.patch diff --git a/package/x11r7/xdriver_xf86-video-sis/0001-cross.patch b/package/x11r7/xdriver_xf86-video-sis/0001-cross.patch deleted file mode 100644 index 9e06480d40..0000000000 --- a/package/x11r7/xdriver_xf86-video-sis/0001-cross.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xf86-video-sis-0.9.3/configure.ac.orig 2007-06-10 21:00:29.000000000 +0200 -+++ xf86-video-sis-0.9.3/configure.ac 2007-06-10 21:00:45.000000000 +0200 -@@ -71,12 +71,18 @@ - AC_HEADER_STDC - - if test "$DRI" != no; then -+ if test "$cross_compiling" = "no" ; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) - AC_CHECK_FILE([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"]) - AC_CHECK_FILE([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"]) -+ else -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ fi - fi - - AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package/x11r7/xdriver_xf86-video-sis/0002-Remove-reference-to-virtualFrom.patch b/package/x11r7/xdriver_xf86-video-sis/0002-Remove-reference-to-virtualFrom.patch deleted file mode 100644 index c9e05efb76..0000000000 --- a/package/x11r7/xdriver_xf86-video-sis/0002-Remove-reference-to-virtualFrom.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4b1356a2b7fd06e9a05d134caa4033681c939737 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Thu, 16 Feb 2017 11:21:27 -0500 -Subject: [PATCH] Remove reference to ->virtualFrom - -The core will print this information as well anyway. - -Signed-off-by: Adam Jackson - -Downloaded from upstream commit -https://cgit.freedesktop.org/xorg/driver/xf86-video-sis/commit/?id=4b1356a2b7fd06e9a05d134caa4033681c939737 - -Signed-off-by: Bernd Kuhls ---- - src/sis_driver.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sis_driver.c b/src/sis_driver.c -index 8f06164..513f68b 100644 ---- a/src/sis_driver.c -+++ b/src/sis_driver.c -@@ -2738,7 +2738,7 @@ SiSPrintModes(ScrnInfoPtr pScrn) - float hsync, refresh = 0.0; - char *desc, *desc2, *prefix, *uprefix, *output; - -- xf86DrvMsg(pScrn->scrnIndex, pScrn->virtualFrom, "Virtual size is %dx%d " -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Virtual size is %dx%d " - "(pitch %d)\n", pScrn->virtualX, pScrn->virtualY, - pScrn->displayWidth); - --- -2.17.1 - diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash index 98ea8b1e4c..bcce6d4740 100644 --- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash +++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash @@ -1,2 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002756.html -sha256 5226b7407c601afa32d6cbf155f9182da95d92cdc89c1f83471e1927e552c10d xf86-video-sis-0.10.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-July/003016.html +md5 b4ad0e572bffa609f75df787ea7b3d11 xf86-video-sis-0.11.0.tar.bz2 +sha1 3e6b22a1c8061fb7efc7bf7012ca47fbf9f64722 xf86-video-sis-0.11.0.tar.bz2 +sha256 2177901a21a980552f8be429f063388e4c5d5f2e24e8b0ce72d65bd93ccc3b6b xf86-video-sis-0.11.0.tar.bz2 +sha512 b8ad05b3faa24c6df65d825b576ddb8e2ce44705ce8b55d8cf0d9f37aa47a429ab43765d8daea57ff35c4cffed056fbec6dfe8ce95efcd6269cc7711115ea09c xf86-video-sis-0.11.0.tar.bz2 +# Locally computed +sha256 e7958f9497a4daa3ae5aeaf885e4565520af2c540b6e4e04b52bf95d41d56c39 COPYING diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk index af80e15da9..7a43d26553 100644 --- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk +++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk @@ -4,12 +4,11 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.9 +XDRIVER_XF86_VIDEO_SIS_VERSION = 0.11.0 XDRIVER_XF86_VIDEO_SIS_SOURCE = xf86-video-sis-$(XDRIVER_XF86_VIDEO_SIS_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_SIS_LICENSE = MIT XDRIVER_XF86_VIDEO_SIS_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) From 47068f5d5814e1a9d36f60460f9dbe143dc58908 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Wed, 28 Aug 2019 18:22:38 +0200 Subject: [PATCH 101/120] package/modem-manager: bump to version 1.10.4 Signed-off-by: Petr Vorel Signed-off-by: Peter Korsgaard --- package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 4d88594e57..8cc85b1a3c 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 bbcf6da35da3d72f688675bde91dfed6485845c3fedd1805ae914b71d1b783f2 ModemManager-1.10.2.tar.xz +sha256 fa556bb4ba1f1478e709b71151b4de8f7d136d80e51c64e887fc1fd8926cdc70 ModemManager-1.10.4.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 61658cf48a..d1234adb76 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.10.2 +MODEM_MANAGER_VERSION = 1.10.4 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) From aee34c479a5f845ed84ca0fac60250843742bec6 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Wed, 28 Aug 2019 18:25:04 +0200 Subject: [PATCH 102/120] package/network-manager: bump to version 1.20.0 Signed-off-by: Petr Vorel Signed-off-by: Peter Korsgaard --- 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 c4baf071ab..c0692b594b 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.18/NetworkManager-1.18.2.sha256sum -sha256 4dd97ca974cd1f97990746527258f551f4257cbf011fecd01d10b7d74a6fa5c3 NetworkManager-1.18.2.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.20/NetworkManager-1.20.0.sha256sum +sha256 b7e605055491ea8ef433bc149d55349111b9c789ad1cd0578f19ece39b1ac7c4 NetworkManager-1.20.0.tar.xz # Locally computed sha256 49d9659a4f9a09747c320d51d3cf9dfde210de67b70862acf849890f6477b00d COPYING sha256 3a2968e3abb4fea464cd8dc1146d71996f9544af91a5f687bc4f3a2932df49b4 libnm-util/COPYING diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 2d35c84f39..1b2321f9d2 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.18 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2 +NETWORK_MANAGER_VERSION_MAJOR = 1.20 +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 8768178914dea3a7224fd3c60973603561aa1161 Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Thu, 29 Aug 2019 12:41:03 +0200 Subject: [PATCH 103/120] package/libusb: bump to 1.0.23 Also remove obsolete patch and not calling autoreconf (as configure.ac is not patched anymore) Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- ...x-detection-of-clock_gettime-library.patch | 36 ------------------- package/libusb/libusb.hash | 2 +- package/libusb/libusb.mk | 4 +-- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 package/libusb/0001-configure.ac-fix-detection-of-clock_gettime-library.patch diff --git a/package/libusb/0001-configure.ac-fix-detection-of-clock_gettime-library.patch b/package/libusb/0001-configure.ac-fix-detection-of-clock_gettime-library.patch deleted file mode 100644 index 89b89bb596..0000000000 --- a/package/libusb/0001-configure.ac-fix-detection-of-clock_gettime-library.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7cc67ed294ad8566f2877d6f71649f1bd36f69a4 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 5 Jun 2018 14:22:21 +0300 -Subject: [PATCH] configure.ac: fix detection of clock_gettime library - -glibc before 2.17 requires link with librt for clock_gettime(). The -AC_SEARCH_LIBS check in configure.ac should detect this dependency. -Unfortunately commit cb77a25e51 (configure.ac: Remove obsolete AC_ERROR -and make formatting consistent) inadvertently renamed to clock_gettime2, -thus breaking librt detection. - -Restore the correct clock_gettime() name. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/libusb/libusb/pull/439 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 5b16c6825d4b..63590d1351a4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -107,7 +107,7 @@ case $backend in - linux) - AC_DEFINE(OS_LINUX, 1, [Linux backend]) - AC_SUBST(OS_LINUX) -- AC_SEARCH_LIBS([clock_gettime2], [rt], [], [], [-pthread]) -+ AC_SEARCH_LIBS([clock_gettime], [rt], [], [], [-pthread]) - AC_ARG_ENABLE([udev], - [AC_HELP_STRING([--enable-udev], [use udev for device enumeration and hotplug support (recommended) [default=yes]])], - [], [enable_udev=yes]) --- -2.17.1 - diff --git a/package/libusb/libusb.hash b/package/libusb/libusb.hash index 7e9d2a2ad2..272dfb0877 100644 --- a/package/libusb/libusb.hash +++ b/package/libusb/libusb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157 libusb-1.0.22.tar.bz2 +sha256 db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d libusb-1.0.23.tar.bz2 sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index fe38a1d2d2..ddc6b27b6c 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -5,15 +5,13 @@ ################################################################################ LIBUSB_VERSION_MAJOR = 1.0 -LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).22 +LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).23 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPL-2.1+ LIBUSB_LICENSE_FILES = COPYING LIBUSB_DEPENDENCIES = host-pkgconf LIBUSB_INSTALL_STAGING = YES -# Patching configure.ac -LIBUSB_AUTORECONF = YES # Avoid the discovery of udev for the host variant HOST_LIBUSB_CONF_OPTS = --disable-udev From 3153d12ae3ce68c97955f58611e60c6397f18613 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Tue, 27 Aug 2019 20:28:02 +0300 Subject: [PATCH 104/120] package/python-daemonize: bump to version 2.5.0 Also add hash for license file. Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-daemonize/python-daemonize.hash | 8 +++++--- package/python-daemonize/python-daemonize.mk | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/python-daemonize/python-daemonize.hash b/package/python-daemonize/python-daemonize.hash index d2111a3193..aa2c904523 100644 --- a/package/python-daemonize/python-daemonize.hash +++ b/package/python-daemonize/python-daemonize.hash @@ -1,3 +1,5 @@ -# From https://pypi.python.org/pypi/daemonize/json -md5 6759005b12dfeea0d4305f8536b4b0c2 daemonize-2.4.7.tar.gz -sha256 c0194e861826be456c7c69985825ac7b79632d8ac7ad4cde8e12fee7971468c8 daemonize-2.4.7.tar.gz +# md5, sha256 from https://pypi.org/pypi/daemonize/json +md5 3d64e7a0219ad22e3fca62460f893b6a daemonize-2.5.0.tar.gz +sha256 dd026e4ff8d22cb016ed2130bc738b7d4b1da597ef93c074d2adb9e4dea08bc3 daemonize-2.5.0.tar.gz +# Locally computed sha256 checksums +sha256 248d0d3147d20a09bed8f03da8ed72f47009073606dcc1bab658f942d34b29f8 LICENSE diff --git a/package/python-daemonize/python-daemonize.mk b/package/python-daemonize/python-daemonize.mk index bfcfe93378..de146bf8de 100644 --- a/package/python-daemonize/python-daemonize.mk +++ b/package/python-daemonize/python-daemonize.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DAEMONIZE_VERSION = 2.4.7 +PYTHON_DAEMONIZE_VERSION = 2.5.0 PYTHON_DAEMONIZE_SOURCE = daemonize-$(PYTHON_DAEMONIZE_VERSION).tar.gz -PYTHON_DAEMONIZE_SITE = https://pypi.python.org/packages/84/15/923e3fe48239adf5d697c29e04a3f868d3e4ce8539aab29d6abe784db5be +PYTHON_DAEMONIZE_SITE = https://files.pythonhosted.org/packages/8c/20/96f7dbc23812cfe4cf479c87af3e4305d0d115fd1fffec32ddeee7b9c82b PYTHON_DAEMONIZE_SETUP_TYPE = setuptools PYTHON_DAEMONIZE_LICENSE = MIT PYTHON_DAEMONIZE_LICENSE_FILES = LICENSE From 5b146ed5499bbfc4e9c7ebc154e454b30cdb168b Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Tue, 27 Aug 2019 20:28:03 +0300 Subject: [PATCH 105/120] package/python-engineio: bump to version 3.9.3 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-engineio/python-engineio.hash | 4 ++-- package/python-engineio/python-engineio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-engineio/python-engineio.hash b/package/python-engineio/python-engineio.hash index 09e004ac46..cf6acb60aa 100644 --- a/package/python-engineio/python-engineio.hash +++ b/package/python-engineio/python-engineio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-engineio/json -md5 ad32353278d0576bfa7d7a2f9b97dec5 python-engineio-3.3.0.tar.gz -sha256 e4ac17c04c32ccca67287dfdbbe4ee1e9eec3a0a1a9a6070f3ab784db08407dd python-engineio-3.3.0.tar.gz +md5 11a4f18f5b08a36d07d3c0ff85e7c047 python-engineio-3.9.3.tar.gz +sha256 2a4c874aea686e79f8ea9efc30748110df581df6d577d18bb5eaa1a8f2199d12 python-engineio-3.9.3.tar.gz # Locally computed sha256 checksums sha256 c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c LICENSE diff --git a/package/python-engineio/python-engineio.mk b/package/python-engineio/python-engineio.mk index c20101984b..cfc7fcaf63 100644 --- a/package/python-engineio/python-engineio.mk +++ b/package/python-engineio/python-engineio.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_ENGINEIO_VERSION = 3.3.0 -PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/2f/09/83d627ad3dadd064bfb875c7767e93f3568354fe82cebe298b4e07f79238 +PYTHON_ENGINEIO_VERSION = 3.9.3 +PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/f4/e4/d46daeb6010781d56f3468d0ad4e11e2d44aafc4ec521327a19d80f536f2 PYTHON_ENGINEIO_SETUP_TYPE = setuptools PYTHON_ENGINEIO_LICENSE = MIT PYTHON_ENGINEIO_LICENSE_FILES = LICENSE From c8a33b531d22b3a4e61bf316b268e0c0562017cc Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Tue, 27 Aug 2019 20:28:04 +0300 Subject: [PATCH 106/120] package/python-futures: bump to version 3.3.0 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-futures/python-futures.hash | 4 ++-- package/python-futures/python-futures.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-futures/python-futures.hash b/package/python-futures/python-futures.hash index db6bb55ea2..a4fbdf4fe9 100644 --- a/package/python-futures/python-futures.hash +++ b/package/python-futures/python-futures.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/futures/json -md5 d1b299a06b96ccb59f70324716dc0016 futures-3.2.0.tar.gz -sha256 9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265 futures-3.2.0.tar.gz +md5 b43a39ae1475e3fd6940f2b4f7214675 futures-3.3.0.tar.gz +sha256 7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794 futures-3.3.0.tar.gz # Locally computed sha256 checksums sha256 a698bd5d441e4a16af6c992b8e80cbfa12755d72d910854fa1fb11d4deb0059a LICENSE diff --git a/package/python-futures/python-futures.mk b/package/python-futures/python-futures.mk index d6366f30ed..0666948115 100644 --- a/package/python-futures/python-futures.mk +++ b/package/python-futures/python-futures.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FUTURES_VERSION = 3.2.0 +PYTHON_FUTURES_VERSION = 3.3.0 PYTHON_FUTURES_SOURCE = futures-$(PYTHON_FUTURES_VERSION).tar.gz -PYTHON_FUTURES_SITE = https://files.pythonhosted.org/packages/1f/9e/7b2ff7e965fc654592269f2906ade1c7d705f1bf25b7d469fa153f7d19eb +PYTHON_FUTURES_SITE = https://files.pythonhosted.org/packages/47/04/5fc6c74ad114032cd2c544c575bffc17582295e9cd6a851d6026ab4b2c00 PYTHON_FUTURES_SETUP_TYPE = setuptools PYTHON_FUTURES_LICENSE = BSD-2-Clause PYTHON_FUTURES_LICENSE_FILES = LICENSE From d11309792b712d55c1c0ddc3bfe8646715afd5c7 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Tue, 27 Aug 2019 20:28:05 +0300 Subject: [PATCH 107/120] package/python-ipaddr: bump to version 2.2.0 Also add hash for license file. Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-ipaddr/python-ipaddr.hash | 8 +++++--- package/python-ipaddr/python-ipaddr.mk | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/python-ipaddr/python-ipaddr.hash b/package/python-ipaddr/python-ipaddr.hash index 99e1ca9415..d9963a2933 100644 --- a/package/python-ipaddr/python-ipaddr.hash +++ b/package/python-ipaddr/python-ipaddr.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f2c7852f95862715f92e7d089dc3f2cf, sha256 locally computed -md5 f2c7852f95862715f92e7d089dc3f2cf ipaddr-2.1.11.tar.gz -sha256 1b555b8a8800134fdafe32b7d0cb52f5bdbfdd093707c3dd484c5ea59f1d98b7 ipaddr-2.1.11.tar.gz +# md5, sha256 from https://pypi.org/pypi/ipaddr/json +md5 f88353e40dec06410acfa075b8209b27 ipaddr-2.2.0.tar.gz +sha256 4092dfe667588d16aa12b59acb7c8a4024e5dcb23a681cd0b0b602373eca88d6 ipaddr-2.2.0.tar.gz +# Locally computed sha256 checksums +sha256 175b3b509d5c840db72ad8c22d22a690d15c67b317f34de8a8bb0a66059e8215 COPYING diff --git a/package/python-ipaddr/python-ipaddr.mk b/package/python-ipaddr/python-ipaddr.mk index 84c486dc56..9a5d147533 100644 --- a/package/python-ipaddr/python-ipaddr.mk +++ b/package/python-ipaddr/python-ipaddr.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPADDR_VERSION = 2.1.11 +PYTHON_IPADDR_VERSION = 2.2.0 PYTHON_IPADDR_SOURCE = ipaddr-$(PYTHON_IPADDR_VERSION).tar.gz -PYTHON_IPADDR_SITE = https://pypi.python.org/packages/source/i/ipaddr +PYTHON_IPADDR_SITE = https://files.pythonhosted.org/packages/9d/a7/1b39a16cb90dfe491f57e1cab3103a15d4e8dd9a150872744f531b1106c1 PYTHON_IPADDR_SETUP_TYPE = distutils PYTHON_IPADDR_LICENSE = Apache-2.0 PYTHON_IPADDR_LICENSE_FILES = COPYING From 39d948c11c6bb05e437f13b5f09d765e54163534 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Tue, 27 Aug 2019 20:28:06 +0300 Subject: [PATCH 108/120] package/python-iptables: bump to version 0.14.0 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-iptables/python-iptables.hash | 4 ++-- package/python-iptables/python-iptables.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-iptables/python-iptables.hash b/package/python-iptables/python-iptables.hash index 3c83a15b8c..46786699ac 100644 --- a/package/python-iptables/python-iptables.hash +++ b/package/python-iptables/python-iptables.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-iptables/json -md5 3761a77c28ca0adc69f4e0e11af2f321 python-iptables-0.13.0.tar.gz -sha256 53b09257467681d7ea547cd3140eccd8c70effb3748af4b56ffed2f6011189e7 python-iptables-0.13.0.tar.gz +md5 98ee55f239bf8f2d002915d76b416c22 python-iptables-0.14.0.tar.gz +sha256 61b23850ad5d917436aa73c2847ab941bc0edbe79a324b0eebdb98af0b65b10d python-iptables-0.14.0.tar.gz # Locally calculated sha256 b827789c74144d9bb92595ed3bc568aef767a7e8d930fba61c2cdd9f6ec27599 NOTICE diff --git a/package/python-iptables/python-iptables.mk b/package/python-iptables/python-iptables.mk index 4aed474e39..66e478a89a 100644 --- a/package/python-iptables/python-iptables.mk +++ b/package/python-iptables/python-iptables.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_IPTABLES_VERSION = 0.13.0 -PYTHON_IPTABLES_SITE = https://files.pythonhosted.org/packages/6e/3a/866f5b1bccc6a4d94811f84304d700da14518ff55b80e08ff2241b3221bf +PYTHON_IPTABLES_VERSION = 0.14.0 +PYTHON_IPTABLES_SITE = https://files.pythonhosted.org/packages/08/5e/16a5ca35c420b8059eeb72716e316eeb6f0e59ce028998d36b2dc87554e5 PYTHON_IPTABLES_SETUP_TYPE = setuptools PYTHON_IPTABLES_LICENSE = Apache-2.0 PYTHON_IPTABLES_LICENSE_FILES = NOTICE From a2b4b93bbf0f55769f502f2bd0ed6d75e3c363f4 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Tue, 27 Aug 2019 20:28:07 +0300 Subject: [PATCH 109/120] package/python-jaraco-classes: bump to version 2.0 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-jaraco-classes/python-jaraco-classes.hash | 7 ++++--- package/python-jaraco-classes/python-jaraco-classes.mk | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-jaraco-classes/python-jaraco-classes.hash b/package/python-jaraco-classes/python-jaraco-classes.hash index bc30c5f79b..6489e8594f 100644 --- a/package/python-jaraco-classes/python-jaraco-classes.hash +++ b/package/python-jaraco-classes/python-jaraco-classes.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/jaraco.classes/json, sha256 locally computed -md5 c0cb1a0ce529e3cdbca9d99742071a04 jaraco.classes-1.4.3.tar.gz -sha256 e347f2b502521bfc35c57ab4695e8b6d7371625c392a0ca0d46742ee93359d3e jaraco.classes-1.4.3.tar.gz +# md5, sha256 from https://pypi.org/pypi/jaraco.classes/json +md5 63d4f5a2df2625ec3979c9633da1505e jaraco.classes-2.0.tar.gz +sha256 dcc2c4a8ca4b344cdbf2e1be7124a5c4f192574cdbb453b62350ae8240a2caf5 jaraco.classes-2.0.tar.gz +# Locally computed sha256 checksums sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE diff --git a/package/python-jaraco-classes/python-jaraco-classes.mk b/package/python-jaraco-classes/python-jaraco-classes.mk index c361e97a68..7455ed4d44 100644 --- a/package/python-jaraco-classes/python-jaraco-classes.mk +++ b/package/python-jaraco-classes/python-jaraco-classes.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JARACO_CLASSES_VERSION = 1.4.3 +PYTHON_JARACO_CLASSES_VERSION = 2.0 PYTHON_JARACO_CLASSES_SOURCE = jaraco.classes-$(PYTHON_JARACO_CLASSES_VERSION).tar.gz -PYTHON_JARACO_CLASSES_SITE = https://pypi.python.org/packages/b3/ce/031a6004619c2a3744b977b4a8414d7e8087afe6247110efcac797fee7f1 +PYTHON_JARACO_CLASSES_SITE = https://files.pythonhosted.org/packages/6e/27/f6ce0863a6ce574922ffe70d63c40b9771aefb686cb595cf435d184f0ca3 PYTHON_JARACO_CLASSES_LICENSE = MIT PYTHON_JARACO_CLASSES_LICENSE_FILES = LICENSE PYTHON_JARACO_CLASSES_SETUP_TYPE = setuptools From fae5d3298a66c973c37d1e4a5d4801993f3b8e0d Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Tue, 27 Aug 2019 20:28:08 +0300 Subject: [PATCH 110/120] package/python-oauthlib: bump to version 3.1.0 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-oauthlib/python-oauthlib.hash | 4 ++-- package/python-oauthlib/python-oauthlib.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-oauthlib/python-oauthlib.hash b/package/python-oauthlib/python-oauthlib.hash index 48905a7508..2bf7f7974d 100644 --- a/package/python-oauthlib/python-oauthlib.hash +++ b/package/python-oauthlib/python-oauthlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/oauthlib/json -md5 1d8454f0e80a628dcef55db12f73895e oauthlib-3.0.2.tar.gz -sha256 b4d99ae8ccfb7d33ba9591b59355c64eef5241534aa3da2e4c0435346b84bc8e oauthlib-3.0.2.tar.gz +md5 43cb2b5bac983712ee55076b61181cc2 oauthlib-3.1.0.tar.gz +sha256 bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889 oauthlib-3.1.0.tar.gz # Locally computed sha256 checksums sha256 3d1e12d8ac52c0b6c148af6d291f72400b8720ed16c0ac4a89868b6d14b1c939 LICENSE diff --git a/package/python-oauthlib/python-oauthlib.mk b/package/python-oauthlib/python-oauthlib.mk index d5fdc8ec7d..407abc7659 100644 --- a/package/python-oauthlib/python-oauthlib.mk +++ b/package/python-oauthlib/python-oauthlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_OAUTHLIB_VERSION = 3.0.2 +PYTHON_OAUTHLIB_VERSION = 3.1.0 PYTHON_OAUTHLIB_SOURCE = oauthlib-$(PYTHON_OAUTHLIB_VERSION).tar.gz -PYTHON_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/6a/cf/f1a44998f36c62a7a9e51145101428299be27b1e3a411adfd6fd87589889 +PYTHON_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/fc/c7/829c73c64d3749da7811c06319458e47f3461944da9d98bb4df1cb1598c2 PYTHON_OAUTHLIB_SETUP_TYPE = setuptools PYTHON_OAUTHLIB_LICENSE = BSD-3-Clause PYTHON_OAUTHLIB_LICENSE_FILES = LICENSE From 8a50813f1b82b1650951476c5cb138384d1a1f0b Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Tue, 27 Aug 2019 20:28:09 +0300 Subject: [PATCH 111/120] package/python-ptyprocess: bump to version 0.6.0 Also add hash for license file. Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-ptyprocess/python-ptyprocess.hash | 8 +++++--- package/python-ptyprocess/python-ptyprocess.mk | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/python-ptyprocess/python-ptyprocess.hash b/package/python-ptyprocess/python-ptyprocess.hash index 0e2e0aeda4..3af431a756 100644 --- a/package/python-ptyprocess/python-ptyprocess.hash +++ b/package/python-ptyprocess/python-ptyprocess.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org, sha256 locally computed -md5 94e537122914cc9ec9c1eadcd36e73a1 ptyprocess-0.5.1.tar.gz -sha256 0530ce63a9295bfae7bd06edc02b6aa935619f486f0f1dc0972f516265ee81a6 ptyprocess-0.5.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/ptyprocess/json +md5 37402d69f3b50913d4d483587bffad8f ptyprocess-0.6.0.tar.gz +sha256 923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0 ptyprocess-0.6.0.tar.gz +# Locally computed sha256 checksums +sha256 c822d385b1a73329846241799becf18690b5d44764c1bed69300b536a405030a LICENSE diff --git a/package/python-ptyprocess/python-ptyprocess.mk b/package/python-ptyprocess/python-ptyprocess.mk index 59329d01e0..45102e9aa7 100644 --- a/package/python-ptyprocess/python-ptyprocess.mk +++ b/package/python-ptyprocess/python-ptyprocess.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PTYPROCESS_VERSION = 0.5.1 -PYTHON_PTYPROCESS_SITE = https://pypi.python.org/packages/source/p/ptyprocess +PYTHON_PTYPROCESS_VERSION = 0.6.0 +PYTHON_PTYPROCESS_SITE = https://files.pythonhosted.org/packages/7d/2d/e4b8733cf79b7309d84c9081a4ab558c89d8c89da5961bf4ddb050ca1ce0 PYTHON_PTYPROCESS_SOURCE = ptyprocess-$(PYTHON_PTYPROCESS_VERSION).tar.gz PYTHON_PTYPROCESS_LICENSE = ISC PYTHON_PTYPROCESS_LICENSE_FILES = LICENSE From a9eaacd9cb458dc41bb94b128c284e7865b3cd22 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Tue, 27 Aug 2019 20:28:10 +0300 Subject: [PATCH 112/120] package/python-xlrd: bump to version 1.2.0 The license file was changed from xlrd/licences.py to LICENSE in the following upstream commit: https://github.com/python-excel/xlrd/commit/e7bcab2f4527b5a3d5118938076571e9e7566c2b While the formatting has changed, the contents are the same. We take this opportunity to add the hash of the license file. Signed-off-by: Asaf Kahlon [Thomas: fix license file details] Signed-off-by: Thomas Petazzoni --- package/python-xlrd/python-xlrd.hash | 9 +++++---- package/python-xlrd/python-xlrd.mk | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/python-xlrd/python-xlrd.hash b/package/python-xlrd/python-xlrd.hash index 8075605a95..0a66a2112a 100644 --- a/package/python-xlrd/python-xlrd.hash +++ b/package/python-xlrd/python-xlrd.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/xlrd/json -md5 9a91b688cd4945477ac28187a54f9a3b xlrd-1.0.0.tar.gz -# sha256 calculated by scanpypi -sha256 0ff87dd5d50425084f7219cb6f86bb3eb5aa29063f53d50bf270ed007e941069 xlrd-1.0.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/xlrd/json +md5 e5d5b96924d791b22898b622eb3e918e xlrd-1.2.0.tar.gz +sha256 546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2 xlrd-1.2.0.tar.gz +# locally calculated +sha256 b5a5dbce60265e305a815a6cb83ed07f24519d8ba644f2a307994488bced8815 LICENSE diff --git a/package/python-xlrd/python-xlrd.mk b/package/python-xlrd/python-xlrd.mk index 5d1363886d..c94e054b5b 100644 --- a/package/python-xlrd/python-xlrd.mk +++ b/package/python-xlrd/python-xlrd.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_XLRD_VERSION = 1.0.0 +PYTHON_XLRD_VERSION = 1.2.0 PYTHON_XLRD_SOURCE = xlrd-$(PYTHON_XLRD_VERSION).tar.gz -PYTHON_XLRD_SITE = https://pypi.python.org/packages/42/85/25caf967c2d496067489e0bb32df069a8361e1fd96a7e9f35408e56b3aab +PYTHON_XLRD_SITE = https://files.pythonhosted.org/packages/aa/05/ec9d4fcbbb74bbf4da9f622b3b61aec541e4eccf31d3c60c5422ec027ce2 PYTHON_XLRD_SETUP_TYPE = setuptools PYTHON_XLRD_LICENSE = BSD-3-Clause -PYTHON_XLRD_LICENSE_FILES = xlrd/licences.py +PYTHON_XLRD_LICENSE_FILES = LICENSE $(eval $(python-package)) $(eval $(host-python-package)) From de9ccc2398d294d67e4d6c48d75a77c84929a497 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Tue, 27 Aug 2019 20:28:11 +0300 Subject: [PATCH 113/120] package/python-xlwt: bump to version 1.3.0 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-xlwt/python-xlwt.hash | 6 +++--- package/python-xlwt/python-xlwt.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-xlwt/python-xlwt.hash b/package/python-xlwt/python-xlwt.hash index 4523887052..7e4c992b13 100644 --- a/package/python-xlwt/python-xlwt.hash +++ b/package/python-xlwt/python-xlwt.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi/xlwt/json, sha256 locally computed -md5 1f2673a93c221f0195f342c578f04968 xlwt-1.2.0.tar.gz -sha256 505669c1eb6a60823fd3e2e723b60eea95f2c56254113bf163091ed2bedb4ac9 xlwt-1.2.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/xlwt/json +md5 4b1ca8a3cef3261f4b4dc3f138e383a8 xlwt-1.3.0.tar.gz +sha256 c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88 xlwt-1.3.0.tar.gz diff --git a/package/python-xlwt/python-xlwt.mk b/package/python-xlwt/python-xlwt.mk index f8a298a484..aaeeffc501 100644 --- a/package/python-xlwt/python-xlwt.mk +++ b/package/python-xlwt/python-xlwt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XLWT_VERSION = 1.2.0 +PYTHON_XLWT_VERSION = 1.3.0 PYTHON_XLWT_SOURCE = xlwt-$(PYTHON_XLWT_VERSION).tar.gz -PYTHON_XLWT_SITE = https://pypi.python.org/packages/5b/8d/22b9ec552a1d7865de39f54bd15f9db09c72a6bf8ab77b11dcce4ae336bb +PYTHON_XLWT_SITE = https://files.pythonhosted.org/packages/06/97/56a6f56ce44578a69343449aa5a0d98eefe04085d69da539f3034e2cd5c1 PYTHON_XLWT_SETUP_TYPE = setuptools PYTHON_XLWT_LICENSE = BSD-3-Clause, BSD-4-Clause PYTHON_XLWT_LICENSE_FILES = docs/licenses.rst From a4deed54ebde00cd1215cadb92724fcc12c1e4c2 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Tue, 27 Aug 2019 20:28:12 +0300 Subject: [PATCH 114/120] package/python-xmltodict: bump to version 0.12.0 Also add hash for license file. Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-xmltodict/python-xmltodict.hash | 9 +++++---- package/python-xmltodict/python-xmltodict.mk | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/python-xmltodict/python-xmltodict.hash b/package/python-xmltodict/python-xmltodict.hash index 4cb265e9b7..16422d78c9 100644 --- a/package/python-xmltodict/python-xmltodict.hash +++ b/package/python-xmltodict/python-xmltodict.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/xmltodict/json, sha256 locally computed -md5 9f955947db085485873ac68154e88069 xmltodict-0.11.0.tar.gz -sha256 8f8d7d40aa28d83f4109a7e8aa86e67a4df202d9538be40c0cb1d70da527b0df xmltodict-0.11.0.tar.gz -sha256 d66d5eb8f83a0ba21d3dd04318b8817588e8764daabea852d1035e3f07ffda55 LICENSE +# md5, sha256 from https://pypi.org/pypi/xmltodict/json +md5 ddb2bd078cef4f7e3021a578034ad941 xmltodict-0.12.0.tar.gz +sha256 50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21 xmltodict-0.12.0.tar.gz +# Locally computed sha256 checksums +sha256 d66d5eb8f83a0ba21d3dd04318b8817588e8764daabea852d1035e3f07ffda55 LICENSE diff --git a/package/python-xmltodict/python-xmltodict.mk b/package/python-xmltodict/python-xmltodict.mk index 66007dfb84..05be4b3c6c 100644 --- a/package/python-xmltodict/python-xmltodict.mk +++ b/package/python-xmltodict/python-xmltodict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XMLTODICT_VERSION = 0.11.0 +PYTHON_XMLTODICT_VERSION = 0.12.0 PYTHON_XMLTODICT_SOURCE = xmltodict-$(PYTHON_XMLTODICT_VERSION).tar.gz -PYTHON_XMLTODICT_SITE = https://pypi.python.org/packages/57/17/a6acddc5f5993ea6eaf792b2e6c3be55e3e11f3b85206c818572585f61e1 +PYTHON_XMLTODICT_SITE = https://files.pythonhosted.org/packages/58/40/0d783e14112e064127063fbf5d1fe1351723e5dfe9d6daad346a305f6c49 PYTHON_XMLTODICT_SETUP_TYPE = setuptools PYTHON_XMLTODICT_LICENSE = MIT PYTHON_XMLTODICT_LICENSE_FILES = LICENSE From 60889ccdf07e7553024e098acdd24902b0d0b8d8 Mon Sep 17 00:00:00 2001 From: Christopher McCrory Date: Wed, 28 Aug 2019 15:28:51 -0700 Subject: [PATCH 115/120] package/tzdata: bump to version 2019b Changed _SITE to https. Add hash for license file. Signed-off-by: Christopher McCrory [Peter: fix LICENSE hash, only use for the host package] Signed-off-by: Peter Korsgaard --- package/tzdata/tzdata.hash | 6 ++++-- package/tzdata/tzdata.mk | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index 6a0ea17ce9..b21e195b43 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,2 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2018-May/000050.html -sha512 d059fcd381b2f6ecdafcd68fdd2a00451d1bf9b1affeb164ae7cabca2e022d499e77f0706ec3f3091b8e84c2211aa66da6c90937108771f1bf070cfebc105cae tzdata2018e.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2019-July/000056.html +sha512 c0104078d994e501d80a41bea31364b1390a75c2fbf42968a8343a090e2ac2eddbc58770ca470b192ea19dec89fcc634141a1de703ea2ffa0325176a64afe1fc tzdata2019b.tar.gz +# Locally computed: +sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index e20c946208..14f25e8766 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,13 +4,14 @@ # ################################################################################ -TZDATA_VERSION = 2018e +TZDATA_VERSION = 2019b TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz -TZDATA_SITE = http://www.iana.org/time-zones/repository/releases +TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_STRIP_COMPONENTS = 0 TZDATA_DEPENDENCIES = host-tzdata HOST_TZDATA_DEPENDENCIES = host-zic TZDATA_LICENSE = Public domain +HOST_TZDATA_LICENSE_FILES = LICENSE # Take care when re-ordering this list since this might break zone # dependencies From 08dfa1332d007ede1e7bdebe60a55f4e9dd57426 Mon Sep 17 00:00:00 2001 From: Christopher McCrory Date: Wed, 28 Aug 2019 15:29:33 -0700 Subject: [PATCH 116/120] package/zic: bump to version 2019b Changed _SITE to https. Add hash for license file. Signed-off-by: Christopher McCrory [Peter: fix license hash] Signed-off-by: Peter Korsgaard --- package/zic/zic.hash | 6 ++++-- package/zic/zic.mk | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/zic/zic.hash b/package/zic/zic.hash index 6b7994731c..48591795aa 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,2 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2018-May/000050.html -sha512 4a245cae2d0922b24539a94cf4a8ccc2bba1ee696e0aaefecb41c7c8d78724a7fcea6039909336177b8b26fec8fc47719e3e56ca9839dbaf52f9a4fec84d4717 tzcode2018e.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2019-July/000056.html +sha512 bcfb417fe3b7c39e702da0090291db0489744f733010ae183007fce5e441bfce885fb25ed11730cf7f363572e107d7ff0c4b38691bb99def2d8cf7017c05720f tzcode2019b.tar.gz +# Locally computed: +sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 224b7ab407..6f3d9d80ac 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,11 +4,12 @@ # ################################################################################ -ZIC_VERSION = 2018e +ZIC_VERSION = 2019b ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz -ZIC_SITE = http://www.iana.org/time-zones/repository/releases +ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 ZIC_LICENSE = Public domain +ZIC_LICENSE_FILES = LICENSE define HOST_ZIC_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) zic From 0f169a58c4a5a61a32f2741b722e7fa6c0b6a39b Mon Sep 17 00:00:00 2001 From: Sergio Prado Date: Wed, 28 Aug 2019 02:47:22 -0300 Subject: [PATCH 117/120] package/stella: bump version to 6.0.1 Signed-off-by: Sergio Prado Signed-off-by: Thomas Petazzoni --- package/stella/stella.hash | 2 +- package/stella/stella.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/stella/stella.hash b/package/stella/stella.hash index 72a28f70a4..b0b8aeec69 100644 --- a/package/stella/stella.hash +++ b/package/stella/stella.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 17aa8c5f08e09c51dd7dd933f93b0a1929d2832bd66f3bd994fa50ebb2b9a2b1 stella-6.0-src.tar.xz +sha256 d611f98bb35ed9eacfb63826b12b4e8b67b874a2a87019d4bdaf1e7f4724c40d stella-6.0.1-src.tar.xz sha256 c946a9ee632ee40111bad6e81c84b3e0bc1e49183b7a809f05d4d371f5f587bb Copyright.txt sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt diff --git a/package/stella/stella.mk b/package/stella/stella.mk index a4df6ea659..01520532ee 100644 --- a/package/stella/stella.mk +++ b/package/stella/stella.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLA_VERSION = 6.0 +STELLA_VERSION = 6.0.1 STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION) STELLA_LICENSE = GPL-2.0+ From 151da9661ea2b64d205da5ede126752c410be885 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Wed, 28 Aug 2019 14:40:11 +0200 Subject: [PATCH 118/120] package/glmark2: bump to the latest version Bump to the latest git version, containing multiple fixes and support for render-only GPUs (lima, panfrost, ...) and missing DRM driver names to run like meson, rockchip, sun4i-drm. Tested on Khadas VIM2 (aarch64) and Panfrost. Signed-off-by: Neil Armstrong Signed-off-by: Thomas Petazzoni --- package/glmark2/glmark2.hash | 2 +- package/glmark2/glmark2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/glmark2/glmark2.hash b/package/glmark2/glmark2.hash index aeb8a78568..c8772422eb 100644 --- a/package/glmark2/glmark2.hash +++ b/package/glmark2/glmark2.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 8800f3cab0575df217adc166b181930e1f881efb6f764f35872993ee78dea5f0 glmark2-9b1070fe9c5cf908f323909d3c8cbed08022abe8.tar.gz +sha256 6a9de46c098406895411b629fe8fadfdce92360500f0f10e4cc60a889a1692eb glmark2-9e01aef1a786b28aca73135a5b00f85c357e8f5e.tar.gz diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk index 4eeaec79c3..c2b9265edb 100644 --- a/package/glmark2/glmark2.mk +++ b/package/glmark2/glmark2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLMARK2_VERSION = 9b1070fe9c5cf908f323909d3c8cbed08022abe8 +GLMARK2_VERSION = 9e01aef1a786b28aca73135a5b00f85c357e8f5e GLMARK2_SITE = $(call github,glmark2,glmark2,$(GLMARK2_VERSION)) GLMARK2_LICENSE = GPL-3.0+, SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI From e1cf3b163ed1021dfaefa0f4ab3571a0ce418f7f Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Tue, 27 Aug 2019 11:16:36 +0200 Subject: [PATCH 119/120] package/tinc: bump to 1.0.36 Update the COPYING hash, since the copyright year was updated: -Copyright (C) 1998-2018 Ivo Timmermans, Guus Sliepen and others. +Copyright (C) 1998-2019 Ivo Timmermans, Guus Sliepen and others. Signed-off-by: Zoltan Gyarmati [Thomas: update license file hash] Signed-off-by: Thomas Petazzoni --- package/tinc/tinc.hash | 4 ++-- package/tinc/tinc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tinc/tinc.hash b/package/tinc/tinc.hash index 0daeb324e9..5bd7aa2b1f 100644 --- a/package/tinc/tinc.hash +++ b/package/tinc/tinc.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 18c83b147cc3e2133a7ac2543eeb014d52070de01c7474287d3ccecc9b16895e tinc-1.0.35.tar.gz -sha256 3a112fd37b47d624e89b130d0e158bb8d14ec5bc9ecf5f18b448d2c07626e43d COPYING +sha256 40f73bb3facc480effe0e771442a706ff0488edea7a5f2505d4ccb2aa8163108 tinc-1.0.36.tar.gz +sha256 3b37ffbf3459f2aceeef169aa65ee8b111ac1f8ba24a2a1b90b079678a9c7faa COPYING sha256 9bf76a8aa304d807df20bf3d221c21d259764be63e39b58f299b80ba3ac14b5b COPYING.README diff --git a/package/tinc/tinc.mk b/package/tinc/tinc.mk index ae7ce97bfa..56a26e9a55 100644 --- a/package/tinc/tinc.mk +++ b/package/tinc/tinc.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINC_VERSION = 1.0.35 +TINC_VERSION = 1.0.36 TINC_SITE = http://www.tinc-vpn.org/packages TINC_DEPENDENCIES = lzo openssl zlib TINC_LICENSE = GPL-2.0+ with OpenSSL exception From f902445dbb4ffd66ac5e65fa2cbd3539eff56414 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 30 Aug 2019 13:38:26 -0300 Subject: [PATCH 120/120] configs/mx53loco: Bump U-Boot and kernel versions Bump to U-Boot 2019.07 and kernel 5.2.9 versions. Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- configs/mx53loco_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index ca6ec446f1..8b78f65865 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 4.17 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y +# Linux headers same as kernel, a 5.2 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx53loco" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx53-qsb imx53-qsrb"