diff --git a/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb index 7e792c5e5fd5..c2e6f6d4743c 100644 --- a/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb +++ b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb @@ -1,33 +1,33 @@ ---- ../passenger-6.0.7/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 -+++ ../passenger-6.0.7/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 +--- ../passenger-6.0.8/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 ++++ ../passenger-6.0.8/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 @@ -33,13 +33,12 @@ desc "Build Nginx support files" task :nginx => [ :nginx_without_native_support, - NATIVE_SUPPORT_TARGET + LIBBOOST_OXT, ].compact desc "Build Nginx support files, including objects suitable for dynamic linking against Nginx" task 'nginx:as_dynamic_module' => [ :nginx_dynamic_without_native_support, - NATIVE_SUPPORT_TARGET ].compact # Workaround for https://github.com/jimweirich/rake/issues/274 @@ -47,7 +46,6 @@ task :nginx_without_native_support => [ auto_generated_sources, - AGENT_TARGET, COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).link_objects ].flatten @@ -55,7 +53,6 @@ # it also creates a namespace:clean task to clean up the output_dir task :nginx_dynamic_without_native_support => [ auto_generated_sources, - AGENT_TARGET, define_libboost_oxt_task("nginx", NGINX_DYNAMIC_OUTPUT_DIR + "libboost_oxt", "-fPIC"), COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR). set_namespace("nginx").set_output_dir(NGINX_DYNAMIC_OUTPUT_DIR + "module_libpassenger_common").define_tasks("-fPIC"). diff --git a/www/nginx-devel/files/extra-patch-passenger-disable-telemetry b/www/nginx-devel/files/extra-patch-passenger-disable-telemetry index 3891ebb09f58..58d1193e894c 100644 --- a/www/nginx-devel/files/extra-patch-passenger-disable-telemetry +++ b/www/nginx-devel/files/extra-patch-passenger-disable-telemetry @@ -1,11 +1,11 @@ ---- ../passenger-6.0.7/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 -+++ ../passenger-6.0.7/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500 +--- ../passenger-6.0.8/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 ++++ ../passenger-6.0.8/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' },