Date: Fri, 5 Jun 2020 22:23:23 +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: r538057 - in head/www: nginx-devel nginx-devel/files rubygem-passenger rubygem-passenger/files Message-ID: <202006052223.055MNNIe040713@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Fri Jun 5 22:23:22 2020 New Revision: 538057 URL: https://svnweb.freebsd.org/changeset/ports/538057 Log: Update passenger and its third-party module from 6.0.4 to 6.0.5. Bump PORTREVISION for www/nginx-devel. Added: head/www/rubygem-passenger/files/patch-src-ruby_native_extension-extconf.rb (contents, props changed) Deleted: head/www/nginx-devel/files/extra-patch-passenger-system-calls head/www/rubygem-passenger/files/patch-freebsd13 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-passenger-disable-telemetry head/www/rubygem-passenger/Makefile head/www/rubygem-passenger/distinfo Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Fri Jun 5 20:46:32 2020 (r538056) +++ head/www/nginx-devel/Makefile Fri Jun 5 22:23:22 2020 (r538057) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.19.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa Modified: head/www/nginx-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Fri Jun 5 20:46:32 2020 (r538056) +++ head/www/nginx-devel/Makefile.extmod Fri Jun 5 22:23:22 2020 (r538057) @@ -232,7 +232,7 @@ OPENTRACING_LIB_DEPENDS= libopentracing.so:devel/libop OPENTRACING_VARS= DSO_EXTMODS+=opentracing OPENTRACING_SUBDIR=/opentracing OPENTRACING_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-opentracing-opentracing-config -PASSENGER_NGINX_VER= 6.0.4 +PASSENGER_NGINX_VER= 6.0.5 PASSENGER_CATEGORIES= ruby PASSENGER_USE= ruby=yes PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake @@ -242,8 +242,7 @@ PASSENGER_DISTFILES= passenger-${PASSENGER_NGINX_VER}. PASSENGER_VARS= WRKSRC_passenger=${WRKDIR}/passenger-${PASSENGER_NGINX_VER} \ DSO_EXTDIRS+=passenger-${PASSENGER_NGINX_VER}/src/nginx_module PASSENGER_EXTRA_PATCHES=${PATCHDIR}/extra-patch-passenger-build-nginx.rb \ - ${PATCHDIR}/extra-patch-passenger-disable-telemetry \ - ${PATCHDIR}/extra-patch-passenger-system-calls + ${PATCHDIR}/extra-patch-passenger-disable-telemetry POSTGRES_USES= pgsql POSTGRES_GH_TUPLE= konstruxi:ngx_postgres:8aa7359:postgres Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Fri Jun 5 20:46:32 2020 (r538056) +++ head/www/nginx-devel/distinfo Fri Jun 5 22:23:22 2020 (r538057) @@ -1,4 +1,4 @@ -TIMESTAMP = 1591365189 +TIMESTAMP = 1591366465 SHA256 (nginx-1.19.0.tar.gz) = 44a616171fcd7d7ad7c6af3e6f3ad0879b54db5a5d21be874cd458b5691e36c8 SIZE (nginx-1.19.0.tar.gz) = 1043748 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -9,8 +9,8 @@ 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 (passenger-6.0.4.tar.gz) = ec1e4b555c176642c1c316897177d54b6f7d369490280e8ee3e54644e40b250b -SIZE (passenger-6.0.4.tar.gz) = 7347803 +SHA256 (passenger-6.0.5.tar.gz) = 94c25d5669c6cd1bc93854a020701c9869012eec621bce331bfe2d0c9c8c3532 +SIZE (passenger-6.0.5.tar.gz) = 7347149 SHA256 (yaoweibin-nginx_ajp_module-a964a0b_GH0.tar.gz) = 0c786660ce2e5c6d23cf02e957786ad581a04cc6315145eb144ec271f7f81326 SIZE (yaoweibin-nginx_ajp_module-a964a0b_GH0.tar.gz) = 109940 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80 Modified: head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb ============================================================================== --- head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Fri Jun 5 20:46:32 2020 (r538056) +++ head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Fri Jun 5 22:23:22 2020 (r538057) @@ -1,5 +1,5 @@ ---- ../passenger-6.0.4/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 -+++ ../passenger-6.0.4/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 +--- ../passenger-6.0.5/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 ++++ ../passenger-6.0.5/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-passenger-disable-telemetry ============================================================================== --- head/www/nginx-devel/files/extra-patch-passenger-disable-telemetry Fri Jun 5 20:46:32 2020 (r538056) +++ head/www/nginx-devel/files/extra-patch-passenger-disable-telemetry Fri Jun 5 22:23:22 2020 (r538057) @@ -1,5 +1,5 @@ ---- ../passenger-6.0.4/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 -+++ ../passenger-6.0.4/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500 +--- ../passenger-6.0.5/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 ++++ ../passenger-6.0.5/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500 @@ -204,7 +204,7 @@ :name => 'passenger_disable_anonymous_telemetry', :scope => :global, Modified: head/www/rubygem-passenger/Makefile ============================================================================== --- head/www/rubygem-passenger/Makefile Fri Jun 5 20:46:32 2020 (r538056) +++ head/www/rubygem-passenger/Makefile Fri Jun 5 22:23:22 2020 (r538057) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= passenger -PORTVERSION= 6.0.4 -PORTREVISION= 1 +PORTVERSION= 6.0.5 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMEPREFIX= rubygem- Modified: head/www/rubygem-passenger/distinfo ============================================================================== --- head/www/rubygem-passenger/distinfo Fri Jun 5 20:46:32 2020 (r538056) +++ head/www/rubygem-passenger/distinfo Fri Jun 5 22:23:22 2020 (r538057) @@ -1,3 +1,3 @@ -TIMESTAMP = 1568811279 -SHA256 (rubygem/passenger-6.0.4.gem) = 298806191e4e8995dbc0f94c3791b2b1916ca50b5993e04236df6f4108bfc2af -SIZE (rubygem/passenger-6.0.4.gem) = 7262720 +TIMESTAMP = 1591366986 +SHA256 (rubygem/passenger-6.0.5.gem) = 9c6f406dd00c4a7c1169a235e454fe40e82ead83c775f488e0d34e809bcb5b76 +SIZE (rubygem/passenger-6.0.5.gem) = 7264256 Added: head/www/rubygem-passenger/files/patch-src-ruby_native_extension-extconf.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/rubygem-passenger/files/patch-src-ruby_native_extension-extconf.rb Fri Jun 5 22:23:22 2020 (r538057) @@ -0,0 +1,15 @@ +--- src/ruby_native_extension/extconf.rb.orig 2020-06-05 11:51:04.865937000 -0400 ++++ src/ruby_native_extension/extconf.rb 2020-06-05 13:22:43.694831000 -0400 +@@ -70,6 +70,12 @@ + File.open("Makefile", "w") do |f| + f.write(makefile) + end ++ elsif RUBY_PLATFORM =~ /freebsd/ ++ makefile = File.read("Makefile") ++ makefile.sub!(/-Wl,--compress-debug-sections=zlib/, "") ++ File.open("Makefile", "w") do |f| ++ f.write(makefile) ++ end + end + end +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006052223.055MNNIe040713>