svn commit: r474970 - in head/www/nginx: . files
Jochen Neumeister
joneum at FreeBSD.org
Thu Jul 19 17:58:36 UTC 2018
Author: joneum
Date: Thu Jul 19 17:58:34 2018
New Revision: 474970
URL: https://svnweb.freebsd.org/changeset/ports/474970
Log:
Update third-party-module:
- echo-nginx-module to c65f5c6
- fastdfs-nginx-module to 8796a7d
- nginx-http-auth-digest to cd86418
-remove needless patch
Deleted:
head/www/nginx/files/extra-patch-ngx_http_echo_request_info.c
Modified:
head/www/nginx/Makefile
head/www/nginx/Makefile.extmod
head/www/nginx/distinfo
head/www/nginx/files/extra-patch-fastdfs-src-config
head/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf
Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile Thu Jul 19 16:17:47 2018 (r474969)
+++ head/www/nginx/Makefile Thu Jul 19 17:58:34 2018 (r474970)
@@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.14.0
-PORTREVISION?= 8
+PORTREVISION?= 9
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/ \
Modified: head/www/nginx/Makefile.extmod
==============================================================================
--- head/www/nginx/Makefile.extmod Thu Jul 19 16:17:47 2018 (r474969)
+++ head/www/nginx/Makefile.extmod Thu Jul 19 17:58:34 2018 (r474970)
@@ -31,9 +31,8 @@ CT_GH_TUPLE= grahamedgecombe:nginx-ct:v1.3.2:ct
CT_VARS= DSO_EXTMODS+=ct
CT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-ct-LibreSSL
-ECHO_GH_TUPLE= openresty:echo-nginx-module:46334b3:echo
+ECHO_GH_TUPLE= openresty:echo-nginx-module:c65f5c6:echo
ECHO_VARS= DSO_EXTMODS+=echo
-ECHO_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_echo_request_info.c
DRIZZLE_LIB_DEPENDS= libdrizzle.so:databases/libdrizzle
DRIZZLE_CONFIGURE_ENV= LIBDRIZZLE_INC=${LOCALBASE}/include \
@@ -52,7 +51,7 @@ ENCRYPTSESSION_IMPLIES= DEVEL_KIT
ENCRYPTSESSION_GH_TUPLE= openresty:encrypted-session-nginx-module:v0.07:encryptsession
ENCRYPTSESSION_VARS= DSO_EXTMODS+=encryptsession
-FASTDFS_GH_TUPLE= happyfish100:fastdfs-nginx-module:85347be:fastdfs
+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 \
@@ -77,7 +76,7 @@ HEADERS_MORE_VARS= DSO_EXTMODS+=headers_more
HTTP_ACCEPT_LANGUAGE_GH_TUPLE= giom:nginx_accept_language_module:2f69842:accept_language
HTTP_ACCEPT_LANGUAGE_CONFIGURE_ON= --add-module=${WRKSRC_accept_language}
-HTTP_AUTH_DIGEST_GH_TUPLE= atomx:nginx-http-auth-digest:274490c:auth_digest
+HTTP_AUTH_DIGEST_GH_TUPLE= atomx:nginx-http-auth-digest:cd86418:auth_digest
HTTP_AUTH_DIGEST_VARS= DSO_EXTMODS+=auth_digest
HTTP_AUTH_KRB5_GH_TUPLE= stnoonan:spnego-http-auth-nginx-module:7e028a5:auth_krb5
Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo Thu Jul 19 16:17:47 2018 (r474969)
+++ head/www/nginx/distinfo Thu Jul 19 17:58:34 2018 (r474970)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1530320452
+TIMESTAMP = 1531906074
SHA256 (nginx-1.14.0.tar.gz) = 5d15becbf69aba1fe33f8d416d97edd95ea8919ea9ac519eff9bafebb6022cb5
SIZE (nginx-1.14.0.tar.gz) = 1016272
SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
@@ -37,12 +37,12 @@ SHA256 (openresty-drizzle-nginx-module-v0.1.11_GH0.tar
SIZE (openresty-drizzle-nginx-module-v0.1.11_GH0.tar.gz) = 50864
SHA256 (cubicdaiya-ngx_dynamic_upstream-v0.1.3_GH0.tar.gz) = bf60cf196c86193376d11f8c7a3826994b24a48bb36943bab8a25af6e776af3b
SIZE (cubicdaiya-ngx_dynamic_upstream-v0.1.3_GH0.tar.gz) = 10921
-SHA256 (openresty-echo-nginx-module-46334b3_GH0.tar.gz) = 00d42a5f562a0be5570110d9b70c8f2cace93b292421a6f994cf4ec76a8979f0
-SIZE (openresty-echo-nginx-module-46334b3_GH0.tar.gz) = 52766
+SHA256 (openresty-echo-nginx-module-c65f5c6_GH0.tar.gz) = aea1d10d9175a6471b34d436df937b5c97e7ba1ac4b4b2582a2cb6716d7fba4b
+SIZE (openresty-echo-nginx-module-c65f5c6_GH0.tar.gz) = 53121
SHA256 (openresty-encrypted-session-nginx-module-v0.07_GH0.tar.gz) = ab7b20be9f32da846f5c380677f7bc1dff0b93ce02c06bf584cd45709896ad66
SIZE (openresty-encrypted-session-nginx-module-v0.07_GH0.tar.gz) = 11139
-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
@@ -53,8 +53,8 @@ SHA256 (openresty-headers-more-nginx-module-55fbdab_GH
SIZE (openresty-headers-more-nginx-module-55fbdab_GH0.tar.gz) = 28139
SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 5534ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0
SIZE (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 3393
-SHA256 (atomx-nginx-http-auth-digest-274490c_GH0.tar.gz) = 0839c33c2f8d519f92daae274f62cf87eb68415d562c6500ee3e3721ce80557c
-SIZE (atomx-nginx-http-auth-digest-274490c_GH0.tar.gz) = 17815
+SHA256 (atomx-nginx-http-auth-digest-cd86418_GH0.tar.gz) = 9858b202e5009da4047ac16f3ee02e018673237f0d9652a9e1c2c9d7917f07bf
+SIZE (atomx-nginx-http-auth-digest-cd86418_GH0.tar.gz) = 17869
SHA256 (stnoonan-spnego-http-auth-nginx-module-7e028a5_GH0.tar.gz) = 13f9f8ce2e815a14e43c4741af054f96b0714327d9e248dada241d4d3eaee40d
SIZE (stnoonan-spnego-http-auth-nginx-module-7e028a5_GH0.tar.gz) = 18227
SHA256 (kvspb-nginx-auth-ldap-42d195d_GH0.tar.gz) = 78d74697f89821a7ed31c6c672f6c06923bb53a681ebb203eabebb657bdafd80
Modified: head/www/nginx/files/extra-patch-fastdfs-src-config
==============================================================================
--- head/www/nginx/files/extra-patch-fastdfs-src-config Thu Jul 19 16:17:47 2018 (r474969)
+++ head/www/nginx/files/extra-patch-fastdfs-src-config Thu Jul 19 17:58:34 2018 (r474970)
@@ -1,11 +1,6 @@
---- ../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
-@@ -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/"
+--- ../fastdfs-nginx-module-8796a7d/src/config.orig 2018-07-19 07:14:11.958521000 +0200
++++ ../fastdfs-nginx-module-8796a7d/src/config 2018-07-19 07:14:30.433965000 +0200
+@@ -7,12 +7,12 @@ if test -n "${ngx_module_link}"; then
ngx_module_libs="-lfastcommon -lfdfsclient"
ngx_module_srcs="$ngx_addon_dir/ngx_http_fastdfs_module.c"
ngx_module_deps=
@@ -15,8 +10,7 @@
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_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\"'"
Modified: head/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf
==============================================================================
--- head/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf Thu Jul 19 16:17:47 2018 (r474969)
+++ head/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf Thu Jul 19 17:58:34 2018 (r474970)
@@ -1,6 +1,6 @@
---- ../fastdfs-nginx-module-85347be/src/mod_fastdfs.conf.orig 2017-09-05 14:19:44.560907000 +0200
-+++ ../fastdfs-nginx-module-85347be/src/mod_fastdfs.conf 2017-09-05 14:24:43.475900000 +0200
-@@ -59,8 +59,8 @@
+--- ../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
@@ -11,7 +11,7 @@
# standard log level as syslog, case insensitive, value list:
### emerg for emergency
-@@ -92,6 +92,14 @@
+@@ -92,6 +92,14 @@ if_alias_prefix=
# NOTE: #include is an include directive, do NOT remove the # before include
#include http.conf
@@ -20,13 +20,13 @@
+
+# MIME types mapping filename
+# MIME types file format: MIME_type extensions
-+# such as: image/jpeg jpeg jpg jpe
++# 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 @@
+@@ -119,8 +127,8 @@ group_count = 0
#group_name=group1
#storage_server_port=23000
#store_path_count=2
@@ -37,9 +37,10 @@
# group settings for group #2
# since v1.14
-@@ -129,5 +137,5 @@
+@@ -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-all
mailing list