From 992b977314d0a0b961804c7707e79c8fcb00e92a Mon Sep 17 00:00:00 2001
From: Ørjan Malde <red@foxi.me>
Date: Feb 05 2022 15:50:13 +0000
Subject: groups/241.native_packages_inet.group: lighttpd: bump to v1.4.64


Signed-off-by: Ørjan Malde <red@foxi.me>

---

diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index dac4419..c17a8d5 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -120,11 +120,11 @@ gl_cv_ld_output_def=no"};
 : ${PKG_LDNS_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/ldns/ldns-${PKG_LDNS_VERSION}.tar.gz};
 : ${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 libz gnutls"};
-: ${PKG_LIGHTTPD_SHA256SUM:=2aef7f0102ebf54a1241a1c3ea8976892f8684bfb21697c9fffb8de0e2d6eab9};
-: ${PKG_LIGHTTPD_VERSION:=1.4.63};
+: ${PKG_LIGHTTPD_DEPENDS:="bzip2 pcre libressl libsasl2 libz gnutls"};
+: ${PKG_LIGHTTPD_SHA256SUM:=e1489d9fa7496fbf2e071c338b593b2300d38c23f1e5967e52c9ef482e1b0e26};
+: ${PKG_LIGHTTPD_VERSION:=1.4.64};
 : ${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-gdbm --with-geoip"};
+: ${PKG_LIGHTTPD_CONFIGURE_ARGS_EXTRA:="--with-pcre2=${PREFIX_NATIVE} --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:=285eed8591c7781ec26213df82786665aaa1b9286782e8a7a1a7e2a6e1630d63};
diff --git a/patches/lighttpd-1.4.63.local.patch b/patches/lighttpd-1.4.63.local.patch
deleted file mode 100644
index 50a2ce9..0000000
--- a/patches/lighttpd-1.4.63.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.63_pre.local.patch b/patches/lighttpd-1.4.63_pre.local.patch
deleted file mode 100644
index 23a3ed1..0000000
--- a/patches/lighttpd-1.4.63_pre.local.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Only in lighttpd-1.4.63/src: Makefile.
-diff -ru lighttpd-1.4.63.orig/src/Makefile.in lighttpd-1.4.63/src/Makefile.in
---- lighttpd-1.4.63.orig/src/Makefile.in	2021-12-04 15:40:42.000000000 +0100
-+++ lighttpd-1.4.63/src/Makefile.in	2021-12-11 13:14:04.707392975 +0100
-@@ -1858,7 +1858,7 @@
- @LIGHTTPD_STATIC_TRUE@	$(am__append_45) $(am__append_48) \
- @LIGHTTPD_STATIC_TRUE@	$(am__append_53) $(am__append_56) \
- @LIGHTTPD_STATIC_TRUE@	$(am__append_59) $(am__append_61)
--@LIGHTTPD_STATIC_FALSE@lighttpd_LDADD = $(PCRE_LIB) $(DL_LIB) $(SENDFILE_LIB) $(ATTR_LIB) $(common_libadd) $(CRYPTO_LIB) $(XXHASH_LIBS) $(FAM_LIBS) $(LIBEV_LIBS) $(LIBUNWIND_LIBS)
-+@LIGHTTPD_STATIC_FALSE@lighttpd_LDADD = $(common_libadd) $(PCRE_LIB) $(DL_LIB) $(SENDFILE_LIB) $(ATTR_LIB) $(CRYPTO_LIB) $(XXHASH_LIBS) $(FAM_LIBS) $(LIBEV_LIBS) $(LIBUNWIND_LIBS)
- @LIGHTTPD_STATIC_TRUE@lighttpd_LDADD = $(common_libadd) $(CRYPT_LIB) \
- @LIGHTTPD_STATIC_TRUE@	$(CRYPTO_LIB) $(XXHASH_LIBS) $(XML_LIBS) \
- @LIGHTTPD_STATIC_TRUE@	$(SQLITE_LIBS) $(UUID_LIBS) $(ELFTC_LIB) \
diff --git a/patches/lighttpd-1.4.64.local.patch b/patches/lighttpd-1.4.64.local.patch
new file mode 100644
index 0000000..50a2ce9
--- /dev/null
+++ b/patches/lighttpd-1.4.64.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) {