From 992b977314d0a0b961804c7707e79c8fcb00e92a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Sat, 5 Feb 2022 16:48:42 +0100
Subject: groups/241.native_packages_inet.group: lighttpd: bump to v1.4.64
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ørjan Malde <red@foxi.me>
---
 patches/lighttpd-1.4.63.local.patch     | 18 ------------------
 patches/lighttpd-1.4.63_pre.local.patch | 13 -------------
 patches/lighttpd-1.4.64.local.patch     | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 31 deletions(-)
 delete mode 100644 patches/lighttpd-1.4.63.local.patch
 delete mode 100644 patches/lighttpd-1.4.63_pre.local.patch
 create mode 100644 patches/lighttpd-1.4.64.local.patch

(limited to 'patches')

diff --git a/patches/lighttpd-1.4.63.local.patch b/patches/lighttpd-1.4.63.local.patch
deleted file mode 100644
index 50a2ce94..00000000
--- 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 23a3ed1c..00000000
--- 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 00000000..50a2ce94
--- /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) {
-- 
cgit v1.2.3