freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update passenger and its third-party modules for www/nginx and

Browse Source 
www/nginx-devel from 6.0.0 to 6.0.1.

While I'm here:
o) remove a needless whitespace and tabs;
o) add a patch to disable anonymouse telemetry for passenger by default.
This commit is contained in:
Sergey A. Osokin
2019-01-12 19:49:11 +00:00
parent 9bd26be469
commit b2d3a90afb
12 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/nginx-devel/Makefile
View File

@@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.15.8
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/ \
LOCAL/osa

2
www/nginx-devel/Makefile.extmod
View File

@@ -223,7 +223,7 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
NJS_GH_TUPLE= nginx:njs:0.2.7:njs
NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx
PASSENGER_NGINX_VER= 6.0.0
PASSENGER_NGINX_VER= 6.0.1
PASSENGER_CATEGORIES= ruby
PASSENGER_USE= ruby=yes
PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake

6
www/nginx-devel/distinfo
View File

@@ -1,4 +1,4 @@
TIMESTAMP = 1545825792
TIMESTAMP = 1547320949
SHA256 (nginx-1.15.8.tar.gz) = a8bdafbca87eb99813ae4fcac1ad0875bf725ce19eb265d28268c309b2b40787
SIZE (nginx-1.15.8.tar.gz) = 1027862
SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
@@ -13,8 +13,8 @@ SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d
SIZE (ngx_http_response-0.3.tar.gz) = 2244
SHA256 (modsecurity-2.9.3.tar.gz) = 4192019d169d3f1dd82cc4714db6986df54c6ceb4ee1c8f253de78d1a6b62118
SIZE (modsecurity-2.9.3.tar.gz) = 4307670
SHA256 (passenger-6.0.0.tar.gz) = 3f826e55065bb69ff5cc945b7b8ab5eb69f957e108053d15401c2ea059321b83
SIZE (passenger-6.0.0.tar.gz) = 7202705
SHA256 (passenger-6.0.1.tar.gz) = 038be424e30a850f340285371419a9bbf236d103f81c79d50e2807bb335502e5
SIZE (passenger-6.0.1.tar.gz) = 7203144
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

4
www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
View File

@@ -1,5 +1,5 @@
--- ../passenger-6.0.0/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400
+++ ../passenger-6.0.0/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400
--- ../passenger-6.0.1/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400
+++ ../passenger-6.0.1/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400
@@ -33,13 +33,12 @@
desc "Build Nginx support files"
task :nginx => [

4
www/nginx-devel/files/extra-patch-passenger-disable-telemetry
View File

@@ -1,5 +1,5 @@
--- ../passenger-6.0.0/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500
+++ ../passenger-6.0.0/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500
--- ../passenger-6.0.1/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500
+++ ../passenger-6.0.1/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,

2
www/nginx/Makefile
View File

@@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.14.2
PORTREVISION?= 3
PORTREVISION?= 4
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/ \

11
www/nginx/Makefile.extmod
View File

@@ -227,16 +227,17 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
NJS_GH_TUPLE= nginx:njs:21572a0:njs
NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx
PASSENGER_NGINX_VER= 6.0.0
PASSENGER_NGINX_VER= 6.0.1
PASSENGER_CATEGORIES= ruby
PASSENGER_USE= ruby=yes
PASSENGER_BUILD_DEPENDS= ${LOCALBASE}/bin/rake:devel/rubygem-rake
PASSENGER_RAKE_BIN= ${LOCALBASE}/bin/rake
PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake
PASSENGER_RAKE_BIN= ${LOCALBASE}/bin/rake
PASSENGER_MASTER_SITES= http://s3.amazonaws.com/phusion-passenger/releases/:passenger
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
PASSENGER_EXTRA_PATCHES=${PATCHDIR}/extra-patch-passenger-build-nginx.rb \
${PATCHDIR}/extra-patch-passenger-disable-telemetry
POSTGRES_USES= pgsql
POSTGRES_GH_TUPLE= FRiCKLE:ngx_postgres:1.0rc7:postgres
@@ -285,7 +286,7 @@ VOD_GH_TUPLE= kaltura:nginx-vod-module:1.23:vod
VOD_USE= GNOME=libxml2
VOD_VARS= DSO_EXTMODS+=vod
VOD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-vod-module-config \
${PATCHDIR}/extra-patch-vod-filters-audio_encoder.c
${PATCHDIR}/extra-patch-vod-filters-audio_encoder.c
VTS_GH_TUPLE= vozlt:nginx-module-vts:v0.1.18:vts
VTS_CONFIGURE_ON= --add-module=${WRKSRC_vts}

6
www/nginx/distinfo
View File

@@ -1,4 +1,4 @@
TIMESTAMP = 1545897033
TIMESTAMP = 1547321675
SHA256 (nginx-1.14.2.tar.gz) = 002d9f6154e331886a2dd4e6065863c9c1cf8291ae97a1255308572c02be9797
SIZE (nginx-1.14.2.tar.gz) = 1015384
SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
@@ -15,8 +15,8 @@ SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae150219a45f16add0c8d6e84546c
SIZE (08a395c66e42.tar.gz) = 120603
SHA256 (modsecurity-2.9.3.tar.gz) = 4192019d169d3f1dd82cc4714db6986df54c6ceb4ee1c8f253de78d1a6b62118
SIZE (modsecurity-2.9.3.tar.gz) = 4307670
SHA256 (passenger-6.0.0.tar.gz) = 3f826e55065bb69ff5cc945b7b8ab5eb69f957e108053d15401c2ea059321b83
SIZE (passenger-6.0.0.tar.gz) = 7202705
SHA256 (passenger-6.0.1.tar.gz) = 038be424e30a850f340285371419a9bbf236d103f81c79d50e2807bb335502e5
SIZE (passenger-6.0.1.tar.gz) = 7203144
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

4
www/nginx/files/extra-patch-passenger-build-nginx.rb
View File

@@ -1,5 +1,5 @@
--- ../passenger-6.0.0/build/nginx.rb.orig 2018-05-20 08:43:19.389262000 +0200
+++ ../passenger-6.0.0/build/nginx.rb 2018-05-20 09:11:27.500253000 +0200
--- ../passenger-6.0.1/build/nginx.rb.orig 2018-05-20 08:43:19.389262000 +0200
+++ ../passenger-6.0.1/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 => [

11
www/nginx/files/extra-patch-passenger-disable-telemetry Normal file
View File

@@ -0,0 +1,11 @@
--- ../passenger-6.0.1/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500
+++ ../passenger-6.0.1/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,
:type => :flag,
- :default => false,
+ :default => true,
:context => [:main],
:struct => 'NGX_HTTP_MAIN_CONF_OFFSET'
},

3
www/rubygem-passenger/Makefile
View File

@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= passenger
PORTVERSION= 6.0.0
PORTREVISION= 1
PORTVERSION= 6.0.1
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMEPREFIX= rubygem-

6
www/rubygem-passenger/distinfo
View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1543772765
SHA256 (rubygem/passenger-6.0.0.gem) = c92174b37f54e8e73b0d51f3ef453bded4119c5ed92504fcdb0c6f3739df977a
SIZE (rubygem/passenger-6.0.0.gem) = 7121408
TIMESTAMP = 1547320762
SHA256 (rubygem/passenger-6.0.1.gem) = 67864107a20dbc5948e75d72ca9737152aea30657a812d613cadacf26e1f6d75
SIZE (rubygem/passenger-6.0.1.gem) = 7121920