summaryrefslogtreecommitdiff
path: root/www/rubygem-passenger
diff options
context:
space:
mode:
Diffstat (limited to 'www/rubygem-passenger')
-rw-r--r--www/rubygem-passenger/Makefile3
-rw-r--r--www/rubygem-passenger/distinfo6
-rw-r--r--www/rubygem-passenger/files/patch-freebsd1391
-rw-r--r--www/rubygem-passenger/files/patch-src-ruby_native_extension-extconf.rb15
4 files changed, 19 insertions, 96 deletions
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 80df183b6e4d..c42841fae41c 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -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-
diff --git a/www/rubygem-passenger/distinfo b/www/rubygem-passenger/distinfo
index 5764dc627461..ffcbecf5fe66 100644
--- a/www/rubygem-passenger/distinfo
+++ b/www/rubygem-passenger/distinfo
@@ -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
diff --git a/www/rubygem-passenger/files/patch-freebsd13 b/www/rubygem-passenger/files/patch-freebsd13
deleted file mode 100644
index e05f91f21642..000000000000
--- a/www/rubygem-passenger/files/patch-freebsd13
+++ /dev/null
@@ -1,91 +0,0 @@
---- src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp.orig 2019-09-19 16:54:40.089339000 -0400
-+++ src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp 2019-09-19 16:54:58.167526000 -0400
-@@ -55,7 +55,7 @@
- self->garbageCollectionCond.timed_wait(lock,
- posix_time::seconds(5));
- }
-- while (!this_thread::interruption_requested()) {
-+ while (!boost::this_thread::interruption_requested()) {
- try {
- UPDATE_TRACE_POINT();
- unsigned long long sleepTime = self->realGarbageCollect();
---- src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp.orig 2019-09-19 16:53:35.309791000 -0400
-+++ src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp 2019-09-19 16:53:59.509027000 -0400
-@@ -305,7 +305,7 @@
- while (true) {
- assert(detachedProcessesCheckerActive);
-
-- if (getLifeStatus() == SHUT_DOWN || this_thread::interruption_requested()) {
-+ if (getLifeStatus() == SHUT_DOWN || boost::this_thread::interruption_requested()) {
- UPDATE_TRACE_POINT();
- P_DEBUG("Stopping detached processes checker");
- detachedProcessesCheckerActive = false;
---- src/cxx_supportlib/oxt/system_calls.cpp.orig 2019-09-19 17:00:06.903986000 -0400
-+++ src/cxx_supportlib/oxt/system_calls.cpp 2019-09-19 17:02:32.106158000 -0400
-@@ -132,15 +132,15 @@
- _my_errno = errno; \
- } while ((error_expression) \
- && _my_errno == EINTR \
-- && (!this_thread::syscalls_interruptable() \
-- || !(_intr_requested = this_thread::interruption_requested())) \
-+ && (!boost::this_thread::syscalls_interruptable() \
-+ || !(_intr_requested = boost::this_thread::interruption_requested())) \
- ); \
- if (OXT_LIKELY(ctx != NULL)) { \
- ctx->syscall_interruption_lock.lock(); \
- } \
- if ((error_expression) \
- && _my_errno == EINTR \
-- && this_thread::syscalls_interruptable() \
-+ && boost::this_thread::syscalls_interruptable() \
- && _intr_requested) { \
- throw thread_interrupted(); \
- } \
-@@ -284,8 +284,8 @@
- }
- if (ret == -1
- && errno == EINTR
-- && this_thread::syscalls_interruptable()
-- && this_thread::interruption_requested()) {
-+ && boost::this_thread::syscalls_interruptable()
-+ && boost::this_thread::interruption_requested()) {
- throw thread_interrupted();
- } else {
- return ret;
-@@ -662,8 +662,8 @@
- }
- } while (ret == -1
- && e == EINTR
-- && (!this_thread::syscalls_interruptable()
-- || !(intr_requested = this_thread::interruption_requested()))
-+ && (!boost::this_thread::syscalls_interruptable()
-+ || !(intr_requested = boost::this_thread::interruption_requested()))
- );
-
- if (OXT_UNLIKELY(ctx != NULL)) {
-@@ -672,7 +672,7 @@
-
- if (ret == -1
- && e == EINTR
-- && this_thread::syscalls_interruptable()
-+ && boost::this_thread::syscalls_interruptable()
- && intr_requested) {
- throw thread_interrupted();
- }
-@@ -748,14 +748,14 @@
- * http://stackoverflow.com/questions/20410943/segmentation-fault-when-accessing-statically-initialized-thread-variable?noredirect=1#comment30483943_20410943
- * https://bugzilla.redhat.com/show_bug.cgi?id=731228
- */
-- __thread int this_thread::_syscalls_interruptable = 1;
-+ __thread int boost::this_thread::_syscalls_interruptable = 1;
-
- bool
- boost::this_thread::syscalls_interruptable() {
- return _syscalls_interruptable;
- }
- #else
-- boost::thread_specific_ptr<bool> this_thread::_syscalls_interruptable;
-+ boost::thread_specific_ptr<bool> boost::this_thread::_syscalls_interruptable;
-
- bool
- boost::this_thread::syscalls_interruptable() {
diff --git a/www/rubygem-passenger/files/patch-src-ruby_native_extension-extconf.rb b/www/rubygem-passenger/files/patch-src-ruby_native_extension-extconf.rb
new file mode 100644
index 000000000000..69f62791f332
--- /dev/null
+++ b/www/rubygem-passenger/files/patch-src-ruby_native_extension-extconf.rb
@@ -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
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-05 23:15:36 +0000