From owner-svn-ports-head@freebsd.org Tue Nov 24 16:00:11 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C1A962E9F3D; Tue, 24 Nov 2020 16:00:11 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CgTHv566Tz4t5g; Tue, 24 Nov 2020 16:00:11 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A237021711; Tue, 24 Nov 2020 16:00:11 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AOG0BtB048103; Tue, 24 Nov 2020 16:00:11 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AOG0ALd048010; Tue, 24 Nov 2020 16:00:10 GMT (envelope-from osa@FreeBSD.org) Message-Id: <202011241600.0AOG0ALd048010@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Tue, 24 Nov 2020 16:00:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556167 - in head/www/nginx-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: osa X-SVN-Commit-Paths: in head/www/nginx-devel: . files X-SVN-Commit-Revision: 556167 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2020 16:00:11 -0000 Author: osa Date: Tue Nov 24 16:00:10 2020 New Revision: 556167 URL: https://svnweb.freebsd.org/changeset/ports/556167 Log: Update third-partu link function module from 3.2.3 to 3.2.4. Bump PORTREVISION. Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/Makefile.extmod head/www/nginx-devel/distinfo head/www/nginx-devel/files/extra-patch-nginx-link-function-config head/www/nginx-devel/files/extra-patch-ngx_link_func_module.c Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue Nov 24 15:55:05 2020 (r556166) +++ head/www/nginx-devel/Makefile Tue Nov 24 16:00:10 2020 (r556167) @@ -3,7 +3,7 @@ PORTNAME?= nginx PORTVERSION= 1.19.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa Modified: head/www/nginx-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Tue Nov 24 15:55:05 2020 (r556166) +++ head/www/nginx-devel/Makefile.extmod Tue Nov 24 16:00:10 2020 (r556167) @@ -213,7 +213,7 @@ LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/lua LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.19:lua LUA_VARS= DSO_EXTMODS+=lua -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-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Tue Nov 24 15:55:05 2020 (r556166) +++ head/www/nginx-devel/distinfo Tue Nov 24 16:00:10 2020 (r556167) @@ -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.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8 Modified: head/www/nginx-devel/files/extra-patch-nginx-link-function-config ============================================================================== --- head/www/nginx-devel/files/extra-patch-nginx-link-function-config Tue Nov 24 15:55:05 2020 (r556166) +++ head/www/nginx-devel/files/extra-patch-nginx-link-function-config Tue Nov 24 16:00:10 2020 (r556167) @@ -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-devel/files/extra-patch-ngx_link_func_module.c ============================================================================== --- head/www/nginx-devel/files/extra-patch-ngx_link_func_module.c Tue Nov 24 15:55:05 2020 (r556166) +++ head/www/nginx-devel/files/extra-patch-ngx_link_func_module.c Tue Nov 24 16:00:10 2020 (r556167) @@ -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 #include