summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--groups/241.native_packages_inet.group4
-rw-r--r--patches/lighttpd-1.4.55_pre.local.patch28
-rw-r--r--patches/lighttpd-1.4.56.local.patch (renamed from patches/lighttpd-1.4.55.local.patch)0
-rw-r--r--patches/lighttpd-1.4.56_pre.local.patch25
4 files changed, 27 insertions, 30 deletions
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index b7d13cdf..7f9355bf 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -104,8 +104,8 @@ 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:=6a0b50e9c9d5cc3d9e48592315c25a2d645858f863e1ccd120507a30ce21e927};
-: ${PKG_LIGHTTPD_VERSION:=1.4.55};
+: ${PKG_LIGHTTPD_SHA256SUM:=e4ce84cd79e8ae8ba193c7a7cc79c4afba9a076b443ef9f8d4bcd13a3354df77};
+: ${PKG_LIGHTTPD_VERSION:=1.4.56};
: ${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.55_pre.local.patch b/patches/lighttpd-1.4.55_pre.local.patch
deleted file mode 100644
index 72863769..00000000
--- a/patches/lighttpd-1.4.55_pre.local.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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) \
diff --git a/patches/lighttpd-1.4.55.local.patch b/patches/lighttpd-1.4.56.local.patch
index 50a2ce94..50a2ce94 100644
--- a/patches/lighttpd-1.4.55.local.patch
+++ b/patches/lighttpd-1.4.56.local.patch
diff --git a/patches/lighttpd-1.4.56_pre.local.patch b/patches/lighttpd-1.4.56_pre.local.patch
new file mode 100644
index 00000000..71689107
--- /dev/null
+++ b/patches/lighttpd-1.4.56_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) \