<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/54d00ca28ead14d2750290c62e50f146c38cd8d0">https://github.com/macports/macports-ports/commit/54d00ca28ead14d2750290c62e50f146c38cd8d0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 54d00ca28ead14d2750290c62e50f146c38cd8d0
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jan 26 01:59:33 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> lighttpd: Fix build on 10.5-10.11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64522
</span>---
www/lighttpd/Portfile | 3 ++-
www/lighttpd/files/mod_webdav.patch | 45 +++++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 1 deletion(-)
<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 736875d3715..c6dbace7167 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;'>@@ -5,7 +5,7 @@ PortGroup legacysupport 1.0
</span>
name lighttpd
version 1.4.64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 efbe3d206de597ef6e8e539f42142dbc21a8c868 \
sha256 e1489d9fa7496fbf2e071c338b593b2300d38c23f1e5967e52c9ef482e1b0e26 \
size 1011436
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +39,7 @@ depends_lib port:brotli \
</span>
patchfiles patch-conf.diff \
rand.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ mod_webdav.patch \
</span> gcc-diag.patch
post-patch {
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fd2a72105ac
</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/mod_webdav.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build failure on Mac OS X 10.5 thru 10.11.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+There is no COPYFILE_CLONE_FORCE on OSX <10.12 so fall back to using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fcopyfile() to avoid race condition on source (if changed to dir) if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+using copyfile() with flags equivalent to COPYFILE_CLONE_FORCE, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+without the 'force' flag.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://redmine.lighttpd.net/issues/3142
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://redmine.lighttpd.net/projects/lighttpd/repository/14/revisions/4432e34253f3ebbbd239ac867207b39a84fdc8f2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/mod_webdav.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/mod_webdav.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2587,15 +2587,11 @@ webdav_copytmp_rename (const plugin_config * const pconf,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int * const flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200 /* 10.12+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(*flags & (WEBDAV_FLAG_COPY_XDEV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ |WEBDAV_FLAG_MOVE_XDEV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ |WEBDAV_FLAG_NO_CLONE))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200 /* 10.12+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (0==clonefile(src->path.ptr,dst->path.ptr,CLONE_NOFOLLOW))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #else /* __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (0==copyfile(src->path.ptr,dst->path.ptr,NULL,COPYFILE_CLONE_FORCE))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* target did not exist; skip stat_cache_delete_entry() */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0; /* copied */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2635,15 +2631,11 @@ webdav_copytmp_rename (const plugin_config * const pconf,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200 /* 10.12+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(*flags & (WEBDAV_FLAG_COPY_XDEV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ |WEBDAV_FLAG_MOVE_XDEV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ |WEBDAV_FLAG_NO_CLONE))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200 /* 10.12+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (0 == clonefile(src->path.ptr, tmpb->ptr, CLONE_NOFOLLOW))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #else /* __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (0 == copyfile(src->path.ptr, tmpb->ptr, NULL, COPYFILE_CLONE_FORCE))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break; /* copied */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (errno) {
</span></pre><pre style='margin:0'>
</pre>