From af9da67ef52b7557fdb15456d55342ee9fc67b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Sun, 21 May 2023 14:18:30 +0200 Subject: groups.d/241.native_packages_inet.group: lighttpd: bump to v1.4.70 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups.d/241.native_packages_inet.group | 4 ++-- patches/lighttpd-1.4.69.local.patch | 18 ------------------ patches/lighttpd-1.4.69_pre.local.patch | 21 --------------------- patches/lighttpd-1.4.70.local.patch | 18 ++++++++++++++++++ patches/lighttpd-1.4.70_pre.local.patch | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 53 insertions(+), 41 deletions(-) delete mode 100644 patches/lighttpd-1.4.69.local.patch delete mode 100644 patches/lighttpd-1.4.69_pre.local.patch create mode 100644 patches/lighttpd-1.4.70.local.patch create mode 100644 patches/lighttpd-1.4.70_pre.local.patch diff --git a/groups.d/241.native_packages_inet.group b/groups.d/241.native_packages_inet.group index 2a4978cf..e4d20558 100644 --- a/groups.d/241.native_packages_inet.group +++ b/groups.d/241.native_packages_inet.group @@ -128,8 +128,8 @@ gl_cv_ld_output_def=no"}; : ${PKG_LDNS_CONFIGURE_ARGS_EXTRA:="--with-ssl=${PREFIX_NATIVE} --disable-dane-ta-usage --with-drill --with-examples"}; : ${PKG_LDNS_MAKEFLAGS_PARALLELISE:="-j1"}; : ${PKG_LIGHTTPD_DEPENDS:="bzip2 pcre libressl libsasl2 libz gnutls"}; -: ${PKG_LIGHTTPD_SHA256SUM:=16ac8db95e719629ba61949b99f8a26feba946a81d185215b28379bb4116b0b4}; -: ${PKG_LIGHTTPD_VERSION:=1.4.69}; +: ${PKG_LIGHTTPD_SHA256SUM:=921ebe1cf4b6b9897e03779ab7a23a31f4ba40a1abe2067525c33cd3ce61fe85}; +: ${PKG_LIGHTTPD_VERSION:=1.4.70}; : ${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.69.local.patch b/patches/lighttpd-1.4.69.local.patch deleted file mode 100644 index 50a2ce94..00000000 --- a/patches/lighttpd-1.4.69.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.69_pre.local.patch b/patches/lighttpd-1.4.69_pre.local.patch deleted file mode 100644 index dd5f1a4d..00000000 --- a/patches/lighttpd-1.4.69_pre.local.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru lighttpd-1.4.68.orig/configure lighttpd-1.4.68/configure ---- lighttpd-1.4.68.orig/configure 2023-01-03 14:05:40.000000000 +0100 -+++ lighttpd-1.4.68/configure 2023-01-07 13:13:44.702656206 +0100 -@@ -18388,7 +18388,7 @@ - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_GNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 3.3.0" 2>/dev/null` -+ pkg_cv_GNUTLS_LIBS=`$PKG_CONFIG --libs-only-l "gnutls >= 3.3.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -18771,7 +18771,7 @@ - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_PCRE2_LIBS=`$PKG_CONFIG --libs "libpcre2-8" 2>/dev/null` -+ pkg_cv_PCRE2_LIBS=`$PKG_CONFIG --libs-only-l "libpcre2-8" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes diff --git a/patches/lighttpd-1.4.70.local.patch b/patches/lighttpd-1.4.70.local.patch new file mode 100644 index 00000000..50a2ce94 --- /dev/null +++ b/patches/lighttpd-1.4.70.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.70_pre.local.patch b/patches/lighttpd-1.4.70_pre.local.patch new file mode 100644 index 00000000..3a114822 --- /dev/null +++ b/patches/lighttpd-1.4.70_pre.local.patch @@ -0,0 +1,33 @@ +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 -ru lighttpd-1.4.68.orig/configure lighttpd-1.4.68/configure +--- lighttpd-1.4.68.orig/configure 2023-01-03 14:05:40.000000000 +0100 ++++ lighttpd-1.4.68/configure 2023-01-07 13:13:44.702656206 +0100 +@@ -18388,7 +18388,7 @@ + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 3.3.0" 2>/dev/null` ++ pkg_cv_GNUTLS_LIBS=`$PKG_CONFIG --libs-only-l "gnutls >= 3.3.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -18771,7 +18771,7 @@ + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_PCRE2_LIBS=`$PKG_CONFIG --libs "libpcre2-8" 2>/dev/null` ++ pkg_cv_PCRE2_LIBS=`$PKG_CONFIG --libs-only-l "libpcre2-8" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes -- cgit v1.2.3