<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/d636f118f49297c7e35d57444f64021f7ce45bc5">https://github.com/macports/macports-ports/commit/d636f118f49297c7e35d57444f64021f7ce45bc5</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 d636f118f49 lighttpd: Update to 1.4.59
</span>d636f118f49 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d636f118f49297c7e35d57444f64021f7ce45bc5
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Mar 17 07:39:28 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> lighttpd: Update to 1.4.59
</span>---
www/lighttpd/Portfile | 28 ++++++++++++++---------
www/lighttpd/files/implicit.patch | 14 ++++++++++++
www/lighttpd/files/patch-conf-darwin.diff | 11 +--------
www/lighttpd/files/patch-conf.diff | 31 ++++++++++++-------------
www/lighttpd/files/patch-tigerfixes.diff | 38 -------------------------------
5 files changed, 47 insertions(+), 75 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 a64f08af134..c973d309c69 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.55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.4.59
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3ec0c81a6ee286efc998150690c9e39f9606ef28 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6a0b50e9c9d5cc3d9e48592315c25a2d645858f863e1ccd120507a30ce21e927 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 765660
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e7191e39e555549e2e932998fed9396acc18accb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fb953db273daef08edb6e202556cae8a3d07eed6081c96bd9903db957d1084d5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 968352
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,12 +30,15 @@ use_xz yes
</span>
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:brotli \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bzip2 \
</span> port:pcre \
port:spawn-fcgi \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zstd
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-conf.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-conf.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch
</span>
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,12 +51,16 @@ post-patch {
</span>
configure.args-append CC_FOR_BUILD="${configure.cc}" \
CFLAGS_FOR_BUILD="${configure.cflags}" \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-brotli \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pcre \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-zstd \
</span> ac_cv_prog_AWK=/usr/bin/awk
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libev
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-conf-darwin.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-tigerfixes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-conf-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
if {${os.major} <= 8} {
set user "www"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,7 +72,6 @@ platform darwin {
</span> reinplace "s|@USER@|${user}|g" ${worksrcpath}/doc/config/lighttpd.conf
reinplace "s|@GROUP@|${group}|g" ${worksrcpath}/doc/config/lighttpd.conf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-libev ac_cv_func_kqueue=no
</span> }
set lighttpd_config_dir ${prefix}/etc/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/lighttpd/files/implicit.patch b/www/lighttpd/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..50036ba9dd6
</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/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+--- configure.orig 2021-02-02 07:13:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-03-17 07:35:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20158,6 +20158,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_SYS_SENDFILE_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/sendfile.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* HAVE_SYS_SENDFILE_H */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <sys/uio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int o = 0;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/lighttpd/files/patch-conf-darwin.diff b/www/lighttpd/files/patch-conf-darwin.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1787afacf53..9330d283be1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/lighttpd/files/patch-conf-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/lighttpd/files/patch-conf-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@
</span> -## the document root
+## On most UNIX-like operating systems it should be set to "public_html" to
+## take ~/public_html/ as the document root.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+## On Mac OS X it should be set to "Sites" to take ~/Sites as the document root.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## On macOS it should be set to "Sites" to take ~/Sites as the document root.
</span> ## Default: empty (document root is the home directory)
##
-userdir.path = "public_html"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,12 +35,3 @@
</span>
##
## Enable lighttpd to serve requests on sockets received from systemd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -184,7 +184,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## linux-sysepoll is recommended on kernel 2.6.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--server.event-handler = "linux-sysepoll"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+server.event-handler = "libev"
</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;'>- ## The basic network interface for all platforms at the syscalls read()
</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 5c6570d891c..0460c6c2606 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;'>@@ -1,16 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/config/conf.d/auth.conf.orig 2010-07-11 12:01:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/config/conf.d/auth.conf 2010-10-17 05:20:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,8 +8,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/config/conf.d/auth.conf.orig 2020-12-17 03:11:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/config/conf.d/auth.conf 2020-12-18 01:16:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,7 +11,7 @@
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #server.modules += ( "mod_authn_file" )
</span> #auth.backend = "plain"
-#auth.backend.plain.userfile = "/etc/lighttpd/lighttpd.user"
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#auth.backend.plain.groupfile = "/etc/lighttpd/lighttpd.group"
</span> +#auth.backend.plain.userfile = conf_dir + "/lighttpd.user"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#auth.backend.plain.groupfile = conf_dir + "/lighttpd.group"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #auth.backend.ldap.hostname = "localhost"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #auth.backend.ldap.base-dn = "dc=my-domain,dc=com"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #server.modules += ( "mod_authn_ldap" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #auth.backend = "ldap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --- doc/config/conf.d/cgi.conf.orig 2010-07-11 12:01:32.000000000 -0500
+++ doc/config/conf.d/cgi.conf 2010-10-17 05:19:33.000000000 -0500
@@ -12,11 +12,11 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,15 +95,15 @@
</span>
##
#######################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/config/lighttpd.conf.orig 2019-05-27 16:03:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/config/lighttpd.conf 2019-05-31 11:17:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/config/lighttpd.conf.orig 2020-12-17 03:11:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/config/lighttpd.conf 2020-12-18 01:14:46.000000000 -0600
</span> @@ -13,11 +13,11 @@
## if you add a variable here. Add the corresponding variable in the
## chroot example aswell.
##
-var.log_root = "/var/log/lighttpd"
-var.server_root = "/srv/www"
<span style='display:block; white-space:pre;background:#ffe0e0;'>--var.state_dir = "/var/run"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-var.state_dir = "/run"
</span> -var.home_dir = "/var/lib/lighttpd"
-var.conf_dir = "/etc/lighttpd"
+var.log_root = "@PREFIX@/var/log/lighttpd"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,14 +116,14 @@
</span> ## run the server chrooted.
@@ -58,7 +58,7 @@
## used in:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ## conf.d/compress.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## conf.d/deflate.conf
</span> ##
-var.cache_dir = "/var/cache/lighttpd"
+var.cache_dir = "@PREFIX@/var/cache/lighttpd"
##
## Base directory for sockets.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -386,7 +386,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;background:#e0e0e0;'>@@ -133,7 +132,7 @@
</span>
##
## mimetype mapping
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -430,7 +430,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -432,7 +432,7 @@
</span> ##
## $SERVER["socket"] == "10.0.0.1:443" {
## ssl.engine = "enable"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,7 +141,7 @@
</span> ##
## # Check your cipher list with: openssl ciphers -v '...'
## # (use single quotes as your shell won't like ! in double quotes)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -441,21 +441,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -443,21 +443,21 @@
</span> ##
## server.name = "www.example.com"
##
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,7 +169,7 @@
</span>
##
## optionally pass the CA certificate here.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -477,6 +477,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -479,6 +479,6 @@
</span> ## custom includes like vhosts.
##
#include "conf.d/config.conf"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/lighttpd/files/patch-tigerfixes.diff b/www/lighttpd/files/patch-tigerfixes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 627fc1855b8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/lighttpd/files/patch-tigerfixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See: https://trac.macports.org/ticket/58550
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fixes for Tiger build, but can be applied generally to all builds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-also requires legacysupport PortGroup for *at functions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-kencu@macports.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/base.h.orig 2020-01-31 20:49:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/base.h 2020-02-10 20:19:44.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,6 +7,10 @@
</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/time.h>
</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__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <time.h>
</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;'>- #include "base_decls.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "buffer.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "array.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/mod_webdav.c.orig 2020-01-31 20:49:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/mod_webdav.c 2020-02-10 20:15:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2011,7 +2011,7 @@
</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 defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && defined(__MACH__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <copyfile.h> /* fcopyfile() *//* OS X 10.5+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_ELFTC_COPYFILE/* __FreeBSD__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2044,7 +2044,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*fcntl(ofd, F_SETFL, fcntl(ofd, F_GETFL, 0) & ~O_NONBLOCK);*/
</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 defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if defined(__APPLE__) && defined(__MACH__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (0 == fcopyfile(ifd, ofd, NULL, COPYFILE_ALL))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>