summaryrefslogtreecommitdiffhomepage
path: root/patches
diff options
context:
space:
mode:
Diffstat (limited to 'patches')
-rw-r--r--patches/lighttpd-1.4.55.local.patch (renamed from patches/lighttpd-1.4.45.local.patch)16
-rw-r--r--patches/lighttpd-1.4.55_pre.local.patch28
2 files changed, 28 insertions, 16 deletions
diff --git a/patches/lighttpd-1.4.45.local.patch b/patches/lighttpd-1.4.55.local.patch
index d3831cc7..50a2ce94 100644
--- a/patches/lighttpd-1.4.45.local.patch
+++ b/patches/lighttpd-1.4.55.local.patch
@@ -16,19 +16,3 @@
}
static handler_t network_server_handle_fdevent(server *srv, void *context, int revents) {
-@@ -445,6 +447,7 @@
- goto error_free_socket;
- }
-
-+#ifndef __midipix__
- if (srv_socket->addr.plain.sa_family != AF_UNIX) {
- val = 1;
- if (setsockopt(srv_socket->fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val)) < 0) {
-@@ -452,6 +455,7 @@
- goto error_free_socket;
- }
- }
-+#endif
-
- if (0 != bind(srv_socket->fd, (struct sockaddr *) &(srv_socket->addr), addr_len)) {
- switch(srv_socket->addr.plain.sa_family) {
diff --git a/patches/lighttpd-1.4.55_pre.local.patch b/patches/lighttpd-1.4.55_pre.local.patch
new file mode 100644
index 00000000..72863769
--- /dev/null
+++ b/patches/lighttpd-1.4.55_pre.local.patch
@@ -0,0 +1,28 @@
+diff -ru lighttpd-1.4.55.orig/src/Makefile.in lighttpd-1.4.55/src/Makefile.in
+--- lighttpd-1.4.55.orig/src/Makefile.in 2020-07-01 13:35:38.245249323 +0200
++++ lighttpd-1.4.55/src/Makefile.in 2020-07-01 13:38:37.027985608 +0200
+@@ -1640,10 +1640,10 @@
+ @BUILD_WITH_OPENSSL_TRUE@mod_openssl_la_LIBADD = $(SSL_LIB) $(common_libadd)
+ mod_rewrite_la_SOURCES = mod_rewrite.c
+ mod_rewrite_la_LDFLAGS = $(common_module_ldflags)
+-mod_rewrite_la_LIBADD = $(PCRE_LIB) $(common_libadd)
++mod_rewrite_la_LIBADD = $(common_libadd) $(PCRE_LIB)
+ mod_redirect_la_SOURCES = mod_redirect.c
+ mod_redirect_la_LDFLAGS = $(common_module_ldflags)
+-mod_redirect_la_LIBADD = $(PCRE_LIB) $(common_libadd)
++mod_redirect_la_LIBADD = $(common_libadd) $(PCRE_LIB)
+ mod_status_la_SOURCES = mod_status.c
+ mod_status_la_LDFLAGS = $(common_module_ldflags)
+ mod_status_la_LIBADD = $(common_libadd)
+diff -ru lighttpd-1.4.55.orig/src/Makefile.in lighttpd-1.4.55/src/Makefile.in
+--- lighttpd-1.4.55.orig/src/Makefile.in 2020-02-01 03:49:27.000000000 +0100
++++ lighttpd-1.4.55/src/Makefile.in 2020-07-01 13:34:55.853249066 +0200
+@@ -1702,7 +1702,7 @@
+ @LIGHTTPD_STATIC_TRUE@ $(LIBUNWIND_CFLAGS) $(am__append_22) \
+ @LIGHTTPD_STATIC_TRUE@ $(am__append_31) $(am__append_34) \
+ @LIGHTTPD_STATIC_TRUE@ $(am__append_37) $(am__append_41)
+-@LIGHTTPD_STATIC_FALSE@lighttpd_LDADD = $(PCRE_LIB) $(DL_LIB) $(SENDFILE_LIB) $(ATTR_LIB) $(common_libadd) $(CRYPTO_LIB) $(FAM_LIBS) $(LIBEV_LIBS) $(LIBUNWIND_LIBS)
++@LIGHTTPD_STATIC_FALSE@lighttpd_LDADD = $(common_libadd) $(PCRE_LIB) $(DL_LIB) $(SENDFILE_LIB) $(ATTR_LIB) $(CRYPTO_LIB) $(FAM_LIBS) $(LIBEV_LIBS) $(LIBUNWIND_LIBS)
+ @LIGHTTPD_STATIC_TRUE@lighttpd_LDADD = $(common_libadd) $(CRYPT_LIB) \
+ @LIGHTTPD_STATIC_TRUE@ $(CRYPTO_LIB) $(XML_LIBS) $(SQLITE_LIBS) \
+ @LIGHTTPD_STATIC_TRUE@ $(UUID_LIBS) $(ELFTC_LIB) $(PCRE_LIB) \