From d483948e94dac6233a81f537df42ad669d8d8dc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Wed, 29 Jun 2022 20:22:12 +0200
Subject: groups/241.native-packages_inet.group: lighttpd: bump to v1.4.65
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ørjan Malde <red@foxi.me>
---
 groups/241.native_packages_inet.group   |  6 +++---
 patches/lighttpd-1.4.64.local.patch     | 18 ------------------
 patches/lighttpd-1.4.65.local.patch     | 18 ++++++++++++++++++
 patches/lighttpd-1.4.65_pre.local.patch | 12 ++++++++++++
 4 files changed, 33 insertions(+), 21 deletions(-)
 delete mode 100644 patches/lighttpd-1.4.64.local.patch
 create mode 100644 patches/lighttpd-1.4.65.local.patch
 create mode 100644 patches/lighttpd-1.4.65_pre.local.patch

diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 4a6aa5a4..4bccc1da 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -122,10 +122,10 @@ 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:=e1489d9fa7496fbf2e071c338b593b2300d38c23f1e5967e52c9ef482e1b0e26};
-: ${PKG_LIGHTTPD_VERSION:=1.4.64};
+: ${PKG_LIGHTTPD_SHA256SUM:=bf0fa68a629fbc404023a912b377e70049331d6797bcbb4b3e8df4c3b42328be};
+: ${PKG_LIGHTTPD_VERSION:=1.4.65};
 : ${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=${PREFIX_NATIVE} --with-bzip2 --with-openssl --with-gnutls --with-libxml --with-sasl"};
+: ${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"};
 : ${PKG_LINKS_DEPENDS:="bzip2 libz libpng libX11 libressl tiff libjpeg_turbo xz zstd"};
 : ${PKG_LINKS_SHA256SUM:=d8ddcbfcede7cdde80abeb0a236358f57fa6beb2bcf92e109624e9b896f9ebb4};
diff --git a/patches/lighttpd-1.4.64.local.patch b/patches/lighttpd-1.4.64.local.patch
deleted file mode 100644
index 50a2ce94..00000000
--- a/patches/lighttpd-1.4.64.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.65.local.patch b/patches/lighttpd-1.4.65.local.patch
new file mode 100644
index 00000000..50a2ce94
--- /dev/null
+++ b/patches/lighttpd-1.4.65.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.65_pre.local.patch b/patches/lighttpd-1.4.65_pre.local.patch
new file mode 100644
index 00000000..596427ef
--- /dev/null
+++ b/patches/lighttpd-1.4.65_pre.local.patch
@@ -0,0 +1,12 @@
+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
-- 
cgit v1.2.3