opensourcemirror
/
opnsense-ports
mirror of https://github.com/opnsense/ports.git
1
0
Fork 0
Code Issues Releases Wiki Activity

www/nginx: partially sync with upstream 

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2019-03-01 06:49:48 +01:00
parent 9264eb1647
commit 6981345428
7 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/nginx/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.14.2
PORTREVISION?= 7
PORTREVISION?= 11
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/ \
@ -71,7 +71,7 @@ NO_OPTIONS_SORT= yes
OPTIONS_GROUP= MAILGRP HTTPGRP
# Modules that are part of the base nginx distribution
OPTIONS_GROUP_HTTPGRP= GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
HTTP_CACHE HTTP_DAV HTTP_FLV HTTP_GEOIP HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC \
HTTP_CACHE HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC \
HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL HTTP_RANDOM_INDEX HTTP_REALIP \
HTTP_REWRITE HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL HTTP_STATUS HTTP_SUB \
HTTP_XSLT HTTPV2 STREAM STREAM_SSL STREAM_SSL_PREREAD
@ -150,8 +150,6 @@ HTTP_AUTH_REQ_CONFIGURE_ON= --with-http_auth_request_module
HTTP_CACHE_CONFIGURE_OFF= --without-http-cache
HTTP_DAV_CONFIGURE_ON= --with-http_dav_module
HTTP_FLV_CONFIGURE_ON= --with-http_flv_module
HTTP_GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
HTTP_GEOIP_VARS= DSO_BASEMODS+=http_geoip_module
HTTP_GZIP_STATIC_CONFIGURE_ON= --with-http_gzip_static_module
HTTP_GUNZIP_FILTER_CONFIGURE_ON=--with-http_gunzip_module
HTTP_IMAGE_FILTER_LIB_DEPENDS= libgd.so:graphics/gd

6
www/nginx/Makefile.extmod
View File

@ -197,7 +197,7 @@ LUA_IMPLIES= DEVEL_KIT
LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.0 \
LUAJIT_LIB=${LOCALBASE}/lib
LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.14rc6:lua
LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.14:lua
LUA_VARS= DSO_EXTMODS+=lua
MEMC_GH_TUPLE= openresty:memc-nginx-module:v0.18:memc
@ -224,10 +224,10 @@ NAXSI_NGINX_VER= 0.56
NAXSI_GH_TUPLE= nbs-system:naxsi:${NAXSI_NGINX_VER}:naxsi
NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
NJS_GH_TUPLE= nginx:njs:113c228:njs
NJS_GH_TUPLE= nginx:njs:0.2.8:njs
NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx
PASSENGER_NGINX_VER= 6.0.1
PASSENGER_NGINX_VER= 6.0.2
PASSENGER_CATEGORIES= ruby
PASSENGER_USE= ruby=yes
PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake

1
www/nginx/Makefile.options.desc
View File

@ -40,7 +40,6 @@ HTTP_FANCYINDEX_DESC= 3rd party http_fancyindex module
HTTP_FLV_DESC= Enable http_flv module
HTTP_FOOTER_DESC= 3rd party http_footer module
HTTP_GEOIP2_DESC= 3rd party geoip2 module
HTTP_GEOIP_DESC= Enable http_geoip module
HTTP_GUNZIP_FILTER_DESC= Enable http_gunzip_filter module
HTTP_GZIP_STATIC_DESC= Enable http_gzip_static module
HTTP_IMAGE_FILTER_DESC= Enable http_image_filter module

14
www/nginx/distinfo
View File

@ -1,4 +1,4 @@
TIMESTAMP = 1549965021
TIMESTAMP = 1551394327
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.1.tar.gz) = 038be424e30a850f340285371419a9bbf236d103f81c79d50e2807bb335502e5
SIZE (passenger-6.0.1.tar.gz) = 7203144
SHA256 (passenger-6.0.2.tar.gz) = 56b2273312e6dc9880f6ba83e381583b8759085a0b41338b782c9575d58346bc
SIZE (passenger-6.0.2.tar.gz) = 7204982
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
@ -99,16 +99,16 @@ SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732
SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133
SHA256 (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = cbf6fcddc00a7e30289134bdeace12565e000cc7d4efee2d2ebb8799d0b88270
SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534
SHA256 (openresty-lua-nginx-module-v0.10.14rc6_GH0.tar.gz) = 370a4ac0b74751d719d27e78bac3ba8fefacdbc15fc999e574f452d77e42b89c
SIZE (openresty-lua-nginx-module-v0.10.14rc6_GH0.tar.gz) = 653621
SHA256 (openresty-lua-nginx-module-v0.10.14_GH0.tar.gz) = 9e17e086d0ac74fb72326abb7f2f8274c080b4981cbf358b026307b4088e7148
SIZE (openresty-lua-nginx-module-v0.10.14_GH0.tar.gz) = 654097
SHA256 (openresty-memc-nginx-module-v0.18_GH0.tar.gz) = 4e280d1dcb8b312bc7875604c1e35b17879279126d3d5fbf482aa9cc7c11276d
SIZE (openresty-memc-nginx-module-v0.18_GH0.tar.gz) = 37113
SHA256 (SpiderLabs-ModSecurity-nginx-71ede63_GH0.tar.gz) = 2914d2fc4b9a0007480585c742cefef345ad8f65396da1ab9cd6e203811ac723
SIZE (SpiderLabs-ModSecurity-nginx-71ede63_GH0.tar.gz) = 28816
SHA256 (nbs-system-naxsi-0.56_GH0.tar.gz) = 0a66dcadd32432460fab180be9f2efe24e911e3798917b2787ee710e02901eb4
SIZE (nbs-system-naxsi-0.56_GH0.tar.gz) = 192120
SHA256 (nginx-njs-113c228_GH0.tar.gz) = 4dcbad2bd4c4f91b4417c419c1986292cccc9840ba88f5a9a9bd171e7c013069
SIZE (nginx-njs-113c228_GH0.tar.gz) = 296618
SHA256 (nginx-njs-0.2.8_GH0.tar.gz) = 193af60a2c0f45d23d0c8f057f3758f2ef166a379322669b241c5792a7eea377
SIZE (nginx-njs-0.2.8_GH0.tar.gz) = 300750
SHA256 (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9
SIZE (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = 40742
SHA256 (openresty-rds-csv-nginx-module-v0.08_GH0.tar.gz) = 26e80646cc4ad87984c60dab584e8f32faf5dbebb4c6911784339822f4675c79

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

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

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

@ -1,5 +1,5 @@
--- ../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
--- ../passenger-6.0.2/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500
+++ ../passenger-6.0.2/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
www/nginx/pkg-plist
View File

@ -28,7 +28,6 @@
%%DSO%%%%HTTP_AUTH_PAM%%libexec/nginx/ngx_http_auth_pam_module.so
%%DSO%%%%HTTP_EVAL%%libexec/nginx/ngx_http_eval_module.so
%%DSO%%%%HTTP_FANCYINDEX%%libexec/nginx/ngx_http_fancyindex_module.so
%%DSO%%%%HTTP_GEOIP%%libexec/nginx/ngx_http_geoip_module.so
%%DSO%%%%HTTP%%%%HTTP_GEOIP2%%libexec/nginx/ngx_http_geoip2_module.so
%%DSO%%%%STREAM%%%%HTTP_GEOIP2%%libexec/nginx/ngx_stream_geoip2_module.so
%%DSO%%%%HTTP_IMAGE_FILTER%%libexec/nginx/ngx_http_image_filter_module.so