diff --git a/groups.d/241.native_packages_inet.d/lighttpd.package b/groups.d/241.native_packages_inet.d/lighttpd.package index 88c02ba..87e9f2e 100644 --- a/groups.d/241.native_packages_inet.d/lighttpd.package +++ b/groups.d/241.native_packages_inet.d/lighttpd.package @@ -1,6 +1,6 @@ : ${PKG_LIGHTTPD_DEPENDS:="bzip2 pcre libressl libsasl2 libz gnutls"}; -: ${PKG_LIGHTTPD_SHA256SUM:=8cbf4296e373cfd0cedfe9d978760b5b05c58fdc4048b4e2bcaf0a61ac8f5011}; -: ${PKG_LIGHTTPD_VERSION:=1.4.76}; +: ${PKG_LIGHTTPD_SHA256SUM:=acafabdbfa2267d8b6452d03d85fdd2a66525f3f05a36a79b6645c017f1562ce}; +: ${PKG_LIGHTTPD_VERSION:=1.4.77}; : ${PKG_LIGHTTPD_URL:=https://download.lighttpd.net/lighttpd/releases-${PKG_LIGHTTPD_VERSION%.*}.x/lighttpd-${PKG_LIGHTTPD_VERSION}.tar.xz}; : ${PKG_LIGHTTPD_CONFIGURE_ARGS_EXTRA:="--with-pcre2 --with-bzip2 --with-openssl --with-gnutls --with-libxml --with-sasl"}; : ${PKG_LIGHTTPD_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/lua5.4"}; diff --git a/patches/lighttpd-1.4.76_pre.local.patch b/patches/lighttpd-1.4.76_pre.local.patch deleted file mode 100644 index 5536067..0000000 --- a/patches/lighttpd-1.4.76_pre.local.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ru lighttpd-1.4.76.orig/configure.ac lighttpd-1.4.76/configure.ac ---- lighttpd-1.4.76.orig/configure.ac 2024-04-11 07:30:19.000000000 +0200 -+++ lighttpd-1.4.76/configure.ac 2024-04-18 12:53:43.846262167 +0200 -@@ -61,7 +61,6 @@ - - dnl Checks for programs. - AC_PROG_CC --AC_PROG_CC_C99 - AX_PROG_CC_FOR_BUILD - LT_PATH_LD - AC_PROG_INSTALL -diff -ru lighttpd-1.4.76.orig/src/Makefile.am lighttpd-1.4.76/src/Makefile.am ---- lighttpd-1.4.76.orig/src/Makefile.am 2024-04-11 07:30:19.000000000 +0200 -+++ lighttpd-1.4.76/src/Makefile.am 2024-04-18 12:45:07.642508927 +0200 -@@ -107,7 +107,7 @@ - lib_LTLIBRARIES += liblightcomp.la - liblightcomp_la_SOURCES=$(common_src) - liblightcomp_la_CFLAGS=$(AM_CFLAGS) $(LIBEV_CFLAGS) --liblightcomp_la_LDFLAGS = $(common_ldflags) --export-all-symbols -+liblightcomp_la_LDFLAGS = $(common_ldflags) - liblightcomp_la_LIBADD = $(PCRE_LIB) $(CRYPTO_LIB) $(FAM_LIBS) $(LIBEV_LIBS) $(ATTR_LIB) $(WS2_32_LIB) - common_libadd = liblightcomp.la - if !LIGHTTPD_STATIC diff --git a/patches/lighttpd-1.4.77.local.patch b/patches/lighttpd-1.4.77.local.patch new file mode 100644 index 0000000..3acc57e --- /dev/null +++ b/patches/lighttpd-1.4.77.local.patch @@ -0,0 +1,19 @@ +diff -ru lighttpd-1.4.77.orig/src/mod_openssl.c lighttpd-1.4.77/src/mod_openssl.c +--- lighttpd-1.4.77.orig/src/mod_openssl.c 2025-01-10 05:12:08.000000000 +0100 ++++ lighttpd-1.4.77/src/mod_openssl.c 2025-02-22 13:20:20.502779996 +0100 +@@ -3020,15 +3020,7 @@ + "X25519:P-256:P-384:X448"; + #endif + +- #if (defined(BORINGSSL_API_VERSION) && BORINGSSL_API_VERSION >= 19) \ +- || (defined(LIBRESSL_VERSION_NUMBER) \ +- && LIBRESSL_VERSION_NUMBER >= 0x2050100fL) \ +- || OPENSSL_VERSION_NUMBER >= 0x10101000L + int rc = SSL_CTX_set1_groups_list(s->ssl_ctx, groups); +- #elif (defined(BORINGSSL_API_VERSION && BORINGSSL_API_VERSION >= 3) \ +- || OPENSSL_VERSION_NUMBER >= 0x10100000L +- int rc = SSL_CTX_set1_curves_list(s->ssl_ctx, groups); +- #endif + if (1 != rc) { + log_error(srv->errh, __FILE__, __LINE__, + "SSL: Unable to config groups %s", groups); diff --git a/patches/lighttpd-1.4.77_pre.local.patch b/patches/lighttpd-1.4.77_pre.local.patch new file mode 100644 index 0000000..5536067 --- /dev/null +++ b/patches/lighttpd-1.4.77_pre.local.patch @@ -0,0 +1,23 @@ +diff -ru lighttpd-1.4.76.orig/configure.ac lighttpd-1.4.76/configure.ac +--- lighttpd-1.4.76.orig/configure.ac 2024-04-11 07:30:19.000000000 +0200 ++++ lighttpd-1.4.76/configure.ac 2024-04-18 12:53:43.846262167 +0200 +@@ -61,7 +61,6 @@ + + dnl Checks for programs. + AC_PROG_CC +-AC_PROG_CC_C99 + AX_PROG_CC_FOR_BUILD + LT_PATH_LD + AC_PROG_INSTALL +diff -ru lighttpd-1.4.76.orig/src/Makefile.am lighttpd-1.4.76/src/Makefile.am +--- lighttpd-1.4.76.orig/src/Makefile.am 2024-04-11 07:30:19.000000000 +0200 ++++ lighttpd-1.4.76/src/Makefile.am 2024-04-18 12:45:07.642508927 +0200 +@@ -107,7 +107,7 @@ + lib_LTLIBRARIES += liblightcomp.la + liblightcomp_la_SOURCES=$(common_src) + liblightcomp_la_CFLAGS=$(AM_CFLAGS) $(LIBEV_CFLAGS) +-liblightcomp_la_LDFLAGS = $(common_ldflags) --export-all-symbols ++liblightcomp_la_LDFLAGS = $(common_ldflags) + liblightcomp_la_LIBADD = $(PCRE_LIB) $(CRYPTO_LIB) $(FAM_LIBS) $(LIBEV_LIBS) $(ATTR_LIB) $(WS2_32_LIB) + common_libadd = liblightcomp.la + if !LIGHTTPD_STATIC