From owner-svn-ports-all@freebsd.org Fri Jun 5 06:33:59 2020 Return-Path: Delivered-To: svn-ports-all@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 1F6CF34211E; Fri, 5 Jun 2020 06:33:59 +0000 (UTC) (envelope-from joneum@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 49dXsz04kgz4Cp9; Fri, 5 Jun 2020 06:33:59 +0000 (UTC) (envelope-from joneum@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 F2187CD01; Fri, 5 Jun 2020 06:33:58 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0556Xweb048608; Fri, 5 Jun 2020 06:33:58 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0556XwFn048604; Fri, 5 Jun 2020 06:33:58 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <202006050633.0556XwFn048604@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Fri, 5 Jun 2020 06:33:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537990 - in head/www/nginx: . files X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in head/www/nginx: . files X-SVN-Commit-Revision: 537990 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 06:33:59 -0000 Author: joneum Date: Fri Jun 5 06:33:57 2020 New Revision: 537990 URL: https://svnweb.freebsd.org/changeset/ports/537990 Log: Merge r532895 from www:/nginx-devel: Convert another 7 third-party modules to dynamic: o) gridfs o) http_push_stream o) http_upstream_sticky o) http_video_thumbextractor o) http_zip o) let o) link Sponsored by: Netzkommune GmbH Deleted: head/www/nginx/files/extra-patch-ngx_http_sticky_misc.c 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 Fri Jun 5 06:23:55 2020 (r537989) +++ head/www/nginx/Makefile Fri Jun 5 06:33:57 2020 (r537990) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.18.0 -PORTREVISION?= 6 +PORTREVISION?= 7 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ Modified: head/www/nginx/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Fri Jun 5 06:23:55 2020 (r537989) +++ head/www/nginx/Makefile.extmod Fri Jun 5 06:33:57 2020 (r537990) @@ -68,9 +68,9 @@ FORMINPUT_IMPLIES= DEVEL_KIT FORMINPUT_GH_TUPLE= calio:form-input-nginx-module:v0.12:forminput FORMINPUT_VARS= DSO_EXTMODS+=forminput -GRIDFS_GH_TUPLE= mdirolf:nginx-gridfs:v0.8:gridfs \ - mongodb:mongo-c-driver:v0.3.1:mongo_c -GRIDFS_CONFIGURE_ON= --add-module=${WRKSRC_gridfs} +GRIDFS_GH_TUPLE= technowledgy:nginx_http_gridfs_module:7970bab:gridfs \ + 10gen-archive:mongo-c-driver-legacy:f06669b:mongo_c +GRIDFS_VARS= DSO_EXTMODS+=gridfs HEADERS_MORE_GH_TUPLE= openresty:headers-more-nginx-module:085fbbc:headers_more HEADERS_MORE_VARS= DSO_EXTMODS+=headers_more @@ -145,7 +145,7 @@ HTTP_PUSH_GH_TUPLE= slact:nchan:v1.1.14:push HTTP_PUSH_VARS= DSO_EXTMODS+=push HTTP_PUSH_STREAM_GH_TUPLE= wandenberg:nginx-push-stream-module:0.5.4:pushstream -HTTP_PUSH_STREAM_CONFIGURE_ON= --add-module=${WRKSRC_pushstream} +HTTP_PUSH_STREAM_VARS= DSO_EXTMODS+=pushstream HTTP_REDIS_MASTER_SITES= LOCAL/osa:redis HTTP_REDIS_DISTFILES= ngx_http_redis-0.3.9.tar.gz:redis @@ -185,21 +185,19 @@ HTTP_UPSTREAM_FAIR_GH_TUPLE= jaygooby:nginx-upstream- HTTP_UPSTREAM_FAIR_VARS= DSO_EXTMODS+=upstreamfair HTTP_UPSTREAM_STICKY_IMPLIES= HTTP_SSL -HTTP_UPSTREAM_STICKY_MASTER_SITES= https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/:upstreamsticky -HTTP_UPSTREAM_STICKY_DISTFILES= 08a395c66e42.tar.gz:upstreamsticky -HTTP_UPSTREAM_STICKY_CONFIGURE_ON= --add-module=${WRKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42/ -HTTP_UPSTREAM_STICKY_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_sticky_misc.c +HTTP_UPSTREAM_STICKY_GH_TUPLE= ayty-adrianomartins:nginx-sticky-module-ng:c407e0d:upstreamsticky +HTTP_UPSTREAM_STICKY_VARS= DSO_EXTMODS+=upstreamsticky HTTP_VIDEO_THUMBEXTRACTOR_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libavcodec.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg HTTP_VIDEO_THUMBEXTRACTOR_USES= jpeg -HTTP_VIDEO_THUMBEXTRACTOR_GH_TUPLE= wandenberg:nginx-video-thumbextractor-module:0.9.0:vte -HTTP_VIDEO_THUMBEXTRACTOR_CONFIGURE_ON=--add-module=${WRKSRC_vte} +HTTP_VIDEO_THUMBEXTRACTOR_GH_TUPLE= Novetta:nginx-video-thumbextractor-module:f5b5bae:vte +HTTP_VIDEO_THUMBEXTRACTOR_VARS= DSO_EXTMODS+=vte -HTTP_ZIP_GH_TUPLE= anthonyryan1:mod_zip:74ef235:mod_zip -HTTP_ZIP_CONFIGURE_ON= --add-module=${WRKSRC_mod_zip} +HTTP_ZIP_GH_TUPLE= rtm-ctrlz:mod_zip:cfd0be4:mod_zip +HTTP_ZIP_VARS= DSO_EXTMODS+=mod_zip ICONV_IMPLIES= DEVEL_KIT ICONV_USES= iconv @@ -207,13 +205,13 @@ ICONV_GH_TUPLE= calio:iconv-nginx-module:v0.14:iconv ICONV_VARS= DSO_EXTMODS+=iconv ICONV_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config -LET_GH_TUPLE= arut:nginx-let-module:v0.0.4:let -LET_CONFIGURE_ON= --add-module=${WRKSRC_let} +LET_GH_TUPLE= baysao:nginx-let-module:c1f23aa:let +LET_VARS= DSO_EXTMODS+=let LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.2: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 +LINK_VARS= DSO_EXTMODS+=link LUA_IMPLIES= DEVEL_KIT LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Fri Jun 5 06:23:55 2020 (r537989) +++ head/www/nginx/distinfo Fri Jun 5 06:33:57 2020 (r537990) @@ -1,4 +1,4 @@ -TIMESTAMP = 1591177712 +TIMESTAMP = 1591302281 SHA256 (nginx-1.18.0.tar.gz) = 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99 SIZE (nginx-1.18.0.tar.gz) = 1039530 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -11,8 +11,6 @@ SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b2 SIZE (ngx_http_redis-0.3.9.tar.gz) = 13051 SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045 SIZE (ngx_http_response-0.3.tar.gz) = 2244 -SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae150219a45f16add0c8d6e84546cb7d80f73ebffd90 -SIZE (08a395c66e42.tar.gz) = 120603 SHA256 (modsecurity-2.9.3.tar.gz) = 4192019d169d3f1dd82cc4714db6986df54c6ceb4ee1c8f253de78d1a6b62118 SIZE (modsecurity-2.9.3.tar.gz) = 4307670 SHA256 (passenger-6.0.4.tar.gz) = ec1e4b555c176642c1c316897177d54b6f7d369490280e8ee3e54644e40b250b @@ -45,10 +43,10 @@ SHA256 (happyfish100-fastdfs-nginx-module-8796a7d_GH0. SIZE (happyfish100-fastdfs-nginx-module-8796a7d_GH0.tar.gz) = 19872 SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106 SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090 -SHA256 (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = ef843824e0aac1dd60b392802861cc06426a4bc5f87d472c7ee00b1296693f2a -SIZE (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = 18883 -SHA256 (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 552c54aff81c4701ace4eb1ce20c114433ee783b4b06c0105921a830c9486172 -SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 53024 +SHA256 (technowledgy-nginx_http_gridfs_module-7970bab_GH0.tar.gz) = 3c53190c24a578c0d6d340d290cd87f139a651372c78b7518b617a037db60582 +SIZE (technowledgy-nginx_http_gridfs_module-7970bab_GH0.tar.gz) = 20495 +SHA256 (10gen-archive-mongo-c-driver-legacy-f06669b_GH0.tar.gz) = cbd6b34aadea40b43db431590808a9e12d813f896ad2b1dcffb820872ef97b21 +SIZE (10gen-archive-mongo-c-driver-legacy-f06669b_GH0.tar.gz) = 79396 SHA256 (openresty-headers-more-nginx-module-085fbbc_GH0.tar.gz) = 720d250a446f233ce12ccfe0d4eec67aa44085a0a71327f158e19bf0b26a602b SIZE (openresty-headers-more-nginx-module-085fbbc_GH0.tar.gz) = 28226 SHA256 (dvershinin-nginx_accept_language_module-5683967_GH0.tar.gz) = a58feb576f2231498b8a3863d3c6fba45c7d48bc48735fa714e07a7bfbedb6e3 @@ -97,14 +95,16 @@ SHA256 (yaoweibin-nginx_upstream_check_module-9aecf15_ SIZE (yaoweibin-nginx_upstream_check_module-9aecf15_GH0.tar.gz) = 130039 SHA256 (jaygooby-nginx-upstream-fair-10ecdcf_GH0.tar.gz) = 93f71b7cf0db9c6dbf97e3ee11cf8efbc149946c0949d7abd19c74c7620eea50 SIZE (jaygooby-nginx-upstream-fair-10ecdcf_GH0.tar.gz) = 10433 -SHA256 (wandenberg-nginx-video-thumbextractor-module-0.9.0_GH0.tar.gz) = 6ad7d12b3f7b65ec8e7f3e0f471463929967cb76ff1a81b35a5a34b33604f3cb -SIZE (wandenberg-nginx-video-thumbextractor-module-0.9.0_GH0.tar.gz) = 2709894 -SHA256 (anthonyryan1-mod_zip-74ef235_GH0.tar.gz) = 0d780e6fef91814fbaa577c9f7cfb7b78f6898e50c34d63f3c5d101eb45afd44 -SIZE (anthonyryan1-mod_zip-74ef235_GH0.tar.gz) = 26125 +SHA256 (ayty-adrianomartins-nginx-sticky-module-ng-c407e0d_GH0.tar.gz) = ee7d6a6e3f4452388d1e821470c2352c5d42970f756507b878529911e79c1b60 +SIZE (ayty-adrianomartins-nginx-sticky-module-ng-c407e0d_GH0.tar.gz) = 120679 +SHA256 (Novetta-nginx-video-thumbextractor-module-f5b5bae_GH0.tar.gz) = cb4ecc14bf8503eb73c50ca5e9952ce1f99badbf2e7fdd2346c73d2e7905a5a5 +SIZE (Novetta-nginx-video-thumbextractor-module-f5b5bae_GH0.tar.gz) = 34434 +SHA256 (rtm-ctrlz-mod_zip-cfd0be4_GH0.tar.gz) = 66e867c9fd311a04f4b69a928441b49b5322d631db650d971abbc55af485cc9c +SIZE (rtm-ctrlz-mod_zip-cfd0be4_GH0.tar.gz) = 26113 SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462 SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133 -SHA256 (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = cbf6fcddc00a7e30289134bdeace12565e000cc7d4efee2d2ebb8799d0b88270 -SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534 +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 (openresty-lua-nginx-module-v0.10.15_GH0.tar.gz) = 7d5f3439c8df56046d0564b5857fd8a30296ab1bd6df0f048aed7afb56a0a4c2 Modified: head/www/nginx/pkg-plist ============================================================================== --- head/www/nginx/pkg-plist Fri Jun 5 06:23:55 2020 (r537989) +++ head/www/nginx/pkg-plist Fri Jun 5 06:33:57 2020 (r537990) @@ -24,6 +24,7 @@ %%DSO%%%%ENCRYPTSESSION%%libexec/nginx/ngx_http_encrypted_session_module.so %%DSO%%%%FASTDFS%%libexec/nginx/ngx_http_fastdfs_module.so %%DSO%%%%FORMINPUT%%libexec/nginx/ngx_http_form_input_module.so +%%DSO%%%%GRIDFS%%libexec/nginx/ngx_http_gridfs_module.so %%DSO%%%%HEADERS_MORE%%libexec/nginx/ngx_http_headers_more_filter_module.so %%DSO%%%%HTTP_ACCEPT_LANGUAGE%%libexec/nginx/ngx_http_accept_language_module.so %%DSO%%%%HTTP_AUTH_DIGEST%%libexec/nginx/ngx_http_auth_digest_module.so @@ -42,13 +43,19 @@ %%DSO%%%%HTTP_IP2PROXY%%libexec/nginx/ngx_http_ip2proxy_module.so %%DSO%%%%HTTP_PERL%%libexec/nginx/ngx_http_perl_module.so %%DSO%%%%HTTP_PUSH%%libexec/nginx/ngx_nchan_module.so +%%DSO%%%%HTTP_PUSH_STREAM%%libexec/nginx/ngx_http_push_stream_module.so %%DSO%%%%HTTP_REDIS%%libexec/nginx/ngx_http_redis_module.so %%DSO%%%%HTTP_TARANTOOL%%libexec/nginx/ngx_http_tnt_module.so %%DSO%%%%HTTP_UPLOAD%%libexec/nginx/ngx_http_upload_module.so %%DSO%%%%HTTP_UPLOAD_PROGRESS%%libexec/nginx/ngx_http_uploadprogress_module.so %%DSO%%%%HTTP_UPSTREAM_FAIR%%libexec/nginx/ngx_http_upstream_fair_module.so +%%DSO%%%%HTTP_UPSTREAM_STICKY%%libexec/nginx/ngx_http_sticky_module.so +%%DSO%%%%HTTP_VIDEO_THUMBEXTRACTOR%%libexec/nginx/ngx_http_video_thumbextractor_module.so %%DSO%%%%HTTP_XSLT%%libexec/nginx/ngx_http_xslt_filter_module.so +%%DSO%%%%HTTP_ZIP%%libexec/nginx/ngx_http_zip_module.so %%DSO%%%%ICONV%%libexec/nginx/ngx_http_iconv_module.so +%%DSO%%%%LET%%libexec/nginx/ngx_http_let_module.so +%%DSO%%%%LINK%%libexec/nginx/ngx_http_link_func_module.so %%DSO%%%%LUA%%libexec/nginx/ngx_http_lua_module.so %%DSO%%%%MAIL%%libexec/nginx/ngx_mail_module.so %%DSO%%%%MEMC%%libexec/nginx/ngx_http_memc_module.so