From bcba053fb06f4182fca9f36cdf93242cdb3f6762 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Thu, 11 May 2023 02:54:08 +0800 Subject: [PATCH 01/38] python3-packages: Set PYTHON3_PKG_BUILD:=0 This sets PYTHON3_PKG_BUILD:=0 so that python3-package.mk does not set any default build recipes. Signed-off-by: Jeffery To --- lang/python/python3-packages/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lang/python/python3-packages/Makefile b/lang/python/python3-packages/Makefile index b1b37dac0..2cde37925 100644 --- a/lang/python/python3-packages/Makefile +++ b/lang/python/python3-packages/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python3-packages PKG_VERSION:=1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Yousong Zhou @@ -31,6 +31,8 @@ PKG_CONFIG_DEPENDS:= \ PKG_BUILD_DEPENDS:=python3 python3/host +PYTHON3_PKG_BUILD:=0 + include $(INCLUDE_DIR)/package.mk include ../python3-host.mk include ../python3-package.mk From b9f23d957d474016f7fc4af0336d055c5a06a0e9 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 19 May 2023 20:03:43 +0800 Subject: [PATCH 02/38] gensio: Fix build on build host with Go compiler If the build host has the Go compiler installed, then configure will detect this and will try to compile gensio's Go support, leading to a build failure. This disables Go support entirely to fix this build failure. Signed-off-by: Jeffery To --- net/gensio/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/net/gensio/Makefile b/net/gensio/Makefile index c49da8e13..b193a0492 100644 --- a/net/gensio/Makefile +++ b/net/gensio/Makefile @@ -45,6 +45,7 @@ CONFIGURE_ARGS += \ --$(if $(CONFIG_GENSIO_PTHREADS),with,without)-pthreads \ --$(if $(CONFIG_GENSIO_GLIB),with,without)-glib \ --$(if $(CONFIG_GENSIO_TCL),with,without)-tcl \ + --without-go \ --without-openipmi \ --with-cplusplus \ --disable-doc From 3570a61cd330e95d98700c4ae5630406226a8026 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 19 May 2023 15:53:38 +0800 Subject: [PATCH 03/38] podman: 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. Manually pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions. Signed-off-by: Tianling Shen --- utils/podman/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/utils/podman/Makefile b/utils/podman/Makefile index 961ffad07..82e930a65 100644 --- a/utils/podman/Makefile +++ b/utils/podman/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=podman PKG_VERSION:=4.5.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/containers/podman/archive/v$(PKG_VERSION) @@ -107,6 +107,10 @@ define Build/Prepare $(eval $(call Download,default-policy)) endef +ifneq ($(CONFIG_USE_MUSL),) + TARGET_CFLAGS += -D_LARGEFILE64_SOURCE +endif + define Package/podman/install $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/podman $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{podman,podman-remote} $(1)/usr/bin/ From ad612d813c788a1a2b8bc70f351a168237014f47 Mon Sep 17 00:00:00 2001 From: Ray Wang Date: Fri, 19 May 2023 22:53:20 +0800 Subject: [PATCH 04/38] natmap: update to 20230519 Signed-off-by: Ray Wang --- net/natmap/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/natmap/Makefile b/net/natmap/Makefile index a8b7221c7..207d37bce 100644 --- a/net/natmap/Makefile +++ b/net/natmap/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=natmap -PKG_VERSION:=20230322 +PKG_VERSION:=20230519 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/heiher/natmap/releases/download/$(PKG_VERSION) -PKG_HASH:=d1abe36eb4deac725e2d20674590fc726b8c79d21b053b40059b093592fd8b8a +PKG_HASH:=61347ccd2bf9e519ecd703559054d9dd27ce42bab1530fb63a72e7d7c4727c96 PKG_MAINTAINER:=Richard Yu PKG_LICENSE:=MIT From c2ed86d59f876b30cd5cf70e9e416d30c085ffc5 Mon Sep 17 00:00:00 2001 From: Ray Wang Date: Fri, 19 May 2023 23:16:04 +0800 Subject: [PATCH 05/38] natmap: add myself to maintainers Signed-off-by: Ray Wang --- net/natmap/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/natmap/Makefile b/net/natmap/Makefile index 207d37bce..3e5c531ae 100644 --- a/net/natmap/Makefile +++ b/net/natmap/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/heiher/natmap/releases/download/$(PKG_VERSION) PKG_HASH:=61347ccd2bf9e519ecd703559054d9dd27ce42bab1530fb63a72e7d7c4727c96 -PKG_MAINTAINER:=Richard Yu +PKG_MAINTAINER:=Richard Yu , Ray Wang PKG_LICENSE:=MIT PKG_LICENSE_FILES:=License From 61106a8df299de5297e816d1f75fbb602382b60c Mon Sep 17 00:00:00 2001 From: Scott McKenzie Date: Sat, 20 May 2023 03:38:27 +1000 Subject: [PATCH 06/38] cloudflared: support setting tunnel token Allows user to provide a token for Cloudflare tunnel. When provided along with credentials, this will take precedence. Signed-off-by: Scott McKenzie --- net/cloudflared/files/cloudflared.init | 1 + 1 file changed, 1 insertion(+) diff --git a/net/cloudflared/files/cloudflared.init b/net/cloudflared/files/cloudflared.init index 4fac31aac..466cb5eb3 100755 --- a/net/cloudflared/files/cloudflared.init +++ b/net/cloudflared/files/cloudflared.init @@ -31,6 +31,7 @@ start_service() { append_param_arg "logfile" procd_append_param command "run" + append_param_arg "token" procd_set_param respawn procd_set_param stderr 1 From b9481f55d85dfca003606ca6bfbc55243ee74f9c Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 19 May 2023 21:03:09 +0800 Subject: [PATCH 07/38] perl: perlmod: append _LARGEFILE64_SOURCE flag for 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. Manually pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions. Signed-off-by: Tianling Shen --- lang/perl/perlmod.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lang/perl/perlmod.mk b/lang/perl/perlmod.mk index 5a91c23a5..db83d603d 100644 --- a/lang/perl/perlmod.mk +++ b/lang/perl/perlmod.mk @@ -25,6 +25,9 @@ MOD_CFLAGS_PERL:=-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(TARGET_CFLAGS) $(T ifdef CONFIG_PERL_THREADS MOD_CFLAGS_PERL+= -D_REENTRANT -D_GNU_SOURCE endif +ifdef CONFIG_USE_MUSL + MOD_CFLAGS_PERL+= -D_LARGEFILE64_SOURCE +endif # Module install prefix PERL_SITELIB:=/usr/lib/perl5/$(PERL_VERSION) From f03a2827ea2c2a8d8b63733b3dc75652b8530ae1 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 19 May 2023 17:37:24 +0800 Subject: [PATCH 08/38] efivar: 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 data types. Signed-off-by: Tianling Shen --- libs/efivar/Makefile | 2 +- .../003-Use-off_t-instead-of-off64_t.patch | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 libs/efivar/patches/003-Use-off_t-instead-of-off64_t.patch diff --git a/libs/efivar/Makefile b/libs/efivar/Makefile index 63c2abe52..f0563ba7b 100644 --- a/libs/efivar/Makefile +++ b/libs/efivar/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=efivar PKG_VERSION:=38 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://github.com/rhboot/efivar/releases/download/$(PKG_VERSION) diff --git a/libs/efivar/patches/003-Use-off_t-instead-of-off64_t.patch b/libs/efivar/patches/003-Use-off_t-instead-of-off64_t.patch new file mode 100644 index 000000000..0f1ac79cb --- /dev/null +++ b/libs/efivar/patches/003-Use-off_t-instead-of-off64_t.patch @@ -0,0 +1,40 @@ +From 914c686cc54b2405dab08bff77cd60827aab54b1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 14 Dec 2022 16:55:51 -0800 +Subject: [PATCH] Use off_t instead of off64_t + +Pass _FILE_OFFSET_BITS=64 to ensure 64bit off_t + +This helps building efivar for 32bit arches on systems using musl C +library. It works with glibc since _GNU_SOURCE defines +_LARGEFILE64_SOURCE as well, this feature test macro enables the 64bit +interfaces which were done as intermediate steps when transition to +66-bit off_t was done as part olf LFS64 support. + +Signed-off-by: Khem Raj +--- + src/error.c | 2 +- + src/include/defaults.mk | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +--- a/src/error.c ++++ b/src/error.c +@@ -191,7 +191,7 @@ dbglog_write(void *cookie, const char *b + } + + static int +-dbglog_seek(void *cookie UNUSED, off64_t *offset, int whence) ++dbglog_seek(void *cookie UNUSED, off_t *offset, int whence) + { + FILE *log = efi_errlog ? efi_errlog : stderr; + int rc; +--- a/src/include/defaults.mk ++++ b/src/include/defaults.mk +@@ -34,6 +34,7 @@ CPPFLAGS ?= + override _CPPFLAGS := $(CPPFLAGS) + override CPPFLAGS = $(_CPPFLAGS) -DLIBEFIVAR_VERSION=$(VERSION) \ + -D_GNU_SOURCE \ ++ -D_FILE_OFFSET_BITS=64 \ + -I$(TOPDIR)/src/include/ + CFLAGS ?= $(OPTIMIZE) $(DEBUGINFO) $(WARNINGS) $(ERRORS) + CFLAGS_GCC ?= -specs=$(TOPDIR)/src/include/gcc.specs \ From 7730e8ea1e028246af8df2284ed5e556bdddef6e Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 19 May 2023 15:42:22 +0800 Subject: [PATCH 09/38] gnutls: fix build with zabbix Zabbix verifies the version of gnutls by search in the header gnutls.h. This is done with 'cat' and 'egrep'. The problem here is now that the preprocess definition did changed in gnutls.h, so the regex does not match anymore. The following error message acourse in the log: > configure: error: GnuTLS library version requirement not met (>= 3.1.18) To fix this backport an upstream patch to let the regex work again. Signed-off-by: Tianling Shen --- libs/gnutls/Makefile | 2 +- ...d-use-clang-format-on-off-annotation.patch | 490 ++++++++++++++++++ 2 files changed, 491 insertions(+), 1 deletion(-) create mode 100644 libs/gnutls/patches/040-build-use-clang-format-on-off-annotation.patch diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index ec7f72d64..a02d9e08f 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnutls PKG_VERSION:=3.8.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_BUILD_FLAGS:=no-mips16 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz diff --git a/libs/gnutls/patches/040-build-use-clang-format-on-off-annotation.patch b/libs/gnutls/patches/040-build-use-clang-format-on-off-annotation.patch new file mode 100644 index 000000000..c377da788 --- /dev/null +++ b/libs/gnutls/patches/040-build-use-clang-format-on-off-annotation.patch @@ -0,0 +1,490 @@ +From 18345986e29c820e64daced78232f236fd4a4e6e Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Thu, 16 Mar 2023 16:21:37 +0900 +Subject: [PATCH] build: use /* clang-format {on|off} */ annotation + +Signed-off-by: Daiki Ueno +--- + lib/includes/gnutls/abstract.h | 4 ---- + lib/includes/gnutls/compat.h | 4 ---- + lib/includes/gnutls/crypto.h | 4 ---- + lib/includes/gnutls/dtls.h | 4 ---- + lib/includes/gnutls/gnutls.h.in | 18 ++++++++---------- + lib/includes/gnutls/ocsp.h | 4 ---- + lib/includes/gnutls/openpgp.h | 4 ---- + lib/includes/gnutls/pkcs11.h | 4 ---- + lib/includes/gnutls/pkcs12.h | 4 ---- + lib/includes/gnutls/pkcs7.h | 4 ---- + lib/includes/gnutls/socket.h | 4 ---- + lib/includes/gnutls/system-keys.h | 4 ---- + lib/includes/gnutls/tpm.h | 4 ---- + lib/includes/gnutls/urls.h | 4 ---- + lib/includes/gnutls/x509-ext.h | 4 ---- + lib/includes/gnutls/x509.h | 4 ---- + tests/test-chains-issuer-aia.h | 4 ---- + tests/test-chains.h | 4 ---- + 18 files changed, 8 insertions(+), 78 deletions(-) + +--- a/lib/includes/gnutls/abstract.h ++++ b/lib/includes/gnutls/abstract.h +@@ -30,11 +30,9 @@ + # include + # include + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + extern "C" { + #endif +-/* *INDENT-ON* */ + + /* Public key operations */ + +@@ -748,10 +746,8 @@ gnutls_pubkey_print(gnutls_pubkey_t pubk + gnutls_certificate_print_formats_t format, + gnutls_datum_t * out); + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + } + #endif +-/* *INDENT-ON* */ + + #endif /* GNUTLS_ABSTRACT_H */ +--- a/lib/includes/gnutls/compat.h ++++ b/lib/includes/gnutls/compat.h +@@ -25,11 +25,9 @@ + #ifndef GNUTLS_COMPAT_H + # define GNUTLS_COMPAT_H + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + extern "C" { + #endif +-/* *INDENT-ON* */ + + # ifdef __GNUC__ + +@@ -228,10 +226,8 @@ int gnutls_priority_compression_list(gnu + const unsigned int **list) + _GNUTLS_GCC_ATTR_DEPRECATED; + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + } + #endif +-/* *INDENT-ON* */ + + #endif /* GNUTLS_COMPAT_H */ +--- a/lib/includes/gnutls/crypto.h ++++ b/lib/includes/gnutls/crypto.h +@@ -25,11 +25,9 @@ + + # include + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + extern "C" { + #endif +-/* *INDENT-ON* */ + + typedef struct api_cipher_hd_st *gnutls_cipher_hd_t; + +@@ -335,10 +333,8 @@ int gnutls_encode_gost_rs_value(gnutls_d + int gnutls_decode_gost_rs_value(const gnutls_datum_t * sig_value, + gnutls_datum_t * r, gnutls_datum_t * s); + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + } + #endif +-/* *INDENT-ON* */ + + #endif /* GNUTLS_CRYPTO_H */ +--- a/lib/includes/gnutls/dtls.h ++++ b/lib/includes/gnutls/dtls.h +@@ -29,11 +29,9 @@ + + # include + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + extern "C" { + #endif +-/* *INDENT-ON* */ + + # define GNUTLS_COOKIE_KEY_SIZE 16 + +@@ -84,10 +82,8 @@ void gnutls_dtls_prestate_set(gnutls_ses + + unsigned int gnutls_record_get_discarded(gnutls_session_t session); + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + } + #endif +-/* *INDENT-ON* */ + + #endif /* GNUTLS_DTLS_H */ +--- a/lib/includes/gnutls/gnutls.h.in ++++ b/lib/includes/gnutls/gnutls.h.in +@@ -45,19 +45,19 @@ + /* Get time_t. */ + # include + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + extern "C" { + #endif +-/* *INDENT-ON* */ + + # define GNUTLS_VERSION "@VERSION@" + +-# define GNUTLS_VERSION_MAJOR @MAJOR_VERSION@ +-# define GNUTLS_VERSION_MINOR @MINOR_VERSION@ +-# define GNUTLS_VERSION_PATCH @PATCH_VERSION@ ++/* clang-format off */ ++#define GNUTLS_VERSION_MAJOR @MAJOR_VERSION@ ++#define GNUTLS_VERSION_MINOR @MINOR_VERSION@ ++#define GNUTLS_VERSION_PATCH @PATCH_VERSION@ + +-# define GNUTLS_VERSION_NUMBER @NUMBER_VERSION@ ++#define GNUTLS_VERSION_NUMBER @NUMBER_VERSION@ ++/* clang-format on */ + + # define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC + # define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC +@@ -2365,9 +2365,9 @@ int gnutls_dh_params_cpy(gnutls_dh_param + + /* Session stuff + */ +-/* *INDENT-OFF* */ ++/* clang-format off */ + @DEFINE_IOVEC_T@ +-/* *INDENT-ON* */ ++/* clang-format on */ + + typedef ssize_t(*gnutls_pull_func) (gnutls_transport_ptr_t, void *, size_t); + typedef ssize_t(*gnutls_push_func) (gnutls_transport_ptr_t, const void *, +@@ -3634,11 +3634,9 @@ gnutls_transport_is_ktls_enabled(gnutls_ + # define GNUTLS_E_APPLICATION_ERROR_MAX -65000 + # define GNUTLS_E_APPLICATION_ERROR_MIN -65500 + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + } + #endif +-/* *INDENT-ON* */ + + # include + +--- a/lib/includes/gnutls/ocsp.h ++++ b/lib/includes/gnutls/ocsp.h +@@ -29,11 +29,9 @@ + # include + # include + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + extern "C" { + #endif +-/* *INDENT-ON* */ + + # define GNUTLS_OCSP_NONCE "1.3.6.1.5.5.7.48.1.2" + +@@ -269,10 +267,8 @@ gnutls_ocsp_resp_list_import2(gnutls_ocs + const gnutls_datum_t * resp_data, + gnutls_x509_crt_fmt_t format, unsigned int flags); + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + } + #endif +-/* *INDENT-ON* */ + + #endif /* GNUTLS_OCSP_H */ +--- a/lib/includes/gnutls/openpgp.h ++++ b/lib/includes/gnutls/openpgp.h +@@ -30,11 +30,9 @@ + # include + # include + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + extern "C" { + #endif +-/* *INDENT-ON* */ + + /* Openpgp certificate stuff + */ +@@ -424,10 +422,8 @@ int gnutls_certificate_set_openpgp_keyri + (gnutls_certificate_credentials_t c, const char *file, + gnutls_openpgp_crt_fmt_t format) _GNUTLS_GCC_ATTR_DEPRECATED; + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + } + #endif +-/* *INDENT-ON* */ + + #endif /* GNUTLS_OPENPGP_H */ +--- a/lib/includes/gnutls/pkcs11.h ++++ b/lib/includes/gnutls/pkcs11.h +@@ -28,11 +28,9 @@ + # include + # include + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + extern "C" { + #endif +-/* *INDENT-ON* */ + + # define GNUTLS_PKCS11_MAX_PIN_LEN 256 + +@@ -491,10 +489,8 @@ gnutls_pkcs11_copy_attached_extension(co + + # define gnutls_x509_crt_import_pkcs11_url gnutls_x509_crt_import_url + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + } + #endif +-/* *INDENT-ON* */ + + #endif /* GNUTLS_PKCS11_H */ +--- a/lib/includes/gnutls/pkcs12.h ++++ b/lib/includes/gnutls/pkcs12.h +@@ -25,11 +25,9 @@ + + # include + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + extern "C" { + #endif +-/* *INDENT-ON* */ + + /* PKCS12 structures handling + */ +@@ -138,10 +136,8 @@ int gnutls_pkcs12_bag_get_friendly_name( + int gnutls_pkcs12_bag_set_friendly_name(gnutls_pkcs12_bag_t bag, + unsigned indx, const char *name); + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + } + #endif +-/* *INDENT-ON* */ + + #endif /* GNUTLS_PKCS12_H */ +--- a/lib/includes/gnutls/pkcs7.h ++++ b/lib/includes/gnutls/pkcs7.h +@@ -31,11 +31,9 @@ + # include + # include + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + extern "C" { + #endif +-/* *INDENT-ON* */ + + /* PKCS7 structures handling + */ +@@ -149,10 +147,8 @@ int gnutls_pkcs7_print_signature_info(gn + gnutls_certificate_print_formats_t format, + gnutls_datum_t * out); + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + } + #endif +-/* *INDENT-ON* */ + + #endif /* GNUTLS_PKCS7_H */ +--- a/lib/includes/gnutls/socket.h ++++ b/lib/includes/gnutls/socket.h +@@ -31,11 +31,9 @@ + /* Get socklen_t */ + # include + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + extern "C" { + #endif +-/* *INDENT-ON* */ + + void gnutls_transport_set_fastopen(gnutls_session_t session, + int fd, +@@ -43,10 +41,8 @@ void gnutls_transport_set_fastopen(gnutl + socklen_t connect_addrlen, + unsigned int flags); + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + } + #endif +-/* *INDENT-ON* */ + + #endif /* GNUTLS_SOCKET_H */ +--- a/lib/includes/gnutls/system-keys.h ++++ b/lib/includes/gnutls/system-keys.h +@@ -31,11 +31,9 @@ + * they will be requested through the pin callbacks. + */ + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + extern "C" { + #endif +-/* *INDENT-ON* */ + + struct system_key_iter_st; + typedef struct system_key_iter_st *gnutls_system_key_iter_t; +@@ -54,10 +52,8 @@ int gnutls_system_key_add_x509(gnutls_x5 + gnutls_x509_privkey_t privkey, const char *label, + char **cert_url, char **key_url); + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + } + #endif +-/* *INDENT-ON* */ + + #endif /* GNUTLS_SYSTEM_KEYS_H */ +--- a/lib/includes/gnutls/tpm.h ++++ b/lib/includes/gnutls/tpm.h +@@ -26,11 +26,9 @@ + # include + # include + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + extern "C" { + #endif +-/* *INDENT-ON* */ + + struct tpm_key_list_st; + typedef struct tpm_key_list_st *gnutls_tpm_key_list_t; +@@ -71,10 +69,8 @@ int gnutls_tpm_get_registered(gnutls_tpm + int gnutls_tpm_privkey_delete(const char *url, const char *srk_password); + + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + } + #endif +-/* *INDENT-ON* */ + + #endif /* GNUTLS_TPM_H */ +--- a/lib/includes/gnutls/urls.h ++++ b/lib/includes/gnutls/urls.h +@@ -31,11 +31,9 @@ + * keys and certificates. + */ + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + extern "C" { + #endif +-/* *INDENT-ON* */ + + typedef int (*gnutls_privkey_import_url_func)(gnutls_privkey_t pkey, + const char *url, unsigned flags); +@@ -71,10 +69,8 @@ typedef struct gnutls_custom_url_st { + + int gnutls_register_custom_url(const gnutls_custom_url_st * st); + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + } + #endif +-/* *INDENT-ON* */ + + #endif /* GNUTLS_URLS_H */ +--- a/lib/includes/gnutls/x509-ext.h ++++ b/lib/includes/gnutls/x509-ext.h +@@ -28,11 +28,9 @@ + # include + # include + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + extern "C" { + #endif +-/* *INDENT-ON* */ + + typedef struct gnutls_subject_alt_names_st *gnutls_subject_alt_names_t; + +@@ -215,10 +213,8 @@ int gnutls_x509_ct_sct_get(const gnutls_ + gnutls_sign_algorithm_t * sigalg, + gnutls_datum_t * signature); + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + } + #endif +-/* *INDENT-ON* */ + + #endif /* GNUTLS_X509_EXT_H */ +--- a/lib/includes/gnutls/x509.h ++++ b/lib/includes/gnutls/x509.h +@@ -30,11 +30,9 @@ + + # include + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + extern "C" { + #endif +-/* *INDENT-ON* */ + + /* Some OIDs usually found in Distinguished names, or + * in Subject Directory Attribute extensions. +@@ -1710,10 +1708,8 @@ gnutls_x509_ext_print(gnutls_x509_ext_st + + # include + +-/* *INDENT-OFF* */ + #ifdef __cplusplus + } + #endif +-/* *INDENT-ON* */ + + #endif /* GNUTLS_X509_H */ +--- a/tests/test-chains-issuer-aia.h ++++ b/tests/test-chains-issuer-aia.h +@@ -23,8 +23,6 @@ + #ifndef GNUTLS_TESTS_TEST_CHAINS_ISSUER_AIA_H + # define GNUTLS_TESTS_TEST_CHAINS_ISSUER_AIA_H + +-/* *INDENT-OFF* */ +- + #define MAX_CHAIN 1 + + static const char *missing_cert_aia[] = { +@@ -132,6 +130,4 @@ static const char *missing_cert_aia_ca[] + # pragma GCC diagnostic pop + #endif + +-/* *INDENT-ON* */ +- + #endif /* GNUTLS_TESTS_TEST_CHAINS_ISSUER_AIA_H */ +--- a/tests/test-chains.h ++++ b/tests/test-chains.h +@@ -23,8 +23,6 @@ + #ifndef GNUTLS_TESTS_TEST_CHAINS_H + # define GNUTLS_TESTS_TEST_CHAINS_H + +-/* *INDENT-OFF* */ +- + #define MAX_CHAIN 10 + + static const char *chain_with_no_subject_id_in_ca_ok[] = { +@@ -4449,6 +4447,4 @@ static struct + # pragma GCC diagnostic pop + #endif + +-/* *INDENT-ON* */ +- + #endif /* GNUTLS_TESTS_TEST_CHAINS_H */ From 3b14d2569864a221c0e44610406ef73b045eb854 Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Thu, 18 May 2023 19:24:21 +0300 Subject: [PATCH 10/38] mariadb: fix gcc 13 building fixes: FAILED: tpool/CMakeFiles/tpool.dir/aio_liburing.cc.o /usr/src/openwrt/staging_dir/toolchain-x86_64_gcc-13.1.0_musl/bin/x86_64-openwrt-linux-musl-g++ -DDBUG_TRACE -DHAVE_CONFIG_H -DHAVE_URING -D_FILE_OFFSET_BITS=64 -I/usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3/wsrep-lib/include -I/usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3/wsrep-lib/wsrep-API/v26 -I/usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3/include -I/usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3/include/providers -I/usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3/tpool -Os -pipe -fno-caller-saves -fno-plt -fhonour-copts -fmacro-prefix-map=/usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3=mariadb-10.9.3 -Wformat -Werror=format-security -fstack-protector -D_FORTIFY_SOURCE=1 -Wl,-z,now -Wl,-z,relro -I/usr/src/openwrt/staging_dir/toolchain-x86_64_gcc-13.1.0_musl/usr/include -I/usr/src/openwrt/staging_dir/toolchain-x86_64_gcc-13.1.0_musl/include/fortify -I/usr/src/openwrt/staging_dir/toolchain-x86_64_gcc-13.1.0_musl/include -DNDEBUG -DDBUG_OFF -std=gnu++11 -DHAVE_IO_URING_MLOCK_SIZE -MD -MT tpool/CMakeFiles/tpool.dir/aio_liburing.cc.o -MF tpool/CMakeFiles/tpool.dir/aio_liburing.cc.o.d -o tpool/CMakeFiles/tpool.dir/aio_liburing.cc.o -c /usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3/tpool/aio_liburing.cc /usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3/tpool/aio_liburing.cc: In constructor '{anonymous}::aio_uring::aio_uring(tpool::thread_pool*, int)': /usr/src/openwrt/build_dir/target-x86_64_musl/mariadb-10.9.3/tpool/aio_liburing.cc:64:18: error: 'runtime_error' is not a member of 'std' 64 | throw std::runtime_error("aio_uring()"); Signed-off-by: Oskari Rauta --- utils/mariadb/Makefile | 2 +- .../mariadb/patches/300-gcc-13-compatibility-fix.patch | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 utils/mariadb/patches/300-gcc-13-compatibility-fix.patch diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index 5c4d6e7f2..e47221e32 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mariadb PKG_VERSION:=10.9.3 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL := https://archive.mariadb.org/$(PKG_NAME)-$(PKG_VERSION)/source diff --git a/utils/mariadb/patches/300-gcc-13-compatibility-fix.patch b/utils/mariadb/patches/300-gcc-13-compatibility-fix.patch new file mode 100644 index 000000000..839e80802 --- /dev/null +++ b/utils/mariadb/patches/300-gcc-13-compatibility-fix.patch @@ -0,0 +1,10 @@ +--- a/tpool/aio_liburing.cc ++++ b/tpool/aio_liburing.cc +@@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fi + #include + #include + #include ++#include + #include + + namespace From 577679a5728a17cc6633c4c5cd223d48ab7c3624 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 19 May 2023 21:45:21 +0800 Subject: [PATCH 11/38] python3-libselinux: 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. Manually pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions. Signed-off-by: Tianling Shen --- lang/python/python3-libselinux/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lang/python/python3-libselinux/Makefile b/lang/python/python3-libselinux/Makefile index 95cb2a813..f56483b44 100644 --- a/lang/python/python3-libselinux/Makefile +++ b/lang/python/python3-libselinux/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk SRC_NAME:=libselinux PKG_NAME:=python3-$(SRC_NAME) PKG_VERSION:=3.3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_BUILD_DIR:=$(BUILD_DIR)/python-libselinux/$(SRC_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(SRC_NAME)-$(PKG_VERSION).tar.gz @@ -48,6 +48,10 @@ define Package/python3-libselinux/description This package provides the Python bindings for libselinux. endef +ifneq ($(CONFIG_USE_MUSL),) + TARGET_CFLAGS += -D_LARGEFILE64_SOURCE +endif + MAKE_FLAGS += \ FTS_LDLIBS=-lfts \ SHLIBDIR=/usr/lib \ From d6f6a393df7bb1e14e7894074b84f19bd7520a40 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Fri, 19 May 2023 13:51:13 +0200 Subject: [PATCH 12/38] evtest: don't build man page Just selecting this package resulted in a build error: /home/mhei/openwrt.git/staging_dir/hostpkg/bin/python3: No module named asciidoc make[4]: *** [Makefile:856: evtest.xml] Error 1 Since we usually do not need the man page, just prevent to build it by pre-setting two environments variables. Then the makefile warns about, but don't try to build. Signed-off-by: Michael Heimpold --- utils/evtest/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/evtest/Makefile b/utils/evtest/Makefile index 86077b5eb..80bd04d0d 100644 --- a/utils/evtest/Makefile +++ b/utils/evtest/Makefile @@ -25,6 +25,8 @@ PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk +CONFIGURE_VARS += ac_cv_path_ASCIIDOC="" ac_cv_path_XMLTO="" + define Package/evtest SECTION:=utils CATEGORY:=Utilities From 71fb98ea4529ccb9749f1fca6670b1966978f9ed Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Fri, 19 May 2023 08:26:18 -0500 Subject: [PATCH 13/38] libpsl: update to 0.21.2 Signed-off-by: W. Michael Petullo --- libs/libpsl/Makefile | 10 +++------- libs/libpsl/patches/010-python.patch | 11 ----------- libs/libpsl/patches/020-iconv.patch | 29 ---------------------------- 3 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 libs/libpsl/patches/010-python.patch delete mode 100644 libs/libpsl/patches/020-iconv.patch diff --git a/libs/libpsl/Makefile b/libs/libpsl/Makefile index 92d2249c1..ea7bb8221 100644 --- a/libs/libpsl/Makefile +++ b/libs/libpsl/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpsl -PKG_VERSION:=0.21.1 -PKG_RELEASE:=3 +PKG_VERSION:=0.21.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/rockdaboot/libpsl/releases/download/$(PKG_VERSION) -PKG_HASH:=ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c +PKG_HASH:=e35991b6e17001afa2c0ca3b10c357650602b92596209b7492802f3768a6285f PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=MIT @@ -34,10 +34,6 @@ define Package/libpsl/description C library to handle the Public Suffix List endef -MESON_ARGS += \ - -Druntime=libidn2 \ - -Dbuiltin=libidn2 - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/include/libpsl.h $(1)/usr/include/ diff --git a/libs/libpsl/patches/010-python.patch b/libs/libpsl/patches/010-python.patch deleted file mode 100644 index d601fd69d..000000000 --- a/libs/libpsl/patches/010-python.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -131,7 +131,7 @@ if psl_test_file == '' - psl_test_file = join_paths(meson.current_source_dir(), 'list', 'tests', 'tests.txt') - endif - --python = import('python').find_installation() -+python = 'python3' - pkgconfig = import('pkgconfig') - - if cc.get_id() == 'msvc' diff --git a/libs/libpsl/patches/020-iconv.patch b/libs/libpsl/patches/020-iconv.patch deleted file mode 100644 index 63c9c752f..000000000 --- a/libs/libpsl/patches/020-iconv.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -20,6 +20,7 @@ libicu_dep = notfound - libidn_dep = notfound - libunistring = notfound - networking_deps = notfound -+libiconv_dep = notfound - - # FIXME: Cleanup this when Meson gets 'feature-combo': - # https://github.com/mesonbuild/meson/issues/4566 -@@ -86,6 +87,7 @@ endif - if libidn2_dep.found() or libidn_dep.found() - # Check for libunistring, we need it for psl_str_to_utf8lower() - libunistring = cc.find_library('unistring') -+ libiconv_dep = dependency('iconv') - endif - - if host_machine.system() == 'windows' ---- a/src/meson.build -+++ b/src/meson.build -@@ -19,7 +19,7 @@ cargs = [ - libpsl = library('psl', sources, suffixes_dafsa_h, - include_directories : [configinc, includedir], - c_args : cargs, -- dependencies : [libidn2_dep, libidn_dep, libicu_dep, libunistring, networking_deps], -+ dependencies : [libidn2_dep, libidn_dep, libicu_dep, libunistring, networking_deps, libiconv_dep], - version: lt_version, - install: true, - ) From 427c9b69742e26d4aacf1f9378917c358c4e5a65 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Fri, 19 May 2023 11:28:21 -0500 Subject: [PATCH 14/38] libgcrypt: update to 1.10.2 Signed-off-by: W. Michael Petullo --- libs/libgcrypt/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libgcrypt/Makefile b/libs/libgcrypt/Makefile index 6b9933b88..2dea9f4ca 100644 --- a/libs/libgcrypt/Makefile +++ b/libs/libgcrypt/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgcrypt -PKG_VERSION:=1.10.1 +PKG_VERSION:=1.10.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/ -PKG_HASH:=ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de +PKG_HASH:=3b9c02a004b68c256add99701de00b383accccf37177e0d6c58289664cce0c03 PKG_MAINTAINER:=W. Michael Petullo PKG_CPE_ID:=cpe:/a:gnupg:libgcrypt From e44d24cf05f711c5debe3b911ec558d331787371 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Fri, 19 May 2023 11:30:33 -0500 Subject: [PATCH 15/38] libgpg-error: update to 1.47 Signed-off-by: W. Michael Petullo --- libs/libgpg-error/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libgpg-error/Makefile b/libs/libgpg-error/Makefile index 6195326f3..62a178448 100644 --- a/libs/libgpg-error/Makefile +++ b/libs/libgpg-error/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgpg-error -PKG_VERSION:=1.46 -PKG_RELEASE:=3 +PKG_VERSION:=1.47 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://mirrors.dotsrc.org/gcrypt/libgpg-error \ http://ring.ksc.gr.jp/archives/net/gnupg/libgpg-error \ https://www.gnupg.org/ftp/gcrypt/libgpg-error -PKG_HASH:=b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d +PKG_HASH:=9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=LGPL-2.1-or-later From b9792544de73a0f1fa9022dc9a4f1313ab184fe8 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Fri, 19 May 2023 11:32:39 -0500 Subject: [PATCH 16/38] libsoup3: update to 2.6.4 Signed-off-by: W. Michael Petullo --- libs/libsoup3/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libsoup3/Makefile b/libs/libsoup3/Makefile index b322cc876..846d85d81 100644 --- a/libs/libsoup3/Makefile +++ b/libs/libsoup3/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libsoup3 -PKG_VERSION:=3.2.2 +PKG_VERSION:=3.4.2 PKG_RELEASE:=1 PKG_SOURCE:=libsoup-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=@GNOME/libsoup/3.2 -PKG_HASH:=83673c685b910fb7d39f1f28eee5afbefb71c05798fc350ac3bf1b885e1efaa1 +PKG_SOURCE_URL:=@GNOME/libsoup/3.4 +PKG_HASH:=78c8fa37cb152d40ec8c4a148d6155e2f6947f3f1602a7cda3a31ad40f5ee2f3 PKG_BUILD_DIR:=$(BUILD_DIR)/libsoup-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo From e24a92498ea3d680b0eb9bb337111f690b3f4df8 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Fri, 19 May 2023 11:34:09 -0500 Subject: [PATCH 17/38] luasec: update to 1.3.1 Signed-off-by: W. Michael Petullo --- lang/luasec/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/luasec/Makefile b/lang/luasec/Makefile index 5c1de2e85..d79975813 100644 --- a/lang/luasec/Makefile +++ b/lang/luasec/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luasec -PKG_VERSION:=1.2.0 +PKG_VERSION:=1.3.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/brunoos/luasec/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=2e86ef8f3486dc1bbecd752d16741a59a01633279facdfe5631f33b6eed1a30a +PKG_HASH:=6fb919633a3304a262189f62a369adc4b36bc7113da37af093b069cf1c8d785e MAINTAINER:=W. Michael Petullo PKG_LICENSE:=MIT From 78c7e8079e3e757d3709387bad0112b5c9c62d06 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Fri, 19 May 2023 11:35:38 -0500 Subject: [PATCH 18/38] nfdump: update to 4.2.0 Signed-off-by: W. Michael Petullo --- net/nfdump/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile index 0af7f2ad1..b26bb6ca5 100644 --- a/net/nfdump/Makefile +++ b/net/nfdump/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nfdump -PKG_VERSION:=1.6.25 +PKG_VERSION:=1.7.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/phaag/nfdump/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=811ffab139078c08d922739d20f487c48870749c74a0cd4b14dd126252c4be88 +PKG_HASH:=0545b792e81f5edd51a2fdfbfcc4eac7ba8087005811ab41c34bfac4d78fe926 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=BSD-3-Clause @@ -27,7 +27,7 @@ include $(INCLUDE_DIR)/package.mk define Package/nfdump SECTION:=net CATEGORY:=Network - DEPENDS:= +flex +libbz2 +USE_MUSL:musl-fts + DEPENDS:= +flex +libbz2 +USE_MUSL:musl-fts +libatomic TITLE:= nfdump URL:=https://github.com/phaag/nfdump/ endef From 03e201629951072a5327dade6a01c44830760f36 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Fri, 19 May 2023 11:37:11 -0500 Subject: [PATCH 19/38] openldap: update to 2.6.4 Signed-off-by: W. Michael Petullo --- libs/openldap/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile index 3c5642266..c3239662b 100644 --- a/libs/openldap/Makefile +++ b/libs/openldap/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openldap -PKG_VERSION:=2.6.3 +PKG_VERSION:=2.6.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/ \ https://mirror.eu.oneandone.net/software/openldap/openldap-release/ \ https://www.openldap.org/software/download/OpenLDAP/openldap-release/ -PKG_HASH:=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46 +PKG_HASH:=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991 PKG_LICENSE:=OLDAP-2.8 PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:openldap:openldap From 09bf479e245fa0aae19a780ac3e76545de0789a2 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Fri, 19 May 2023 11:38:49 -0500 Subject: [PATCH 20/38] php8-pecl-krb5: update to 1.1.5 Signed-off-by: W. Michael Petullo --- lang/php8-pecl-krb5/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/php8-pecl-krb5/Makefile b/lang/php8-pecl-krb5/Makefile index f058d4f4b..1377480de 100644 --- a/lang/php8-pecl-krb5/Makefile +++ b/lang/php8-pecl-krb5/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PECL_NAME:=krb5 PECL_LONGNAME:=Bindings for the Kerberos library -PKG_VERSION:=1.1.4 -PKG_RELEASE:=2 -PKG_HASH:=8aba35bb9f2892be9092e8717d3e13604a817cdfb478dbc3855a226abc6c5979 +PKG_VERSION:=1.1.5 +PKG_RELEASE:=1 +PKG_HASH:=2798e57ad231aa3467f09460e3e69169e04c88bd82972d8e86a6641e4ddc9d3d PKG_NAME:=php8-pecl-krb5 PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz From 614eb9dba9dbff297106a3fa49df51e13e4aa314 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Fri, 19 May 2023 12:20:27 -0500 Subject: [PATCH 21/38] php8-pecl-mcrypt: update to 1.0.6 Signed-off-by: W. Michael Petullo --- lang/php8-pecl-mcrypt/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/php8-pecl-mcrypt/Makefile b/lang/php8-pecl-mcrypt/Makefile index 7e275eca0..3b5d500a9 100644 --- a/lang/php8-pecl-mcrypt/Makefile +++ b/lang/php8-pecl-mcrypt/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PECL_NAME:=mcrypt PECL_LONGNAME:=Bindings for the libmcrypt library -PKG_VERSION:=1.0.5 +PKG_VERSION:=1.0.6 PKG_RELEASE:=1 -PKG_HASH:=c9f51e211640a15d2a983f5d80e26660656351651d6f682d657bdf1cfa07d8a3 +PKG_HASH:=be6efd52a76ed01aabdda0ce426aed0a93db4ec06908c16a5460175c35b0d08a PKG_NAME:=php8-pecl-mcrypt PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz From 1fcea0798110cca216676d065dd66a17d1a1f447 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Fri, 19 May 2023 11:40:28 -0500 Subject: [PATCH 22/38] syslog-ng: update to 4.2.0 Signed-off-by: W. Michael Petullo --- admin/syslog-ng/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile index 7a214f152..2f2cdc663 100644 --- a/admin/syslog-ng/Makefile +++ b/admin/syslog-ng/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=syslog-ng -PKG_VERSION:=4.1.1 +PKG_VERSION:=4.2.0 PKG_RELEASE:=1 PKG_MAINTAINER:=Josef Schlehofer @@ -11,7 +11,7 @@ PKG_CPE_ID:=cpe:/a:balabit:syslog-ng PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/syslog-ng/syslog-ng/releases/download/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_HASH:=d7df3cfa32d1a750818d94b8ea582dea54c37226e7b55a88c3d2f3a543d8f20e +PKG_HASH:=092bd17fd47002c988aebdf81d0ed3f3cfd0e82b388d2453bcaa5e67934f4dda PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 From 1abea58fecae0b4f0507ec5406ae12e0afac7612 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Fri, 19 May 2023 20:35:59 -0500 Subject: [PATCH 23/38] scapy: update to 2.5.0 Signed-off-by: W. Michael Petullo --- net/scapy/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/scapy/Makefile b/net/scapy/Makefile index 987872e47..71ee81630 100644 --- a/net/scapy/Makefile +++ b/net/scapy/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=scapy -PKG_VERSION:=2.4.5 +PKG_VERSION:=2.5.0 PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=bc707e3604784496b6665a9e5b2a69c36cc9fb032af4864b29051531b24c8593 +PKG_HASH:=5b260c2b754fd8d409ba83ee7aee294ecdbb2c235f9f78fe90bc11cb6e5debc2 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-only From 7cc8d253818a745c065014586cc93ea5e2c612c9 Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Thu, 18 May 2023 19:58:42 +0300 Subject: [PATCH 24/38] ttyd: update to 1.7.3 also fixes linking issue that appeared after gcc 13 removed obsolete (merged) patch, ttyd now depends on libcap, added that as a dependency. remaining patch refreshed. release notes: https://github.com/tsl0922/ttyd/releases Signed-off-by: Oskari Rauta --- utils/ttyd/Makefile | 8 ++++---- .../ttyd/patches/090-fix-ssl-ca-option-init.patch | 14 -------------- utils/ttyd/patches/100-log-to-syslog.patch | 4 ++-- 3 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 utils/ttyd/patches/090-fix-ssl-ca-option-init.patch diff --git a/utils/ttyd/Makefile b/utils/ttyd/Makefile index 147eda81e..83682fee2 100644 --- a/utils/ttyd/Makefile +++ b/utils/ttyd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ttyd -PKG_VERSION:=1.6.3 -PKG_RELEASE:=3 +PKG_VERSION:=1.7.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tsl0922/ttyd/tar.gz/$(PKG_VERSION)? -PKG_HASH:=1116419527edfe73717b71407fb6e06f46098fc8a8e6b0bb778c4c75dc9f64b9 +PKG_HASH:=c9cf5eece52d27c5d728000f11315d36cb400c6948d1964a34a7eae74b454099 PKG_MAINTAINER:=Shuanglei Tao PKG_LICENSE:=MIT @@ -26,7 +26,7 @@ define Package/ttyd SECTION:=utils CATEGORY:=Utilities TITLE:=Command-line tool for sharing terminal over the web - DEPENDS:=+libopenssl +libjson-c +libuv +zlib +libwebsockets-full + DEPENDS:=+libcap +libopenssl +libjson-c +libuv +zlib +libwebsockets-full URL:=https://github.com/tsl0922/ttyd SUBMENU:=Terminal endef diff --git a/utils/ttyd/patches/090-fix-ssl-ca-option-init.patch b/utils/ttyd/patches/090-fix-ssl-ca-option-init.patch deleted file mode 100644 index 06803aeab..000000000 --- a/utils/ttyd/patches/090-fix-ssl-ca-option-init.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/server.c -+++ b/src/server.c -@@ -509,9 +509,10 @@ int main(int argc, char **argv) { - if (ssl) { - info.ssl_cert_filepath = cert_path; - info.ssl_private_key_filepath = key_path; -- if (strlen(ca_path) > 0) -+ if (strlen(ca_path) > 0) { - info.ssl_ca_filepath = ca_path; - info.options |= LWS_SERVER_OPTION_REQUIRE_VALID_OPENSSL_CLIENT_CERT; -+ } - #if LWS_LIBRARY_VERSION_MAJOR >= 2 - info.options |= LWS_SERVER_OPTION_REDIRECT_HTTP_TO_HTTPS; - #endif diff --git a/utils/ttyd/patches/100-log-to-syslog.patch b/utils/ttyd/patches/100-log-to-syslog.patch index 06012dfd9..aed465a02 100644 --- a/utils/ttyd/patches/100-log-to-syslog.patch +++ b/utils/ttyd/patches/100-log-to-syslog.patch @@ -8,7 +8,7 @@ #include "utils.h" -@@ -478,7 +479,8 @@ int main(int argc, char **argv) { +@@ -509,7 +510,8 @@ int main(int argc, char **argv) { return -1; } @@ -16,5 +16,5 @@ + openlog("ttyd", LOG_NDELAY | LOG_PID, LOG_DAEMON); + lws_set_log_level(debug_level, lwsl_emit_syslog); - #if LWS_LIBRARY_VERSION_MAJOR >= 2 char server_hdr[128] = ""; + sprintf(server_hdr, "ttyd/%s (libwebsockets/%s)", TTYD_VERSION, LWS_LIBRARY_VERSION); From f8a8b71e26b9bdbf86fbb7d4d1482637af7f3ba4 Mon Sep 17 00:00:00 2001 From: Michal Hrusecky Date: Mon, 15 May 2023 14:30:29 +0200 Subject: [PATCH 25/38] openvpn: Add more hotplug events OpenVPN supports more hooks than just 'up' and 'down'. Especially reacting to 'route-up' and 'route-pre-down' events could be important. When routing table changes, it can make sense to adapt firewall, run some tests or change even more routes. This change passes those events to hotplug, so it is easy to react to them without changing configuration files provided by VPN provider. Signed-off-by: Michal Hrusecky --- net/openvpn/Makefile | 2 +- net/openvpn/files/openvpn.init | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index fd6e7bd54..213f027fd 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openvpn PKG_VERSION:=2.5.8 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=\ https://build.openvpn.net/downloads/releases/ \ diff --git a/net/openvpn/files/openvpn.init b/net/openvpn/files/openvpn.init index 380b42349..b5f612e46 100644 --- a/net/openvpn/files/openvpn.init +++ b/net/openvpn/files/openvpn.init @@ -153,6 +153,9 @@ openvpn_add_instance() { --config "$conf" \ --up "/usr/libexec/openvpn-hotplug up $name" \ --down "/usr/libexec/openvpn-hotplug down $name" \ + --route-up "/usr/libexec/openvpn-hotplug route-up $name" \ + --route-pre-down "/usr/libexec/openvpn-hotplug route-pre-down $name" \ + --ipchange "/usr/libexec/openvpn-hotplug ipchange $name" \ ${up:+--setenv user_up "$up"} \ ${down:+--setenv user_down "$down"} \ --script-security "${security:-2}" \ From cb7aa1e2daef38de7a6482079b09292e9f874971 Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Fri, 19 May 2023 21:14:59 +0300 Subject: [PATCH 26/38] zmq: fix gcc 13 errors gcc 13 compatibility patch is from alpine linux. https://git.alpinelinux.org/aports/tree/main/zeromq/gcc13.patch fixes #20972 I also renamed one of patches, so patch filenames are more unified. Signed-off-by: Oskari Rauta --- libs/zmq/Makefile | 2 +- ... 010-fix-openpgm-linking-for-zeromq.patch} | 0 .../zmq/patches/030-gcc13-compatibility.patch | 58 +++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) rename libs/zmq/patches/{0001-fix-openpgm-linking-for-zeromq.patch => 010-fix-openpgm-linking-for-zeromq.patch} (100%) create mode 100644 libs/zmq/patches/030-gcc13-compatibility.patch diff --git a/libs/zmq/Makefile b/libs/zmq/Makefile index 25266b981..0c3a7f3e1 100644 --- a/libs/zmq/Makefile +++ b/libs/zmq/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zeromq PKG_VERSION:=4.3.4 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/zeromq/libzmq/releases/download/v$(PKG_VERSION) diff --git a/libs/zmq/patches/0001-fix-openpgm-linking-for-zeromq.patch b/libs/zmq/patches/010-fix-openpgm-linking-for-zeromq.patch similarity index 100% rename from libs/zmq/patches/0001-fix-openpgm-linking-for-zeromq.patch rename to libs/zmq/patches/010-fix-openpgm-linking-for-zeromq.patch diff --git a/libs/zmq/patches/030-gcc13-compatibility.patch b/libs/zmq/patches/030-gcc13-compatibility.patch new file mode 100644 index 000000000..b8c7489ee --- /dev/null +++ b/libs/zmq/patches/030-gcc13-compatibility.patch @@ -0,0 +1,58 @@ +Patch-Source: https://github.com/zeromq/libzmq/commit/438d5d88392baffa6c2c5e0737d9de19d6686f0d +-- +From 438d5d88392baffa6c2c5e0737d9de19d6686f0d Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Tue, 20 Dec 2022 21:45:16 +0000 +Subject: [PATCH] src/secure_allocator.hpp: define missing 'rebind' type + +`gcc-13` added an assert to standard headers to make sure custom +allocators have intended implementation of rebind type instead +of inherited rebind. gcc change: + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7 + +Without the fix build fails on this week's `gcc-13` as: + + [ 92%] Building CXX object tests/CMakeFiles/test_security_curve.dir/test_security_curve.cpp.o + In file included from /<>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34, + from /<>/gcc-13.0.0/include/c++/13.0.0/bits/stl_uninitialized.h:64, + from /<>/gcc-13.0.0/include/c++/13.0.0/memory:69, + from tests/../src/secure_allocator.hpp:42, + from tests/../src/curve_client_tools.hpp:49, + from tests/test_security_curve.cpp:53: + /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind, unsigned char, void>': + /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11: required by substitution of 'template using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = zmq::secure_allocator_t; _Up = unsigned char]' + /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8: required by substitution of 'template template using std::allocator_traits< >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc = zmq::secure_allocator_t]' + /<>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65: required from 'struct __gnu_cxx::__alloc_traits, unsigned char>::rebind' + /<>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21: required from 'struct std::_Vector_base >' + /<>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11: required from 'class std::vector >' + tests/../src/curve_client_tools.hpp:64:76: required from here + /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits::rebind_alloc must be A + 70 | _Tp>::value, + | ^~~~~ + +The change adds trivial `rebind` definition with expected return type +and satisfies conversion requirements. +--- + src/secure_allocator.hpp | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +--- a/src/secure_allocator.hpp ++++ b/src/secure_allocator.hpp +@@ -95,6 +95,17 @@ bool operator!= (const secure_allocator_ + #else + template struct secure_allocator_t : std::allocator + { ++ secure_allocator_t () ZMQ_DEFAULT; ++ ++ template ++ secure_allocator_t (const secure_allocator_t &) ZMQ_NOEXCEPT ++ { ++ } ++ ++ template struct rebind ++ { ++ typedef secure_allocator_t other; ++ }; + }; + #endif + } From 4a7822604ad3cadb0461c5969bbf07b18a046834 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Fri, 19 May 2023 10:41:29 -0500 Subject: [PATCH 27/38] vips: update to 8.14.2 Signed-off-by: W. Michael Petullo --- libs/vips/Makefile | 76 +++++++++---------- .../vips/patches/010-reproducible-build.patch | 15 ---- 2 files changed, 36 insertions(+), 55 deletions(-) delete mode 100644 libs/vips/patches/010-reproducible-build.patch diff --git a/libs/vips/Makefile b/libs/vips/Makefile index f07698dc3..f95c2ea8b 100644 --- a/libs/vips/Makefile +++ b/libs/vips/Makefile @@ -6,24 +6,23 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vips -PKG_VERSION:=8.13.3 +PKG_VERSION:=8.14.2 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/libvips/libvips/releases/download/v$(PKG_VERSION) -PKG_HASH:=4eff5cdc8dbe1a05a926290a99014e20ba386f5dcca38d9774bef61413435d4c +PKG_HASH:=27dad021f0835a5ab14e541d02abd41e4c3bd012d2196438df5a9e754984f7ce PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:vips:vips -PKG_FIXUP:=autoreconf -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=glib2/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk +include $(INCLUDE_DIR)/meson.mk define Package/vips $(call Package/vips/Default) @@ -31,41 +30,38 @@ define Package/vips CATEGORY:=Multimedia TITLE:=An image manipulation library URL:=https://libvips.github.io/libvips/ - DEPENDS:=+glib2 +libexif +libexpat +libjpeg +libpng +giflib +libxml2 +libstdcpp $(INTL_DEPENDS) + DEPENDS:=+glib2 +libexif +libexpat +libjpeg +libpng +giflib +libxml2 endef -CONFIGURE_ARGS += \ - --disable-debug \ - --disable-gtk-doc-html \ - --disable-magickload \ - --disable-magicksave \ - --without-analyze \ - --without-cfitsio \ - --without-fftw \ - --without-gsf \ - --without-imagequant \ - --without-lcms \ - --without-libwebp \ - --without-magick \ - --without-magickpackage \ - --without-matio \ - --without-nifti \ - --without-OpenEXR \ - --without-openslide \ - --without-orc \ - --without-pangoft2 \ - --without-pdfium \ - --without-poppler \ - --without-ppm \ - --without-radiance \ - --without-rsvg \ - --without-tiff \ - --without-x \ - --without-zlib \ - --with-giflib \ - --with-jpeg \ - --with-libexif \ - --with-png \ +MESON_ARGS += \ + -Dgtk_doc=false \ + -Dintrospection=false \ + -Danalyze=false \ + -Dcfitsio=disabled \ + -Dfftw=disabled \ + -Dgsf=disabled \ + -Dimagequant=disabled \ + -Dlcms=disabled \ + -Dwebp=disabled \ + -Dmagick=disabled \ + -Dmagick-package=disabled \ + -Dmatio=disabled \ + -Dnifti=disabled \ + -Dopenexr=disabled \ + -Dopenslide=disabled \ + -Dorc=disabled \ + -Dpangocairo=disabled \ + -Dpdfium=disabled \ + -Dpoppler=disabled \ + -Dppm=false \ + -Dradiance=false \ + -Drsvg=disabled \ + -Dtiff=disabled \ + -Dzlib=disabled \ + -Dcgif=enabled \ + -Djpeg=enabled \ + -Dexif=enabled \ + -Dpng=enabled \ TARGET_CXXFLAGS += -fno-rtti @@ -74,7 +70,7 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/vips/* $(1)/usr/include/vips $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libvips.{a,so}* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libvips.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/vips.pc $(1)/usr/lib/pkgconfig/vips.pc diff --git a/libs/vips/patches/010-reproducible-build.patch b/libs/vips/patches/010-reproducible-build.patch deleted file mode 100644 index c6e990212..000000000 --- a/libs/vips/patches/010-reproducible-build.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -26,7 +26,11 @@ VIPS_MAJOR_VERSION=vips_major_version() - VIPS_MINOR_VERSION=vips_minor_version() - VIPS_MICRO_VERSION=vips_micro_version() - VIPS_VERSION=vips_version() --VIPS_VERSION_STRING="$VIPS_VERSION-$(date -u -r $srcdir/ChangeLog)" -+if test "x$SOURCE_DATE_EPOCH" = "x"; then -+ VIPS_VERSION_STRING=$VIPS_VERSION-`date -u -r ChangeLog` -+else -+ VIPS_VERSION_STRING=$VIPS_VERSION-`LC_ALL=C date --utc --date="@$SOURCE_DATE_EPOCH"` -+fi - - # packages add to these as we find them - VIPS_CFLAGS="" From e499f0adf12a1a15079f9c9fcbe7b34ff3003f72 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Mon, 15 May 2023 18:44:52 +0200 Subject: [PATCH 28/38] nginx-util: add version to UCI conf template Add versioning to UCI conf template as a commented version. This permits the introduction of migration script since the template is saved and restored config restore. The migration script are handled by nginx init.d script. Signed-off-by: Christian Marangi --- net/nginx-util/Makefile | 2 +- net/nginx-util/files/uci.conf.template | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/net/nginx-util/Makefile b/net/nginx-util/Makefile index 52cdbb4ea..ce08d6628 100644 --- a/net/nginx-util/Makefile +++ b/net/nginx-util/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nginx-util PKG_VERSION:=1.6 -PKG_RELEASE:=16 +PKG_RELEASE:=17 PKG_MAINTAINER:=Peter Stadler include $(INCLUDE_DIR)/package.mk diff --git a/net/nginx-util/files/uci.conf.template b/net/nginx-util/files/uci.conf.template index 406ddb4cc..b56b1119e 100644 --- a/net/nginx-util/files/uci.conf.template +++ b/net/nginx-util/files/uci.conf.template @@ -1,6 +1,7 @@ # Consider using UCI or creating files in /etc/nginx/conf.d/ for configuration. # Parsing UCI configuration is skipped if uci set nginx.global.uci_enable=false # For details see: https://openwrt.org/docs/guide-user/services/webserver/nginx +# UCI_CONF_VERSION=1.1 worker_processes auto; From 6a3cc76ea56d8e4ac675e67a55c7f4b76e97bd5b Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Thu, 4 May 2023 01:47:07 +0200 Subject: [PATCH 29/38] nginx: introduce migration for old uci conf template Introduce support for migration of old uci conf template to new version. Uci conf template are saved in config backup. This cause problem on config restore as old config template might have compatibility problem with new nginx implementation. Add logic to migrate the template script at runtime to correctly align to latest change from nginx and nginx-util. Fixes: 65a676ed56fb ("nginx: introduce support for dynamic modules") Fixes: #20904 Signed-off-by: Christian Marangi --- net/nginx/files/nginx.init | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/net/nginx/files/nginx.init b/net/nginx/files/nginx.init index 632a3f10a..9e3ed0a7a 100644 --- a/net/nginx/files/nginx.init +++ b/net/nginx/files/nginx.init @@ -8,11 +8,27 @@ USE_PROCD=1 G_OPTS="daemon off;" NGINX_UTIL="/usr/bin/nginx-util" +UCI_CONF_TEMPLATE="/etc/nginx/uci.conf.template" +LATEST_UCI_CONF_VERSION="1.1" eval $("${NGINX_UTIL}" get_env) CONF="" +nginx_check_luci_template() { + UCI_CONF_VERSION="$(sed -nr 's/# UCI_CONF_VERSION=(.*)/\1/p' $UCI_CONF_TEMPLATE)" + + # No need to migrate already latest version + if [ "$UCI_CONF_VERSION" = "$LATEST_UCI_CONF_VERSION" ]; then + return + fi + + if [ -z "$UCI_CONF_VERSION" ]; then + echo "" >> $UCI_CONF_TEMPLATE + echo "include module.d/*.module;" >> $UCI_CONF_TEMPLATE + echo "# UCI_CONF_VERSION=1.1" >> $UCI_CONF_TEMPLATE + fi +} nginx_init() { [ -z "${CONF}" ] || return # already called. @@ -23,6 +39,10 @@ nginx_init() { rm -f "$(readlink "${UCI_CONF}")" ${NGINX_UTIL} init_lan + if [ -f $UCI_CONF_TEMPLATE ]; then + nginx_check_luci_template + fi + if [ -e "${UCI_CONF}" ] then CONF="${UCI_CONF}" else CONF="${NGINX_CONF}" From 57eb73ae633f22dea618cf173cd10ae6226494ef Mon Sep 17 00:00:00 2001 From: Glen Huang Date: Thu, 11 May 2023 11:25:10 +0800 Subject: [PATCH 30/38] nginx: add configure flag --with-compat Without it, nginx could complain about incompatible dynamic modules Signed-off-by: Glen Huang [ fix conflict error on cherry-pick ] Signed-off-by: Christian Marangi --- net/nginx/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/net/nginx/Makefile b/net/nginx/Makefile index 16767efdd..bb0b9441e 100644 --- a/net/nginx/Makefile +++ b/net/nginx/Makefile @@ -402,6 +402,7 @@ CONFIGURE_ARGS += \ --prefix=/usr \ --conf-path=/etc/nginx/nginx.conf \ --modules-path=/usr/lib/nginx/modules \ + --with-compat \ $(ADDITIONAL_MODULES) \ --error-log-path=stderr \ --pid-path=/var/run/nginx.pid \ From 0da92a74aa9a01545f82fc13fe61a9342dd90baa Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Sat, 20 May 2023 23:27:13 +0800 Subject: [PATCH 31/38] tailscale: update to 1.40.1 Signed-off-by: Zephyr Lykos --- net/tailscale/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/tailscale/Makefile b/net/tailscale/Makefile index 53dffb790..e71978a8e 100644 --- a/net/tailscale/Makefile +++ b/net/tailscale/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tailscale -PKG_VERSION:=1.40.0 +PKG_VERSION:=1.40.1 PKG_RELEASE:=1 PKG_SOURCE:=tailscale-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=6964176889943e0e0b25d8d69e14226cfb1c1a9944a257b24cb2dd212f797141 +PKG_HASH:=9c0a9648c921f695fc501536e69c8b4998d318256c8049de538f72fbe1491c18 PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause From d82eb0eb2bb9bbdac420cdd90c16da141b61419c Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Sun, 21 May 2023 10:31:20 +0200 Subject: [PATCH 32/38] php8-pecl-xdebug: update to 3.2.1 Some bugfixes, see changelog: https://pecl.php.net/package-info.php?package=xdebug&version=3.2.1 Signed-off-by: Michael Heimpold --- lang/php8-pecl-xdebug/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/php8-pecl-xdebug/Makefile b/lang/php8-pecl-xdebug/Makefile index 322558840..d2a85f26c 100644 --- a/lang/php8-pecl-xdebug/Makefile +++ b/lang/php8-pecl-xdebug/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PECL_NAME:=xdebug PECL_LONGNAME:=Xdebug extension -PKG_VERSION:=3.2.0 +PKG_VERSION:=3.2.1 PKG_RELEASE:=1 -PKG_HASH:=7769b20eecdadf5fbe9f582512c10b394fb575b6f7a8c3a3a82db6883e0032b7 +PKG_HASH:=ef4cb3c228192798874e4530cccceee76840cc80821909740088a1e1a8f00445 PKG_NAME:=php8-pecl-xdebug PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz From f66bcdd1b6f8534c0e366a13ee2750820a13e3bb Mon Sep 17 00:00:00 2001 From: Marius Dinu Date: Sat, 20 May 2023 19:41:57 +0300 Subject: [PATCH 33/38] transmission: add missing nls.mk include Fixes issue #21016. Signed-off-by: Marius Dinu --- net/transmission/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/net/transmission/Makefile b/net/transmission/Makefile index d655c6da8..13b6b1de4 100644 --- a/net/transmission/Makefile +++ b/net/transmission/Makefile @@ -34,6 +34,7 @@ PKG_CONFIG_DEPENDS:= \ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/package-seccomp.mk +include $(INCLUDE_DIR)/nls.mk define Package/transmission/template SUBMENU:=BitTorrent From 0ef5f50a839b57da407a0bdcc4898dec19e8e973 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 20 May 2023 10:45:54 +0800 Subject: [PATCH 34/38] oath-toolkit: splitting liboath from oath-toolkit Signed-off-by: Tianling Shen --- utils/oath-toolkit/Makefile | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/utils/oath-toolkit/Makefile b/utils/oath-toolkit/Makefile index 3063d1fa6..1eb4c2110 100644 --- a/utils/oath-toolkit/Makefile +++ b/utils/oath-toolkit/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oath-toolkit PKG_VERSION:=2.6.5 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SAVANNAH/oath-toolkit @@ -29,21 +29,30 @@ CONFIGURE_ARGS += \ --disable-xmltest \ --disable-pskc +define Package/liboath + SECTION:=libs + CATEGORY:=Libraries + TITLE:=A shared and static C library for OATH handling + URL:=http://www.nongnu.org/oath-toolkit/index.html +endef + define Package/oath-toolkit SECTION:=utils CATEGORY:=Utilities - TITLE:=Toolkit for building one-time password authentication + TITLE:=A command line tool for generating and validating OTPs URL:=http://www.nongnu.org/oath-toolkit/index.html - DEPENDS:= + DEPENDS:= +liboath endef -define Package/oath-toolkit/description - The OATH Toolkit provide components for building one-time password - authentication systems. It contains shared libraries, command line - tools and a PAM module. Supported technologies include the event-based - HOTP algorithm (RFC4226) and the time-based TOTP algorithm (RFC6238). +define Package/liboath/description + The OATH Toolkit provide components for building one-time password + authentication systems. It contains shared libraries, command line + tools and a PAM module. Supported technologies include the event-based + HOTP algorithm (RFC4226) and the time-based TOTP algorithm (RFC6238). endef +Package/oath-toolkit/description = $(Package/liboath/description) + define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/liboath $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ @@ -51,11 +60,15 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ endef -define Package/oath-toolkit/install - $(INSTALL_DIR) $(1)/usr/bin +define Package/liboath/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/oathtool $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/liboath.so* $(1)/usr/lib/ endef +define Package/oath-toolkit/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/oathtool $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,liboath)) $(eval $(call BuildPackage,oath-toolkit)) From 80dad35294197d537fe50f4e6143c74acfaf02b0 Mon Sep 17 00:00:00 2001 From: Thlv Alivs Date: Sat, 20 May 2023 12:21:44 +0800 Subject: [PATCH 35/38] oath-toolkit: Add oath PAM authentication module will install to /usr/lib/security/pam_oath.so Signed-off-by: Thlv Alivs --- utils/oath-toolkit/Makefile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/utils/oath-toolkit/Makefile b/utils/oath-toolkit/Makefile index 1eb4c2110..fa29cc884 100644 --- a/utils/oath-toolkit/Makefile +++ b/utils/oath-toolkit/Makefile @@ -36,6 +36,14 @@ define Package/liboath URL:=http://www.nongnu.org/oath-toolkit/index.html endef +define Package/oath-pam + SECTION:=libs + CATEGORY:=Libraries + TITLE:=The oath PAM module + URL:=http://www.nongnu.org/oath-toolkit/index.html + DEPENDS:= +libpam +liboath +endef + define Package/oath-toolkit SECTION:=utils CATEGORY:=Utilities @@ -51,6 +59,8 @@ define Package/liboath/description HOTP algorithm (RFC4226) and the time-based TOTP algorithm (RFC6238). endef +Package/oath-pam/description = $(Package/liboath/description) + Package/oath-toolkit/description = $(Package/liboath/description) define Build/InstallDev @@ -65,10 +75,16 @@ define Package/liboath/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/liboath.so* $(1)/usr/lib/ endef +define Package/oath-pam/install + $(INSTALL_DIR) $(1)/usr/lib/security + $(CP) $(PKG_INSTALL_DIR)/usr/lib/security/pam_oath.so* $(1)/usr/lib/security/ +endef + define Package/oath-toolkit/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/oathtool $(1)/usr/bin/ endef $(eval $(call BuildPackage,liboath)) +$(eval $(call BuildPackage,oath-pam)) $(eval $(call BuildPackage,oath-toolkit)) From 8dd2a6edf2e32a2b9fb4c3df10380525fcf620ee Mon Sep 17 00:00:00 2001 From: Thlv Alivs Date: Sat, 20 May 2023 12:21:57 +0800 Subject: [PATCH 36/38] ocserv: add otp config option and also fix build error: Package ocserv is missing dependencies for the following libraries: liboath.so.0 Signed-off-by: Thlv Alivs --- net/ocserv/Config.in | 4 ++++ net/ocserv/Makefile | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/net/ocserv/Config.in b/net/ocserv/Config.in index cf86bef17..36533dfae 100644 --- a/net/ocserv/Config.in +++ b/net/ocserv/Config.in @@ -16,6 +16,10 @@ config OCSERV_RADIUS bool "enable radius authentication" default n +config OCSERV_LIBOATH + bool "enable OTP" + default n + config OCSERV_PROTOBUF bool "use external libprotobuf" default y diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile index 7db36a6e1..0bbe4f3b2 100644 --- a/net/ocserv/Makefile +++ b/net/ocserv/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ocserv PKG_VERSION:=1.1.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_FLAGS:=no-mips16 PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -39,7 +39,7 @@ define Package/ocserv TITLE:=OpenConnect VPN server URL:=http://www.infradead.org/ocserv/ MAINTAINER:=Nikos Mavrogiannopoulos - DEPENDS:= +OCSERV_RADIUS:libradcli +OCSERV_HTTP_PARSER:libhttp-parser +OCSERV_SECCOMP:libseccomp +libgnutls +certtool +libncurses +libreadline +OCSERV_PAM:libpam +OCSERV_PROTOBUF:libprotobuf-c +libev +kmod-tun + DEPENDS:= +OCSERV_RADIUS:libradcli +OCSERV_HTTP_PARSER:libhttp-parser +OCSERV_SECCOMP:libseccomp +libgnutls +certtool +libncurses +libreadline +OCSERV_PAM:libpam +OCSERV_PROTOBUF:libprotobuf-c +OCSERV_LIBOATH:liboath +libev +kmod-tun USERID:=ocserv=72:ocserv=72 endef @@ -89,6 +89,10 @@ ifneq ($(CONFIG_OCSERV_HTTP_PARSER),y) CONFIGURE_ARGS += --without-http-parser endif +ifndef CONFIG_OCSERV_LIBOATH +CONFIGURE_ARGS += --without-liboath +endif + define Package/ocserv/conffiles /etc/config/ocserv endef From 6c34bf90e38e55d7f2a809f375624f475d4d8d91 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Sun, 21 May 2023 15:08:35 +0200 Subject: [PATCH 37/38] pciutils: update to 3.10.0 Manually refresh: - 101-no-strip.patch Remove upstreamed: - 107-avoid-addng-multiple-version-tags.patch ChangeLog: https://github.com/pciutils/pciutils/blob/21407521fb62a65e39051561e16e4ce1a74362c1/ChangeLog Signed-off-by: Nick Hainke --- utils/pciutils/Makefile | 6 +-- utils/pciutils/patches/101-no-strip.patch | 6 +-- ...07-avoid-addng-multiple-version-tags.patch | 42 ------------------- 3 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 utils/pciutils/patches/107-avoid-addng-multiple-version-tags.patch diff --git a/utils/pciutils/Makefile b/utils/pciutils/Makefile index 870ffae3e..0eaea5342 100644 --- a/utils/pciutils/Makefile +++ b/utils/pciutils/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pciutils -PKG_VERSION:=3.8.0 -PKG_RELEASE:=2 +PKG_VERSION:=3.10.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/utils/pciutils -PKG_HASH:=91edbd0429a84705c9ad156d4ff38ccc724d41ea54c4c5b88e38e996f8a34f05 +PKG_HASH:=238a2e27166730e53a17fe07bfad229e07fa39b618117e5944b6d7eda9fbb0e9 PKG_MAINTAINER:=Lucian Cristian PKG_LICENSE:=GPL-2.0 diff --git a/utils/pciutils/patches/101-no-strip.patch b/utils/pciutils/patches/101-no-strip.patch index 827a4531c..9fdfc7e57 100644 --- a/utils/pciutils/patches/101-no-strip.patch +++ b/utils/pciutils/patches/101-no-strip.patch @@ -1,13 +1,13 @@ --- a/Makefile +++ b/Makefile -@@ -131,8 +131,8 @@ distclean: clean +@@ -149,8 +149,8 @@ distclean: clean install: all # -c is ignored on Linux, but required on FreeBSD - $(DIRINSTALL) -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 $(DESTDIR)/$(MANDIR)/man5 + $(DIRINSTALL) -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 $(DESTDIR)$(MANDIR)/man5 - $(INSTALL) -c -m 755 $(STRIP) lspci$(EXEEXT) $(DESTDIR)$(LSPCIDIR) - $(INSTALL) -c -m 755 $(STRIP) setpci$(EXEEXT) $(DESTDIR)$(SBINDIR) + $(INSTALL) -c -m 755 lspci$(EXEEXT) $(DESTDIR)$(LSPCIDIR) + $(INSTALL) -c -m 755 setpci$(EXEEXT) $(DESTDIR)$(SBINDIR) $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR) + ifneq ($(IDSDIR),) $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR) - $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8 diff --git a/utils/pciutils/patches/107-avoid-addng-multiple-version-tags.patch b/utils/pciutils/patches/107-avoid-addng-multiple-version-tags.patch deleted file mode 100644 index 74b578288..000000000 --- a/utils/pciutils/patches/107-avoid-addng-multiple-version-tags.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0478e1f3928bfaa34eb910ba2cbaf1dda8f84aab Mon Sep 17 00:00:00 2001 -From: Martin Mares -Date: Wed, 10 Aug 2022 13:34:28 +0700 -Subject: [PATCH] Avoid adding multiple version tags to the same symbol - -This is apparently forbidden in most versions of binutils. ---- - lib/filter.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - ---- a/lib/filter.c -+++ b/lib/filter.c -@@ -303,21 +303,25 @@ pci_filter_match_v30(struct pci_filter_v - // (their positions in struct pci_filter were declared as RFU). - - STATIC_ALIAS(void pci_filter_init(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38(a, f)); -+DEFINE_ALIAS(void pci_filter_init_v33(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38); - SYMBOL_VERSION(pci_filter_init_v30, pci_filter_init@LIBPCI_3.0); --SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@LIBPCI_3.3); -+SYMBOL_VERSION(pci_filter_init_v33, pci_filter_init@LIBPCI_3.3); - SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@@LIBPCI_3.8); - - STATIC_ALIAS(char *pci_filter_parse_slot(struct pci_filter *f, char *str), pci_filter_parse_slot_v38(f, str)); -+DEFINE_ALIAS(char *pci_filter_parse_slot_v33(struct pci_filter *f, char *str), pci_filter_parse_slot_v38); - SYMBOL_VERSION(pci_filter_parse_slot_v30, pci_filter_parse_slot@LIBPCI_3.0); --SYMBOL_VERSION(pci_filter_parse_slot_v38, pci_filter_parse_slot@LIBPCI_3.3); -+SYMBOL_VERSION(pci_filter_parse_slot_v33, pci_filter_parse_slot@LIBPCI_3.3); - SYMBOL_VERSION(pci_filter_parse_slot_v38, pci_filter_parse_slot@@LIBPCI_3.8); - - STATIC_ALIAS(char *pci_filter_parse_id(struct pci_filter *f, char *str), pci_filter_parse_id_v38(f, str)); -+DEFINE_ALIAS(char *pci_filter_parse_id_v33(struct pci_filter *f, char *str), pci_filter_parse_id_v38); - SYMBOL_VERSION(pci_filter_parse_id_v30, pci_filter_parse_id@LIBPCI_3.0); --SYMBOL_VERSION(pci_filter_parse_id_v38, pci_filter_parse_id@LIBPCI_3.3); -+SYMBOL_VERSION(pci_filter_parse_id_v33, pci_filter_parse_id@LIBPCI_3.3); - SYMBOL_VERSION(pci_filter_parse_id_v38, pci_filter_parse_id@@LIBPCI_3.8); - - STATIC_ALIAS(int pci_filter_match(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v38(f, d)); -+DEFINE_ALIAS(int pci_filter_match_v33(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v38); - SYMBOL_VERSION(pci_filter_match_v30, pci_filter_match@LIBPCI_3.0); --SYMBOL_VERSION(pci_filter_match_v38, pci_filter_match@LIBPCI_3.3); -+SYMBOL_VERSION(pci_filter_match_v33, pci_filter_match@LIBPCI_3.3); - SYMBOL_VERSION(pci_filter_match_v38, pci_filter_match@@LIBPCI_3.8); From e90bb8ea9ad6a36deab4bda7ea3d7f022a22f039 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 22 May 2023 18:17:47 +0800 Subject: [PATCH 38/38] dos2unix: Update to 7.5.0 Signed-off-by: Tianling Shen --- utils/dos2unix/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/dos2unix/Makefile b/utils/dos2unix/Makefile index 3dbcd70e5..c662e4e72 100644 --- a/utils/dos2unix/Makefile +++ b/utils/dos2unix/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dos2unix -PKG_VERSION:=7.4.4 +PKG_VERSION:=7.5.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://waterlan.home.xs4all.nl/dos2unix/ \ @SF/dos2unix -PKG_HASH:=28a841db0bd5827d645caba9d8015e3a71983dc6e398070b5287ee137ae4436e +PKG_HASH:=7a3b01d01e214d62c2b3e04c3a92e0ddc728a385566e4c0356efa66fd6eb95af PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=BSD-2-Clause