mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-22 04:17:44 +00:00
Update 3rd party module passenger to 6.0.5
Sponsored by: Netzkommune GmbH
This commit is contained in:
Jochen Neumeister
parent
4ca11de2a5
commit
fa2128241b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=538259
@ -3,7 +3,7 @@
|
||||
|
||||
PORTNAME= nginx
|
||||
PORTVERSION= 1.18.0
|
||||
PORTREVISION?= 14
|
||||
PORTREVISION?= 15
|
||||
PORTEPOCH= 2
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= https://nginx.org/download/ \
|
||||
|
||||
@ -123,7 +123,6 @@ HTTP_MOGILEFS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_mogilefs_module.c
|
||||
${PATCHDIR}/extra-patch-nginx_mogilefs_module-config
|
||||
HTTP_MOGILEFS_VARS= DSO_EXTDIRS+=nginx_mogilefs_module-1.0.4
|
||||
|
||||
|
||||
HTTP_MP4_H264_MASTER_SITES= http://h264.code-shop.com/download/:mp4streaming
|
||||
HTTP_MP4_H264_CONFIGURE_ON= --with-cc-opt="-DLARGEFILE_SOURCE -DBUILDING_NGINX"
|
||||
HTTP_MP4_H264_DISTFILES= nginx_mod_h264_streaming-2.2.7.tar.gz:mp4streaming
|
||||
@ -233,7 +232,7 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
|
||||
NJS_GH_TUPLE= nginx:njs:629027e:njs
|
||||
NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx
|
||||
|
||||
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
|
||||
@ -243,8 +242,7 @@ PASSENGER_DISTFILES= passenger-${PASSENGER_NGINX_VER}.tar.gz:passenger
|
||||
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
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
TIMESTAMP = 1591435465
|
||||
TIMESTAMP = 1591645713
|
||||
SHA256 (nginx-1.18.0.tar.gz) = 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99
|
||||
SIZE (nginx-1.18.0.tar.gz) = 1039530
|
||||
SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
|
||||
@ -11,8 +11,8 @@ SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b25
|
||||
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-bf6cd93_GH0.tar.gz) = 9e3f78ea73e2d606a95ee64fd3affa4c249f9b342e66b6b11b63061791f28316
|
||||
SIZE (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 109704
|
||||
SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- ../passenger-6.0.3/build/nginx.rb.orig 2018-05-20 08:43:19.389262000 +0200
|
||||
+++ ../passenger-6.0.4/build/nginx.rb 2018-05-20 09:11:27.500253000 +0200
|
||||
--- ../passenger-6.0.5/build/nginx.rb.orig 2018-05-20 08:43:19.389262000 +0200
|
||||
+++ ../passenger-6.0.5/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 => [
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- ../passenger-6.0.3/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,
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
--- ../passenger-6.0.4/src/cxx_supportlib/oxt/system_calls.cpp.original 2019-11-15 01:35:57.674449000 +0200
|
||||
+++ ../passenger-6.0.4/src/cxx_supportlib/oxt/system_calls.cpp 2019-11-15 01:36:06.053234000 +0200
|
||||
@@ -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();
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user