diff --git a/groups.d/241.native_packages_inet.group b/groups.d/241.native_packages_inet.group index 46598d4..e82b959 100644 --- a/groups.d/241.native_packages_inet.group +++ b/groups.d/241.native_packages_inet.group @@ -134,8 +134,8 @@ gl_cv_ld_output_def=no"}; : ${PKG_LDNS_CONFIGURE_ARGS_EXTRA:="--with-ssl=${PREFIX_NATIVE} --disable-dane-ta-usage --disable-gost --with-drill --with-examples"}; : ${PKG_LDNS_MAKEFLAGS_PARALLELISE:="-j1"}; : ${PKG_LIGHTTPD_DEPENDS:="bzip2 pcre libressl libsasl2 libz gnutls"}; -: ${PKG_LIGHTTPD_SHA256SUM:=818816d0b314b0aa8728a7076513435f6d5eb227f3b61323468e1f10dbe84ca8}; -: ${PKG_LIGHTTPD_VERSION:=1.4.73}; +: ${PKG_LIGHTTPD_SHA256SUM:=8cbf4296e373cfd0cedfe9d978760b5b05c58fdc4048b4e2bcaf0a61ac8f5011}; +: ${PKG_LIGHTTPD_VERSION:=1.4.76}; : ${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.73.local.patch b/patches/lighttpd-1.4.73.local.patch deleted file mode 100644 index 50a2ce9..0000000 --- a/patches/lighttpd-1.4.73.local.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- lighttpd-1.4.45/src/network.c.orig 2017-01-14 05:05:17.000000000 +0000 -+++ lighttpd-1.4.45/src/network.c 2018-02-17 20:39:33.920000000 +0000 -@@ -53,6 +53,7 @@ - void - network_accept_tcp_nagle_disable (const int fd) - { -+#ifndef __midipix__ - static int noinherit_tcpnodelay = -1; - int opt; - -@@ -70,6 +71,7 @@ - - opt = 1; - (void)setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt)); -+#endif - } - - static handler_t network_server_handle_fdevent(server *srv, void *context, int revents) { diff --git a/patches/lighttpd-1.4.73_pre.local.patch b/patches/lighttpd-1.4.73_pre.local.patch deleted file mode 100644 index 004f3b3..0000000 --- a/patches/lighttpd-1.4.73_pre.local.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru lighttpd-1.4.70.orig/src/Makefile.in lighttpd-1.4.70/src/Makefile.in ---- lighttpd-1.4.70.orig/src/Makefile.in 2023-05-10 09:21:16.000000000 +0200 -+++ lighttpd-1.4.70/src/Makefile.in 2023-05-21 14:12:46.984527740 +0200 -@@ -1469,7 +1469,7 @@ - @NO_RDYNAMIC_TRUE@common_ldflags = -avoid-version -no-undefined - @NO_RDYNAMIC_TRUE@liblightcomp_la_SOURCES = $(common_src) - @NO_RDYNAMIC_TRUE@liblightcomp_la_CFLAGS = $(AM_CFLAGS) $(LIBEV_CFLAGS) --@NO_RDYNAMIC_TRUE@liblightcomp_la_LDFLAGS = $(common_ldflags) --export-all-symbols -+@NO_RDYNAMIC_TRUE@liblightcomp_la_LDFLAGS = $(common_ldflags) - @NO_RDYNAMIC_TRUE@liblightcomp_la_LIBADD = $(PCRE_LIB) $(CRYPTO_LIB) $(FAM_LIBS) $(LIBEV_LIBS) $(ATTR_LIB) $(WS2_32_LIB) - @NO_RDYNAMIC_FALSE@common_libadd = - @NO_RDYNAMIC_TRUE@common_libadd = liblightcomp.la diff --git a/patches/lighttpd-1.4.76.local.patch b/patches/lighttpd-1.4.76.local.patch new file mode 100644 index 0000000..50a2ce9 --- /dev/null +++ b/patches/lighttpd-1.4.76.local.patch @@ -0,0 +1,18 @@ +--- lighttpd-1.4.45/src/network.c.orig 2017-01-14 05:05:17.000000000 +0000 ++++ lighttpd-1.4.45/src/network.c 2018-02-17 20:39:33.920000000 +0000 +@@ -53,6 +53,7 @@ + void + network_accept_tcp_nagle_disable (const int fd) + { ++#ifndef __midipix__ + static int noinherit_tcpnodelay = -1; + int opt; + +@@ -70,6 +71,7 @@ + + opt = 1; + (void)setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt)); ++#endif + } + + static handler_t network_server_handle_fdevent(server *srv, void *context, int revents) { diff --git a/patches/lighttpd-1.4.76_pre.local.patch b/patches/lighttpd-1.4.76_pre.local.patch new file mode 100644 index 0000000..5536067 --- /dev/null +++ b/patches/lighttpd-1.4.76_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