Date: Tue, 28 Jan 2020 23:26:02 +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: r524524 - in head/www/nginx: . files Message-ID: <202001282326.00SNQ2CY001665@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Tue Jan 28 23:26:02 2020 New Revision: 524524 URL: https://svnweb.freebsd.org/changeset/ports/524524 Log: Update 3rd party module Fix a error with the nginx-link-funktion module Sponsored by: Netzkommune GmbH Added: head/www/nginx/files/extra-patch-nginx-link-function-config (contents, props changed) head/www/nginx/files/extra-patch-ngx_link_func_module.c (contents, props changed) Modified: head/www/nginx/Makefile head/www/nginx/Makefile.extmod head/www/nginx/distinfo head/www/nginx/pkg-plist Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Tue Jan 28 22:15:19 2020 (r524523) +++ head/www/nginx/Makefile Tue Jan 28 23:26:02 2020 (r524524) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.16.1 -PORTREVISION?= 9 +PORTREVISION?= 10 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ @@ -351,6 +351,9 @@ do-install-DSO-on: do-install-FASTDFS-on: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fdfs ${INSTALL_DATA} ${WRKSRC_fastdfs}/src/mod_fastdfs.conf ${STAGEDIR}${PREFIX}/etc/fdfs/mod_fastdfs.conf.sample + +do-install-LINK-on: + ${INSTALL_DATA} ${WRKSRC_link}/src/ngx_link_func_module.h ${STAGEDIR}${PREFIX}/include do-install-MODSECURITY-on: ${INSTALL_DATA} \ Modified: head/www/nginx/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Tue Jan 28 22:15:19 2020 (r524523) +++ head/www/nginx/Makefile.extmod Tue Jan 28 23:26:02 2020 (r524524) @@ -22,7 +22,7 @@ CACHE_PURGE_CONFIGURE_ON= --add-module=${WRKDIR}/ngx_c CLOJURE_CATEGORIES+= java CLOJURE_USE= JAVA=yes JAVA_OS=native JAVA_VERSION=1.8 \ JAVA_VENDOR=openjdk JAVA_BUILD=yes JAVA_RUN=yes -CLOJURE_GH_TUPLE= nginx-clojure:nginx-clojure:v0.4.5:clojure +CLOJURE_GH_TUPLE= nginx-clojure:nginx-clojure:v0.5.1:clojure CLOJURE_CONFIGURE_ENV= "JNI_INCS=-I${LOCALBASE}/openjdk8/include -I${LOCALBASE}/openjdk8/include/freebsd" CLOJURE_VARS= DSO_EXTMODS+=clojure CLOJURE_SUBDIR=/src/c @@ -45,7 +45,7 @@ DYNAMIC_UPSTREAM_VARS= DSO_EXTMODS+=dynamic_upstream DEVEL_KIT_GH_TUPLE= simpl:ngx_devel_kit:v0.3.1:devel_kit DEVEL_KIT_VARS= FIRST_DSO_EXTMODS+=devel_kit -ECHO_GH_TUPLE= openresty:echo-nginx-module:32859fc:echo +ECHO_GH_TUPLE= openresty:echo-nginx-module:996412d:echo ECHO_VARS= DSO_EXTMODS+=echo ENCRYPTSESSION_IMPLIES= DEVEL_KIT @@ -210,6 +210,8 @@ LET_CONFIGURE_ON= --add-module=${WRKSRC_let} LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.1:link LINK_CONFIGURE_ON= --add-module=${WRKSRC_link} +LINK_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-link-function-config \ + ${PATCHDIR}/extra-patch-ngx_link_func_module.c LUA_IMPLIES= DEVEL_KIT LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty @@ -244,7 +246,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:b2f0f5d:njs +NJS_GH_TUPLE= nginx:njs:19ff812:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx PASSENGER_NGINX_VER= 6.0.4 Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Tue Jan 28 22:15:19 2020 (r524523) +++ head/www/nginx/distinfo Tue Jan 28 23:26:02 2020 (r524524) @@ -1,4 +1,4 @@ -TIMESTAMP = 1579697249 +TIMESTAMP = 1579717532 SHA256 (nginx-1.16.1.tar.gz) = f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b SIZE (nginx-1.16.1.tar.gz) = 1032630 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -27,8 +27,8 @@ SHA256 (anomalizer-ngx_aws_auth-75c94e6_GH0.tar.gz) = SIZE (anomalizer-ngx_aws_auth-75c94e6_GH0.tar.gz) = 15326 SHA256 (eustas-ngx_brotli-8104036_GH0.tar.gz) = 16c8fc9f96cf272b20244fd10baa09b4d2b75f6661ce4a428999f0fc6d1aa4d7 SIZE (eustas-ngx_brotli-8104036_GH0.tar.gz) = 12673 -SHA256 (nginx-clojure-nginx-clojure-v0.4.5_GH0.tar.gz) = c6d500f935dde5f87a6eb47ca473094a8ee2c9b4bb4578c9f99ccdc70a12d59e -SIZE (nginx-clojure-nginx-clojure-v0.4.5_GH0.tar.gz) = 602064 +SHA256 (nginx-clojure-nginx-clojure-v0.5.1_GH0.tar.gz) = dd7f6760b4040722e28e8262765596959cbc11b6dc5e058a0a897ca697ffa4cb +SIZE (nginx-clojure-nginx-clojure-v0.5.1_GH0.tar.gz) = 742237 SHA256 (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = b4ceae549b9dbf84b2e511633982e4efeee0388e3b7a038a8bac555008a77b88 SIZE (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = 6844 SHA256 (simpl-ngx_devel_kit-v0.3.1_GH0.tar.gz) = 0e971105e210d272a497567fa2e2c256f4e39b845a5ba80d373e26ba1abfbd85 @@ -37,8 +37,8 @@ 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-cc5dac3_GH0.tar.gz) = ab940f76b02d77a5cf59bed3fbd3d0ace51d51ba7a8bf1ab3447b14982e92aeb SIZE (cubicdaiya-ngx_dynamic_upstream-cc5dac3_GH0.tar.gz) = 11009 -SHA256 (openresty-echo-nginx-module-32859fc_GH0.tar.gz) = 550cb82a9992837bffbb0f2cbe7bda235c080426a3da70d674af770bf77f389e -SIZE (openresty-echo-nginx-module-32859fc_GH0.tar.gz) = 53244 +SHA256 (openresty-echo-nginx-module-996412d_GH0.tar.gz) = 07074c1859a0e6e5bee129fd2b2938c44ac3de198b51472a64f07243474fdf53 +SIZE (openresty-echo-nginx-module-996412d_GH0.tar.gz) = 53347 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-8796a7d_GH0.tar.gz) = 083fe7ecd484b9adce41c938f0f95b81ebe8336765896107e5864243c9789ef5 @@ -115,8 +115,8 @@ SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.1_GH0.tar.gz SIZE (SpiderLabs-ModSecurity-nginx-v1.0.1_GH0.tar.gz) = 31920 SHA256 (nbs-system-naxsi-0.56_GH0.tar.gz) = 0a66dcadd32432460fab180be9f2efe24e911e3798917b2787ee710e02901eb4 SIZE (nbs-system-naxsi-0.56_GH0.tar.gz) = 192120 -SHA256 (nginx-njs-b2f0f5d_GH0.tar.gz) = da57417aea97bb8e9e39293f4e6d1c6bfce0b59cdb614f78834b12df0a086756 -SIZE (nginx-njs-b2f0f5d_GH0.tar.gz) = 374888 +SHA256 (nginx-njs-19ff812_GH0.tar.gz) = f84dc6d2b1668f6841f0591f6741c2553f043f7fca38a9eb24550419249f8985 +SIZE (nginx-njs-19ff812_GH0.tar.gz) = 398411 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.08_GH0.tar.gz) = 26e80646cc4ad87984c60dab584e8f32faf5dbebb4c6911784339822f4675c79 Added: head/www/nginx/files/extra-patch-nginx-link-function-config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-nginx-link-function-config Tue Jan 28 23:26:02 2020 (r524524) @@ -0,0 +1,43 @@ +--- ../nginx-link-function-3.2.1/config.orig 2019-02-22 21:19:02.000000000 -0500 ++++ ../nginx-link-function-3.2.1/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 + + +-# ngx_link_func_module headers +-# to Test this in order to share the header file to other client instead of just depend on it owns +-ngx_feature="ngx_http_link_func" +-ngx_feature_name="NGX_HAVE_HTTP_LINK_FUNC_HEADERS" +-ngx_feature_run=no +-ngx_feature_incs="#include <ngx_link_func_module.h>" +-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;" +-. 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 "e.g install -m 644 ../nginx-link-function/src/ngx_link_func_module.h /usr/local/include/" +-echo +-exit 1 +-else + 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 @@ + 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 + sed -i '' "s@NGINX_HTTP_LINK_FUNC_TEST_LIB_PATH@$ABSOLUTE_NGX_LINKFUNC_CURRENT_PATH/t/liblinkfuntest.dylib@g" $ngx_addon_dir/t/sanity.t + else +-if [ "$NGX_PLATFORM" != win32 ]; then ++if [ "$NGX_PLATFORM" = win32 ]; then + cc -shared -o $ngx_addon_dir/t/liblinkfuntest.so -fPIC $ngx_addon_dir/build_test_resources/linkfuntest.c + sed -i "s@NGINX_HTTP_LINK_FUNC_TEST_LIB_PATH@$ABSOLUTE_NGX_LINKFUNC_CURRENT_PATH/t/liblinkfuntest.so@g" $ngx_addon_dir/t/sanity.t + fi Added: head/www/nginx/files/extra-patch-ngx_link_func_module.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-ngx_link_func_module.c Tue Jan 28 23:26:02 2020 (r524524) @@ -0,0 +1,11 @@ +--- ../nginx-link-function-3.2.1/src/ngx_link_func_module.c.orig 2020-01-24 10:32:50.550797000 -0500 ++++ ../nginx-link-function-3.2.1/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> + #include <ngx_http.h> +-#include <ngx_link_func_module.h> ++#include "ngx_link_func_module.h" + + #define MODULE_NAME "nginx_link_function" + Modified: head/www/nginx/pkg-plist ============================================================================== --- head/www/nginx/pkg-plist Tue Jan 28 22:15:19 2020 (r524523) +++ head/www/nginx/pkg-plist Tue Jan 28 23:26:02 2020 (r524524) @@ -2,6 +2,7 @@ @sample %%ETCDIR%%/fastcgi_params-dist %%ETCDIR%%/fastcgi_params %%ETCDIR%%/koi-utf %%ETCDIR%%/koi-win +%%LINK%%include/ngx_link_func_module.h %%MODSECURITY%%%%ETCDIR%%/unicode.mapping %%NAXSI%%%%ETCDIR%%/naxsi_core.rules @sample %%ETCDIR%%/scgi_params-dist %%ETCDIR%%/scgi_params
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001282326.00SNQ2CY001665>