Date: Tue, 28 Jan 2020 15:11:34 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524489 - in head/www/nginx-devel: . files Message-ID: <202001281511.00SFBYmT098710@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Tue Jan 28 15:11:34 2020 New Revision: 524489 URL: https://svnweb.freebsd.org/changeset/ports/524489 Log: Commit missing patches for r524122. Eagle eye notice from: joneum No cookie for: osa Added: head/www/nginx-devel/files/extra-patch-nginx-link-function-config (contents, props changed) head/www/nginx-devel/files/extra-patch-ngx_link_func_module.c (contents, props changed) Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/Makefile.extmod head/www/nginx-devel/Makefile.options.desc head/www/nginx-devel/distinfo Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue Jan 28 14:56:37 2020 (r524488) +++ head/www/nginx-devel/Makefile Tue Jan 28 15:11:34 2020 (r524489) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.17.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -83,9 +83,9 @@ OPTIONS_GROUP_HTTPGRP+= AJP AWS_AUTH BROTLI CACHE_PURG HTTP_REDIS HTTP_RESPONSE HTTP_SLICE_AHEAD HTTP_SUBS_FILTER \ HTTP_TARANTOOL HTTP_UPLOAD HTTP_UPLOAD_PROGRESS HTTP_UPSTREAM_CHECK \ HTTP_UPSTREAM_FAIR HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR \ - HTTP_ZIP ICONV LET LINK LUA MEMC MODSECURITY MODSECURITY3 NAXSI NJS PASSENGER \ - POSTGRES RDS_CSV RDS_JSON REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH \ - SLOWFS_CACHE SMALL_LIGHT SRCACHE VOD VTS XSS WEBSOCKIFY + HTTP_ZIP ICONV LET LINK LUA MEMC MODSECURITY MODSECURITY3 NAXSI NJS \ + OPENTRACING PASSENGER POSTGRES RDS_CSV RDS_JSON REDIS2 RTMP SET_MISC \ + SFLOW SHIBBOLETH SLOWFS_CACHE SMALL_LIGHT SRCACHE VOD VTS XSS WEBSOCKIFY OPTIONS_GROUP_MAILGRP= MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL OPTIONS_DEFINE= DEBUG DEBUGLOG DSO FILE_AIO IPV6 THREADS WWW OPTIONS_DEFAULT?= DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \ Modified: head/www/nginx-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Tue Jan 28 14:56:37 2020 (r524488) +++ head/www/nginx-devel/Makefile.extmod Tue Jan 28 15:11:34 2020 (r524489) @@ -241,6 +241,9 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_sr NJS_GH_TUPLE= nginx:njs:0.3.8:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx +OPENTRACING_GH_TUPLE= opentracing-contrib:nginx-opentracing:v0.9.0:opentracing +OPENTRACING_VARS= DSO_EXTMODS+=opentracing OPENTRACING_SUBDIR=/opentracing + PASSENGER_NGINX_VER= 6.0.4 PASSENGER_CATEGORIES= ruby PASSENGER_USE= ruby=yes Modified: head/www/nginx-devel/Makefile.options.desc ============================================================================== --- head/www/nginx-devel/Makefile.options.desc Tue Jan 28 14:56:37 2020 (r524488) +++ head/www/nginx-devel/Makefile.options.desc Tue Jan 28 15:11:34 2020 (r524489) @@ -91,6 +91,7 @@ MODSECURITY3_DESC= 3rd party modsecurity3 module MODSECURITY_DESC= 3rd party mod_security module NAXSI_DESC= 3rd party naxsi module NJS_DESC= Enable http_javascript module +OPENTRACING_DESC= 3rd party opentracing module PASSENGER_DESC= 3rd party passenger module POSTGRES_DESC= 3rd party postgres module RDS_CSV_DESC= 3rd party rds_csv module Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Tue Jan 28 14:56:37 2020 (r524488) +++ head/www/nginx-devel/distinfo Tue Jan 28 15:11:34 2020 (r524489) @@ -1,4 +1,4 @@ -TIMESTAMP = 1579980602 +TIMESTAMP = 1579981520 SHA256 (nginx-1.17.8.tar.gz) = 97d23ecf6d5150b30e284b40e8a6f7e3bb5be6b601e373a4d013768d5a25965b SIZE (nginx-1.17.8.tar.gz) = 1038627 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -113,6 +113,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 (opentracing-contrib-nginx-opentracing-v0.9.0_GH0.tar.gz) = 4fc410d7aef0c8a6371afa9f249d2c6cec50ea88785d05052f8f457c35b69c18 +SIZE (opentracing-contrib-nginx-opentracing-v0.9.0_GH0.tar.gz) = 664311 SHA256 (nginx-njs-0.3.8_GH0.tar.gz) = 5620fab03f890043a3f5b95459be24f2c22e0b5478c4b925aafdcfe13a60fc16 SIZE (nginx-njs-0.3.8_GH0.tar.gz) = 398172 SHA256 (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9 Added: head/www/nginx-devel/files/extra-patch-nginx-link-function-config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-nginx-link-function-config Tue Jan 28 15:11:34 2020 (r524489) @@ -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-devel/files/extra-patch-ngx_link_func_module.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-ngx_link_func_module.c Tue Jan 28 15:11:34 2020 (r524489) @@ -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" +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001281511.00SFBYmT098710>