<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/ab3d120c565ddad0c407026548f9a69c4b5bd01c">https://github.com/macports/macports-ports/commit/ab3d120c565ddad0c407026548f9a69c4b5bd01c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ab3d120c565 lighttpd: update to 1.4.64
</span>ab3d120c565 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ab3d120c565ddad0c407026548f9a69c4b5bd01c
</span>Author: Glenn Strauss <gstrauss@gluelogic.com>
AuthorDate: Fri Jan 21 06:17:02 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> lighttpd: update to 1.4.64
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update to 1.4.64
</span><span style='display:block; white-space:pre;color:#404040;'> * remove files/implicit.patch; incorporated upstream
</span><span style='display:block; white-space:pre;color:#404040;'> * remove compiler.blacklist gcc 3.* 4.*
</span><span style='display:block; white-space:pre;color:#404040;'> provide patch to move #pragma GCC diagnostic outside funcs
</span><span style='display:block; white-space:pre;color:#404040;'> https://trac.macports.org/ticket/62625
</span><span style='display:block; white-space:pre;color:#404040;'> * remove patch to doc/config/conf.d/mysql_vhost.conf
</span><span style='display:block; white-space:pre;color:#404040;'> (removed in lighttpd 1.4.64)
</span>---
www/lighttpd/Portfile | 16 +++-----
www/lighttpd/files/gcc-diag.patch | 82 ++++++++++++++++++++++++++++++++++++++
www/lighttpd/files/implicit.patch | 14 -------
www/lighttpd/files/patch-conf.diff | 11 -----
4 files changed, 88 insertions(+), 35 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 5d6ff596081..6b797fdfc55 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.63
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f8b13b883825626ed04c3349ec5f2330c49a6a37 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2aef7f0102ebf54a1241a1c3ea8976892f8684bfb21697c9fffb8de0e2d6eab9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1023568
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.4.64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 efbe3d206de597ef6e8e539f42142dbc21a8c868 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e1489d9fa7496fbf2e071c338b593b2300d38c23f1e5967e52c9ef482e1b0e26 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1011436
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,20 +39,16 @@ depends_lib port:brotli \
</span> port:zstd
patchfiles patch-conf.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- implicit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc-diag.patch
</span>
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" \
${worksrcpath}/doc/config/conf.d/cgi.conf \
${worksrcpath}/doc/config/conf.d/fastcgi.conf \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/doc/config/conf.d/mysql_vhost.conf \
</span> ${worksrcpath}/doc/config/conf.d/rrdtool.conf \
${worksrcpath}/doc/config/lighttpd.conf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/62625
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist *gcc-3.* *gcc-4.*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append CC_FOR_BUILD="${configure.cc}" \
CFLAGS_FOR_BUILD="${configure.cflags}" \
--with-brotli \
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5d004d756e6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/lighttpd/files/gcc-diag.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,82 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/ls-hpack/lshpack.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/ls-hpack/lshpack.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -691,6 +691,11 @@ lshpack_enc_enc_int (unsigned char *dst, unsigned char *const end,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __GNUC__ && !defined(__COVERITY__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma GCC diagnostic ignored "-Wuninitialized"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lshpack_enc_huff_encode (const unsigned char *src,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const unsigned char *const src_end, unsigned char *const dst, int dst_len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -701,9 +706,6 @@ lshpack_enc_huff_encode (const unsigned char *src,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned bits_used = 0, adj;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct encode_el cur_enc_code;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if __GNUC__ && !defined(__COVERITY__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma GCC diagnostic ignored "-Wuninitialized"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bits = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -817,10 +819,10 @@ lshpack_enc_huff_encode (const unsigned char *src,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return p_dst - dst;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __GNUC__ && !defined(__COVERITY__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma GCC diagnostic pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !LS_HPACK_EMIT_TEST_CODE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1853,6 +1855,11 @@ need_more_buf:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SHORTEST_CODE 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma GCC diagnostic ignored "-Wuninitialized"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* The decoder is optimized for the common case. Most of the time, we decode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * 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:#e0ffe0;'>+ * 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:#e0ffe0;'>+@@ -1874,10 +1881,6 @@ lshpack_dec_huff_decode (const unsigned char *src, int src_len,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma GCC diagnostic ignored "-Wuninitialized"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buf = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2038,9 +2041,6 @@ lshpack_dec_huff_decode (const unsigned char *src, int src_len,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (((1u << avail_bits) - 1) != (buf & ((1u << avail_bits) - 1)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1; /* Not EOF as expected */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma GCC diagnostic pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return dst - orig_dst;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2057,7 +2057,11 @@ lshpack_dec_huff_decode (const unsigned char *src, int src_len,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma GCC diagnostic pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma GCC diagnostic pop /* -Wunknown-pragmas */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/lighttpd/files/implicit.patch b/www/lighttpd/files/implicit.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f5231422ed4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/lighttpd/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conftest.c:105:21: error: implicit declaration of function 'sendfile' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2021-12-04 08:40:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2021-12-05 07:34:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20446,6 +20446,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_SYS_SENDFILE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/sendfile.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* HAVE_SYS_SENDFILE_H */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include <sys/uio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <errno.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int o = 0;
</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 fa6c29854d8..5954991115d 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;'>@@ -67,17 +67,6 @@
</span> #
##
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/config/conf.d/mysql_vhost.conf.orig 2010-07-11 12:01:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/config/conf.d/mysql_vhost.conf 2010-10-17 05:14:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Local path to the mysql socket
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#mysql-vhost.sock = "/var/lib/mysql/mysql.sock"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+mysql-vhost.sock = "@PREFIX@/var/run/mysql5/mysqld.sock"
</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;'>- ## Host of the MySQL server.
</span> --- doc/config/conf.d/rrdtool.conf.orig 2010-07-11 12:01:32.000000000 -0500
+++ doc/config/conf.d/rrdtool.conf 2010-10-17 05:07:35.000000000 -0500
@@ -10,12 +10,12 @@
</pre><pre style='margin:0'>
</pre>