From 4070b265e885f223fdd30a2051ec995afbcda501 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Wed, 20 Sep 2023 01:48:12 +0200 Subject: [PATCH 1/9] czmq: drop libpcre dependency It seems like the libpcre dependency was added by mistake. While checking in the source code of czmq (Makefile.am, CMakeLists.txt), I see there are several dependencies, but there isn't PCRE. Fixes: 936a48a ("czmq: add new package") Signed-off-by: Josef Schlehofer (cherry picked from commit e3ab95185cb67e6d5753b2d7380bac74c4ef4acd) --- libs/czmq/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/czmq/Makefile b/libs/czmq/Makefile index cc35bf1a3f..e900559fc9 100644 --- a/libs/czmq/Makefile +++ b/libs/czmq/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=czmq PKG_VERSION:=4.2.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/zeromq/czmq/releases/download/v$(PKG_VERSION)/ @@ -31,7 +31,7 @@ define Package/czmq TITLE:=CZMQ High-level C binding for ZeroMQ URL:=http://czmq.zeromq.org ABI_VERSION:=4 - DEPENDS:=+libzmq +libuuid +libpcre +libmicrohttpd +liblz4 +libcurl + DEPENDS:=+libzmq +libuuid +libmicrohttpd +liblz4 +libcurl endef define Package/czmq/description From 89e73b369ce6d8ab4e7b0ea7bb231bd3aaee8e07 Mon Sep 17 00:00:00 2001 From: Huangbin Zhan Date: Tue, 9 Nov 2021 04:16:56 +0800 Subject: [PATCH 2/9] wget: fix hsts time `time_t` on musl 1.2 is 64bit, while `long` is 32 bit. we will always get zero time with the original source on mips big endian. Signed-off-by: Huangbin Zhan (cherry picked from commit 09076512680b742ad369d6496bf9b6819a37af24) --- net/wget/Makefile | 2 +- net/wget/patches/100-fix-hsts-time.patch | 54 ++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 net/wget/patches/100-fix-hsts-time.patch diff --git a/net/wget/Makefile b/net/wget/Makefile index 0206a6135a..e250ab339e 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wget PKG_VERSION:=1.21.1 -PKG_RELEASE:=1 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) diff --git a/net/wget/patches/100-fix-hsts-time.patch b/net/wget/patches/100-fix-hsts-time.patch new file mode 100644 index 0000000000..964d2957b0 --- /dev/null +++ b/net/wget/patches/100-fix-hsts-time.patch @@ -0,0 +1,54 @@ +From: Huangbin Zhan +Date: Tue, 9 Nov 2021 23:05:55 +0800 +Subject: [PATCH] hsts.c: fix timestamp reading and writing. + +Always get zero time on big endian 32bit OS with 64bit time_t such as mips_24kc_musl. +--- + src/hsts.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +--- a/src/hsts.c ++++ b/src/hsts.c +@@ -280,7 +280,7 @@ hsts_read_database (hsts_store_t store, + + char host[256]; + int port; +- time_t created, max_age; ++ uintmax_t created, max_age; + int include_subdomains; + + func = (merge_with_existing_entries ? hsts_store_merge : hsts_new_entry); +@@ -293,15 +293,15 @@ hsts_read_database (hsts_store_t store, + if (*p == '#') + continue; + +- items_read = sscanf (p, "%255s %d %d %lu %lu", ++ items_read = sscanf (p, "%255s %d %d %"SCNuMAX" %"SCNuMAX, + host, + &port, + &include_subdomains, +- (unsigned long *) &created, +- (unsigned long *) &max_age); ++ &created, ++ &max_age); + + if (items_read == 5) +- func (store, host, port, created, max_age, !!include_subdomains); ++ func (store, host, port, (time_t) created, (time_t) max_age, !!include_subdomains); + } + + xfree (line); +@@ -326,10 +326,10 @@ hsts_store_dump (hsts_store_t store, FIL + struct hsts_kh *kh = (struct hsts_kh *) it.key; + struct hsts_kh_info *khi = (struct hsts_kh_info *) it.value; + +- if (fprintf (fp, "%s\t%d\t%d\t%lu\t%lu\n", ++ if (fprintf (fp, "%s\t%d\t%d\t%"PRIuMAX"\t%"PRIuMAX"\n", + kh->host, kh->explicit_port, khi->include_subdomains, +- (unsigned long) khi->created, +- (unsigned long) khi->max_age) < 0) ++ (uintmax_t) khi->created, ++ (uintmax_t) khi->max_age) < 0) + { + logprintf (LOG_ALWAYS, "Could not write the HSTS database correctly.\n"); + break; From a75ddf0974419656b25d3fb921dce1060dd9911c Mon Sep 17 00:00:00 2001 From: Huangbin Zhan Date: Wed, 20 Oct 2021 00:12:23 +0800 Subject: [PATCH 3/9] wget: update to 1.21.2 Signed-off-by: Huangbin Zhan (cherry picked from commit 9ac16d452845f8ef9922e9fddc0f44f1d5e2554e) --- net/wget/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/wget/Makefile b/net/wget/Makefile index e250ab339e..f6b0881211 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wget -PKG_VERSION:=1.21.1 +PKG_VERSION:=1.21.2 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_HASH:=59ba0bdade9ad135eda581ae4e59a7a9f25e3a4bde6a5419632b31906120e26e +PKG_HASH:=e6d4c76be82c676dd7e8c61a29b2ac8510ae108a810b5d1d18fc9a1d2c9a2497 PKG_MAINTAINER:=Peter Wagner PKG_LICENSE:=GPL-3.0-or-later From da0e7c29ef25316ce49a907b300e6e8be5296d1a Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Tue, 29 Nov 2022 20:03:26 +0200 Subject: [PATCH 4/9] wget: update to 1.21.3 Update wget to 1.21.3 * Remove patch 100-fix-hsts-time.patch as upstream has issued its own version on the fixes * Add a hack (and fixup autoreconf) to fix an upstream bug that forces the nettle library into nossl even if NTLM is disabled. Upstream bug filed: https://savannah.gnu.org/bugs/?63431 * Remove old maintainer who has not been active Signed-off-by: Hannu Nyman (cherry picked from commit a694130993d9d9eed8689ecdc1d6044dca3dc40e) --- net/wget/Makefile | 9 ++-- net/wget/patches/001-fix-nettle-ntml.patch | 18 ++++++++ net/wget/patches/100-fix-hsts-time.patch | 54 ---------------------- 3 files changed, 23 insertions(+), 58 deletions(-) create mode 100644 net/wget/patches/001-fix-nettle-ntml.patch delete mode 100644 net/wget/patches/100-fix-hsts-time.patch diff --git a/net/wget/Makefile b/net/wget/Makefile index f6b0881211..7589ef1a86 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -8,18 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wget -PKG_VERSION:=1.21.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.21.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_HASH:=e6d4c76be82c676dd7e8c61a29b2ac8510ae108a810b5d1d18fc9a1d2c9a2497 +PKG_HASH:=5726bb8bc5ca0f6dc7110f6416e4bb7019e2d2ff5bf93d1ca2ffcc6656f220e5 -PKG_MAINTAINER:=Peter Wagner +PKG_MAINTAINER:= PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:gnu:wget +PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 diff --git a/net/wget/patches/001-fix-nettle-ntml.patch b/net/wget/patches/001-fix-nettle-ntml.patch new file mode 100644 index 0000000000..1cddf4070f --- /dev/null +++ b/net/wget/patches/001-fix-nettle-ntml.patch @@ -0,0 +1,18 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -630,6 +630,7 @@ then + AC_DEFINE([ENABLE_NTLM], 1, [Define if you want the NTLM authorization support compiled in.]) + fi + else ++ if test x"$ENABLE_NTLM" != xno; then + PKG_CHECK_MODULES([NETTLE], nettle, [ + HAVE_NETTLE=yes + LIBS="$NETTLE_LIBS $LIBS" +@@ -651,6 +652,7 @@ else + ENABLE_NTLM=yes + AC_DEFINE([ENABLE_NTLM], 1, [Define if you want the NTLM authorization support compiled in.]) + fi ++ fi + fi + + dnl ********************************************************************** diff --git a/net/wget/patches/100-fix-hsts-time.patch b/net/wget/patches/100-fix-hsts-time.patch deleted file mode 100644 index 964d2957b0..0000000000 --- a/net/wget/patches/100-fix-hsts-time.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Huangbin Zhan -Date: Tue, 9 Nov 2021 23:05:55 +0800 -Subject: [PATCH] hsts.c: fix timestamp reading and writing. - -Always get zero time on big endian 32bit OS with 64bit time_t such as mips_24kc_musl. ---- - src/hsts.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - ---- a/src/hsts.c -+++ b/src/hsts.c -@@ -280,7 +280,7 @@ hsts_read_database (hsts_store_t store, - - char host[256]; - int port; -- time_t created, max_age; -+ uintmax_t created, max_age; - int include_subdomains; - - func = (merge_with_existing_entries ? hsts_store_merge : hsts_new_entry); -@@ -293,15 +293,15 @@ hsts_read_database (hsts_store_t store, - if (*p == '#') - continue; - -- items_read = sscanf (p, "%255s %d %d %lu %lu", -+ items_read = sscanf (p, "%255s %d %d %"SCNuMAX" %"SCNuMAX, - host, - &port, - &include_subdomains, -- (unsigned long *) &created, -- (unsigned long *) &max_age); -+ &created, -+ &max_age); - - if (items_read == 5) -- func (store, host, port, created, max_age, !!include_subdomains); -+ func (store, host, port, (time_t) created, (time_t) max_age, !!include_subdomains); - } - - xfree (line); -@@ -326,10 +326,10 @@ hsts_store_dump (hsts_store_t store, FIL - struct hsts_kh *kh = (struct hsts_kh *) it.key; - struct hsts_kh_info *khi = (struct hsts_kh_info *) it.value; - -- if (fprintf (fp, "%s\t%d\t%d\t%lu\t%lu\n", -+ if (fprintf (fp, "%s\t%d\t%d\t%"PRIuMAX"\t%"PRIuMAX"\n", - kh->host, kh->explicit_port, khi->include_subdomains, -- (unsigned long) khi->created, -- (unsigned long) khi->max_age) < 0) -+ (uintmax_t) khi->created, -+ (uintmax_t) khi->max_age) < 0) - { - logprintf (LOG_ALWAYS, "Could not write the HSTS database correctly.\n"); - break; From 2b3839e3e2b6133d5d1329af401a914b1829df6b Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sun, 11 Dec 2022 16:10:15 +0200 Subject: [PATCH 5/9] wget: apply upstream fix to avoid nettle linking in nossl Replace my own patch with the upstream solution, which they issued in response to my bug report. (Two patches as they overlooked something on the first try. Reference to https://savannah.gnu.org/bugs/index.php?63431 ) The nettle lib evaluation is now conditional to not having "--disable-ntlm". Signed-off-by: Hannu Nyman (cherry picked from commit fd7da3333e98c0d2ef1ed9d7997fe78000474caf) --- net/wget/Makefile | 2 +- net/wget/patches/001-fix-nettle-ntml.patch | 18 ----- .../001-upstream-fix-disable-ntlm-1.patch | 25 +++++++ .../002-upstream-fix-disable-ntlm-2.patch | 65 +++++++++++++++++++ 4 files changed, 91 insertions(+), 19 deletions(-) delete mode 100644 net/wget/patches/001-fix-nettle-ntml.patch create mode 100644 net/wget/patches/001-upstream-fix-disable-ntlm-1.patch create mode 100644 net/wget/patches/002-upstream-fix-disable-ntlm-2.patch diff --git a/net/wget/Makefile b/net/wget/Makefile index 7589ef1a86..006399312e 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wget PKG_VERSION:=1.21.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) diff --git a/net/wget/patches/001-fix-nettle-ntml.patch b/net/wget/patches/001-fix-nettle-ntml.patch deleted file mode 100644 index 1cddf4070f..0000000000 --- a/net/wget/patches/001-fix-nettle-ntml.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -630,6 +630,7 @@ then - AC_DEFINE([ENABLE_NTLM], 1, [Define if you want the NTLM authorization support compiled in.]) - fi - else -+ if test x"$ENABLE_NTLM" != xno; then - PKG_CHECK_MODULES([NETTLE], nettle, [ - HAVE_NETTLE=yes - LIBS="$NETTLE_LIBS $LIBS" -@@ -651,6 +652,7 @@ else - ENABLE_NTLM=yes - AC_DEFINE([ENABLE_NTLM], 1, [Define if you want the NTLM authorization support compiled in.]) - fi -+ fi - fi - - dnl ********************************************************************** diff --git a/net/wget/patches/001-upstream-fix-disable-ntlm-1.patch b/net/wget/patches/001-upstream-fix-disable-ntlm-1.patch new file mode 100644 index 0000000000..5b3b1a64f8 --- /dev/null +++ b/net/wget/patches/001-upstream-fix-disable-ntlm-1.patch @@ -0,0 +1,25 @@ +From 485217d0ff8d0d17ea3815244b2bc2b747451e15 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim=20R=C3=BChsen?= +Date: Sat, 10 Dec 2022 16:43:38 +0100 +Subject: [PATCH] * configure.ac: Allow disabling NTLM if nettle present (Savannah #63431) + +--- + configure.ac | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -648,8 +648,11 @@ else + + if test x"$HAVE_NETTLE" = xyes; then + AC_DEFINE([HAVE_NETTLE], [1], [Use libnettle]) +- ENABLE_NTLM=yes +- AC_DEFINE([ENABLE_NTLM], 1, [Define if you want the NTLM authorization support compiled in.]) ++ if test x"$ENABLE_NTLM" != xno ++ then ++ ENABLE_NTLM=yes ++ AC_DEFINE([ENABLE_NTLM], 1, [Define if you want the NTLM authorization support compiled in.]) ++ fi + fi + fi + diff --git a/net/wget/patches/002-upstream-fix-disable-ntlm-2.patch b/net/wget/patches/002-upstream-fix-disable-ntlm-2.patch new file mode 100644 index 0000000000..91fb52aa31 --- /dev/null +++ b/net/wget/patches/002-upstream-fix-disable-ntlm-2.patch @@ -0,0 +1,65 @@ +From c69030a904f8ab25b9ca2704c8a6dd03554e9503 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim=20R=C3=BChsen?= +Date: Sun, 11 Dec 2022 13:31:38 +0100 +Subject: [PATCH] * configure.ac: Disable nettle if NTLM is explicitly disabled + +--- + configure.ac | 41 +++++++++++++++++++---------------------- + 1 file changed, 19 insertions(+), 22 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -622,34 +622,31 @@ AS_IF([test x"$with_ssl" = xopenssl], [ + ]) # endif: --with-ssl == openssl? + + dnl Enable NTLM if requested and if SSL is available. +-if test x"$LIBSSL" != x || test "$ac_cv_lib_ssl32_SSL_connect" = yes ++if test x"$ENABLE_NTLM" != xno + then +- if test x"$ENABLE_NTLM" != xno ++ if test x"$LIBSSL" != x || test "$ac_cv_lib_ssl32_SSL_connect" = yes + then + ENABLE_NTLM=yes + AC_DEFINE([ENABLE_NTLM], 1, [Define if you want the NTLM authorization support compiled in.]) +- fi +-else +- PKG_CHECK_MODULES([NETTLE], nettle, [ +- HAVE_NETTLE=yes +- LIBS="$NETTLE_LIBS $LIBS" +- CFLAGS="$NETTLE_CFLAGS $CFLAGS" +- ], [ +- AC_CHECK_LIB(nettle, nettle_md4_init, [HAVE_NETTLE=yes], [HAVE_NETTLE=no; AC_MSG_WARN(*** libnettle was not found. You will not be able to use NTLM)]) +- if test x"$HAVE_NETTLE" != xyes; then +- if test x"$ENABLE_NTLM" = xyes; then +- AC_MSG_ERROR([NTLM authorization requested and SSL not enabled; aborting]) +- fi +- else +- AC_SUBST(NETTLE_LIBS, "-lnettle") ++ else ++ PKG_CHECK_MODULES([NETTLE], nettle, [ ++ HAVE_NETTLE=yes + LIBS="$NETTLE_LIBS $LIBS" +- fi +- ]) ++ CFLAGS="$NETTLE_CFLAGS $CFLAGS" ++ ], [ ++ AC_CHECK_LIB(nettle, nettle_md4_init, [HAVE_NETTLE=yes], [HAVE_NETTLE=no; AC_MSG_WARN(*** libnettle was not found. You will not be able to use NTLM)]) ++ if test x"$HAVE_NETTLE" != xyes; then ++ if test x"$ENABLE_NTLM" = xyes; then ++ AC_MSG_ERROR([NTLM authorization requested and SSL not enabled; aborting]) ++ fi ++ else ++ AC_SUBST(NETTLE_LIBS, "-lnettle") ++ LIBS="$NETTLE_LIBS $LIBS" ++ fi ++ ]) + +- if test x"$HAVE_NETTLE" = xyes; then +- AC_DEFINE([HAVE_NETTLE], [1], [Use libnettle]) +- if test x"$ENABLE_NTLM" != xno +- then ++ if test x"$HAVE_NETTLE" = xyes; then ++ AC_DEFINE([HAVE_NETTLE], [1], [Use libnettle]) + ENABLE_NTLM=yes + AC_DEFINE([ENABLE_NTLM], 1, [Define if you want the NTLM authorization support compiled in.]) + fi From a0fa77fafe86f855a1f9cca93631c8f2daa3a1b9 Mon Sep 17 00:00:00 2001 From: "Leon M. Busch-George" Date: Sun, 11 Jun 2023 20:39:06 +0200 Subject: [PATCH 6/9] wget: use pcre2 Pcre (1) is unmaintained and reached its end of life in 2021. The base system provides pcre2 exclusively since May. Signed-off-by: Leon M. Busch-George (cherry picked from commit 379946951c22ea774e4e22b4379571da604ded4b) --- net/wget/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/wget/Makefile b/net/wget/Makefile index 006399312e..f70c0def72 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wget PKG_VERSION:=1.21.3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) @@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/package.mk define Package/wget/Default SECTION:=net CATEGORY:=Network - DEPENDS:=+libpcre +zlib + DEPENDS:=+libpcre2 +zlib SUBMENU:=File Transfer TITLE:=Non-interactive network downloader URL:=https://www.gnu.org/software/wget/index.html @@ -73,7 +73,6 @@ endef CONFIGURE_ARGS+= \ --disable-rpath \ --disable-iri \ - --disable-pcre2 \ --with-included-libunistring \ --without-libuuid \ --without-libpsl From 2e9a63a900e14de5f46c24da96ebf4424a4ae55b Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 27 Sep 2023 16:27:44 +0200 Subject: [PATCH 7/9] apache: bump to release 2.4.57 Bump apache to release 2.4.57 and refresh patch automatically. Signed-off-by: Christian Marangi (cherry picked from commit 86f9af41c1cb8670e56be5d0fec8b64daf7c7499) --- net/apache/Makefile | 4 ++-- net/apache/patches/020-openssl-deprecated.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/apache/Makefile b/net/apache/Makefile index 9a6c881585..6b01b80292 100644 --- a/net/apache/Makefile +++ b/net/apache/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apache -PKG_VERSION:=2.4.52 +PKG_VERSION:=2.4.57 PKG_RELEASE:=1 PKG_SOURCE_NAME:=httpd PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@APACHE/httpd/ -PKG_HASH:=0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 +PKG_HASH:=dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION) diff --git a/net/apache/patches/020-openssl-deprecated.patch b/net/apache/patches/020-openssl-deprecated.patch index c4f600fa85..94115840a6 100644 --- a/net/apache/patches/020-openssl-deprecated.patch +++ b/net/apache/patches/020-openssl-deprecated.patch @@ -1,6 +1,6 @@ --- a/modules/md/md_crypt.c +++ b/modules/md/md_crypt.c -@@ -1139,23 +1139,23 @@ const char *md_cert_get_serial_number(co +@@ -1194,23 +1194,23 @@ int md_certs_are_equal(const md_cert_t * int md_cert_is_valid_now(const md_cert_t *cert) { @@ -102,7 +102,7 @@ * when the user points at an explicit non-engine flavor of OpenSSL --- a/support/ab.c +++ b/support/ab.c -@@ -652,11 +652,11 @@ static void ssl_print_cert_info(BIO *bio +@@ -665,11 +665,11 @@ static void ssl_print_cert_info(BIO *bio BIO_printf(bio, "Certificate version: %ld\n", X509_get_version(cert)+1); BIO_printf(bio,"Valid from: "); @@ -116,7 +116,7 @@ BIO_printf(bio,"\n"); pk = X509_get_pubkey(cert); -@@ -2634,8 +2634,10 @@ int main(int argc, const char * const ar +@@ -2647,8 +2647,10 @@ int main(int argc, const char * const ar CRYPTO_malloc_init(); #endif #endif From e5b7e46eff74305f2ad23f8f253b00ab719ae98c Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 27 Sep 2023 16:28:14 +0200 Subject: [PATCH 8/9] apache: move to PCRE2 Move apache to PCRE2 now that PCRE is flagged EOL and won't receive any security update. Signed-off-by: Christian Marangi (cherry picked from commit d14fe0c51c0be8d66772b83a165c7fb3c4850af0) --- net/apache/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/apache/Makefile b/net/apache/Makefile index 6b01b80292..5005a233dd 100644 --- a/net/apache/Makefile +++ b/net/apache/Makefile @@ -66,7 +66,7 @@ endef define Package/apache $(call Package/apache/Default) USERID:=apache=377:apache=377 - DEPENDS:=+libapr +libaprutil +libpcre + DEPENDS:=+libapr +libaprutil +libpcre2 endef define Package/apache/description @@ -201,7 +201,7 @@ CONFIGURE_ARGS+= \ --with-apr-util="$(STAGING_DIR)/usr/bin/apu-1-config" \ --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \ --with-mpm=prefork \ - --with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \ + --with-pcre="$(STAGING_DIR)/usr/bin/pcre2-config" \ --with-program-name=apache2 \ --with-ssl From 2db418f6707af1a938d6c033aa81946334c1a8bb Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 20 Sep 2023 21:00:32 +0200 Subject: [PATCH 9/9] libuecc: update repository URL I've changed my username to neocturne. Signed-off-by: Matthias Schiffer (cherry picked from commit 1df594bc01b0c7be34cd6eb477ebd1621959d15d) --- libs/libuecc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libuecc/Makefile b/libs/libuecc/Makefile index 57ca7a377f..afd2af22fb 100644 --- a/libs/libuecc/Makefile +++ b/libs/libuecc/Makefile @@ -13,7 +13,7 @@ PKG_RELEASE:=2 PKG_MAINTAINER:=Matthias Schiffer PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=https://github.com/NeoRaider/libuecc/releases/download/v$(PKG_VERSION) +PKG_SOURCE_URL:=https://github.com/neocturne/libuecc/releases/download/v$(PKG_VERSION) PKG_HASH:=b94aef08eab5359d0facaa7ead2ce81b193eef0c61379d9835213ebc0a46257a PKG_LICENSE:=BSD-2-Clause @@ -26,7 +26,7 @@ define Package/libuecc SECTION:=libs CATEGORY:=Libraries TITLE:=Very small Elliptic Curve Cryptography library - URL:=https://github.com/NeoRaider/libuecc/ + URL:=https://github.com/neocturne/libuecc/ endef TARGET_CFLAGS += -ffunction-sections -fdata-sections