pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www {ap2-,}passenger: update to 5.3.7
details: https://anonhg.NetBSD.org/pkgsrc/rev/61dc33e7c61e
branches: trunk
changeset: 317418:61dc33e7c61e
user: markd <markd%pkgsrc.org@localhost>
date: Sun Jan 06 09:52:50 2019 +0000
description:
{ap2-,}passenger: update to 5.3.7
also patches to work correctly on NetBSD.
5.3.7
* Fixes package installation issues on Ubuntu 18.04. These issues were caused
by an update released by Ubuntu on the nginx-common package.
* Fixes compilation problems and warnings with GCC 8.2. Tested on Alpine Linux
edge 2018-11-05.
* Fixes compatibility with libcurl 7.62.0. Contributed by Po-Chuan Hsieh.
* Changes minimum supported macOS version to 10.11 El Capitan.
* Removes packages for Ubuntu 17.10 Artful.
5.3.6
* Fixes smart spawning. A regression in 5.3.5 (due to a refactoring) made it so
that Passenger only used the direct spawning method. This issue was mostly
noticeable in the form of increased process spawning times between 5.3.4
and 5.3.5.
* Fixes Passenger Core and application processes staying on the Watchdog's OOM
score (unkillable).
* Fixes "mach_vm_map failed" warnings on macOS >= High Sierra. These warnings
were harmless, but annoying.
* Fixes passenger-config compile-agent compilation with optimizations. The
optimization flags were not properly passed to the compiler.
* Fixes a crash that could occur when HTTP clients send a chunked
transfer-encoding body containing a chunk larger than 429496729 bytes.
* Improves detection of the system Apache's include headers on macOS High
Sierra and later.
* Fixes RVM gemset detection on RVM 1.29.
* No longer supplies precompiled Ruby extensions for Ruby 1.9.3 and 2.0.0.
5.3.5
* Fixes Ubuntu 18.04 package installation problems due to Nginx version
mismatch.
* Improves usability of crash reports. Crash reports are no longer dumped
in one big chunk to stderr. Instead, they are now dumped into multiple
files, making it easy to inspect relevant reports.
* Fixes some crashes that only occur with log level 7.
* Downloads binaries from the newly-introduced Github mirror. This improves
the reliability of binary downloads.
* Updated various library versions used in precompiled binaries (used for
e.g. gem installs):
* OpenSSL: 1.0.2p (was: 1.0.2o)
* libcurl: 7.61.1 (was: 7.60.0)
diffstat:
www/ap2-passenger/Makefile | 3 +-
www/passenger/Makefile | 3 +-
www/passenger/Makefile.common | 4 +-
www/passenger/PLIST | 32 +++--
www/passenger/distinfo | 12 +-
www/passenger/patches/patch-src_agent_Core_SpawningKit_Exceptions.h | 16 +++
www/passenger/patches/patch-src_cxx__supportlib_SystemTools_ProcessMetricsCollector.h | 47 ++++++++++
7 files changed, 92 insertions(+), 25 deletions(-)
diffs (232 lines):
diff -r a58799172bfa -r 61dc33e7c61e www/ap2-passenger/Makefile
--- a/www/ap2-passenger/Makefile Sun Jan 06 09:09:16 2019 +0000
+++ b/www/ap2-passenger/Makefile Sun Jan 06 09:52:50 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2018/12/13 19:52:25 adam Exp $
+# $NetBSD: Makefile,v 1.7 2019/01/06 09:52:50 markd Exp $
PKGNAME= ${APACHE_PKG_PREFIX}-${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION= 2
COMMENT= Passenger module for Apache 2.x
BUILDLINK_DEPMETHOD.curl= build
diff -r a58799172bfa -r 61dc33e7c61e www/passenger/Makefile
--- a/www/passenger/Makefile Sun Jan 06 09:09:16 2019 +0000
+++ b/www/passenger/Makefile Sun Jan 06 09:52:50 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2018/12/13 19:52:26 adam Exp $
+# $NetBSD: Makefile,v 1.6 2019/01/06 09:52:50 markd Exp $
COMMENT= Web and application server for Ruby, Python and Node.js
-PKGREVISION= 2
.include "Makefile.common"
diff -r a58799172bfa -r 61dc33e7c61e www/passenger/Makefile.common
--- a/www/passenger/Makefile.common Sun Jan 06 09:09:16 2019 +0000
+++ b/www/passenger/Makefile.common Sun Jan 06 09:52:50 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.9 2018/12/15 21:12:24 wiz Exp $
+# $NetBSD: Makefile.common,v 1.10 2019/01/06 09:52:50 markd Exp $
# used by www/ap2-passenger/Makefile
# used by www/passenger/Makefile
-DISTNAME= passenger-5.3.3
+DISTNAME= passenger-5.3.7
CATEGORIES= www
MASTER_SITES= http://s3.amazonaws.com/phusion-passenger/releases/
diff -r a58799172bfa -r 61dc33e7c61e www/passenger/PLIST
--- a/www/passenger/PLIST Sun Jan 06 09:09:16 2019 +0000
+++ b/www/passenger/PLIST Sun Jan 06 09:52:50 2019 +0000
@@ -1,17 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 2018/06/13 12:57:47 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/01/06 09:52:50 markd Exp $
bin/passenger
bin/passenger-config
bin/passenger-install-apache2-module
bin/passenger-install-nginx-module
lib/passenger/common/libboost_oxt.a
-lib/passenger/common/libpassenger_common/AppTypes.o
-lib/passenger/common/libpassenger_common/Crypto.o
+lib/passenger/common/libpassenger_common/Algorithms/Hasher.o
+lib/passenger/common/libpassenger_common/AppTypeDetector/CBindings.o
lib/passenger/common/libpassenger_common/DataStructures/LString.o
lib/passenger/common/libpassenger_common/Exceptions.o
lib/passenger/common/libpassenger_common/FileTools/FileManip.o
lib/passenger/common/libpassenger_common/FileTools/PathManip.o
lib/passenger/common/libpassenger_common/FileTools/PathManipCBindings.o
lib/passenger/common/libpassenger_common/FileTools/PathSecurityCheck.o
+lib/passenger/common/libpassenger_common/IOTools/IOUtils.o
lib/passenger/common/libpassenger_common/JsonTools/CBindings.o
lib/passenger/common/libpassenger_common/LoggingKit.o
lib/passenger/common/libpassenger_common/MemoryKit/mbuf.o
@@ -19,38 +20,41 @@
lib/passenger/common/libpassenger_common/ProcessManagement/Ruby.o
lib/passenger/common/libpassenger_common/ProcessManagement/Spawn.o
lib/passenger/common/libpassenger_common/ProcessManagement/Utils.o
+lib/passenger/common/libpassenger_common/SecurityKit/Crypto.o
lib/passenger/common/libpassenger_common/ServerKit/Implementation.o
lib/passenger/common/libpassenger_common/ServerKit/http_parser.o
+lib/passenger/common/libpassenger_common/StrIntTools/StrIntUtils.o
+lib/passenger/common/libpassenger_common/StrIntTools/StrIntUtilsNoStrictAliasing.o
+lib/passenger/common/libpassenger_common/SystemTools/UserDatabase.o
lib/passenger/common/libpassenger_common/Utils.o
lib/passenger/common/libpassenger_common/Utils/CachedFileStat.o
-lib/passenger/common/libpassenger_common/Utils/Hasher.o
-lib/passenger/common/libpassenger_common/Utils/IOUtils.o
-lib/passenger/common/libpassenger_common/Utils/StrIntUtils.o
-lib/passenger/common/libpassenger_common/Utils/StrIntUtilsNoStrictAliasing.o
lib/passenger/common/libpassenger_common/Utils/SystemTime.o
lib/passenger/common/libpassenger_common/WatchdogLauncher.o
+lib/passenger/common/libpassenger_common/WrapperRegistry/CBindings.o
lib/passenger/common/libpassenger_common/jsoncpp.o
lib/passenger/common/libpassenger_common/vendor-modified/modp_b64.o
lib/passenger/common/libpassenger_common/vendor-modified/modp_b64_strict_aliasing.o
lib/passenger/nginx_dynamic/libboost_oxt.a
-lib/passenger/nginx_dynamic/module_libpassenger_common/AppTypes.o
+lib/passenger/nginx_dynamic/module_libpassenger_common/Algorithms/Hasher.o
+lib/passenger/nginx_dynamic/module_libpassenger_common/AppTypeDetector/CBindings.o
lib/passenger/nginx_dynamic/module_libpassenger_common/Exceptions.o
lib/passenger/nginx_dynamic/module_libpassenger_common/FileTools/FileManip.o
lib/passenger/nginx_dynamic/module_libpassenger_common/FileTools/PathManip.o
lib/passenger/nginx_dynamic/module_libpassenger_common/FileTools/PathManipCBindings.o
lib/passenger/nginx_dynamic/module_libpassenger_common/FileTools/PathSecurityCheck.o
+lib/passenger/nginx_dynamic/module_libpassenger_common/IOTools/IOUtils.o
lib/passenger/nginx_dynamic/module_libpassenger_common/JsonTools/CBindings.o
lib/passenger/nginx_dynamic/module_libpassenger_common/LoggingKit.o
lib/passenger/nginx_dynamic/module_libpassenger_common/ProcessManagement/Spawn.o
lib/passenger/nginx_dynamic/module_libpassenger_common/ProcessManagement/Utils.o
+lib/passenger/nginx_dynamic/module_libpassenger_common/StrIntTools/StrIntUtils.o
+lib/passenger/nginx_dynamic/module_libpassenger_common/StrIntTools/StrIntUtilsNoStrictAliasing.o
+lib/passenger/nginx_dynamic/module_libpassenger_common/SystemTools/UserDatabase.o
lib/passenger/nginx_dynamic/module_libpassenger_common/Utils.o
lib/passenger/nginx_dynamic/module_libpassenger_common/Utils/CachedFileStat.o
-lib/passenger/nginx_dynamic/module_libpassenger_common/Utils/Hasher.o
-lib/passenger/nginx_dynamic/module_libpassenger_common/Utils/IOUtils.o
-lib/passenger/nginx_dynamic/module_libpassenger_common/Utils/StrIntUtils.o
-lib/passenger/nginx_dynamic/module_libpassenger_common/Utils/StrIntUtilsNoStrictAliasing.o
lib/passenger/nginx_dynamic/module_libpassenger_common/Utils/SystemTime.o
lib/passenger/nginx_dynamic/module_libpassenger_common/WatchdogLauncher.o
+lib/passenger/nginx_dynamic/module_libpassenger_common/WrapperRegistry/CBindings.o
lib/passenger/nginx_dynamic/module_libpassenger_common/jsoncpp.o
lib/passenger/support-binaries/PassengerAgent
${RUBY_VENDORLIB}/phusion_passenger.rb
@@ -179,13 +183,14 @@
share/passenger/helper-scripts/rack-loader.rb
share/passenger/helper-scripts/rack-preloader.rb
share/passenger/helper-scripts/wsgi-loader.py
-share/passenger/include/cxx_supportlib/AppTypes.h
+share/passenger/include/cxx_supportlib/AppTypeDetector/CBindings.h
share/passenger/include/cxx_supportlib/Constants.h
share/passenger/include/cxx_supportlib/Exceptions.h
share/passenger/include/cxx_supportlib/FileTools/PathManipCBindings.h
share/passenger/include/cxx_supportlib/JsonTools/CBindings.h
share/passenger/include/cxx_supportlib/Utils/CachedFileStat.h
share/passenger/include/cxx_supportlib/WatchdogLauncher.h
+share/passenger/include/cxx_supportlib/WrapperRegistry/CBindings.h
share/passenger/include/cxx_supportlib/vendor-modified/modp_b64.cpp
share/passenger/include/cxx_supportlib/vendor-modified/modp_b64.h
share/passenger/include/cxx_supportlib/vendor-modified/modp_b64_data.h
@@ -318,7 +323,6 @@
share/passenger/templates/config/installation_utils/unexpected_filesystem_problem.txt.erb
share/passenger/templates/config/installation_utils/user_support_binaries_dir_not_writable.txt.erb
share/passenger/templates/config/nginx_engine_compiler/possible_solutions_for_download_and_extraction_problems.txt.erb
-share/passenger/templates/error_renderer/.editorconfig
share/passenger/templates/error_renderer/with_details/README.md
share/passenger/templates/error_renderer/with_details/dist/bundle.js
share/passenger/templates/error_renderer/with_details/dist/styles.css
diff -r a58799172bfa -r 61dc33e7c61e www/passenger/distinfo
--- a/www/passenger/distinfo Sun Jan 06 09:09:16 2019 +0000
+++ b/www/passenger/distinfo Sun Jan 06 09:52:50 2019 +0000
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.9 2018/07/04 14:41:18 fhajny Exp $
+$NetBSD: distinfo,v 1.10 2019/01/06 09:52:50 markd Exp $
-SHA1 (passenger-5.3.3.tar.gz) = 5543fefd4992dab20049f27f8d82d91f33728f59
-RMD160 (passenger-5.3.3.tar.gz) = 458f5f8d3ba27f6f018d985a741d83e0519a6cc2
-SHA512 (passenger-5.3.3.tar.gz) = ae0b4a2681e7877c7a57d236139033f17782f3d0d891ac58bbfec211e77e3ada9d36c250c9c9234d853c666d1501ccc0e2d5997c247f10985cad936ad97a741e
-Size (passenger-5.3.3.tar.gz) = 7040055 bytes
+SHA1 (passenger-5.3.7.tar.gz) = 8d665aa9c662bf0e75585ad038d5474398120a8c
+RMD160 (passenger-5.3.7.tar.gz) = 0ec1392becd55903c88ec2a52baa41c130b8fb6b
+SHA512 (passenger-5.3.7.tar.gz) = bbef4881e0e0c698b29b10ff8a7afbc001c31d14fb80ffa27ed6867a92ad23712319733e6162be1f7720ebda421630af2f258f8167fa73c7b5ea594bc8247158
+Size (passenger-5.3.7.tar.gz) = 7195477 bytes
SHA1 (patch-build_common__library.rb) = fc019cb2774245400e74741d34b43b87b4b8b0c8
SHA1 (patch-build_packaging.rb) = b50c291c8e3989bbd8d128dab98c06f5e6a30e51
+SHA1 (patch-src_agent_Core_SpawningKit_Exceptions.h) = 2a11497e944f680893662a8cd4bef866dd4e71f8
SHA1 (patch-src_cxx__supportlib_LoggingKit_Context.h) = ff8dd506a6f5cd110c8e4317ecceab480a8f90c4
+SHA1 (patch-src_cxx__supportlib_SystemTools_ProcessMetricsCollector.h) = 51e91937618fe89c56e9f1cdbce03a76bd59d635
SHA1 (patch-src_ruby__supportlib_phusion__passenger.rb) = b5bf22b8ef94f9c64e0f02ed97e4c104eddf7cb6
SHA1 (patch-src_ruby__supportlib_phusion__passenger_packaging.rb) = 74134ef6c360bc65ffb4f74e7ebcc36bf7b6e9f7
SHA1 (patch-src_ruby__supportlib_phusion__passenger_platform__info_cxx__portability.rb) = a3ad34fe1b5917c1971b49c8831d8aea9dbb090a
diff -r a58799172bfa -r 61dc33e7c61e www/passenger/patches/patch-src_agent_Core_SpawningKit_Exceptions.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/passenger/patches/patch-src_agent_Core_SpawningKit_Exceptions.h Sun Jan 06 09:52:50 2019 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_agent_Core_SpawningKit_Exceptions.h,v 1.1 2019/01/06 09:52:50 markd Exp $
+
+NetBSD "id" doesn't know about "-a" and linux "id" does same thing
+with or without it so drop argument.
+
+--- src/agent/Core/SpawningKit/Exceptions.h.orig 2013-10-27 00:00:00.000000000 +0000
++++ src/agent/Core/SpawningKit/Exceptions.h
+@@ -754,7 +754,7 @@ private:
+ }
+
+ static string gatherUserInfo() {
+- const char *command[] = { "id", "-a", NULL };
++ const char *command[] = { "id", NULL };
+ try {
+ SubprocessInfo info;
+ SubprocessOutput output;
diff -r a58799172bfa -r 61dc33e7c61e www/passenger/patches/patch-src_cxx__supportlib_SystemTools_ProcessMetricsCollector.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/passenger/patches/patch-src_cxx__supportlib_SystemTools_ProcessMetricsCollector.h Sun Jan 06 09:52:50 2019 +0000
@@ -0,0 +1,47 @@
+$NetBSD: patch-src_cxx__supportlib_SystemTools_ProcessMetricsCollector.h,v 1.1 2019/01/06 09:52:50 markd Exp $
+
+In !PS_SUPPORTS_MULTIPLE_PIDS case need "-ax" to get all processes and
+when parsing the output need to skip to the beginning of next line on
+all lines, not just those of the pids we care about.
+
+--- src/cxx_supportlib/SystemTools/ProcessMetricsCollector.h.orig 2013-10-27 00:00:00.000000000 +0000
++++ src/cxx_supportlib/SystemTools/ProcessMetricsCollector.h
+@@ -236,14 +236,14 @@ private:
+
+ 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;
+- }
++ start = strchr(start, '\n');
++ if (start != NULL) {
++ // Skip to beginning of next line.
++ start++;
++ if (*start == '\0') {
++ start = NULL;
+ }
+ }
+ }
+@@ -313,10 +313,16 @@ public:
+ fmtArg.append("pid,ppid,%cpu,rss,vsize,pgid,uid,command");
+ #endif
+
++ #ifndef PS_SUPPORTS_MULTIPLE_PIDS
++ string allpidsArg = "-ax";
++ #endif
++
+ const char *command[] = {
+ "ps", fmtArg.c_str(),
+ #ifdef PS_SUPPORTS_MULTIPLE_PIDS
+ pidsArg.c_str(),
++ #else
++ allpidsArg.c_str(),
+ #endif
+ NULL
+ };
Home |
Main Index |
Thread Index |
Old Index