Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/nginx nginx: updated to 1.18.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/8b61647d43fe
branches: trunk
changeset: 433270:8b61647d43fe
user: adam <adam%pkgsrc.org@localhost>
date: Mon Jun 01 06:18:51 2020 +0000
description:
nginx: updated to 1.18.0
Changes with nginx 1.18.0
*) 1.18.x stable branch.
Changes with nginx 1.17.10
*) Feature: the "auth_delay" directive.
diffstat:
www/nginx/Makefile | 5 +-
www/nginx/PLIST | 4 +-
www/nginx/distinfo | 19 +++----
www/nginx/options.mk | 21 ++++----
www/nginx/patches/patch-src_http_ngx__http__special__response.c | 23 ----------
5 files changed, 23 insertions(+), 49 deletions(-)
diffs (140 lines):
diff -r 079d504547bb -r 8b61647d43fe www/nginx/Makefile
--- a/www/nginx/Makefile Mon Jun 01 06:14:02 2020 +0000
+++ b/www/nginx/Makefile Mon Jun 01 06:18:51 2020 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.87 2020/01/19 07:28:36 kim Exp $
+# $NetBSD: Makefile,v 1.88 2020/06/01 06:18:51 adam Exp $
-DISTNAME= nginx-1.16.1
+DISTNAME= nginx-1.18.0
MAINTAINER= joerg%NetBSD.org@localhost
-PKGREVISION= 2
.include "../../www/nginx/Makefile.common"
diff -r 079d504547bb -r 8b61647d43fe www/nginx/PLIST
--- a/www/nginx/PLIST Mon Jun 01 06:14:02 2020 +0000
+++ b/www/nginx/PLIST Mon Jun 01 06:18:51 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2015/10/12 14:53:17 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.11 2020/06/01 06:18:51 adam Exp $
${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.${SOEXT}
${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/nginx.pm
man/man8/nginx.8
@@ -8,9 +8,9 @@
share/examples/nginx/conf/koi-utf
share/examples/nginx/conf/koi-win
share/examples/nginx/conf/mime.types
+${PLIST.naxsi}share/examples/nginx/conf/naxsi_core.rules
share/examples/nginx/conf/nginx.conf
${PLIST.uwsgi}share/examples/nginx/conf/uwsgi_params
-${PLIST.naxsi}share/examples/nginx/conf/naxsi_core.rules
share/examples/nginx/conf/win-utf
share/examples/nginx/html/50x.html
share/examples/nginx/html/index.html
diff -r 079d504547bb -r 8b61647d43fe www/nginx/distinfo
--- a/www/nginx/distinfo Mon Jun 01 06:14:02 2020 +0000
+++ b/www/nginx/distinfo Mon Jun 01 06:18:51 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.72 2020/01/19 07:42:42 kim Exp $
+$NetBSD: distinfo,v 1.73 2020/06/01 06:18:51 adam Exp $
SHA1 (array-var-nginx-module-0.05.tar.gz) = c69fac77814947009ab783a471783b3c95a63a26
RMD160 (array-var-nginx-module-0.05.tar.gz) = 89bd4efc04864e3e90781588a337338951ec8733
@@ -28,18 +28,18 @@
RMD160 (naxsi-0.56.tar.gz) = a5c97194ef3db415a4bab07c44f9e9f2860b9e1a
SHA512 (naxsi-0.56.tar.gz) = 4660751849bce303af6010b7257532404710106a94817e78d4bc4b566f8019620f24f30207f1d4366b88132a5124e34b164dc67ed80b6710f4bad66115564cbd
Size (naxsi-0.56.tar.gz) = 192120 bytes
-SHA1 (nginx-1.16.1.tar.gz) = 77ce4d26481b62f7a9d83e399454df0912f01a4b
-RMD160 (nginx-1.16.1.tar.gz) = add74d704607e48db5fba935552f5432252eef46
-SHA512 (nginx-1.16.1.tar.gz) = 17e95b43fa47d4fef5e652dea587518e16ab5ec562c9c94355c356440166d4b6a6a41ee520d406e5a34791a327d2e3c46b3f9b105ac9ce07afdd495c49eca437
-Size (nginx-1.16.1.tar.gz) = 1032630 bytes
+SHA1 (nginx-1.18.0.tar.gz) = 47b2c5ccd12e2a7088b03d629ff6b9ab18215180
+RMD160 (nginx-1.18.0.tar.gz) = 224ad8782243ddd1f702bad11f2da38b60e31a38
+SHA512 (nginx-1.18.0.tar.gz) = 8c21eeb62ab6e32e436932500f700bd2fb99fd2d29e43c08a5bfed4714c189c29c7141db551fcd5d2437303b7439f71758f7407dfd3e801e704e45e7daa78ddb
+Size (nginx-1.18.0.tar.gz) = 1039530 bytes
SHA1 (nginx-rtmp-module-1.2.1.tar.gz) = 7c6ae1afc117e3bf946b0d81f99d41fe538a7245
RMD160 (nginx-rtmp-module-1.2.1.tar.gz) = 5fc0b4ac0b2c0a6d70957a5256754db8a9e934cf
SHA512 (nginx-rtmp-module-1.2.1.tar.gz) = 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
Size (nginx-rtmp-module-1.2.1.tar.gz) = 519919 bytes
-SHA1 (nginx_http_push_module-1.2.6.tar.gz) = 393d32d61fadd5d2c181ef0538383777f123b66f
-RMD160 (nginx_http_push_module-1.2.6.tar.gz) = 5bf879d80aa9c78ad2a9e67c7a817e1d5533213f
-SHA512 (nginx_http_push_module-1.2.6.tar.gz) = 08071b86384eb49540a04181d35ac37dbffa33d160e364f1ca9e806088522dc1db6bb679cc80c96366539e7ff5cb781978419e0282dcbe97f485c57600da1afd
-Size (nginx_http_push_module-1.2.6.tar.gz) = 671808 bytes
+SHA1 (nginx_http_push_module-1.2.7.tar.gz) = 55b61d12f7f66176ff859d7cc9933b9912db85b4
+RMD160 (nginx_http_push_module-1.2.7.tar.gz) = 13dcd7dba0c88f1d6c74e008f1e8c3d96b8b4e42
+SHA512 (nginx_http_push_module-1.2.7.tar.gz) = d8b0e79c2b9cf4dd0b3ba8bfeeca86795b1206ec2a468829e6fd20c2286c9a8f75ad135424590cfb3a9d9cded5cefde4f19ba9e36d63a0ff95487d7139732bd9
+Size (nginx_http_push_module-1.2.7.tar.gz) = 673406 bytes
SHA1 (ngx_devel_kit-0.3.1.tar.gz) = e15316e13a7b19a3d2502becbb26043a464a135a
RMD160 (ngx_devel_kit-0.3.1.tar.gz) = 5c52a463544294096611aa9dec1c76e937a1aa23
SHA512 (ngx_devel_kit-0.3.1.tar.gz) = de1e3349d8dd08e5982279b2219dc8a8006739f0409b8e0f5c50d93434beff1fbafba43e9c5ac85a5fab90afc5c0a7244a340610339c36f82f2cba7233e72de9
@@ -53,4 +53,3 @@
SHA1 (patch-auto_cc_conf) = 5e6a479ba419cd16dedeb3b4c47dc685d126ef6a
SHA1 (patch-auto_lib_pcre_conf) = 8cf03fe38e7f75ef6892cc8b93be5cb18c381e97
SHA1 (patch-src_event_modules_ngx__eventport__module.c) = c8e919f48d68bd5bffc4ad11d9c79dc6da3a0de2
-SHA1 (patch-src_http_ngx__http__special__response.c) = 7ac84762cc42932c43dc5191888fbe33c2125c3b
diff -r 079d504547bb -r 8b61647d43fe www/nginx/options.mk
--- a/www/nginx/options.mk Mon Jun 01 06:14:02 2020 +0000
+++ b/www/nginx/options.mk Mon Jun 01 06:18:51 2020 +0000
@@ -1,16 +1,15 @@
-# $NetBSD: options.mk,v 1.55 2020/03/10 08:20:31 adam Exp $
+# $NetBSD: options.mk,v 1.56 2020/06/01 06:18:51 adam Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
-PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 luajit mail-proxy memcache naxsi \
- geoip pcre push realip ssl sub uwsgi image-filter \
- debug slice status nginx-autodetect-cflags echo \
- set-misc headers-more array-var encrypted-session \
- form-input perl gzip http2 auth-request secure-link rtmp \
- stream-ssl-preread
+PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
+PKG_SUPPORTED_OPTIONS= array-var auth-request dav debug echo encrypted-session \
+ form-input flv geoip gtools gzip headers-more http2 \
+ image-filter luajit mail-proxy memcache naxsi \
+ pcre perl push realip rtmp secure-link set-misc slice \
+ ssl status stream-ssl-preread sub uwsgi
+PKG_SUGGESTED_OPTIONS= pcre ssl
+
PKG_OPTIONS_LEGACY_OPTS+= v2:http2
-PKG_SUGGESTED_OPTIONS= inet6 pcre ssl
-
PLIST_VARS+= naxsi perl uwsgi
.include "../../mk/bsd.options.mk"
@@ -191,7 +190,7 @@
CONFIGURE_ARGS+= --add-module=../nchan-${PUSH_VERSION}
.endif
.if !empty(PKG_OPTIONS:Mpush) || make(makesum) || make(mdi)
-PUSH_VERSION= 1.2.6
+PUSH_VERSION= 1.2.7
PUSH_DISTNAME= nginx_http_push_module-${PUSH_VERSION}
PUSH_DISTFILE= ${PUSH_DISTNAME}.tar.gz
SITES.${PUSH_DISTFILE}= -https://github.com/slact/nchan/archive/v${PUSH_VERSION}.tar.gz
diff -r 079d504547bb -r 8b61647d43fe www/nginx/patches/patch-src_http_ngx__http__special__response.c
--- a/www/nginx/patches/patch-src_http_ngx__http__special__response.c Mon Jun 01 06:14:02 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD$
-
-Discard request body when redirecting to a URL via error_page.
-
-Fixes CVE-2019-20372.
-
-https://github.com/nginx/nginx/commit/c1be55f97211d38b69ac0c2027e6812ab8b1b94e.patch
-
---- src/http/ngx_http_special_response.c
-+++ src/http/ngx_http_special_response.c
-@@ -623,6 +623,12 @@ ngx_http_send_error_page(ngx_http_request_t *r, ngx_http_err_page_t *err_page)
- return ngx_http_named_location(r, &uri);
- }
-
-+ r->expect_tested = 1;
-+
-+ if (ngx_http_discard_request_body(r) != NGX_OK) {
-+ r->keepalive = 0;
-+ }
-+
- location = ngx_list_push(&r->headers_out.headers);
-
- if (location == NULL) {
Home |
Main Index |
Thread Index |
Old Index