Date: Sun, 13 May 2018 15:04:51 +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: r469801 - in head/www/nginx-devel: . files Message-ID: <201805131504.w4DF4p8V042057@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Sun May 13 15:04:50 2018 New Revision: 469801 URL: https://svnweb.freebsd.org/changeset/ports/469801 Log: Upgrade third-party passenger module from 5.2.3 to 5.3.0. While I'm here fix the issue with GSSAPIINCDIR variable, it's been introduced as GSSAPINCDIR without a correct substitution during the third-party auth_krb5 module's patch time. 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-passenger-build-nginx.rb head/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Sun May 13 15:04:49 2018 (r469800) +++ head/www/nginx-devel/Makefile Sun May 13 15:04:50 2018 (r469801) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.14.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ \ LOCAL/osa @@ -260,7 +260,8 @@ post-patch-GRIDFS-on: @${REINPLACE_CMD} 's!--std=c99!-DMONGO_HAVE_STDINT!' ${WRKSRC_gridfs}/config post-patch-HTTP_AUTH_KRB5-on: - @${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!' ${WRKSRC_auth_krb5}/config + @${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!g; \ + s!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!g' ${WRKSRC_auth_krb5}/config post-patch-HTTP_TARANTOOL-on: @${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config Modified: head/www/nginx-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Sun May 13 15:04:49 2018 (r469800) +++ head/www/nginx-devel/Makefile.extmod Sun May 13 15:04:50 2018 (r469801) @@ -224,7 +224,7 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_sr NJS_GH_TUPLE= nginx:njs:ce54200:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx -PASSENGER_NGINX_VER= 5.2.3 +PASSENGER_NGINX_VER= 5.3.0 PASSENGER_CATEGORIES= ruby PASSENGER_USE= ruby=yes PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Sun May 13 15:04:49 2018 (r469800) +++ head/www/nginx-devel/distinfo Sun May 13 15:04:50 2018 (r469801) @@ -1,4 +1,4 @@ -TIMESTAMP = 1526172928 +TIMESTAMP = 1526222484 SHA256 (nginx-1.14.0.tar.gz) = 5d15becbf69aba1fe33f8d416d97edd95ea8919ea9ac519eff9bafebb6022cb5 SIZE (nginx-1.14.0.tar.gz) = 1016272 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -15,8 +15,8 @@ SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae1 SIZE (08a395c66e42.tar.gz) = 120603 SHA256 (modsecurity-2.9.2.tar.gz) = 41a8f73476ec891f3a9e8736b98b64ea5c2105f1ce15ea57a1f05b4bf2ffaeb5 SIZE (modsecurity-2.9.2.tar.gz) = 4298993 -SHA256 (passenger-5.2.3.tar.gz) = 0a06a2c75688a0e6c85717fb67b57940bebca5e56b7c76337c50b8c3d024345b -SIZE (passenger-5.2.3.tar.gz) = 6956101 +SHA256 (passenger-5.3.0.tar.gz) = 096c637d8fa14b71160eab5c8a5caee4d6553683f04e78ce37f47f7113b5842d +SIZE (passenger-5.3.0.tar.gz) = 7033231 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809 SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 9e3f78ea73e2d606a95ee64fd3affa4c249f9b342e66b6b11b63061791f28316 Modified: head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb ============================================================================== --- head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Sun May 13 15:04:49 2018 (r469800) +++ head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Sun May 13 15:04:50 2018 (r469801) @@ -1,5 +1,5 @@ ---- ../passenger-5.2.3/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 -+++ ../passenger-5.2.3/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 +--- ../passenger-5.3.0/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 ++++ ../passenger-5.3.0/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 @@ -33,13 +33,12 @@ desc "Build Nginx support files" task :nginx => [ Modified: head/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config ============================================================================== --- head/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config Sun May 13 15:04:49 2018 (r469800) +++ head/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config Sun May 13 15:04:50 2018 (r469801) @@ -8,7 +8,7 @@ - ngx_feature_libs="$ngx_feature_libs -lgssapi" -fi +ngx_feature_libs="%%GSSAPILIBS%%" -+ngx_module_incs="%%GSSAPINCDIR%%" ++ngx_module_incs="%%GSSAPIINCDIR%%" if test -n "$ngx_module_link"; then ngx_module_type=HTTP
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805131504.w4DF4p8V042057>