From 18296154f8772ac61d4fb92e522f5f5099d7f400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Sat, 7 Jan 2023 13:16:57 +0100 Subject: groups/241.native_packages_inet.group: lighttpd: bump to v1.4.68 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups/241.native_packages_inet.group | 4 ++-- patches/lighttpd-1.4.67.local.patch | 18 ------------------ patches/lighttpd-1.4.67_pre.local.patch | 12 ------------ patches/lighttpd-1.4.68.local.patch | 18 ++++++++++++++++++ patches/lighttpd-1.4.68_pre.local.patch | 21 +++++++++++++++++++++ 5 files changed, 41 insertions(+), 32 deletions(-) delete mode 100644 patches/lighttpd-1.4.67.local.patch delete mode 100644 patches/lighttpd-1.4.67_pre.local.patch create mode 100644 patches/lighttpd-1.4.68.local.patch create mode 100644 patches/lighttpd-1.4.68_pre.local.patch diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index 5f7e4b82..8a2b8f91 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -130,8 +130,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_BUILD:="-j1"}; : ${PKG_LIGHTTPD_DEPENDS:="bzip2 pcre libressl libsasl2 libz gnutls"}; -: ${PKG_LIGHTTPD_SHA256SUM:=7e04d767f51a8d824b32e2483ef2950982920d427d1272ef4667f49d6f89f358}; -: ${PKG_LIGHTTPD_VERSION:=1.4.67}; +: ${PKG_LIGHTTPD_SHA256SUM:=e56f37ae52b63e1ada4d76ce78005affb6e56eea2f6bdb0ce17d6d36e9583384}; +: ${PKG_LIGHTTPD_VERSION:=1.4.68}; : ${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.67.local.patch b/patches/lighttpd-1.4.67.local.patch deleted file mode 100644 index 50a2ce94..00000000 --- a/patches/lighttpd-1.4.67.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.67_pre.local.patch b/patches/lighttpd-1.4.67_pre.local.patch deleted file mode 100644 index 596427ef..00000000 --- a/patches/lighttpd-1.4.67_pre.local.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru lighttpd-1.4.65.orig/configure lighttpd-1.4.65/configure ---- lighttpd-1.4.65.orig/configure 2022-06-29 20:12:39.278502239 +0200 -+++ lighttpd-1.4.65/configure 2022-06-29 20:18:18.776131546 +0200 -@@ -18859,7 +18859,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.68.local.patch b/patches/lighttpd-1.4.68.local.patch new file mode 100644 index 00000000..50a2ce94 --- /dev/null +++ b/patches/lighttpd-1.4.68.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.68_pre.local.patch b/patches/lighttpd-1.4.68_pre.local.patch new file mode 100644 index 00000000..dd5f1a4d --- /dev/null +++ b/patches/lighttpd-1.4.68_pre.local.patch @@ -0,0 +1,21 @@ +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