Date: Sat, 5 Dec 2020 08:32:52 +0000 (UTC) From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r557045 - in head/www/nginx: . files Message-ID: <202012050832.0B58WqhZ091782@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Sat Dec 5 08:32:52 2020 New Revision: 557045 URL: https://svnweb.freebsd.org/changeset/ports/557045 Log: Update third-party link function module to 3.2.4 Sponsored by: Netzkommune GmbH Modified: head/www/nginx/Makefile head/www/nginx/Makefile.extmod head/www/nginx/distinfo head/www/nginx/files/extra-patch-nginx-link-function-config head/www/nginx/files/extra-patch-ngx_link_func_module.c Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Sat Dec 5 07:38:53 2020 (r557044) +++ head/www/nginx/Makefile Sat Dec 5 08:32:52 2020 (r557045) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.18.0 -PORTREVISION?= 32 +PORTREVISION?= 33 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ Modified: head/www/nginx/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Sat Dec 5 07:38:53 2020 (r557044) +++ head/www/nginx/Makefile.extmod Sat Dec 5 08:32:52 2020 (r557045) @@ -213,7 +213,7 @@ ICONV_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-calio-ico LET_GH_TUPLE= baysao:nginx-let-module:c1f23aa:let LET_VARS= DSO_EXTMODS+=let -LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.3:link +LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.4:link LINK_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-link-function-config \ ${PATCHDIR}/extra-patch-ngx_link_func_module.c LINK_VARS= DSO_EXTMODS+=link Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Sat Dec 5 07:38:53 2020 (r557044) +++ head/www/nginx/distinfo Sat Dec 5 08:32:52 2020 (r557045) @@ -1,4 +1,4 @@ -TIMESTAMP = 1606661305 +TIMESTAMP = 1606676061 SHA256 (nginx-1.18.0.tar.gz) = 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99 SIZE (nginx-1.18.0.tar.gz) = 1039530 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -101,8 +101,8 @@ SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b 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.3_GH0.tar.gz) = 0b74d94896709aba21036ed6f9dfd63c9efc5b9921ee5892d28a4b03bd9b09bd -SIZE (Taymindis-nginx-link-function-3.2.3_GH0.tar.gz) = 145317 +SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f03b2fa0b13591226363c8dd7930d7f02702cd5abada +SIZE (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 139656 SHA256 (openresty-lua-nginx-module-v0.10.19_GH0.tar.gz) = 242d60b97eb7459cd0c0d58083cf7f3195d46181829da45ab8b09a857bb0ed01 SIZE (openresty-lua-nginx-module-v0.10.19_GH0.tar.gz) = 666942 SHA256 (openresty-memc-nginx-module-v0.18_GH0.tar.gz) = 4e280d1dcb8b312bc7875604c1e35b17879279126d3d5fbf482aa9cc7c11276d Modified: head/www/nginx/files/extra-patch-nginx-link-function-config ============================================================================== --- head/www/nginx/files/extra-patch-nginx-link-function-config Sat Dec 5 07:38:53 2020 (r557044) +++ head/www/nginx/files/extra-patch-nginx-link-function-config Sat Dec 5 08:32:52 2020 (r557045) @@ -1,5 +1,5 @@ ---- ../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 +--- ../nginx-link-function-3.2.4/config.orig 2020-10-12 22:32:47.000000000 -0400 ++++ ../nginx-link-function-3.2.4/config 2020-11-13 12:26:56.186032000 -0500 @@ -15,24 +15,6 @@ #echo "#define NGINX_HTTP_HTTP_LINK_FUNC_VERSION \""$HTTP_LINK_FUNC_VERSION"\"" > $NGX_OBJS/ngx_vod_version.h @@ -13,11 +13,11 @@ -ngx_feature_path= -ngx_feature_libs= -# ngx_feature_exit_if_not_found=yes --ngx_feature_test="int ngx_link_func_module_current_version_=ngx_link_func_module_version_33;" +-ngx_feature_test="int ngx_link_func_module_current_version_=ngx_link_func_module_version_34;" -. auto/feature - -if [ $ngx_found != yes ]; then --echo "ngx_link_func_module.h not found in your system c header path, please copy latest ngx_link_func_module.h to your /usr/include or /usr/local/include or relavent header search path with read and write permission given." +-echo "ngx_link_func_module.h not found or version not aligned in your system c header path, please copy latest ngx_link_func_module.h to your /usr/include or /usr/local/include or relavent header search path with read and write permission given." -echo "e.g install -m 644 ../nginx-link-function/src/ngx_link_func_module.h /usr/local/include/" -echo -exit 1 @@ -25,12 +25,11 @@ cat $ngx_addon_dir/build_test_resources/sanity_test_raw_parse.t > $ngx_addon_dir/t/sanity.t if [ $USE_THREADS = YES ]; then cat $ngx_addon_dir/build_test_resources/sanity_test_aio_parse.t >> $ngx_addon_dir/t/sanity.t -@@ -42,13 +24,13 @@ +@@ -42,13 +24,12 @@ if [ $USE_THREADS = YES ]; then cat $ngx_addon_dir/build_test_resources/sanity_test_subrequest_aio_parse.t >> $ngx_addon_dir/t/sanity.t fi -fi -+ ABSOLUTE_NGX_LINKFUNC_CURRENT_PATH="$( cd "$ngx_addon_dir" ; pwd -P )" if [ "$NGX_SYSTEM" = "Darwin" ]; then clang -dynamiclib -o $ngx_addon_dir/t/liblinkfuntest.dylib -fPIC $ngx_addon_dir/build_test_resources/linkfuntest.c -Wl,-undefined,dynamic_lookup Modified: head/www/nginx/files/extra-patch-ngx_link_func_module.c ============================================================================== --- head/www/nginx/files/extra-patch-ngx_link_func_module.c Sat Dec 5 07:38:53 2020 (r557044) +++ head/www/nginx/files/extra-patch-ngx_link_func_module.c Sat Dec 5 08:32:52 2020 (r557045) @@ -1,5 +1,5 @@ ---- ../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 +--- ../nginx-link-function-3.2.4/src/ngx_link_func_module.c.orig 2020-01-24 10:32:50.550797000 -0500 ++++ ../nginx-link-function-3.2.4/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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012050832.0B58WqhZ091782>