<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7c1ea185a75d6231e082ef49981f5ce333f55c04">https://github.com/macports/macports-ports/commit/7c1ea185a75d6231e082ef49981f5ce333f55c04</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 7c1ea18 nginx: update to 1.16.3
</span>7c1ea18 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7c1ea185a75d6231e082ef49981f5ce333f55c04
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Tue Aug 28 16:43:18 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> nginx: update to 1.16.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> update davext, zip, http_push, devel_kit, and lua modules
</span>---
www/nginx/Portfile | 53 ++++++++++------------
.../files/patch-src-ngx_http_lua_headers.c.diff | 44 ------------------
2 files changed, 24 insertions(+), 73 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nginx/Portfile b/www/nginx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dd5fef4..afbb03b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nginx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nginx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name nginx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.15.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.15.3
</span> categories www mail
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +35,9 @@ master_sites http://nginx.org/download:nginx \
</span>
distfiles ${name}-${version}${extract.suffix}:nginx
checksums ${name}-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 60536f677d8c64d91bdb298d2e422d2b5c5e4929 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 eeba09aecfbe8277ac33a5a2486ec2d6731739f3c1c701b42a0c3784af67ad90 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1025746
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 60a5791c6f4df7823743f5099d0d03622a52710f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9391fb91c3e2ebd040a4e3ac2b2f0893deb6232edc30a8e16fcc9c3fa9d6be85 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1022881
</span>
depends_lib port:pcre \
port:zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,12 +136,13 @@ variant dav description {Add WebDAV support to server} {
</span>
variant davext description {Add WebDAV (extended) support to server} {
set davext_filename nginx-dav-ext-module
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set davext_version 0.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set davext_version 0.1.0
</span> set davext_distname ${davext_filename}-${davext_version}
distfiles-append v${davext_version}.tar.gz:davext_module
checksums-append v${davext_version}.tar.gz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0d407e687bd59e81c2c9805ee8b39b8b85d43d08 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d428a0236c933779cb40ac8c91afb19d5c25a376dc3caab825bfd543e1ee530d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 78b7008e570fb4cb5d80a76011f88b5a1d34c529 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6b004eed8ea16ad8de4d304027bf0413cc323a95914e58625a7dc066481aae3a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6614 \
</span> configure.args-append --with-http_dav_module --add-module=${workpath}/${davext_distname}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -294,14 +295,14 @@ variant xslt description {Post-process pages with XSLT} {
</span> depends_lib-append port:libxslt
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant zip description {Enable Ngx zip download module \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (https://code.google.com/p/mod-zip/)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant zip description {Enable Ngx zip download module (https://github.com/evanmiller/mod_zip)} {
</span>
set zip_distname mod_zip-1.1.6
distfiles-append ${zip_distname}.tar.gz:zip_module
checksums-append ${zip_distname}.tar.gz \
rmd160 17a465d87b8e1ba71bdd6ad40e20d21cc7dcd434 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d30546b4be8308c721df0240ebc38c474c6b577381a110321eded6dbed5104b1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d30546b4be8308c721df0240ebc38c474c6b577381a110321eded6dbed5104b1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21991 \
</span> configure.args-append --add-module=${workpath}/${zip_distname}
patchfiles-append patch-src-http-ngx_http_upstream.c.diff \
patch-src-http-ngx_http_upstream.h.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -342,23 +343,25 @@ variant rtmp description {Enable Ngx RTMP module (https://github.com/arut/nginx-
</span>
variant http_push description {Enable Ngx HTTP Push module (https://github.com/slact/nchan)} {
set http_push_filename nchan
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set http_push_version 0.731
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set http_push_version 1.2.1
</span> set http_push_distname ${http_push_filename}-${http_push_version}
distfiles-append v${http_push_version}.tar.gz:http_push_module
checksums-append v${http_push_version}.tar.gz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d35d7138d3b4dd20076b1026c420f03c68177f99 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dd0c893fcf5af90a4f3c76a5750df9c39cba486ecb93cf76624af29f809ec345
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --add-module=${workpath}/${http_push_distname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 aeae5bbb2becaa83a52ccf1350f7b8ee170ab388 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7bb3ae57a036afabee1da5e40085b69b3fd68026fcc1d8abc98a8ad9f5dccc44 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 645188 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --add-module=${workpath}/${http_push_distname}
</span> }
variant devel_kit description {Enable ngx_devel_kit module (https://github.com/simpl/ngx_devel_kit)} {
set devel_kit_filename ngx_devel_kit
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set devel_kit_version 0.2.19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set devel_kit_version 0.3.0
</span> set devel_kit_distname ${devel_kit_filename}-${devel_kit_version}
distfiles-append v${devel_kit_version}.tar.gz:devel_kit_module
checksums-append v${devel_kit_version}.tar.gz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 64d3737bc4cc948c1363cce80d70e5260878811e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 beb2736eb06e8e26f60643623553789346f653da \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 66455 \
</span>
configure.args-append --add-module=${workpath}/${devel_kit_distname}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,13 +369,13 @@ variant devel_kit description {Enable ngx_devel_kit module (https://github.com/s
</span> variant lua requires devel_kit description {Enable Lua module (https://github.com/openresty/lua-nginx-module)} {
depends_lib-append port:luajit
set ngx_lua_filename lua-nginx-module
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set ngx_lua_version 0.10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ngx_lua_version 0.10.13
</span> set ngx_lua_distname ${ngx_lua_filename}-${ngx_lua_version}
distfiles-append v${ngx_lua_version}.tar.gz:lua_module
checksums-append v${ngx_lua_version}.tar.gz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7e0959c91c439c679a8c2276d9817b279fed5315 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d67449c71051b3cc2d6dd60df0ae0d21fca08aa19c9b30c5b95ee21ff38ef8dd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-src-ngx_http_lua_headers.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ec6278fb7936abfdead2df5e20a90092a1024098 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ecea8c3d7f69dd48c6132498ddefb5d83ba9f387fa3d4da14e2abeacdfc8a3ee \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 624102
</span>
configure.cflags -I${prefix}/include/luajit-2.0/ ${configure.cflags}
configure.env LUAJIT_INC=${prefix}/include/luajit-2.0/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -380,14 +383,6 @@ variant lua requires devel_kit description {Enable Lua module (https://github.co
</span> configure.args-append --add-module=${workpath}/${ngx_lua_distname}
nginx_set_portfile_var nginx_lua_mod_dirname "${ngx_lua_distname}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch routine balks on file names with "../", but rel-paths in patchfiles start from $worksrcpath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s "${workpath}/${nginx_lua_mod_dirname}" "${worksrcpath}/nginx_lua_module.tmp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete "${worksrcpath}/nginx_lua_module.tmp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant headers_more description {Enable headers-more module (https://github.com/openresty/headers-more-nginx-module)} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nginx/files/patch-src-ngx_http_lua_headers.c.diff b/www/nginx/files/patch-src-ngx_http_lua_headers.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 85bde66..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nginx/files/patch-src-ngx_http_lua_headers.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- nginx_lua_module.tmp/src/ngx_http_lua_headers.c.orig 2017-03-23 18:22:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ nginx_lua_module.tmp/src/ngx_http_lua_headers.c 2017-03-23 18:23:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,6 +77,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_buf_t *b, *first = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_int_t i, j;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(nginx_version) && nginx_version >= 1011011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ngx_chain_t *cl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_connection_t *c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_http_request_t *r, *mr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_http_connection_t *hc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -147,8 +150,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (hc->nbusy) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(nginx_version) && nginx_version >= 1011011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (cl = hc->busy; cl; /* void */) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ b = cl->buf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cl = cl->next;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < hc->nbusy; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b = hc->busy[i];
</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;'>- dd("busy buf: %d: [%.*s]", (int) i, (int) (b->pos - b->start),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b->start);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -223,8 +233,15 @@
</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 (hc->nbusy) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(nginx_version) && nginx_version >= 1011011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (cl = hc->busy; cl; /* void */) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ b = cl->buf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cl = cl->next;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < hc->nbusy; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b = hc->busy[i];
</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 (!found) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (b != first) {
</span></pre><pre style='margin:0'>
</pre>