Date: Wed, 28 Nov 2018 00:00:03 +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: r486073 - in head/www: nginx nginx-devel nginx-devel/files nginx/files rubygem-passenger rubygem-passenger/files Message-ID: <201811280000.wAS003t9068549@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Wed Nov 28 00:00:03 2018 New Revision: 486073 URL: https://svnweb.freebsd.org/changeset/ports/486073 Log: Update passenger and it's modules for www/nginx and www/nginx-devel ports to 5.3.7. Deleted: head/www/rubygem-passenger/files/patch-src-agent-Core-SecurityUpdateChecker.h 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/Makefile head/www/nginx/Makefile.extmod head/www/nginx/distinfo head/www/nginx/files/extra-patch-passenger-build-nginx.rb head/www/rubygem-passenger/Makefile head/www/rubygem-passenger/distinfo head/www/rubygem-passenger/files/pkg-message-nginx.in Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue Nov 27 23:04:07 2018 (r486072) +++ head/www/nginx-devel/Makefile Wed Nov 28 00:00:03 2018 (r486073) @@ -3,6 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.15.7 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ \ LOCAL/osa Modified: head/www/nginx-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Tue Nov 27 23:04:07 2018 (r486072) +++ head/www/nginx-devel/Makefile.extmod Wed Nov 28 00:00:03 2018 (r486073) @@ -222,7 +222,7 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_sr NJS_GH_TUPLE= nginx:njs:ca2bcd2:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx -PASSENGER_NGINX_VER= 5.3.5 +PASSENGER_NGINX_VER= 5.3.7 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 Tue Nov 27 23:04:07 2018 (r486072) +++ head/www/nginx-devel/distinfo Wed Nov 28 00:00:03 2018 (r486073) @@ -1,4 +1,4 @@ -TIMESTAMP = 1543358883 +TIMESTAMP = 1543359412 SHA256 (nginx-1.15.7.tar.gz) = 8f22ea2f6c0e0a221b6ddc02b6428a3ff708e2ad55f9361102b1c9f4142bdf93 SIZE (nginx-1.15.7.tar.gz) = 1026732 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -13,8 +13,8 @@ SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053 SIZE (ngx_http_response-0.3.tar.gz) = 2244 SHA256 (modsecurity-2.9.2.tar.gz) = 41a8f73476ec891f3a9e8736b98b64ea5c2105f1ce15ea57a1f05b4bf2ffaeb5 SIZE (modsecurity-2.9.2.tar.gz) = 4298993 -SHA256 (passenger-5.3.5.tar.gz) = 2a257b1902691736dcee5d193784f45d44c8709ee2ed039d89eb3fedfe07cca1 -SIZE (passenger-5.3.5.tar.gz) = 7217952 +SHA256 (passenger-5.3.7.tar.gz) = ff9185257feafd6c2d982652dd1bbd06118895012f6e799ce170b7c855f7b5cb +SIZE (passenger-5.3.7.tar.gz) = 7195477 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 Tue Nov 27 23:04:07 2018 (r486072) +++ head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Wed Nov 28 00:00:03 2018 (r486073) @@ -1,5 +1,5 @@ ---- ../passenger-5.3.5/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 -+++ ../passenger-5.3.5/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 +--- ../passenger-5.3.7/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 ++++ ../passenger-5.3.7/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/Makefile ============================================================================== --- head/www/nginx/Makefile Tue Nov 27 23:04:07 2018 (r486072) +++ head/www/nginx/Makefile Wed Nov 28 00:00:03 2018 (r486073) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.14.1 -PORTREVISION?= 3 +PORTREVISION?= 4 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ \ Modified: head/www/nginx/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Tue Nov 27 23:04:07 2018 (r486072) +++ head/www/nginx/Makefile.extmod Wed Nov 28 00:00:03 2018 (r486073) @@ -226,7 +226,7 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_sr NJS_GH_TUPLE= nginx:njs:992e93d:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx -PASSENGER_NGINX_VER= 5.3.5 +PASSENGER_NGINX_VER= 5.3.7 PASSENGER_CATEGORIES= ruby PASSENGER_USE= ruby=yes PASSENGER_BUILD_DEPENDS= ${LOCALBASE}/bin/rake:devel/rubygem-rake Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Tue Nov 27 23:04:07 2018 (r486072) +++ head/www/nginx/distinfo Wed Nov 28 00:00:03 2018 (r486073) @@ -1,4 +1,4 @@ -TIMESTAMP = 1542300703 +TIMESTAMP = 1543362482 SHA256 (nginx-1.14.1.tar.gz) = bf09974130c0d41c0a811decc17a96ec2f58cdc8bbacb771de8d38c9ba14a4a4 SIZE (nginx-1.14.1.tar.gz) = 1014040 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.3.5.tar.gz) = 2a257b1902691736dcee5d193784f45d44c8709ee2ed039d89eb3fedfe07cca1 -SIZE (passenger-5.3.5.tar.gz) = 7217952 +SHA256 (passenger-5.3.7.tar.gz) = ff9185257feafd6c2d982652dd1bbd06118895012f6e799ce170b7c855f7b5cb +SIZE (passenger-5.3.7.tar.gz) = 7195477 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/files/extra-patch-passenger-build-nginx.rb ============================================================================== --- head/www/nginx/files/extra-patch-passenger-build-nginx.rb Tue Nov 27 23:04:07 2018 (r486072) +++ head/www/nginx/files/extra-patch-passenger-build-nginx.rb Wed Nov 28 00:00:03 2018 (r486073) @@ -1,5 +1,5 @@ ---- ../passenger-5.3.5/build/nginx.rb.orig 2018-05-20 08:43:19.389262000 +0200 -+++ ../passenger-5.3.5/build/nginx.rb 2018-05-20 09:11:27.500253000 +0200 +--- ../passenger-5.3.7/build/nginx.rb.orig 2018-05-20 08:43:19.389262000 +0200 ++++ ../passenger-5.3.7/build/nginx.rb 2018-05-20 09:11:27.500253000 +0200 @@ -39,13 +39,12 @@ auto_generated_sources = %w( desc "Build Nginx support files" task :nginx => [ Modified: head/www/rubygem-passenger/Makefile ============================================================================== --- head/www/rubygem-passenger/Makefile Tue Nov 27 23:04:07 2018 (r486072) +++ head/www/rubygem-passenger/Makefile Wed Nov 28 00:00:03 2018 (r486073) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= passenger -PORTVERSION= 5.3.5 -PORTREVISION= 1 +PORTVERSION= 5.3.7 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMEPREFIX= rubygem- @@ -39,21 +38,7 @@ USES+= apache:2.2+ USE_RUBY= yes RAKE_BIN= ${LOCALBASE}/bin/rake USES+= cpe gem libtool python:env shebangfix ssl -SHEBANG_FILES= \ - src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py \ - dev/vagrant/nginx_start \ - dev/vagrant/provision.sh \ - dev/ci/run-tests-with-docker \ - dev/ci/tests/debian/run \ - dev/ci/tests/rpm/run \ - dev/ci/scripts/setup-host-natively.sh \ - dev/ci/scripts/docker-entrypoint-stage2.sh \ - dev/ci/scripts/inituidgid \ - dev/ci/scripts/debug-console-wrapper.sh \ - dev/ci/scripts/run-tests-natively-stage2.sh \ - dev/ci/scripts/docker-entrypoint.sh \ - dev/ci/run-tests-natively \ - dev/ci/setup-host +SHEBANG_FILES= src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py LIB_DEPENDS+= libuv.so:devel/libuv \ libcurl.so:ftp/curl \ @@ -78,12 +63,6 @@ SYMLINK_SUB_LIST= PASSENGER_INSTALL_DIR="${PREFIX}/${G SYMLINK_SUB_LIST_OFF= PASSENGER_INSTALL_DIR="${PREFIX}/${GEM_LIB_DIR}" pre-patch: -.if ${FLAVOR} == nginx - @${ECHO_CMD} - @${ECHO_CMD} "Do not forget compile www/nginx" - @${ECHO_CMD} "with PASSENGER_MODULE support" - @${ECHO_CMD} -.endif @${REINPLACE_CMD} \ 's!-Wall!!g; \ s!gcc!${CC}!g; \ Modified: head/www/rubygem-passenger/distinfo ============================================================================== --- head/www/rubygem-passenger/distinfo Tue Nov 27 23:04:07 2018 (r486072) +++ head/www/rubygem-passenger/distinfo Wed Nov 28 00:00:03 2018 (r486073) @@ -1,3 +1,3 @@ -TIMESTAMP = 1537823017 -SHA256 (rubygem/passenger-5.3.5.gem) = b8c84f92be4fb40bc9a1a455ce95db9fa8f354db01aa923c80afe2b3f255f31e -SIZE (rubygem/passenger-5.3.5.gem) = 7134720 +TIMESTAMP = 1543359462 +SHA256 (rubygem/passenger-5.3.7.gem) = 7399b1ef7bc826f6e06d9143b1f802bb585ee393f5c8bfa18a58b6d2e9c24213 +SIZE (rubygem/passenger-5.3.7.gem) = 7114240 Modified: head/www/rubygem-passenger/files/pkg-message-nginx.in ============================================================================== --- head/www/rubygem-passenger/files/pkg-message-nginx.in Tue Nov 27 23:04:07 2018 (r486072) +++ head/www/rubygem-passenger/files/pkg-message-nginx.in Wed Nov 28 00:00:03 2018 (r486073) @@ -1,6 +1,11 @@ +The nginx flavor of this port installs passenger core binaries only, +to make it works with nginx make sure www/nginx or www/nginx-devel +port has been compiled with third-party PASSENGER module support and +installed into a system. + ##################################################################### -Please edit your nginx configuration file, and add these lines: +Please edit a nginx configuration file, and add these lines: server { root %%PASSENGER_INSTALL_DIR%%; @@ -9,8 +14,7 @@ Please edit your nginx configuration file, and add the passenger_sticky_sessions on; } -After you restart nginx, you are ready to deploy any number of Ruby on Rails -applications on nginx, without any further Ruby on Rails-specific -configuration! +Once nginx restarts it's possible to deploy a Ruby on Rails +application without any further Ruby on Rails-specific configuration! #####################################################################
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811280000.wAS003t9068549>