From 516610df29ea7a60e14f078d42b807e3ef306f4f Mon Sep 17 00:00:00 2001 From: Lucian Cristian Date: Tue, 16 May 2023 20:30:50 +0000 Subject: [PATCH 01/12] nss: update to 3.89.1 Signed-off-by: Lucian Cristian --- libs/nss/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/nss/Makefile b/libs/nss/Makefile index c34bbc012..b7dc8c2d6 100644 --- a/libs/nss/Makefile +++ b/libs/nss/Makefile @@ -7,14 +7,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nss -PKG_VERSION:=3.88.1 +PKG_VERSION:=3.89.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ https://download.cdn.mozilla.net/pub/security/$(PKG_NAME)/releases/NSS_$(subst .,_,$(PKG_VERSION))_RTM/src \ https://archive.mozilla.org/pub/security/$(PKG_NAME)/releases/NSS_$(subst .,_,$(PKG_VERSION))_RTM/src -PKG_HASH:=27d243edf87d1cf1bb9c861f03d387e0e9230ce5017f4308c941f558b54b3496 +PKG_HASH:=3adaedb9e70c3c5f40603bf60a01e336190a6dbe01929d395f16b01fe84a0156 PKG_MAINTAINER:=Lucian Cristian PKG_LICENCE:=MPL-2.0 From 9ecbba977edc36996c01a8a6b9299b28173ad2b4 Mon Sep 17 00:00:00 2001 From: Lucian Cristian Date: Tue, 16 May 2023 20:23:01 +0000 Subject: [PATCH 02/12] nspr: fix musl compile Manually pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions. Signed-off-by: Lucian Cristian --- libs/nspr/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/nspr/Makefile b/libs/nspr/Makefile index 4315c42e0..c61bf527a 100644 --- a/libs/nspr/Makefile +++ b/libs/nspr/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nspr PKG_VERSION:=4.35 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Lucian Cristian PKG_LICENCE:=MPL-2.0 @@ -36,6 +36,9 @@ endif export MUSL=$(if $(CONFIG_LIBC_USE_GLIBC),0,1) TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed $(FPIC) +ifneq ($(CONFIG_USE_MUSL),) + TARGET_CFLAGS += -D_LARGEFILE64_SOURCE +endif CONFIGURE_ARGS += \ --build=$(GNU_HOST_NAME) \ From fa771eead4472dba3be5f9cb7cd2dd3078745460 Mon Sep 17 00:00:00 2001 From: "S. Brusch" Date: Tue, 16 May 2023 18:18:32 +0200 Subject: [PATCH 03/12] crowdsec-firewall-bouncer: new upstream release version 0.0.27 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update crowdsec-firewall-bouncer to latest upstream release version 0.0.27 Signed-off-by: S. Brusch Maintainer: Kerma Gérald Run tested: ipq40xx/generic, Fritzbox 4040, Openwrt 22.03.5 --- net/crowdsec-firewall-bouncer/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/crowdsec-firewall-bouncer/Makefile b/net/crowdsec-firewall-bouncer/Makefile index 2088c2d33..82eb69974 100644 --- a/net/crowdsec-firewall-bouncer/Makefile +++ b/net/crowdsec-firewall-bouncer/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=crowdsec-firewall-bouncer -PKG_VERSION:=0.0.26 +PKG_VERSION:=0.0.27 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/crowdsecurity/cs-firewall-bouncer/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=2325df3f8d01e2c9b52db212a796b15b4992a135d5d278441277e97db353b2a7 +PKG_HASH:=2516e700c88e46e6aa58100ff6f343257cc1befdb555d6ab9e124f217ec46ca0 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE From 0f40d9f404a40b512d9ef21dfac156402b8069e3 Mon Sep 17 00:00:00 2001 From: Lucian Cristian Date: Tue, 16 May 2023 16:54:46 +0000 Subject: [PATCH 04/12] openfortivpn: update to 1.20.3 Signed-off-by: Lucian Cristian --- net/openfortivpn/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/openfortivpn/Makefile b/net/openfortivpn/Makefile index 4347cf8c6..d9e1e4259 100644 --- a/net/openfortivpn/Makefile +++ b/net/openfortivpn/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openfortivpn -PKG_VERSION:=1.19.0 +PKG_VERSION:=1.20.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/adrienverge/openfortivpn/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=9e244c3b63176269ce433349e67f8fd6e532f7c8d515f4c97558911a449152c3 +PKG_HASH:=e54331098dc2c009cf98524f0ade027e337739506c5a60b65e2c2bf5f9c1d7e1 PKG_MAINTAINER:=Lucian Cristian PKG_LICENSE:=GPL-3.0-or-later OpenSSL From feaba4f52bc902a9ee1f4980d84377a67a15117a Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Wed, 17 May 2023 00:08:36 +0200 Subject: [PATCH 05/12] btop: fix compilation with musl 1.2.4 _LARGEFILE64_SOURCE has to be defined in the source, or CFLAGS can be used to pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions. Fixes errors in the form of: Compiling src/linux/btop_collect.cpp src/linux/btop_collect.cpp: In function 'Mem::mem_info& Mem::collect(bool)': src/linux/btop_collect.cpp:1082:58: error: aggregate 'Mem::collect(bool)::statvfs64 vfs' has incomplete type and cannot be defined 1082 | struct statvfs64 vfs; | ^~~ src/linux/btop_collect.cpp:1083:79: error: invalid use of incomplete type 'struct Mem::collect(bool)::statvfs64' 1083 | if (statvfs64(mountpoint.c_str(), &vfs) < 0) { | ^ src/linux/btop_collect.cpp:1082:48: note: forward declaration of 'struct Mem::collect(bool)::statvfs64' 1082 | struct statvfs64 vfs; | ^~~~~~~~~ make[3]: *** [Makefile:274: obj/linux/btop_collect.o] Error 1 make[3]: Leaving directory '/home/nick/openwrt/build_dir/target-aarch64_cortex-a53_musl/btop-1.2.13' make[2]: *** [Makefile:53: /home/nick/openwrt/build_dir/target-aarch64_cortex-a53_musl/btop-1.2.13/.built] Error 2 make[2]: Leaving directory '/home/nick/openwrt/feeds/packages/admin/btop' time: package/feeds/packages/btop/compile#2.57#0.17#3.02 ERROR: package/feeds/packages/btop failed to build. Signed-off-by: Nick Hainke --- admin/btop/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/admin/btop/Makefile b/admin/btop/Makefile index 8b8888b50..b3a92d17c 100644 --- a/admin/btop/Makefile +++ b/admin/btop/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=btop PKG_VERSION:=1.2.13 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL=https://codeload.github.com/aristocratos/btop/tar.gz/v$(PKG_VERSION)? @@ -37,6 +37,10 @@ MAKE_FLAGS+= \ OPTFLAGS="$(TARGET_CXXFLAGS)" \ LDCXXFLAGS="$(TARGET_LDFLAGS) -pthread" +ifneq ($(CONFIG_USE_MUSL),) + TARGET_CFLAGS += -D_LARGEFILE64_SOURCE +endif + define Package/btop/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/btop $(1)/usr/bin/ From 18cfa22c654da757f61823a6c3f21384980ea008 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 16 May 2023 22:02:20 +0800 Subject: [PATCH 06/12] alsa-lib: Update to 1.2.9 * updated source url (prefer https rather than http/ftp) * refreshed patches Signed-off-by: Tianling Shen --- libs/alsa-lib/Makefile | 10 +++++----- libs/alsa-lib/patches/200-usleep.patch | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile index 1efd068a1..d9922b35f 100644 --- a/libs/alsa-lib/Makefile +++ b/libs/alsa-lib/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alsa-lib -PKG_VERSION:=1.2.6.1 -PKG_RELEASE:=3 +PKG_VERSION:=1.2.9 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \ - http://distfiles.gentoo.org/distfiles/ -PKG_HASH:=ad582993d52cdb5fb159a0beab60a6ac57eab0cc1bdf85dc4db6d6197f02333f +PKG_SOURCE_URL:=https://www.alsa-project.org/files/pub/lib/ \ + https://distfiles.gentoo.org/distfiles/ +PKG_HASH:=dc9c643fdc4ccfd0572cc685858dd41e08afb583f30460b317e4188275f615b2 PKG_MAINTAINER:=Ted Hess , \ Peter Wagner diff --git a/libs/alsa-lib/patches/200-usleep.patch b/libs/alsa-lib/patches/200-usleep.patch index 7551584a8..9e66ef8ba 100644 --- a/libs/alsa-lib/patches/200-usleep.patch +++ b/libs/alsa-lib/patches/200-usleep.patch @@ -17,9 +17,9 @@ const char *_snd_module_pcm_shm = ""; --- a/src/ucm/ucm_local.h +++ b/src/ucm/ucm_local.h -@@ -58,6 +58,14 @@ - #define SEQUENCE_ELEMENT_TYPE_SYSSET 11 - #define SEQUENCE_ELEMENT_TYPE_CFGSAVE 12 +@@ -61,6 +61,14 @@ + #define SEQUENCE_ELEMENT_TYPE_DEV_DISABLE_SEQ 14 + #define SEQUENCE_ELEMENT_TYPE_DEV_DISABLE_ALL 15 +#if _POSIX_C_SOURCE >= 200809L +#define usleep(a) \ From 4d7d7a01bd19850092f6db54eb2fc5db09163573 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 16 May 2023 22:04:51 +0800 Subject: [PATCH 07/12] alsa-ucm-conf: Update to 1.2.9 * updated source url (prefer https rather than http/ftp) Signed-off-by: Tianling Shen --- libs/alsa-ucm-conf/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/alsa-ucm-conf/Makefile b/libs/alsa-ucm-conf/Makefile index 153f0739e..c6daddb66 100644 --- a/libs/alsa-ucm-conf/Makefile +++ b/libs/alsa-ucm-conf/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alsa-ucm-conf -PKG_VERSION:=1.2.6.2 +PKG_VERSION:=1.2.9 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \ - http://distfiles.gentoo.org/distfiles/ -PKG_HASH:=8be24fb9fe789ee2778ae6f32e18e8043fe7f8bc735871e9d17c68a04566a822 +PKG_SOURCE_URL:=https://www.alsa-project.org/files/pub/lib/ \ + https://distfiles.gentoo.org/distfiles/ +PKG_HASH:=374f6833bfd77d0a4675e4aa2bfb79defe850e5a46a5d4542a45962f4b9e272a PKG_MAINTAINER:= PKG_LICENSE:=BSD-3-Clause From b6d0e882dd2154d89d1e3dcf59f7f4cfb517f08d Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 16 May 2023 22:05:12 +0800 Subject: [PATCH 08/12] alsa-utils: Update to 1.2.9 * updated source url (prefer https rather than http/ftp) * fixed build with musl 1.2.4 Signed-off-by: Tianling Shen --- sound/alsa-utils/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/alsa-utils/Makefile b/sound/alsa-utils/Makefile index 17e9ac6fe..87329df82 100644 --- a/sound/alsa-utils/Makefile +++ b/sound/alsa-utils/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alsa-utils -PKG_VERSION:=1.2.6 +PKG_VERSION:=1.2.9 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/utils/ \ - http://distfiles.gentoo.org/distfiles/ -PKG_HASH:=6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d +PKG_SOURCE_URL:=https://www.alsa-project.org/files/pub/utils/ \ + https://distfiles.gentoo.org/distfiles/ +PKG_HASH:=e7623d4525595f92e11ce25ee9a97f2040a14c6e4dcd027aa96e06cbce7817bd PKG_MAINTAINER:=Ted Hess PKG_LICENSE:=GPL-2.0-or-later From fa2dce3b5b166f44ae71e808aa31d37807775299 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 17 May 2023 10:22:20 +0800 Subject: [PATCH 09/12] gptfdisk: Update to 1.0.9 Backported an upstream commit to fix build with musl 1.2.4. Signed-off-by: Tianling Shen --- utils/gptfdisk/Makefile | 6 ++-- ...10-Use-64bit-time_t-on-linux-as-well.patch | 29 +++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 utils/gptfdisk/patches/010-Use-64bit-time_t-on-linux-as-well.patch diff --git a/utils/gptfdisk/Makefile b/utils/gptfdisk/Makefile index 9f2955307..a5ebaefaf 100644 --- a/utils/gptfdisk/Makefile +++ b/utils/gptfdisk/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gptfdisk -PKG_VERSION:=1.0.8 -PKG_RELEASE:=5 +PKG_VERSION:=1.0.9 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_HASH:=95d19856f004dabc4b8c342b2612e8d0a9eebdd52004297188369f152e9dc6df +PKG_HASH:=dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2 PKG_MAINTAINER:= PKG_LICENSE:=GPL-2.0-or-later diff --git a/utils/gptfdisk/patches/010-Use-64bit-time_t-on-linux-as-well.patch b/utils/gptfdisk/patches/010-Use-64bit-time_t-on-linux-as-well.patch new file mode 100644 index 000000000..c000abc99 --- /dev/null +++ b/utils/gptfdisk/patches/010-Use-64bit-time_t-on-linux-as-well.patch @@ -0,0 +1,29 @@ +From 7dfa8984f5a30f313d8675ff6097c8592d636d10 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 12 Dec 2022 12:50:07 -0800 +Subject: [PATCH] Use 64bit time_t on linux as well + +Alias 64bit version of stat functions to original functions +we are already passing -D_FILE_OFFSET_BITS=64 in linux Makefile + +Signed-off-by: Khem Raj +--- + diskio-unix.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/diskio-unix.cc ++++ b/diskio-unix.cc +@@ -37,8 +37,12 @@ + + using namespace std; + +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__linux__) + #define off64_t off_t ++#define stat64 stat ++#define fstat64 fstat ++#define lstat64 lstat ++#define lseek64 lseek + #endif + + // Returns the official "real" name for a shortened version of same. From e44c45fd23688166ca42d3b14acfb1ac52f0bb86 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 17 May 2023 10:27:37 +0800 Subject: [PATCH 10/12] Revert "gptfdisk: fix some warnings treated as errors" The bug was fixed in 1.0.9, so remove this hack. This reverts commit 5899a16f4ba70689055f7276e84aa96adce14373. Signed-off-by: Tianling Shen --- utils/gptfdisk/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/gptfdisk/Makefile b/utils/gptfdisk/Makefile index a5ebaefaf..35f34d0a4 100644 --- a/utils/gptfdisk/Makefile +++ b/utils/gptfdisk/Makefile @@ -73,7 +73,7 @@ define Package/fixparts/description Master Boot Record (MBR) partition tables endef -TARGET_CXXFLAGS += -std=c++11 -fno-rtti -Wno-format-security +TARGET_CXXFLAGS += -std=c++11 -fno-rtti TARGET_LDFLAGS += -Wl,--as-needed define Package/gdisk/install From a5c2eececb64037a96163c62d41135b893f36ba8 Mon Sep 17 00:00:00 2001 From: Lucian Cristian Date: Tue, 16 May 2023 20:37:12 +0000 Subject: [PATCH 11/12] libreswan: update to 4.11 Fixes https://libreswan.org/security/CVE-2023-30570 Signed-off-by: Lucian Cristian --- net/libreswan/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/libreswan/Makefile b/net/libreswan/Makefile index 952720892..dae864a64 100644 --- a/net/libreswan/Makefile +++ b/net/libreswan/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libreswan -PKG_VERSION:=4.10 +PKG_VERSION:=4.11 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://download.libreswan.org/ -PKG_HASH:=5a9400c25a8edba07420426fb55dcbaafdaa3702e5b0f2c19205a6c567248a7b +PKG_HASH:=429a917fe4a55260f152cfb3188a587e5b12e94a14e240ac125319ff14b8c83d PKG_MAINTAINER:=Lucian Cristian PKG_LICENSE:=GPL-2.0-or-later From 6c6d8fe5420a1fc88797f406e4483d743b87ac60 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 16 May 2023 17:17:06 +0800 Subject: [PATCH 12/12] acl: fix compilation with musl 1.2.4 musl 1.2.4 deprecated legacy "LFS64" ("large file support") interfaces so just having _GNU_SOURCE defined is not enough anymore. Backport an upstream fix to replace these old functions. Signed-off-by: Tianling Shen --- utils/acl/Makefile | 2 +- ...rtable-version-of-dirent-and-readdir.patch | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 utils/acl/patches/103-chacl-Use-portable-version-of-dirent-and-readdir.patch diff --git a/utils/acl/Makefile b/utils/acl/Makefile index 8fa85ddc2..69caa54ed 100644 --- a/utils/acl/Makefile +++ b/utils/acl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acl PKG_VERSION:=2.3.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.savannah.nongnu.org/cgit/acl.git/snapshot diff --git a/utils/acl/patches/103-chacl-Use-portable-version-of-dirent-and-readdir.patch b/utils/acl/patches/103-chacl-Use-portable-version-of-dirent-and-readdir.patch new file mode 100644 index 000000000..66bd86c64 --- /dev/null +++ b/utils/acl/patches/103-chacl-Use-portable-version-of-dirent-and-readdir.patch @@ -0,0 +1,33 @@ +From 2b42f64737adf6a2ddd491213580d6e9cdd2f5af Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 10 Nov 2022 18:04:15 -0800 +Subject: [PATCH] chacl: Use portable version of dirent and readdir + +Using 64bit versions on 32bit architectures should be enabled with +--enable-largefile, this makes it portable across musl and glibc + +Signed-off-by: Khem Raj +--- + tools/chacl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/tools/chacl.c ++++ b/tools/chacl.c +@@ -320,7 +320,7 @@ walk_dir(acl_t acl, acl_t dacl, const ch + { + int failed = 0; + DIR *dir; +- struct dirent64 *d; ++ struct dirent *d; + char *name; + + if ((dir = opendir(fname)) == NULL) { +@@ -332,7 +332,7 @@ walk_dir(acl_t acl, acl_t dacl, const ch + return(0); /* got a file, not an error */ + } + +- while ((d = readdir64(dir)) != NULL) { ++ while ((d = readdir(dir)) != NULL) { + /* skip "." and ".." entries */ + if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0) + continue;