svn commit: r515207 - in head/www/nginx-devel: . files
Sergey A. Osokin
osa at FreeBSD.org
Tue Oct 22 18:33:15 UTC 2019
Author: osa
Date: Tue Oct 22 18:33:14 2019
New Revision: 515207
URL: https://svnweb.freebsd.org/changeset/ports/515207
Log:
Update nginx from 1.17.4 to 1.17.5.
Update njs module from 0.3.5 to 0.3.6.
Sync third-party fastdfs module version with www/nginx.
<ChangeLog for nginx 1.17.5>
*) Feature: now nginx uses ioctl(FIONREAD), if available, to avoid
reading from a fast connection for a long time.
*) Bugfix: incomplete escaped characters at the end of the request URI
were ignored.
*) Bugfix: "/." and "/.." at the end of the request URI were not
normalized.
*) Bugfix: in the "merge_slashes" directive.
*) Bugfix: in the "ignore_invalid_headers" directive.
Thanks to Alan Kemp.
*) Bugfix: nginx could not be built with MinGW-w64 gcc 8.1 or newer.
</ChangeLog>
<ChangeLog for njs 0.3.6>
nginx modules:
*) Improvement: getting special headers from r.headersIn.
Core:
*) Feature: added new Function() support.
*) Feature: added Number.prototype.toFixed().
*) Feature: added Number.prototype.toPrecision().
*) Feature: added Number.prototype.toExponential().
*) Improvement: making "prototype" property of function
instances writable.
*) Improvement: limiting recursion depth while compiling.
*) Improvement: moving global functions to the global object.
*) Bugfix: fixed prototype mutation for object literals.
*) Bugfix: fixed heap-buffer-overflow while parsing regexp literals.
*) Bugfix: fixed integer-overflow while parsing exponent
of number literals.
*) Bugfix: fixed parseFloat().
*) Bugfix: fixed Array.prototype functions according to the specification.
The following functions were fixed: every, includes, indexOf, filter,
find, findIndex, forEach, lastIndexOf, map, pop, push, reduce,
reduceRight, shift, some, unshift.
*) Bugfix: fixed handing of accessor descriptors in Object.freeze().
*) Bugfix: fixed String.prototype.replace() when first argument
is not a string.
*) Bugfix: fixed stack-use-after-scope in Array.prototype.map().
*) Bugfix: Date.prototype.toUTCString() format was aligned to ES9.
*) Bugfix: fixed buffer overflow in Number.prototype.toString(radix).
*) Bugfix: fixed Regexp.prototype.test() for regexps with backreferences.
*) Bugfix: fixed Array.prototype.map() for objects with nonexistent values.
*) Bugfix: fixed Array.prototype.pop() and shift() for sparse objects.
*) Bugfix: fixed Date.UTC() according to the specification.
*) Bugfix: fixed Date() constructor according to the specification.
*) Bugfix: fixed type of Date.prototype.
Thanks to Artem S. Povalyukhin.
*) Bugfix: fixed Date.prototype.setTime().
Thanks to Artem S. Povalyukhin.
*) Bugfix: fixed default number of arguments expected by built-in functions.
*) Bugfix: fixed "caller" and "arguments" properties of a function instance.
Thanks to Artem S. Povalyukhin.
</ChangeLog>
Added:
head/www/nginx-devel/files/extra-patch-fastdfs-src-mod_fastdfs.conf (contents, props changed)
Modified:
head/www/nginx-devel/Makefile
head/www/nginx-devel/Makefile.extmod
head/www/nginx-devel/distinfo
head/www/nginx-devel/files/extra-patch-fastdfs-src-config
Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile Tue Oct 22 18:01:58 2019 (r515206)
+++ head/www/nginx-devel/Makefile Tue Oct 22 18:33:14 2019 (r515207)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= nginx
-PORTVERSION= 1.17.4
+PORTVERSION= 1.17.5
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
Modified: head/www/nginx-devel/Makefile.extmod
==============================================================================
--- head/www/nginx-devel/Makefile.extmod Tue Oct 22 18:01:58 2019 (r515206)
+++ head/www/nginx-devel/Makefile.extmod Tue Oct 22 18:33:14 2019 (r515207)
@@ -51,8 +51,9 @@ ENCRYPTSESSION_IMPLIES= DEVEL_KIT
ENCRYPTSESSION_GH_TUPLE= openresty:encrypted-session-nginx-module:v0.08:encryptsession
ENCRYPTSESSION_VARS= DSO_EXTMODS+=encryptsession
-FASTDFS_GH_TUPLE= happyfish100:fastdfs-nginx-module:85347be:fastdfs
-FASTDFS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-fastdfs-src-config
+FASTDFS_GH_TUPLE= happyfish100:fastdfs-nginx-module:8796a7d:fastdfs
+FASTDFS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-fastdfs-src-config \
+ ${PATCHDIR}/extra-patch-fastdfs-src-mod_fastdfs.conf
FASTDFS_BUILD_DEPENDS= ${LOCALBASE}/include/fastcommon/logger.h:devel/libfastcommon \
${LOCALBASE}/include/fastdfs/fdfs_client.h:ftp/fastdfs
FASTDFS_LIB_DEPENDS= libfastcommon.so:devel/libfastcommon \
@@ -230,7 +231,7 @@ NAXSI_NGINX_VER= 0.56
NAXSI_GH_TUPLE= nbs-system:naxsi:${NAXSI_NGINX_VER}:naxsi
NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
-NJS_GH_TUPLE= nginx:njs:0.3.5:njs
+NJS_GH_TUPLE= nginx:njs:0.3.6:njs
NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx
PASSENGER_NGINX_VER= 6.0.4
Modified: head/www/nginx-devel/distinfo
==============================================================================
--- head/www/nginx-devel/distinfo Tue Oct 22 18:01:58 2019 (r515206)
+++ head/www/nginx-devel/distinfo Tue Oct 22 18:33:14 2019 (r515207)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1569343000
-SHA256 (nginx-1.17.4.tar.gz) = 62854b365e66670ef4f1f8cc79124f914551444da974207cd5fe22d85710e555
-SIZE (nginx-1.17.4.tar.gz) = 1034845
+TIMESTAMP = 1571764510
+SHA256 (nginx-1.17.5.tar.gz) = 63ee35e15a75af028ffa1f995e2b9c120b59ef5f1b61a23b8a4c33c262fc10c3
+SIZE (nginx-1.17.5.tar.gz) = 1036056
SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
SIZE (ngx_cache_purge-2.3.tar.gz) = 12248
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -39,8 +39,8 @@ SHA256 (openresty-echo-nginx-module-c65f5c6_GH0.tar.gz
SIZE (openresty-echo-nginx-module-c65f5c6_GH0.tar.gz) = 53121
SHA256 (openresty-encrypted-session-nginx-module-v0.08_GH0.tar.gz) = 6e526ea097c6805ec2cf1d0d3d79ed24326bc2d0babe158c29edd07d8c0d106a
SIZE (openresty-encrypted-session-nginx-module-v0.08_GH0.tar.gz) = 11802
-SHA256 (happyfish100-fastdfs-nginx-module-85347be_GH0.tar.gz) = 00bbcc70bfd711cd67ca685ad5620764c54be13f95299b8a5d175cdeb10b6d3c
-SIZE (happyfish100-fastdfs-nginx-module-85347be_GH0.tar.gz) = 19835
+SHA256 (happyfish100-fastdfs-nginx-module-8796a7d_GH0.tar.gz) = 083fe7ecd484b9adce41c938f0f95b81ebe8336765896107e5864243c9789ef5
+SIZE (happyfish100-fastdfs-nginx-module-8796a7d_GH0.tar.gz) = 19872
SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106
SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
SHA256 (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = ef843824e0aac1dd60b392802861cc06426a4bc5f87d472c7ee00b1296693f2a
@@ -111,8 +111,8 @@ SHA256 (SpiderLabs-ModSecurity-nginx-ecb255a_GH0.tar.g
SIZE (SpiderLabs-ModSecurity-nginx-ecb255a_GH0.tar.gz) = 31087
SHA256 (nbs-system-naxsi-0.56_GH0.tar.gz) = 0a66dcadd32432460fab180be9f2efe24e911e3798917b2787ee710e02901eb4
SIZE (nbs-system-naxsi-0.56_GH0.tar.gz) = 192120
-SHA256 (nginx-njs-0.3.5_GH0.tar.gz) = 75e6035eb23ec908061e67d71091a77dcc8e45d29cc4ac659b70989daac3d0af
-SIZE (nginx-njs-0.3.5_GH0.tar.gz) = 339177
+SHA256 (nginx-njs-0.3.6_GH0.tar.gz) = 7022a9b3ed2c8ca91127af179cc36568a9bfd6b9b40665c7c91cd11cdf2b2e2c
+SIZE (nginx-njs-0.3.6_GH0.tar.gz) = 354475
SHA256 (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9
SIZE (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = 40742
SHA256 (openresty-rds-csv-nginx-module-v0.09_GH0.tar.gz) = 896be99c0cad50218417800a159e43ec088d6b58c099472ed3b3d7f179d6c0ea
Modified: head/www/nginx-devel/files/extra-patch-fastdfs-src-config
==============================================================================
--- head/www/nginx-devel/files/extra-patch-fastdfs-src-config Tue Oct 22 18:01:58 2019 (r515206)
+++ head/www/nginx-devel/files/extra-patch-fastdfs-src-config Tue Oct 22 18:33:14 2019 (r515207)
@@ -1,11 +1,11 @@
---- ../fastdfs-nginx-module-85347be/src/config.orig 2016-10-12 16:09:34.075804000 +0200
-+++ ../fastdfs-nginx-module-85347be/src/config 2016-10-12 16:10:43.916280000 +0200
+--- ../fastdfs-nginx-module-8796a7d/src/config.orig 2018-07-16 05:05:22.000000000 -0400
++++ ../fastdfs-nginx-module-8796a7d/src/config 2019-10-22 14:20:23.138241000 -0400
@@ -3,16 +3,16 @@
if test -n "${ngx_module_link}"; then
ngx_module_type=HTTP
ngx_module_name=$ngx_addon_name
-- ngx_module_incs="/usr/include/fastdfs /usr/include/fastcommon/"
-+ ngx_module_incs="%%LOCALBASE%%/include/fastdfs %%LOCALBASE%%/include/fastcommon/"
+- ngx_module_incs="/usr/local/include"
++ ngx_module_incs="%%LOCALBASE%%/include"
ngx_module_libs="-lfastcommon -lfdfsclient"
ngx_module_srcs="$ngx_addon_dir/ngx_http_fastdfs_module.c"
ngx_module_deps=
@@ -15,8 +15,8 @@
else
HTTP_MODULES="$HTTP_MODULES ngx_http_fastdfs_module"
NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fastdfs_module.c"
-- CORE_INCS="$CORE_INCS /usr/include/fastdfs /usr/include/fastcommon/"
-+ CORE_INCS="$CORE_INCS %%LOCALBASE%%/include/fastdfs %%LOCALBASE%%/include/fastcommon/"
+- CORE_INCS="$CORE_INCS /usr/local/include"
++ CORE_INCS="$CORE_INCS %%LOCALBASE%%/include"
CORE_LIBS="$CORE_LIBS -lfastcommon -lfdfsclient"
- CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"/etc/fdfs/mod_fastdfs.conf\"'"
+ CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"%%PREFIX%%/etc/fdfs/mod_fastdfs.conf\"'"
Added: head/www/nginx-devel/files/extra-patch-fastdfs-src-mod_fastdfs.conf
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-fastdfs-src-mod_fastdfs.conf Tue Oct 22 18:33:14 2019 (r515207)
@@ -0,0 +1,46 @@
+--- ../fastdfs-nginx-module-8796a7d/src/mod_fastdfs.conf.orig 2018-07-19 19:22:45.973450000 +0200
++++ ../fastdfs-nginx-module-8796a7d/src/mod_fastdfs.conf 2018-07-19 19:28:48.173589000 +0200
+@@ -59,8 +59,8 @@ store_path_count=1
+ # store_path#, based 0, if store_path0 not exists, it's value is base_path
+ # the paths must be exist
+ # must same as storage.conf
+-store_path0=/home/yuqing/fastdfs
+-#store_path1=/home/yuqing/fastdfs1
++store_path0=/var/db/fastdfs/storage
++#store_path1=/var/db/fastdfs/storage2
+
+ # standard log level as syslog, case insensitive, value list:
+ ### emerg for emergency
+@@ -92,6 +92,14 @@ if_alias_prefix=
+ # NOTE: #include is an include directive, do NOT remove the # before include
+ #include http.conf
+
++# HTTP default content type
++http.default_content_type = application/octet-stream
++
++# MIME types mapping filename
++# MIME types file format: MIME_type extensions
++# such as: image/jpeg jpeg jpg jpe
++# you can use apache's MIME file: mime.types
++http.mime_types_filename=/usr/local/etc/nginx/mime.types
+
+ # if support flv
+ # default value is false
+@@ -119,8 +127,8 @@ group_count = 0
+ #group_name=group1
+ #storage_server_port=23000
+ #store_path_count=2
+-#store_path0=/home/yuqing/fastdfs
+-#store_path1=/home/yuqing/fastdfs1
++#store_path0=/var/db/fastdfs/storage
++#store_path1=/var/db/fastdfs/storage2
+
+ # group settings for group #2
+ # since v1.14
+@@ -129,5 +137,4 @@ group_count = 0
+ #group_name=group2
+ #storage_server_port=23000
+ #store_path_count=1
+-#store_path0=/home/yuqing/fastdfs
+-
++#store_path0=/var/db/fastdfs/storage
More information about the svn-ports-head
mailing list