<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/f9913a354a35a39b0111db6d7b80d250460710c2">https://github.com/macports/macports-ports/commit/f9913a354a35a39b0111db6d7b80d250460710c2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f9913a354a35a39b0111db6d7b80d250460710c2
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Dec 24 11:22:22 2016 -0600
<span style='display:block; white-space:pre;color:#404040;'> lighttpd: Update to 1.4.44
</span>---
www/lighttpd/Portfile | 16 ++++------------
www/lighttpd/files/memcpy.patch | 28 ----------------------------
www/lighttpd/files/pipe2.patch | 37 -------------------------------------
3 files changed, 4 insertions(+), 77 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 c118709e..a2c9225 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;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name lighttpd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4.43
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.4.44
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories www
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,8 +22,8 @@ homepage http://www.lighttpd.net/
</span> master_sites http://download.lighttpd.net/lighttpd/releases-${branch}.x/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1f8707d127b2e8bfc0f7b83aa9f29d7ecea1bd50 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fe0c4a06dd2408a83ee7a2bfedc45e09597f3313cbda82485507573ae8fa948a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8c49f8077b48e106384417c8adbb039dc872d8a8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 adb66ca985651957feb209c91c55ebbf917d23630bfc3a216a2f70043c7b5422
</span>
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,9 +32,7 @@ depends_lib port:bzip2 \
</span> port:spawn-fcgi \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-conf.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memcpy.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pipe2.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;background:#e0e0e0;'>@@ -64,12 +62,6 @@ platform darwin {
</span> reinplace "s|@GROUP@|${group}|g" ${worksrcpath}/doc/config/lighttpd.conf
}
configure.args-append --with-libev ac_cv_func_kqueue=no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The configure script checks for arc4random (which has existed since 10.4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # but the code also uses arc4random_buf (which did not exist until 10.7).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://redmine.lighttpd.net/issues/2773
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append ac_cv_func_arc4random=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
set lighttpd_config_dir ${prefix}/etc/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/lighttpd/files/memcpy.patch b/www/lighttpd/files/memcpy.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cffb0e9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/lighttpd/files/memcpy.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit f635ae7a07f56db636ab557a5f24bbcaf0b1bcd9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Glenn Strauss <gstrauss@gluelogic.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu Nov 24 22:45:53 2016 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [mod_auth] compile fix for Mac OS X XCode (fixes #2772)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memcpy() may be a macro and gave error for missing arguement when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONST_STR_LEN() macro is used (which expands to two arguments)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (thx ryandesign)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x-ref:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "mod_authn_file.c:683:56: error: too few arguments provided to function-like macro invocation (memcpy)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://redmine.lighttpd.net/issues/2772
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/mod_authn_file.c src/mod_authn_file.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 85470ab..a494957 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/mod_authn_file.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/mod_authn_file.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -680,7 +680,7 @@ static handler_t mod_authn_file_htpasswd_basic(server *srv, connection *con, voi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- li_tohex(ntlmhex,sizeof(ntlmhex),ntlmhash,sizeof(ntlmhash));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*(reuse sample buffer for salt (FYI: expect slen == 8))*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- memcpy(sample, CONST_STR_LEN("$1$"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ memcpy(sample, "$1$", sizeof("$1$")-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memcpy(sample+sizeof("$1$")-1, b, slen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sample[sizeof("$1$")-1+slen] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(HAVE_CRYPT_R)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/lighttpd/files/pipe2.patch b/www/lighttpd/files/pipe2.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 68fc1ac..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/lighttpd/files/pipe2.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit 653305628989ded07c65e815b32cf0e50f95077f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Glenn Strauss <gstrauss@gluelogic.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri Nov 4 18:05:45 2016 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [mod_cgi] FreeBSD 9.3/MacOSX does not have pipe2() (fixes #2765)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FreeBSD 9.3 has O_CLOEXEC, but does not have pipe2() until FreeBSD 10.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FreeBSD 10 also adds SOCK_CLOEXEC, so use that as indicator
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://wiki.freebsd.org/AtomicCloseOnExec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Note: FreeBSD 9.3 will soon reach its "extended" EOL date (31 Dec 2016),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- so those using FreeBSD 9.3 should consider upgrading.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://www.freebsd.org/security/security.html#sup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Mac OS X does not have pipe2(). User reported:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Undefined symbols for architecture x86_64:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "_pipe2", referenced from:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _mod_cgi_handle_subrequest in mod_cgi.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x-ref:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Undefined symbols _pipe2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://redmine.lighttpd.net/issues/2765
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/mod_cgi.c src/mod_cgi.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 64d3b12..ed8c916 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/mod_cgi.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/mod_cgi.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,7 +36,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(O_CLOEXEC) && (!defined(__FreeBSD__) || defined(F_DUPFD_CLOEXEC))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(O_CLOEXEC) && (!defined(__FreeBSD__) || defined(SOCK_CLOEXEC)) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && !(defined(__APPLE__) && defined(__MACH__))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define pipe_cloexec(pipefd) pipe2((pipefd), O_CLOEXEC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined FD_CLOEXEC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define pipe_cloexec(pipefd) \
</span></pre><pre style='margin:0'>
</pre>