From f4ec955897c3179f242212413f13ce4a88096f7b Mon Sep 17 00:00:00 2001 From: Ørjan Malde Date: Jul 17 2021 14:44:37 +0000 Subject: groups/241.native_packages_inet.group: lighttpd: bump to v1.4.59 Signed-off-by: Ørjan Malde --- diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index e8d440c..dd0d225 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -107,8 +107,8 @@ proxytunnel rsync socat thttpd w3m weechat wget whois")"; : ${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"}; -: ${PKG_LIGHTTPD_SHA256SUM:=e4ce84cd79e8ae8ba193c7a7cc79c4afba9a076b443ef9f8d4bcd13a3354df77}; -: ${PKG_LIGHTTPD_VERSION:=1.4.56}; +: ${PKG_LIGHTTPD_SHA256SUM:=fb953db273daef08edb6e202556cae8a3d07eed6081c96bd9903db957d1084d5}; +: ${PKG_LIGHTTPD_VERSION:=1.4.59}; : ${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-pcre=${PREFIX_NATIVE}"}; : ${PKG_LINKS_DEPENDS:="bzip2 libz libpng libX11 libressl tiff libjpeg_turbo xz zstd"}; diff --git a/patches/lighttpd-1.4.56.local.patch b/patches/lighttpd-1.4.56.local.patch deleted file mode 100644 index 50a2ce9..0000000 --- a/patches/lighttpd-1.4.56.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.56_pre.local.patch b/patches/lighttpd-1.4.56_pre.local.patch deleted file mode 100644 index 7168910..0000000 --- a/patches/lighttpd-1.4.56_pre.local.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ru lighttpd-1.4.56.orig/src/Makefile.in lighttpd-1.4.56/src/Makefile.in ---- lighttpd-1.4.56.orig/src/Makefile.in 2020-11-29 23:32:23.000000000 +0100 -+++ lighttpd-1.4.56/src/Makefile.in 2020-12-13 15:46:36.596115969 +0100 -@@ -1771,10 +1771,10 @@ - @BUILD_WITH_WOLFSSL_TRUE@mod_wolfssl_la_CPPFLAGS = $(WOLFSSL_CFLAGS) - 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) -@@ -1842,7 +1842,7 @@ - @LIGHTTPD_STATIC_TRUE@ $(am__append_42) $(am__append_45) \ - @LIGHTTPD_STATIC_TRUE@ $(am__append_50) $(am__append_53) \ - @LIGHTTPD_STATIC_TRUE@ $(am__append_56) $(am__append_58) --@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) $(common_libadd) $(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.59.local.patch b/patches/lighttpd-1.4.59.local.patch new file mode 100644 index 0000000..50a2ce9 --- /dev/null +++ b/patches/lighttpd-1.4.59.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.59_pre.local.patch b/patches/lighttpd-1.4.59_pre.local.patch new file mode 100644 index 0000000..7168910 --- /dev/null +++ b/patches/lighttpd-1.4.59_pre.local.patch @@ -0,0 +1,25 @@ +diff -ru lighttpd-1.4.56.orig/src/Makefile.in lighttpd-1.4.56/src/Makefile.in +--- lighttpd-1.4.56.orig/src/Makefile.in 2020-11-29 23:32:23.000000000 +0100 ++++ lighttpd-1.4.56/src/Makefile.in 2020-12-13 15:46:36.596115969 +0100 +@@ -1771,10 +1771,10 @@ + @BUILD_WITH_WOLFSSL_TRUE@mod_wolfssl_la_CPPFLAGS = $(WOLFSSL_CFLAGS) + 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) +@@ -1842,7 +1842,7 @@ + @LIGHTTPD_STATIC_TRUE@ $(am__append_42) $(am__append_45) \ + @LIGHTTPD_STATIC_TRUE@ $(am__append_50) $(am__append_53) \ + @LIGHTTPD_STATIC_TRUE@ $(am__append_56) $(am__append_58) +-@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) $(common_libadd) $(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) \