summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--groups/241.native_packages_inet.group4
-rw-r--r--patches/lighttpd-1.4.59_pre.local.patch25
-rw-r--r--patches/lighttpd-1.4.63.local.patch (renamed from patches/lighttpd-1.4.59.local.patch)0
-rw-r--r--patches/lighttpd-1.4.63_pre.local.patch13
4 files changed, 15 insertions, 27 deletions
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 9103e760..14b697f1 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -115,8 +115,8 @@ gl_cv_ld_output_def=no"};
: ${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:=fb953db273daef08edb6e202556cae8a3d07eed6081c96bd9903db957d1084d5};
-: ${PKG_LIGHTTPD_VERSION:=1.4.59};
+: ${PKG_LIGHTTPD_SHA256SUM:=2aef7f0102ebf54a1241a1c3ea8976892f8684bfb21697c9fffb8de0e2d6eab9};
+: ${PKG_LIGHTTPD_VERSION:=1.4.63};
: ${PKG_LIGHTTPD_URL:=https://download.lighttpd.net/lighttpd/releases-${PKG_LIGHTTPD_VERSION%.*}.x/lighttpd-${PKG_LIGHTTPD_VERSION}.tar.xz};
: ${PKG_LIGHTTPD_CONFIG_CACHE_EXTRA:="
ac_cv_path_PCRECONFIG=%PREFIX%/bin/pcre-config
diff --git a/patches/lighttpd-1.4.59_pre.local.patch b/patches/lighttpd-1.4.59_pre.local.patch
deleted file mode 100644
index 71689107..00000000
--- a/patches/lighttpd-1.4.59_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.63.local.patch
index 50a2ce94..50a2ce94 100644
--- a/patches/lighttpd-1.4.59.local.patch
+++ b/patches/lighttpd-1.4.63.local.patch
diff --git a/patches/lighttpd-1.4.63_pre.local.patch b/patches/lighttpd-1.4.63_pre.local.patch
new file mode 100644
index 00000000..23a3ed1c
--- /dev/null
+++ b/patches/lighttpd-1.4.63_pre.local.patch
@@ -0,0 +1,13 @@
+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) \