summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2020-06-05 14:13:40 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2020-06-05 14:13:40 +0000
commit757729ad86334883a65ebbb57e5e794995cb14e9 (patch)
tree78e20ac0641b0974cbe2d7905b3ea29696aba13c
parentmisc/snakemake: Update 5.18.1 -> 5.19.2 (diff)
Merge r538002 from www/nginx.
Update 3rd party module nginx-link-function to 3.2.3. Bump PORTREVISION.
Notes
Notes: svn path=/head/; revision=538022
-rw-r--r--www/nginx-devel/Makefile2
-rw-r--r--www/nginx-devel/Makefile.extmod2
-rw-r--r--www/nginx-devel/distinfo6
-rw-r--r--www/nginx-devel/files/extra-patch-nginx-link-function-config4
-rw-r--r--www/nginx-devel/files/extra-patch-ngx_link_func_module.c4
5 files changed, 9 insertions, 9 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 6dd58051eafd..12ecfe3574af 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.19.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 67bf5e82f5af..56fbddbbbf38 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -207,7 +207,7 @@ LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.15:lua
LUA_VARS= DSO_EXTMODS+=lua
-LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.2:link
+LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.3:link
LINK_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-link-function-config \
${PATCHDIR}/extra-patch-ngx_link_func_module.c
LINK_VARS= DSO_EXTMODS+=link
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 542faa43c332..18400f0356ac 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1591120787
+TIMESTAMP = 1591365189
SHA256 (nginx-1.19.0.tar.gz) = 44a616171fcd7d7ad7c6af3e6f3ad0879b54db5a5d21be874cd458b5691e36c8
SIZE (nginx-1.19.0.tar.gz) = 1043748
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -99,8 +99,8 @@ SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732
SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133
SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5fbd1d8b00bc85e71f2f387c344f007773e49050
SIZE (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 20617
-SHA256 (Taymindis-nginx-link-function-3.2.2_GH0.tar.gz) = ef6c17bad33af15d816e21a3c82a5feb8769564e6b52c10384cffd35f757ee5d
-SIZE (Taymindis-nginx-link-function-3.2.2_GH0.tar.gz) = 145304
+SHA256 (Taymindis-nginx-link-function-3.2.3_GH0.tar.gz) = 0b74d94896709aba21036ed6f9dfd63c9efc5b9921ee5892d28a4b03bd9b09bd
+SIZE (Taymindis-nginx-link-function-3.2.3_GH0.tar.gz) = 145317
SHA256 (openresty-lua-nginx-module-v0.10.15_GH0.tar.gz) = 7d5f3439c8df56046d0564b5857fd8a30296ab1bd6df0f048aed7afb56a0a4c2
SIZE (openresty-lua-nginx-module-v0.10.15_GH0.tar.gz) = 655110
SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8
diff --git a/www/nginx-devel/files/extra-patch-nginx-link-function-config b/www/nginx-devel/files/extra-patch-nginx-link-function-config
index 7e2971304e1a..d5e7e1d19314 100644
--- a/www/nginx-devel/files/extra-patch-nginx-link-function-config
+++ b/www/nginx-devel/files/extra-patch-nginx-link-function-config
@@ -1,5 +1,5 @@
---- ../nginx-link-function-3.2.2/config.orig 2019-02-22 21:19:02.000000000 -0500
-+++ ../nginx-link-function-3.2.2/config 2020-01-24 10:29:53.871805000 -0500
+--- ../nginx-link-function-3.2.3/config.orig 2019-02-22 21:19:02.000000000 -0500
++++ ../nginx-link-function-3.2.3/config 2020-01-24 10:29:53.871805000 -0500
@@ -15,24 +15,6 @@
#echo "#define NGINX_HTTP_HTTP_LINK_FUNC_VERSION \""$HTTP_LINK_FUNC_VERSION"\"" > $NGX_OBJS/ngx_vod_version.h
diff --git a/www/nginx-devel/files/extra-patch-ngx_link_func_module.c b/www/nginx-devel/files/extra-patch-ngx_link_func_module.c
index 845e1e06d882..6dea2f976e45 100644
--- a/www/nginx-devel/files/extra-patch-ngx_link_func_module.c
+++ b/www/nginx-devel/files/extra-patch-ngx_link_func_module.c
@@ -1,5 +1,5 @@
---- ../nginx-link-function-3.2.2/src/ngx_link_func_module.c.orig 2020-01-24 10:32:50.550797000 -0500
-+++ ../nginx-link-function-3.2.2/src/ngx_link_func_module.c 2020-01-24 10:33:17.135348000 -0500
+--- ../nginx-link-function-3.2.3/src/ngx_link_func_module.c.orig 2020-01-24 10:32:50.550797000 -0500
++++ ../nginx-link-function-3.2.3/src/ngx_link_func_module.c 2020-01-24 10:33:17.135348000 -0500
@@ -35,7 +35,7 @@
#include <ngx_config.h>
#include <ngx_core.h>