diff options
| -rw-r--r-- | www/nginx-devel/Makefile | 3 | ||||
| -rw-r--r-- | www/nginx-devel/distinfo | 6 | ||||
| -rw-r--r-- | www/nginx-devel/files/extra-patch-ngx_http_auth_digest_module.c | 30 | ||||
| -rw-r--r-- | www/nginx-devel/files/extra-patch-openresty-set-misc-nginx-module-config | 13 |
4 files changed, 4 insertions, 48 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 473f48ebad2e..76f80e20212b 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME?= nginx -PORTVERSION= 1.19.3 -PORTREVISION= 5 +PORTVERSION= 1.19.4 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 06795566c5c2..671ac9622545 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1601390607 -SHA256 (nginx-1.19.3.tar.gz) = 91e5b74fa17879d2463294e93ad8f6ffc066696ae32ad0478ffe15ba0e9e8df0 -SIZE (nginx-1.19.3.tar.gz) = 1052581 +TIMESTAMP = 1603816481 +SHA256 (nginx-1.19.4.tar.gz) = 61df546927905a0d624f9396bb7a8bc7ca7fd26522ce9714d56a78b73284000e +SIZE (nginx-1.19.4.tar.gz) = 1054974 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208 SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401264a345d25988a76037c2856cec756c19 diff --git a/www/nginx-devel/files/extra-patch-ngx_http_auth_digest_module.c b/www/nginx-devel/files/extra-patch-ngx_http_auth_digest_module.c deleted file mode 100644 index 0b98a0e67fa4..000000000000 --- a/www/nginx-devel/files/extra-patch-ngx_http_auth_digest_module.c +++ /dev/null @@ -1,30 +0,0 @@ ---- ../nginx-http-auth-digest-bd1c86a/ngx_http_auth_digest_module.c.orig 2011-12-29 04:00:32.000000000 +0400 -+++ ../nginx-http-auth-digest-bd1c86a/ngx_http_auth_digest_module.c 2015-06-13 20:18:59.856347000 +0300 -@@ -403,11 +403,11 @@ - if (http_method.data==NULL) return NGX_HTTP_INTERNAL_SERVER_ERROR; - p = ngx_cpymem(http_method.data, r->method_name.data, r->method_end - r->method_name.data+1); - -- ha2_key.len = http_method.len + r->uri.len + 1; -+ ha2_key.len = http_method.len + r->unparsed_uri.len + 1; - ha2_key.data = ngx_pcalloc(r->pool, ha2_key.len); - if (ha2_key.data==NULL) return NGX_HTTP_INTERNAL_SERVER_ERROR; - p = ngx_cpymem(ha2_key.data, http_method.data, http_method.len-1); *p++ = ':'; -- p = ngx_cpymem(p, r->uri.data, r->uri.len); -+ p = ngx_cpymem(p, r->unparsed_uri.data, r->unparsed_uri.len); - - HA2.len = 33; - HA2.data = ngx_pcalloc(r->pool, HA2.len); -@@ -487,11 +487,11 @@ - // recalculate the digest with a modified HA2 value (for rspauth) and emit the - // Authentication-Info header - ngx_memset(ha2_key.data, 0, ha2_key.len); -- p = ngx_sprintf(ha2_key.data, ":%s", r->uri.data); -+ p = ngx_sprintf(ha2_key.data, ":%s", r->unparsed_uri.data); - - ngx_memset(HA2.data, 0, HA2.len); - ngx_md5_init(&md5); -- ngx_md5_update(&md5, ha2_key.data, r->uri.len); -+ ngx_md5_update(&md5, ha2_key.data, r->unparsed_uri.len); - ngx_md5_final(hash, &md5); - ngx_hex_dump(HA2.data, hash, 16); - diff --git a/www/nginx-devel/files/extra-patch-openresty-set-misc-nginx-module-config b/www/nginx-devel/files/extra-patch-openresty-set-misc-nginx-module-config deleted file mode 100644 index 4acc8aee7492..000000000000 --- a/www/nginx-devel/files/extra-patch-openresty-set-misc-nginx-module-config +++ /dev/null @@ -1,13 +0,0 @@ ---- ../set-misc-nginx-module-0.29/config.orig 2011-12-09 10:27:53.861265188 +0300 -+++ ../set-misc-nginx-module-0.29/config 2011-12-09 10:28:07.107259301 +0300 -@@ -1,10 +1,3 @@ --if echo $HTTP_MODULES | grep " ndk_http_module" > /dev/null; then -- echo "found ngx_devel_kit for ngx_set_misc; looks good." --else -- echo "error: ngx_devel_kit is required to build ngx_set_misc; please put it before ngx_set_misc." 1>&2 -- exit 1 --fi -- - ngx_addon_name=ngx_http_set_misc_module - HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_set_misc_module" - NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_set_base32.c $ngx_addon_dir/src/ngx_http_set_default_value.c $ngx_addon_dir/src/ngx_http_set_hashed_upstream.c $ngx_addon_dir/src/ngx_http_set_quote_sql.c $ngx_addon_dir/src/ngx_http_set_quote_json.c $ngx_addon_dir/src/ngx_http_set_unescape_uri.c $ngx_addon_dir/src/ngx_http_set_misc_module.c $ngx_addon_dir/src/ngx_http_set_escape_uri.c $ngx_addon_dir/src/ngx_http_set_hash.c $ngx_addon_dir/src/ngx_http_set_local_today.c $ngx_addon_dir/src/ngx_http_set_hex.c $ngx_addon_dir/src/ngx_http_set_base64.c $ngx_addon_dir/src/ngx_http_set_random.c" |