This updates ruby-passenger to the latest release. This is usually the most difficult ruby gem port to update, and this update was not an exception. It takes quite a while to build and this update had numerous issues where it hard coded "ruby" instead of using the DEFAULT_RUBY value. Additionally, this update contains code that is just broken on OpenBSD and NetBSD, even though the code is aware of the issue and tries to work around it. Updating this port is like playing a very slow game of whack-a-mole.
If you are using passenger, I highly recommend switching to unicorn or puma instead. Passenger is probably more complicated by 1-2 orders of magnitude. Changelog is here: https://github.com/phusion/passenger/blob/stable-6.0/CHANGELOG The major change is that passenger now supports all programming languages. They also added automated spying ("telemetry") for all applications, though I added a patch to stop the telemetry thread from starting, which should hopefully prevent that. Tested very briefly with a super simple rack application, both in standalone and nginx modes. I'll be committing in a couple days unless I hear objections. The plist diff is attached and gzipped for size reasons. Thanks, Jeremy Index: www/nginx/Makefile =================================================================== RCS file: /cvs/ports/www/nginx/Makefile,v retrieving revision 1.139 diff -u -p -u -p -r1.139 Makefile --- www/nginx/Makefile 6 Nov 2019 13:05:49 -0000 1.139 +++ www/nginx/Makefile 10 Nov 2019 21:19:29 -0000 @@ -22,6 +22,7 @@ DISTNAME= nginx-${VERSION} CATEGORIES= www REVISION= 1 +REVISION-passenger= 2 VERSION-rtmp= 1.2.1 PKGNAME-main= ${DISTNAME} Index: www/ruby-passenger/Makefile =================================================================== RCS file: /cvs/ports/www/ruby-passenger/Makefile,v retrieving revision 1.63 diff -u -p -u -p -r1.63 Makefile --- www/ruby-passenger/Makefile 12 Jul 2019 21:02:29 -0000 1.63 +++ www/ruby-passenger/Makefile 10 Nov 2019 21:19:29 -0000 @@ -4,10 +4,9 @@ COMMENT = ruby web application server/n BROKEN-alpha = .got subsegment exceeds 64K (size 83312) BROKEN-hppa = rake fails when linking PassengerHelperAgent -PASS_VERSION = 5.1.11 -NGINX_VERSION = 1.12.1 +PASS_VERSION = 6.0.4 +NGINX_VERSION = 1.16.1 DISTNAME = passenger-${PASS_VERSION} -REVISION = 5 CATEGORIES = www DISTFILES = ${DISTNAME}.gem \ @@ -21,7 +20,7 @@ PERMIT_PACKAGE = Yes MODULES = lang/ruby -CONFIGURE_STYLE = gem ext +CONFIGURE_STYLE = ruby gem ext WANTLIB = ${MODRUBY_WANTLIB} crypto curl kvm nghttp2 pcre pthread ssl ${COMPILER_LIBCXX} z @@ -47,6 +46,9 @@ SUBST_VARS = MODRUBY_FLAVOR NGINX_VERSI pre-configure: ${SUBST_CMD} -DRUBY=${RUBY} \ -DPASSENGER_ROOT='${PREFIX}/lib/phusion-passenger${GEM_MAN_SUFFIX}' \ + ${WRKSRC}/src/agent/Core/AdminPanelConnector.h \ + ${WRKSRC}/src/agent/Core/ApplicationPool/Options.h \ + ${WRKSRC}/src/agent/Core/SpawningKit/Factory.h \ ${WRKSRC}/src/nginx_module/config \ ${WRKSRC}/src/ruby_supportlib/phusion_passenger.rb \ ${WRKSRC}/src/ruby_supportlib/phusion_passenger/constants.rb \ Index: www/ruby-passenger/distinfo =================================================================== RCS file: /cvs/ports/www/ruby-passenger/distinfo,v retrieving revision 1.11 diff -u -p -u -p -r1.11 distinfo --- www/ruby-passenger/distinfo 4 Nov 2017 15:56:29 -0000 1.11 +++ www/ruby-passenger/distinfo 10 Nov 2019 21:19:29 -0000 @@ -1,4 +1,4 @@ -SHA256 (nginx-1.12.1.tar.gz) = h5O/QmSFow+RAhtrlFqf2KhNh9F7VmViw3l6uo+sdvs= -SHA256 (passenger-5.1.11.gem) = EPtLaFo7Hq5kReSaKqb53rZ845FDxb03cc5ZkGPboVk= -SIZE (nginx-1.12.1.tar.gz) = 981093 -SIZE (passenger-5.1.11.gem) = 4160512 +SHA256 (nginx-1.16.1.tar.gz) = 8RwqbdHTUVc28DJIV5V9st6YvoYkYbWlQqOsYYjb4ys= +SHA256 (passenger-6.0.4.gem) = KYgGGR5OiZXbwPlMN5GysZFspQtZk+BCNt9vQQi/wq8= +SIZE (nginx-1.16.1.tar.gz) = 1032630 +SIZE (passenger-6.0.4.gem) = 7262720 Index: www/ruby-passenger/patches/patch-src_agent_Core_AdminPanelConnector_h =================================================================== RCS file: www/ruby-passenger/patches/patch-src_agent_Core_AdminPanelConnector_h diff -N www/ruby-passenger/patches/patch-src_agent_Core_AdminPanelConnector_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/ruby-passenger/patches/patch-src_agent_Core_AdminPanelConnector_h 10 Nov 2019 21:19:29 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: src/agent/Core/AdminPanelConnector.h +--- src/agent/Core/AdminPanelConnector.h.orig ++++ src/agent/Core/AdminPanelConnector.h +@@ -109,7 +109,7 @@ class AdminPanelConnector { (public) + add("instance_dir", STRING_TYPE, OPTIONAL | READ_ONLY); + add("web_server_version", STRING_TYPE, OPTIONAL | READ_ONLY); + add("web_server_module_version", STRING_TYPE, OPTIONAL | READ_ONLY); +- add("ruby", STRING_TYPE, OPTIONAL, "ruby"); ++ add("ruby", STRING_TYPE, OPTIONAL, "${RUBY}"); + + addValidator(ConfigKit::validateIntegrationMode); + addValidator(ConfigKit::validateStandaloneEngine); Index: www/ruby-passenger/patches/patch-src_agent_Core_ApplicationPool_Options_h =================================================================== RCS file: www/ruby-passenger/patches/patch-src_agent_Core_ApplicationPool_Options_h diff -N www/ruby-passenger/patches/patch-src_agent_Core_ApplicationPool_Options_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/ruby-passenger/patches/patch-src_agent_Core_ApplicationPool_Options_h 10 Nov 2019 21:19:29 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ + +Index: src/agent/Core/ApplicationPool/Options.h +--- src/agent/Core/ApplicationPool/Options.h.orig ++++ src/agent/Core/ApplicationPool/Options.h +@@ -437,7 +437,7 @@ class Options { (public) + defaultUser(PASSENGER_DEFAULT_USER, sizeof(PASSENGER_DEFAULT_USER) - 1), + lveMinUid(DEFAULT_LVE_MIN_UID), + integrationMode(DEFAULT_INTEGRATION_MODE, sizeof(DEFAULT_INTEGRATION_MODE) - 1), +- ruby(DEFAULT_RUBY, sizeof(DEFAULT_RUBY) - 1), ++ ruby("${RUBY}", sizeof("${RUBY}") - 1), + python(DEFAULT_PYTHON, sizeof(DEFAULT_PYTHON) - 1), + nodejs(DEFAULT_NODEJS, sizeof(DEFAULT_NODEJS) - 1), + fileDescriptorUlimit(0), +@@ -621,7 +621,7 @@ class Options { (public) + + string interpreter; + if (entry.language == P_STATIC_STRING("ruby")) { +- interpreter = escapeShell(ruby); ++ interpreter = "${RUBY}"; + } else if (entry.language == P_STATIC_STRING("python")) { + interpreter = escapeShell(python); + } else if (entry.language == P_STATIC_STRING("nodejs")) { Index: www/ruby-passenger/patches/patch-src_agent_Core_ApplicationPool_Pool_AnalyticsCollection_cpp =================================================================== RCS file: /cvs/ports/www/ruby-passenger/patches/patch-src_agent_Core_ApplicationPool_Pool_AnalyticsCollection_cpp,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-src_agent_Core_ApplicationPool_Pool_AnalyticsCollection_cpp --- www/ruby-passenger/patches/patch-src_agent_Core_ApplicationPool_Pool_AnalyticsCollection_cpp 4 Nov 2016 22:08:19 -0000 1.1 +++ www/ruby-passenger/patches/patch-src_agent_Core_ApplicationPool_Pool_AnalyticsCollection_cpp 10 Nov 2019 21:19:29 -0000 @@ -3,9 +3,10 @@ $OpenBSD: patch-src_agent_Core_Applicati Remove unnecessary warning, as their metrics parser apparently doesn't work on OpenBSD. ---- src/agent/Core/ApplicationPool/Pool/AnalyticsCollection.cpp.orig Mon Jul 25 19:56:01 2016 -+++ src/agent/Core/ApplicationPool/Pool/AnalyticsCollection.cpp Tue Nov 1 13:18:15 2016 -@@ -184,7 +184,6 @@ Pool::realCollectAnalytics() { +Index: src/agent/Core/ApplicationPool/Pool/AnalyticsCollection.cpp +--- src/agent/Core/ApplicationPool/Pool/AnalyticsCollection.cpp.orig ++++ src/agent/Core/ApplicationPool/Pool/AnalyticsCollection.cpp +@@ -143,7 +143,6 @@ Pool::realCollectAnalytics() { P_DEBUG("Collecting process metrics"); processMetrics = ProcessMetricsCollector().collect(pids); } catch (const ParseException &) { Index: www/ruby-passenger/patches/patch-src_agent_Core_CoreMain_cpp =================================================================== RCS file: /cvs/ports/www/ruby-passenger/patches/patch-src_agent_Core_CoreMain_cpp,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-src_agent_Core_CoreMain_cpp --- www/ruby-passenger/patches/patch-src_agent_Core_CoreMain_cpp 4 Nov 2017 15:56:29 -0000 1.1 +++ www/ruby-passenger/patches/patch-src_agent_Core_CoreMain_cpp 10 Nov 2019 21:19:29 -0000 @@ -1,18 +1,16 @@ $OpenBSD: patch-src_agent_Core_CoreMain_cpp,v 1.1 2017/11/04 15:56:29 jeremy Exp $ -Remove checking for newer versions. +Remove security update checker and telemetry collector. Index: src/agent/Core/CoreMain.cpp --- src/agent/Core/CoreMain.cpp.orig +++ src/agent/Core/CoreMain.cpp -@@ -788,9 +788,7 @@ initializeSecurityUpdateChecker() { - TRACE_POINT(); +@@ -1349,8 +1349,6 @@ runCore() { + lowerPrivilege(); + initializeCurl(); + initializeNonPrivilegedWorkingObjects(); +- initializeSecurityUpdateChecker(); +- initializeTelemetryCollector(); + initializeAdminPanelConnector(); + prestartWebApps(); - VariantMap &options = *agentsOptions; -- if (options.getBool("disable_security_update_check", false, false)) { -- P_NOTICE("Security update check disabled."); -- } else { -+ if (false) { - string proxy = options.get("security_update_check_proxy", false); - - string serverIntegration = options.get("integration_mode"); // nginx / apache / standalone Index: www/ruby-passenger/patches/patch-src_agent_Core_SecurityUpdateChecker_h =================================================================== RCS file: www/ruby-passenger/patches/patch-src_agent_Core_SecurityUpdateChecker_h diff -N www/ruby-passenger/patches/patch-src_agent_Core_SecurityUpdateChecker_h --- www/ruby-passenger/patches/patch-src_agent_Core_SecurityUpdateChecker_h 8 Nov 2018 20:34:00 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -$OpenBSD: patch-src_agent_Core_SecurityUpdateChecker_h,v 1.1 2018/11/08 20:34:00 naddy Exp $ - -CURLE_SSL_CACERT is obsolete in curl >=7.62.0 - -Index: src/agent/Core/SecurityUpdateChecker.h ---- src/agent/Core/SecurityUpdateChecker.h.orig -+++ src/agent/Core/SecurityUpdateChecker.h -@@ -130,9 +130,6 @@ class SecurityUpdateChecker { (private) - error.append(" for proxy address " + proxyAddress); - break; - -- case CURLE_SSL_CACERT: -- // Peer certificate cannot be authenticated with given / known CA certificates. This would happen -- // for MITM but could also be a truststore issue. - case CURLE_PEER_FAILED_VERIFICATION: - // The remote server's SSL certificate or SSH md5 fingerprint was deemed not OK. - error.append(" while connecting to " CHECK_HOST_DEFAULT "; check that your connection is secure and that the " Index: www/ruby-passenger/patches/patch-src_agent_Core_SpawningKit_Exceptions_h =================================================================== RCS file: www/ruby-passenger/patches/patch-src_agent_Core_SpawningKit_Exceptions_h diff -N www/ruby-passenger/patches/patch-src_agent_Core_SpawningKit_Exceptions_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/ruby-passenger/patches/patch-src_agent_Core_SpawningKit_Exceptions_h 10 Nov 2019 21:19:29 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +Omit -a arugment to id(1) when handling exceptions. + +Index: src/agent/Core/SpawningKit/Exceptions.h +--- src/agent/Core/SpawningKit/Exceptions.h.orig ++++ src/agent/Core/SpawningKit/Exceptions.h +@@ -754,7 +754,7 @@ class SpawnException: public oxt::tracable_exception { + } + + static string gatherUserInfo() { +- const char *command[] = { "id", "-a", NULL }; ++ const char *command[] = { "id", NULL }; + try { + SubprocessInfo info; + SubprocessOutput output; Index: www/ruby-passenger/patches/patch-src_agent_Core_SpawningKit_Factory_h =================================================================== RCS file: www/ruby-passenger/patches/patch-src_agent_Core_SpawningKit_Factory_h diff -N www/ruby-passenger/patches/patch-src_agent_Core_SpawningKit_Factory_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/ruby-passenger/patches/patch-src_agent_Core_SpawningKit_Factory_h 10 Nov 2019 21:19:29 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: src/agent/Core/SpawningKit/Factory.h +--- src/agent/Core/SpawningKit/Factory.h.orig ++++ src/agent/Core/SpawningKit/Factory.h +@@ -49,7 +49,7 @@ class Factory { (private) + string dir = context->resourceLocator->getHelperScriptsDir(); + vector<string> preloaderCommand; + if (options.appType == "ruby" || options.appType == "rack") { +- preloaderCommand.push_back(options.ruby); ++ preloaderCommand.push_back("${RUBY}"); + preloaderCommand.push_back(dir + "/rack-preloader.rb"); + } else { + return SpawnerPtr(); Index: www/ruby-passenger/patches/patch-src_cxx_supportlib_FileTools_FileManip_cpp =================================================================== RCS file: www/ruby-passenger/patches/patch-src_cxx_supportlib_FileTools_FileManip_cpp diff -N www/ruby-passenger/patches/patch-src_cxx_supportlib_FileTools_FileManip_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/ruby-passenger/patches/patch-src_cxx_supportlib_FileTools_FileManip_cpp 10 Nov 2019 21:19:29 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ + +Don't crash process if there is an error removing temporary files. + +Index: src/cxx_supportlib/FileTools/FileManip.cpp +--- src/cxx_supportlib/FileTools/FileManip.cpp.orig ++++ src/cxx_supportlib/FileTools/FileManip.cpp +@@ -319,9 +319,6 @@ removeDirTree(const string &path) { + }; + SubprocessInfo info; + runCommand(command, info, true, true, redirectStderrToDevNull); +- if (info.status != 0 && info.status != -2) { +- throw RuntimeException("Cannot remove directory '" + path + "'"); +- } + } + } + Index: www/ruby-passenger/patches/patch-src_cxx_supportlib_SystemTools_ProcessMetricsCollector_h =================================================================== RCS file: www/ruby-passenger/patches/patch-src_cxx_supportlib_SystemTools_ProcessMetricsCollector_h diff -N www/ruby-passenger/patches/patch-src_cxx_supportlib_SystemTools_ProcessMetricsCollector_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/ruby-passenger/patches/patch-src_cxx_supportlib_SystemTools_ProcessMetricsCollector_h 10 Nov 2019 21:19:29 -0000 @@ -0,0 +1,62 @@ +$OpenBSD$ + +Fix broken code. On NetBSD/OpenBSD, if ps output contained +any process we weren't looking for (very likely), a ParseError +would be raised. + +Index: src/cxx_supportlib/SystemTools/ProcessMetricsCollector.h +--- src/cxx_supportlib/SystemTools/ProcessMetricsCollector.h.orig ++++ src/cxx_supportlib/SystemTools/ProcessMetricsCollector.h +@@ -234,16 +234,13 @@ class ProcessMetricsCollector { (private) + pidAllowed = pids.find(metrics.pid) != pids.end(); + #endif + +- if (pidAllowed) { +- result[metrics.pid] = metrics; +- +- start = strchr(start, '\n'); +- if (start != NULL) { +- // Skip to beginning of next line. +- start++; +- if (*start == '\0') { +- start = NULL; +- } ++ result[metrics.pid] = metrics; ++ start = strchr(start, '\n'); ++ if (start != NULL) { ++ // Skip to beginning of next line. ++ start++; ++ if (*start == '\0') { ++ start = NULL; + } + } + } +@@ -293,16 +290,8 @@ class ProcessMetricsCollector { (private) + ConstIterator it; + // The list of PIDs must follow -p without a space. + // https://groups.google.com/forum/#!topic/phusion-passenger/WKXy61nJBMA +- string pidsArg = "-p"; ++ string pidsArg = "-ax"; + +- for (it = pids.begin(); it != pids.end(); it++) { +- pidsArg.append(toString(*it)); +- pidsArg.append(","); +- } +- if (pidsArg[pidsArg.size() - 1] == ',') { +- pidsArg.resize(pidsArg.size() - 1); +- } +- + // The list of format arguments must also follow -o + // without a space. + // https://github.com/phusion/passenger/pull/94 +@@ -315,9 +304,7 @@ class ProcessMetricsCollector { (private) + + const char *command[] = { + "ps", fmtArg.c_str(), +- #ifdef PS_SUPPORTS_MULTIPLE_PIDS +- pidsArg.c_str(), +- #endif ++ pidsArg.c_str(), + NULL + }; + Index: www/ruby-passenger/patches/patch-src_cxx_supportlib_vendor-modified_boost_predef_detail_endian_compat_h =================================================================== RCS file: /cvs/ports/www/ruby-passenger/patches/patch-src_cxx_supportlib_vendor-modified_boost_predef_detail_endian_compat_h,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-src_cxx_supportlib_vendor-modified_boost_predef_detail_endian_compat_h --- www/ruby-passenger/patches/patch-src_cxx_supportlib_vendor-modified_boost_predef_detail_endian_compat_h 4 Nov 2016 22:08:19 -0000 1.1 +++ www/ruby-passenger/patches/patch-src_cxx_supportlib_vendor-modified_boost_predef_detail_endian_compat_h 10 Nov 2019 21:19:29 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-src_cxx_supportlib_vendor-modified_boost_predef_detail_endian_compat_h,v 1.1 2016/11/04 22:08:19 jeremy Exp $ ---- src/cxx_supportlib/vendor-modified/boost/predef/detail/endian_compat.h.orig Mon Jul 25 19:56:05 2016 -+++ src/cxx_supportlib/vendor-modified/boost/predef/detail/endian_compat.h Tue Nov 1 13:41:58 2016 -@@ -21,6 +21,15 @@ http://www.boost.org/LICENSE_1_0.txt) +Index: src/cxx_supportlib/vendor-modified/boost/predef/detail/endian_compat.h +--- src/cxx_supportlib/vendor-modified/boost/predef/detail/endian_compat.h.orig ++++ src/cxx_supportlib/vendor-modified/boost/predef/detail/endian_compat.h +@@ -23,6 +23,15 @@ http://www.boost.org/LICENSE_1_0.txt) #if BOOST_ENDIAN_LITTLE_WORD # define BOOST_PDP_ENDIAN # define BOOST_BYTE_ORDER 2134 Index: www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_config_agent_compiler_rb =================================================================== RCS file: /cvs/ports/www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_config_agent_compiler_rb,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-src_ruby_supportlib_phusion_passenger_config_agent_compiler_rb --- www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_config_agent_compiler_rb 4 Nov 2016 22:08:19 -0000 1.1 +++ www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_config_agent_compiler_rb 10 Nov 2019 21:19:29 -0000 @@ -2,17 +2,18 @@ $OpenBSD: patch-src_ruby_supportlib_phus Remove hiding of build steps. ---- src/ruby_supportlib/phusion_passenger/config/agent_compiler.rb.orig Tue Nov 1 15:23:44 2016 -+++ src/ruby_supportlib/phusion_passenger/config/agent_compiler.rb Tue Nov 1 15:27:21 2016 +Index: src/ruby_supportlib/phusion_passenger/config/agent_compiler.rb +--- src/ruby_supportlib/phusion_passenger/config/agent_compiler.rb.orig ++++ src/ruby_supportlib/phusion_passenger/config/agent_compiler.rb @@ -131,22 +131,13 @@ module PhusionPassenger def compile_agent puts "<banner>Compiling #{PROGRAM_NAME} agent...</banner>" - progress_bar = ProgressBar.new e_working_dir = Shellwords.escape(@working_dir) - args = "#{e_working_dir}/support-binaries/#{AGENT_EXE}" + - " CACHING=false" + - " OUTPUT_DIR=#{e_working_dir} " + args = "#{e_working_dir}/support-binaries/#{AGENT_EXE}" \ + " CACHING=false" \ + " OUTPUT_DIR=#{e_working_dir} " \ " OPTIMIZE=#{!!@optimize}" - begin - progress_bar.set(0) Index: www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_config_nginx_engine_compiler_rb =================================================================== RCS file: /cvs/ports/www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_config_nginx_engine_compiler_rb,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-src_ruby_supportlib_phusion_passenger_config_nginx_engine_compiler_rb --- www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_config_nginx_engine_compiler_rb 4 Nov 2017 15:56:29 -0000 1.2 +++ www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_config_nginx_engine_compiler_rb 10 Nov 2019 21:19:29 -0000 @@ -5,7 +5,7 @@ Remove hiding of build steps. Index: src/ruby_supportlib/phusion_passenger/config/nginx_engine_compiler.rb --- src/ruby_supportlib/phusion_passenger/config/nginx_engine_compiler.rb.orig +++ src/ruby_supportlib/phusion_passenger/config/nginx_engine_compiler.rb -@@ -286,37 +286,17 @@ module PhusionPassenger +@@ -285,37 +285,17 @@ module PhusionPassenger def compile_support_libraries puts "Compiling support libraries (step 1 of 2)..." @@ -46,7 +46,7 @@ Index: src/ruby_supportlib/phusion_passe FileUtils.cp("#{@working_dir}/nginx-#{@nginx_version}/objs/nginx", "#{@destdir}/nginx-#{@nginx_version}") -@@ -341,60 +321,12 @@ module PhusionPassenger +@@ -340,60 +320,12 @@ module PhusionPassenger command << "#{shell} ./configure --prefix=/tmp " + "#{self.class.configure_script_options} " + "--add-module=#{Shellwords.escape PhusionPassenger.nginx_module_source_dir}" Index: www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_platform_info_compiler_rb =================================================================== RCS file: /cvs/ports/www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_platform_info_compiler_rb,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-src_ruby_supportlib_phusion_passenger_platform_info_compiler_rb --- www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_platform_info_compiler_rb 4 Nov 2016 22:08:19 -0000 1.1 +++ www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_platform_info_compiler_rb 10 Nov 2019 21:19:29 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-src_ruby_supportlib_phusion_passenger_platform_info_compiler_rb,v 1.1 2016/11/04 22:08:19 jeremy Exp $ ---- src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb.orig Mon Jul 25 19:56:07 2016 -+++ src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb Tue Nov 1 13:18:15 2016 -@@ -224,7 +224,7 @@ module PhusionPassenger +Index: src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb +--- src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb.orig ++++ src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb +@@ -233,7 +233,7 @@ module PhusionPassenger f.close begin command = create_compiler_command(language, Index: www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_rb =================================================================== RCS file: /cvs/ports/www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_rb,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-src_ruby_supportlib_phusion_passenger_rb --- www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_rb 4 Nov 2017 15:56:29 -0000 1.2 +++ www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_rb 10 Nov 2019 21:19:29 -0000 @@ -7,16 +7,16 @@ Don't store or look for stuff in $HOME, Index: src/ruby_supportlib/phusion_passenger.rb --- src/ruby_supportlib/phusion_passenger.rb.orig +++ src/ruby_supportlib/phusion_passenger.rb -@@ -33,7 +33,7 @@ module PhusionPassenger - # Run 'rake src/cxx_supportlib/Constants.h' after changing this number. - VERSION_STRING = '5.1.11' +@@ -34,7 +34,7 @@ module PhusionPassenger + VERSION_STRING = '6.0.4' -- PREFERRED_NGINX_VERSION = '1.12.1' + # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION> +- PREFERRED_NGINX_VERSION = '1.17.3' + PREFERRED_NGINX_VERSION = '${NGINX_VERSION}' - NGINX_SHA256_CHECKSUM = '8793bf426485a30f91021b6b945a9fd8a84d87d17b566562c3797aba8fac76fb' + NGINX_SHA256_CHECKSUM = '3b84fe1c2cf9ca22fde370e486a9ab16b6427df1b6ea62cdb61978c9f34d0f3c' # Packaging may be locked to an older version due to the specific module configuration being -@@ -320,18 +320,6 @@ private +@@ -323,18 +323,6 @@ private # example `sudo` preserves it. That's why we don't respect it by # default. def self.home_dir(respect_home_env = false)
passenger-plist.diff.gz
Description: application/gunzip
