<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/81d0f4da5fd6aef7450158f07d6a44722d992bd4">https://github.com/macports/macports-ports/commit/81d0f4da5fd6aef7450158f07d6a44722d992bd4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 81d0f4da5fd6aef7450158f07d6a44722d992bd4
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jun 8 14:01:34 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> lighttpd: Update to 1.4.65
</span>---
www/lighttpd/Portfile | 15 +++----
www/lighttpd/files/gcc-diag.patch | 82 -------------------------------------
www/lighttpd/files/mod_webdav.patch | 45 --------------------
www/lighttpd/files/patch-conf.diff | 6 +--
www/lighttpd/files/rand.patch | 16 --------
5 files changed, 9 insertions(+), 155 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/lighttpd/Portfile b/www/lighttpd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c6dbace7167..90cb59484e9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/lighttpd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/lighttpd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,11 +4,11 @@ PortSystem 1.0
</span> PortGroup legacysupport 1.0
name lighttpd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4.64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 efbe3d206de597ef6e8e539f42142dbc21a8c868 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e1489d9fa7496fbf2e071c338b593b2300d38c23f1e5967e52c9ef482e1b0e26 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1011436
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.4.65
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8c601ddcc073a2b5b7a735d0cd6f72e05f594db1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bf0fa68a629fbc404023a912b377e70049331d6797bcbb4b3e8df4c3b42328be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1033568
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,10 +37,7 @@ depends_lib port:brotli \
</span> port:zlib \
port:zstd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-conf.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rand.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mod_webdav.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gcc-diag.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-conf.diff
</span>
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/lighttpd/files/gcc-diag.patch b/www/lighttpd/files/gcc-diag.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5d004d756e6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/lighttpd/files/gcc-diag.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,82 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/ls-hpack/lshpack.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/ls-hpack/lshpack.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -691,6 +691,11 @@ lshpack_enc_enc_int (unsigned char *dst, unsigned char *const end,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __GNUC__ && !defined(__COVERITY__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#pragma GCC diagnostic ignored "-Wuninitialized"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lshpack_enc_huff_encode (const unsigned char *src,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const unsigned char *const src_end, unsigned char *const dst, int dst_len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -701,9 +706,6 @@ lshpack_enc_huff_encode (const unsigned char *src,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned bits_used = 0, adj;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct encode_el cur_enc_code;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if __GNUC__ && !defined(__COVERITY__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#pragma GCC diagnostic ignored "-Wuninitialized"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bits = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -817,10 +819,10 @@ lshpack_enc_huff_encode (const unsigned char *src,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return p_dst - dst;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __GNUC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __GNUC__ && !defined(__COVERITY__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma GCC diagnostic pop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if !LS_HPACK_EMIT_TEST_CODE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1853,6 +1855,11 @@ need_more_buf:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define SHORTEST_CODE 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __GNUC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#pragma GCC diagnostic ignored "-Wuninitialized"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* The decoder is optimized for the common case. Most of the time, we decode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * data whose encoding is 16 bits or shorter. This lets us use a 64 KB table
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * indexed by two bytes of input and outputs 1, 2, or 3 bytes at a time.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1874,10 +1881,6 @@ lshpack_dec_huff_decode (const unsigned char *src, int src_len,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if __GNUC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#pragma GCC diagnostic ignored "-Wuninitialized"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buf = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2038,9 +2041,6 @@ lshpack_dec_huff_decode (const unsigned char *src, int src_len,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (((1u << avail_bits) - 1) != (buf & ((1u << avail_bits) - 1)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1; /* Not EOF as expected */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __GNUC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#pragma GCC diagnostic pop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return dst - orig_dst;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2057,7 +2057,11 @@ lshpack_dec_huff_decode (const unsigned char *src, int src_len,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __GNUC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#pragma GCC diagnostic pop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if __GNUC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma GCC diagnostic pop /* -Wunknown-pragmas */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/lighttpd/files/mod_webdav.patch b/www/lighttpd/files/mod_webdav.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fd2a72105ac..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/lighttpd/files/mod_webdav.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,45 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build failure on Mac OS X 10.5 thru 10.11.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-There is no COPYFILE_CLONE_FORCE on OSX <10.12 so fall back to using
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fcopyfile() to avoid race condition on source (if changed to dir) if
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-using copyfile() with flags equivalent to COPYFILE_CLONE_FORCE, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-without the 'force' flag.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://redmine.lighttpd.net/issues/3142
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://redmine.lighttpd.net/projects/lighttpd/repository/14/revisions/4432e34253f3ebbbd239ac867207b39a84fdc8f2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/mod_webdav.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/mod_webdav.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2587,15 +2587,11 @@ webdav_copytmp_rename (const plugin_config * const pconf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int * const flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200 /* 10.12+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!(*flags & (WEBDAV_FLAG_COPY_XDEV
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- |WEBDAV_FLAG_MOVE_XDEV
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- |WEBDAV_FLAG_NO_CLONE))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200 /* 10.12+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (0==clonefile(src->path.ptr,dst->path.ptr,CLONE_NOFOLLOW))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #else /* __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (0==copyfile(src->path.ptr,dst->path.ptr,NULL,COPYFILE_CLONE_FORCE))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* target did not exist; skip stat_cache_delete_entry() */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0; /* copied */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2635,15 +2631,11 @@ webdav_copytmp_rename (const plugin_config * const pconf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- do {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200 /* 10.12+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!(*flags & (WEBDAV_FLAG_COPY_XDEV
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- |WEBDAV_FLAG_MOVE_XDEV
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- |WEBDAV_FLAG_NO_CLONE))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200 /* 10.12+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (0 == clonefile(src->path.ptr, tmpb->ptr, CLONE_NOFOLLOW))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #else /* __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (0 == copyfile(src->path.ptr, tmpb->ptr, NULL, COPYFILE_CLONE_FORCE))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break; /* copied */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (errno) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/lighttpd/files/patch-conf.diff b/www/lighttpd/files/patch-conf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5954991115d..dd40d988b72 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/lighttpd/files/patch-conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/lighttpd/files/patch-conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,8 +84,8 @@
</span>
##
#######################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/config/lighttpd.conf.orig 2020-12-17 03:11:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/config/lighttpd.conf 2020-12-18 01:14:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/config/lighttpd.conf.orig 2022-06-07 22:05:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/config/lighttpd.conf 2022-06-08 13:51:38.000000000 -0500
</span> @@ -13,11 +13,11 @@
## if you add a variable here. Add the corresponding variable in the
## chroot example as well.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,7 +112,7 @@
</span>
##
## Base directory for sockets.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -385,7 +385,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -388,7 +388,7 @@
</span> ## Format: <errorfile-prefix><status-code>.html
## -> ..../status-404.html for 'File not found'
##
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/lighttpd/files/rand.patch b/www/lighttpd/files/rand.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 722e157b688..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/lighttpd/files/rand.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build failure on OS X 10.10 thru 10.13.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://redmine.lighttpd.net/issues/3140
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/rand.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/rand.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -82,9 +82,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/ioctl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101000 /* OS X 10.10+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200 /* OS X 10.12+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_ARC4RANDOM_BUF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define HAVE_CCRANDOMGENERATEBYTES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <CommonCrypto/CommonCryptoError.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CommonCrypto/CommonRandom.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span></pre><pre style='margin:0'>
</pre>