diff options
| -rw-r--r-- | groups/241.native_packages_inet.group | 6 | ||||
| -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.patch | 28 |
3 files changed, 31 insertions, 19 deletions
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index afc61318..9fa3f3d6 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -104,9 +104,9 @@ pacman 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:=1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f}; -: ${PKG_LIGHTTPD_VERSION:=1.4.45}; -: ${PKG_LIGHTTPD_URL:=http://download.lighttpd.net/lighttpd/releases-${PKG_LIGHTTPD_VERSION%.*}.x/lighttpd-${PKG_LIGHTTPD_VERSION}.tar.xz}; +: ${PKG_LIGHTTPD_SHA256SUM:=6a0b50e9c9d5cc3d9e48592315c25a2d645858f863e1ccd120507a30ce21e927}; +: ${PKG_LIGHTTPD_VERSION:=1.4.55}; +: ${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_LYNX_DEPENDS:="libreadline gnutls ncursesw"}; : ${PKG_LYNX_SHA256SUM:=6980e75cf0d677fd52c116e2e0dfd3884e360970c88c8356a114338500d5bee7}; 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) \ |