passenger 6.1.4 → 6.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6f20a62dcc25b713ff9248f45037a5feb3a5cbd7870f8edd4c942cfc5b359ed
-  data.tar.gz: '06687c19693759fea00331bebcc242f83a9976add99cb04b39be733a6f62f4d0'
+  metadata.gz: 2dd1fdb6483c4366fa3d4b9116ab193e5b4dd792fcd96ba0f473df90f242e840
+  data.tar.gz: 3f9d87a07478e540a116902a4a2b0cd1ac0f6c859f95d8d819c2e7725e6adaa4
 SHA512:
-  metadata.gz: 91bd9c4a5b3c6688f6feb8719033defbd5e9ab94c56313c3be82eb42820c60e90db2f2604647060a81f831ddeddb9d553a5f19a356c456b0ab0ddddb548b2228
-  data.tar.gz: 0c4c152dac036de853c9ad4fb58c1aaee943755f4b9f08279adc5ab7debb7ce50236494b9650c0e5d5742eb9c1e9e120df42c64f68378d1cd26403923f7e4562
+  metadata.gz: cf613cab8b915a9fe7d229526997a15e60ba1ad3a51c06d48e7d0b51243ce88f5c08543b13f4528859c5981601dc390080c316742382d41946271fa25f75b1eb
+  data.tar.gz: 4afe74d5212532a3d07f828ae641f7548abc1853ad39b9fec7dac76e21688393e12f84926627e5a02ddb2beaea580405b4b4bc3b116cfa406d104fdabb34f15b

data/CHANGELOG

@@ -1,4 +1,9 @@
-Release 6.1.4 (Not yet released)
+Release 6.1.5 (Not yet released)
+-------------
+ * [Ubuntu] Rebuild packages against broken Nginx packages that Ubuntu is shipping. Closes GH-2662.
+
+
+Release 6.1.4
 -------------
  * [Nginx] Upgrades preferred Nginx to 1.30.2 from 1.30.1.
  * Updated various library versions used in precompiled binaries (used for e.g. gem installs):

data/Rakefile

@@ -76,7 +76,7 @@ task :default do
 end
 
 desc "Remove compiled files"
-task :clean => 'clean:cache' do
+task clean: 'clean:cache' do
   if OUTPUT_DIR == "buildout/"
     sh "rm -rf buildout"
   end

data/build/agent.rb

@@ -46,15 +46,15 @@ AGENT_OBJECTS = {
   "#{AGENT_OUTPUT_DIR}ExecHelperMain.o" =>
     "src/agent/ExecHelper/ExecHelperMain.cpp",
   "#{AGENT_OUTPUT_DIR}FileReadHelperMain.o" =>
-    "src/agent/FileReadHelper/FileReadHelperMain.cpp"
+    "src/agent/FileReadHelper/FileReadHelperMain.cpp",
 }
 AGENT_AUTOGENERATED_SOURCES = {
   "src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h" => [
-    "src/agent/Core/SpawningKit/Config.h"
+    "src/agent/Core/SpawningKit/Config.h",
   ],
   "src/agent/Core/SpawningKit/Result/AutoGeneratedCode.h" => [
-    "src/agent/Core/SpawningKit/Result.h"
-  ]
+    "src/agent/Core/SpawningKit/Result.h",
+  ],
 }
 
 # Agent-specific compiler flags.
@@ -92,18 +92,18 @@ AGENT_OBJECTS.each_pair do |object, source|
     object,
     source,
     lambda { {
-      :include_paths => [
+      include_paths: [
         "src/agent",
-        *CXX_SUPPORTLIB_INCLUDE_PATHS
+        *CXX_SUPPORTLIB_INCLUDE_PATHS,
       ],
-      :flags => [
+      flags: [
         agent_cflags,
         libev_cflags,
         libuv_cflags,
         PlatformInfo.curl_flags,
         PlatformInfo.openssl_extra_cflags,
-        PlatformInfo.zlib_flags
-      ]
+        PlatformInfo.zlib_flags,
+      ],
     } }
   )
 end
@@ -116,7 +116,7 @@ dependencies = AGENT_OBJECTS.keys + [
   LIBBOOST_OXT,
   agent_libs.link_objects,
   LIBEV_TARGET,
-  LIBUV_TARGET
+  LIBUV_TARGET,
 ].flatten.compact
 file(AGENT_TARGET => dependencies) do
   sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
@@ -124,29 +124,29 @@ file(AGENT_TARGET => dependencies) do
     [
       agent_libs.link_objects_as_string,
       AGENT_OBJECTS.keys,
-      LIBBOOST_OXT_LINKARG
+      LIBBOOST_OXT_LINKARG,
     ],
-    :flags => [
+    flags: [
       libev_libs,
       libuv_libs,
       PlatformInfo.curl_libs,
       PlatformInfo.zlib_libs,
       PlatformInfo.crypto_libs,
       PlatformInfo.portability_cxx_ldflags,
-      agent_ldflags
+      agent_ldflags,
     ]
   )
 end
 
 desc 'Build the agent'
-task :agent => AGENT_TARGET
+task agent: AGENT_TARGET
 
 task 'common:clean' do
   sh('rm', '-rf', AGENT_TARGET, *AGENT_OBJECTS.keys)
 end
 
 def create_agent_auto_generated_source_task(source, dependencies)
-  dependencies += ["#{source}.cxxcodebuilder"]
+  dependencies += [ "#{source}.cxxcodebuilder" ]
   file(source => dependencies) do
     template = CxxCodeTemplateRenderer.new("#{source}.cxxcodebuilder")
     template.render_to(source)

data/build/apache2.rb

@@ -41,9 +41,9 @@ APACHE2_OBJECTS = {
   "#{APACHE2_OUTPUT_DIR}Bucket.o" =>
     "src/apache2_module/Bucket.cpp",
   "#{APACHE2_OUTPUT_DIR}Hooks.o" =>
-    "src/apache2_module/Hooks.cpp"
+    "src/apache2_module/Hooks.cpp",
 }
-APACHE2_AUTOGENERATED_SOURCES = %w(
+APACHE2_AUTOGENERATED_SOURCES = %w[
   src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp
   src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp
   src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp
@@ -54,16 +54,16 @@ APACHE2_AUTOGENERATED_SOURCES = %w(
   src/apache2_module/DirConfig/AutoGeneratedStruct.h
   src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.cpp
   src/apache2_module/DirConfig/AutoGeneratedManifestGeneration.cpp
-)
+]
 
 let(:apache2_cflags) do
-  result = [PlatformInfo.apache2_module_cflags]
+  result = [ PlatformInfo.apache2_module_cflags ]
   result << '-O' if OPTIMIZE
   result.join(' ')
 end
 
 let(:apache2_cxxflags) do
-  result = [PlatformInfo.apache2_module_cxxflags]
+  result = [ PlatformInfo.apache2_module_cxxflags ]
   result << '-O' if OPTIMIZE
   result.join(' ')
 end
@@ -75,11 +75,11 @@ APACHE2_OBJECTS.each_pair do |object, source|
       object,
       source,
       lambda { {
-        :include_paths => [
+        include_paths: [
           "src/agent",
-          *CXX_SUPPORTLIB_INCLUDE_PATHS
+          *CXX_SUPPORTLIB_INCLUDE_PATHS,
         ],
-        :flags => apache2_cflags
+        flags: apache2_cflags,
       } }
     )
   else
@@ -87,11 +87,11 @@ APACHE2_OBJECTS.each_pair do |object, source|
       object,
       source,
       lambda { {
-        :include_paths => [
+        include_paths: [
           "src/agent",
-          *CXX_SUPPORTLIB_INCLUDE_PATHS
+          *CXX_SUPPORTLIB_INCLUDE_PATHS,
         ],
-        :flags => apache2_cxxflags
+        flags: apache2_cxxflags,
       } }
     )
   end
@@ -111,7 +111,7 @@ APACHE2_MODULE_COMMON_LIBRARIES  = COMMON_LIBRARY.
 dependencies = [
   APACHE2_MODULE_COMMON_LIBRARIES,
   APACHE2_MODULE_BOOST_OXT_LIBRARY,
-  APACHE2_OBJECTS.keys
+  APACHE2_OBJECTS.keys,
 ].flatten
 file(APACHE2_TARGET => dependencies) do
   PlatformInfo.apache2ctl.nil? and raise "Could not find 'apachectl' or 'apache2ctl'."
@@ -120,7 +120,7 @@ file(APACHE2_TARGET => dependencies) do
   sh "mkdir -p #{APACHE2_OUTPUT_DIR}" if !File.directory?(APACHE2_OUTPUT_DIR)
   create_shared_library(APACHE2_TARGET,
     APACHE2_OBJECTS.keys,
-    :flags => [
+    flags: [
       APACHE2_MODULE_COMMON_LIBRARIES,
       APACHE2_MODULE_BOOST_OXT_LINKARG,
       PlatformInfo.apache2_module_cxx_ldflags,
@@ -132,16 +132,16 @@ file(APACHE2_TARGET => dependencies) do
 end
 
 desc "Build Apache 2 module"
-task :apache2 => [
+task apache2: [
   APACHE2_TARGET,
   AGENT_TARGET,
-  NATIVE_SUPPORT_TARGET
+  NATIVE_SUPPORT_TARGET,
 ].compact
 
 # Workaround for https://github.com/jimweirich/rake/issues/274
-task :_apache2 => :apache2
+task _apache2: :apache2
 
-task :clean => 'apache2:clean'
+task clean: 'apache2:clean'
 desc "Clean all compiled Apache 2 files"
 task 'apache2:clean' => 'common:clean' do
   files = APACHE2_OBJECTS.keys.dup
@@ -152,7 +152,7 @@ end
 def create_apache2_auto_generated_source_task(source)
   dependencies = [
     "#{source}.cxxcodebuilder",
-    'src/ruby_supportlib/phusion_passenger/apache2/config_options.rb'
+    'src/ruby_supportlib/phusion_passenger/apache2/config_options.rb',
   ]
   file(source => dependencies) do
     template = CxxCodeTemplateRenderer.new("#{source}.cxxcodebuilder")

data/build/basics.rb

@@ -103,7 +103,7 @@ LTO         = OPTIMIZE && boolean_option('LTO')
 CXX_SUPPORTLIB_INCLUDE_PATHS = [
   "src/cxx_supportlib",
   "src/cxx_supportlib/vendor-copy",
-  "src/cxx_supportlib/vendor-modified"
+  "src/cxx_supportlib/vendor-modified",
 ]
 
 # Extra compiler flags that should always be passed to the C/C++ compiler.

data/build/common_library.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
 #
@@ -56,8 +57,8 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
       object_file,
       source_file,
       lambda { {
-        :include_paths => CXX_SUPPORTLIB_INCLUDE_PATHS,
-        :flags => [optimize, maybe_eval_lambda(extra_compiler_flags)]
+        include_paths: CXX_SUPPORTLIB_INCLUDE_PATHS,
+        flags: [ optimize, maybe_eval_lambda(extra_compiler_flags) ],
       } }
     )
   end
@@ -74,8 +75,8 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
       object_file,
       source_file,
       lambda { {
-        :include_paths => CXX_SUPPORTLIB_INCLUDE_PATHS,
-        :flags => [optimize, maybe_eval_lambda(extra_compiler_flags)]
+        include_paths: CXX_SUPPORTLIB_INCLUDE_PATHS,
+        flags: [ optimize, maybe_eval_lambda(extra_compiler_flags) ],
       } }
     )
   end
@@ -93,9 +94,9 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
   if OPTIMIZE && LTO
     # Clang -flto does not support static libraries containing
     # .o files that are compiled with -flto themselves.
-    [output_file, [output_file, boost_object_files, oxt_object_files].flatten.join(" ")]
+    [ output_file, [ output_file, boost_object_files, oxt_object_files ].flatten.join(" ") ]
   else
-    [output_file, output_file]
+    [ output_file, output_file ]
   end
 end
 
@@ -122,12 +123,12 @@ if USE_VENDORED_LIBEV
     "#{LIBEV_OUTPUT_DIR}.libs/libev.a #{$1}".strip
   end
 
-  task :libev => LIBEV_TARGET
+  task libev: LIBEV_TARGET
 
   dependencies = [
     "src/cxx_supportlib/vendor-modified/libev/configure",
     "src/cxx_supportlib/vendor-modified/libev/config.h.in",
-    "src/cxx_supportlib/vendor-modified/libev/Makefile.am"
+    "src/cxx_supportlib/vendor-modified/libev/Makefile.am",
   ]
   file LIBEV_OUTPUT_DIR + "Makefile" => dependencies do
     cc_command = cc
@@ -147,20 +148,20 @@ if USE_VENDORED_LIBEV
   end
 
   libev_sources = Dir["src/cxx_supportlib/vendor-modified/libev/{*.c,*.h}"].sort
-  file LIBEV_OUTPUT_DIR + ".libs/libev.a" => [LIBEV_OUTPUT_DIR + "Makefile"] + libev_sources do
+  file LIBEV_OUTPUT_DIR + ".libs/libev.a" => [ LIBEV_OUTPUT_DIR + "Makefile" ] + libev_sources do
     sh "rm -f #{LIBEV_OUTPUT_DIR}libev.la"
     sh "cd #{LIBEV_OUTPUT_DIR} && make libev.la V=1"
   end
 
   task 'libev:clean' do
-    patterns = %w(Makefile config.h config.log config.status libtool
-      stamp-h1 *.o *.lo *.la .libs .deps)
+    patterns = %w[Makefile config.h config.log config.status libtool
+      stamp-h1 *.o *.lo *.la .libs .deps]
     patterns.each do |pattern|
       sh "rm -rf #{LIBEV_OUTPUT_DIR}#{pattern}"
     end
   end
 
-  task :clean => 'libev:clean'
+  task clean: 'libev:clean'
 else
   LIBEV_TARGET = nil
 
@@ -193,11 +194,11 @@ if USE_VENDORED_LIBUV
     "#{LIBUV_OUTPUT_DIR}.libs/libuv.a #{$1}".strip
   end
 
-  task :libuv => LIBUV_TARGET
+  task libuv: LIBUV_TARGET
 
   dependencies = [
     "src/cxx_supportlib/vendor-copy/libuv/configure",
-    "src/cxx_supportlib/vendor-copy/libuv/Makefile.am"
+    "src/cxx_supportlib/vendor-copy/libuv/Makefile.am",
   ]
   file LIBUV_OUTPUT_DIR + "Makefile" => dependencies do
     cc_command = cc
@@ -220,20 +221,20 @@ if USE_VENDORED_LIBUV
   end
 
   libuv_sources = Dir["src/cxx_supportlib/vendor-copy/libuv/**/{*.c,*.h}"].sort
-  file LIBUV_OUTPUT_DIR + ".libs/libuv.a" => [LIBUV_OUTPUT_DIR + "Makefile"] + libuv_sources do
+  file LIBUV_OUTPUT_DIR + ".libs/libuv.a" => [ LIBUV_OUTPUT_DIR + "Makefile" ] + libuv_sources do
     sh "rm -f #{LIBUV_OUTPUT_DIR}/libuv.la"
     sh "cd #{LIBUV_OUTPUT_DIR} && make -j2 libuv.la V=1"
   end
 
   task 'libuv:clean' do
-    patterns = %w(Makefile config.h config.log config.status libtool
-      stamp-h1 src test *.o *.lo *.la *.pc .libs .deps)
+    patterns = %w[Makefile config.h config.log config.status libtool
+      stamp-h1 src test *.o *.lo *.la *.pc .libs .deps]
     patterns.each do |pattern|
       sh "rm -rf #{LIBUV_OUTPUT_DIR}#{pattern}"
     end
   end
 
-  task :clean => 'libuv:clean'
+  task clean: 'libuv:clean'
 else
   LIBUV_TARGET = nil
 
@@ -252,9 +253,9 @@ end
 # If you add a new shared definition file, don't forget to update
 # src/ruby_supportlib/phusion_passenger/packaging.rb!
 
-dependencies = ['src/cxx_supportlib/Constants.h.cxxcodebuilder',
+dependencies = [ 'src/cxx_supportlib/Constants.h.cxxcodebuilder',
   'src/ruby_supportlib/phusion_passenger.rb',
-  'src/ruby_supportlib/phusion_passenger/constants.rb']
+  'src/ruby_supportlib/phusion_passenger/constants.rb' ]
 file 'src/cxx_supportlib/Constants.h' => dependencies do
   PhusionPassenger.require_passenger_lib 'constants'
   template = CxxCodeTemplateRenderer.new('src/cxx_supportlib/Constants.h.cxxcodebuilder')

data/build/cxx_tests.rb

@@ -135,7 +135,7 @@ TEST_CXX_OBJECTS = {
   "#{TEST_OUTPUT_DIR}cxx/StrIntTools/TemplateTest.o" =>
     "test/cxx/StrIntTools/TemplateTest.cpp",
   "#{TEST_OUTPUT_DIR}cxx/Base64DecodingTest.o" =>
-    "test/cxx/Base64DecodingTest.cpp"
+    "test/cxx/Base64DecodingTest.cpp",
 }
 
 let(:basic_test_cxx_flags) do
@@ -144,7 +144,7 @@ let(:basic_test_cxx_flags) do
     libuv_cflags,
     PlatformInfo.crypto_extra_cflags,
     PlatformInfo.curl_flags,
-    TEST_COMMON_CFLAGS
+    TEST_COMMON_CFLAGS,
   ]
 end
 
@@ -153,7 +153,7 @@ let(:test_cxx_include_paths) do
     'test/cxx',
     'test/support',
     'src/agent',
-    *CXX_SUPPORTLIB_INCLUDE_PATHS
+    *CXX_SUPPORTLIB_INCLUDE_PATHS,
   ]
 end
 
@@ -161,11 +161,11 @@ let(:test_cxx_flags) do
   # Some flags are necessary to make precompiled headers play well with ccache (and possibly also sccache):
   # https://ccache.dev/manual/4.8.2.html#_precompiled_headers
   if PlatformInfo.cxx_is_gcc?
-    ['-include test/cxx/TestSupport.h', '-fpch-preprocess']
+    [ '-include test/cxx/TestSupport.h', '-fpch-preprocess' ]
   elsif PlatformInfo.cxx_is_clang?
-    ["-include-pch test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}", '-Xclang', '-fno-pch-timestamp']
+    [ "-include-pch test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}", '-Xclang', '-fno-pch-timestamp' ]
   else
-    ['-include test/cxx/TestSupport.h']
+    [ '-include test/cxx/TestSupport.h' ]
   end + basic_test_cxx_flags
 end
 
@@ -188,9 +188,9 @@ TEST_CXX_OBJECTS.each_pair do |object, source|
     object,
     source,
     lambda { {
-      :include_paths => test_cxx_include_paths,
-      :flags => test_cxx_flags,
-      :deps => "test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}"
+      include_paths: test_cxx_include_paths,
+      flags: test_cxx_flags,
+      deps: "test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}",
     } }
   )
 end
@@ -202,13 +202,13 @@ dependencies = [
   LIBUV_TARGET,
   TEST_BOOST_OXT_LIBRARY,
   TEST_COMMON_LIBRARY.link_objects,
-  AGENT_OBJECTS.keys - [AGENT_MAIN_OBJECT]
+  AGENT_OBJECTS.keys - [ AGENT_MAIN_OBJECT ],
 ].flatten.compact
 file(TEST_CXX_TARGET => dependencies) do
   create_cxx_executable(
     TEST_CXX_TARGET,
-    TEST_CXX_OBJECTS.keys + AGENT_OBJECTS.keys - [AGENT_MAIN_OBJECT],
-    :flags => test_cxx_ldflags
+    TEST_CXX_OBJECTS.keys + AGENT_OBJECTS.keys - [ AGENT_MAIN_OBJECT ],
+    flags: test_cxx_ldflags
   )
 end
 
@@ -216,13 +216,13 @@ cxx_test_dependencies = [
   TEST_CXX_TARGET,
   "#{TEST_OUTPUT_DIR}allocate_memory",
   NATIVE_SUPPORT_TARGET,
-  AGENT_TARGET
+  AGENT_TARGET,
 ].compact
 task 'test:cxx:build' => cxx_test_dependencies
 
 desc "Run unit tests for the C++ components"
 task 'test:cxx' => cxx_test_dependencies do
-  args = ENV['GROUPS'].to_s.split(";").map{ |name| "-g #{name}" }
+  args = ENV['GROUPS'].to_s.split(";").map { |name| "-g #{name}" }
 
   if level = string_option('LOG_LEVEL')
     args << '-l'
@@ -273,14 +273,14 @@ task 'test:cxx' => cxx_test_dependencies do
       puts
       puts "---------------------------------"
       puts "Saving log files:"
-      FileUtils.mkdir_p("#{OUTPUT_DIR}testlogs", :verbose => true)
+      FileUtils.mkdir_p("#{OUTPUT_DIR}testlogs", verbose: true)
       if boolean_option('SUDO')
         sh "sudo cp /tmp/passenger-error-*.html #{OUTPUT_DIR}testlogs/"
         sh "sudo chown $(whoami): #{OUTPUT_DIR}testlogs/passenger-error-*.html"
       else
         error_pages.each do |path|
           if File.readable?(path)
-            FileUtils.cp(path, "#{OUTPUT_DIR}testlogs/", :verbose => true)
+            FileUtils.cp(path, "#{OUTPUT_DIR}testlogs/", verbose: true)
           else
             puts "Skip copying #{path}: file not readable"
           end
@@ -294,11 +294,11 @@ file("test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}" => ge
   compile_cxx(
     "test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}",
     'test/cxx/TestSupport.h',
-    :include_paths => test_cxx_include_paths,
-    :flags => [
+    include_paths: test_cxx_include_paths,
+    flags: [
       "-x c++-header",
       PlatformInfo.cxx_is_clang? ? "-Xclang -emit-pch" : nil,
-      basic_test_cxx_flags
+      basic_test_cxx_flags,
     ].compact.flatten
   )
 end

data/build/integration_tests.rb

@@ -26,14 +26,14 @@
 
 def integration_test_dependencies(runtime_target_name)
   if string_option('PASSENGER_LOCATION_CONFIGURATION_FILE')
-    return []
+    []
   else
-    return [runtime_target_name, NATIVE_SUPPORT_TARGET].compact
+    [ runtime_target_name, NATIVE_SUPPORT_TARGET ].compact
   end
 end
 
 desc "Run all integration tests"
-task 'test:integration' => ['test:integration:apache2', 'test:integration:nginx'] do
+task 'test:integration' => [ 'test:integration:apache2', 'test:integration:nginx' ] do
 end
 
 dependencies = integration_test_dependencies(:_apache2)

data/build/misc.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
 #
@@ -71,7 +72,7 @@ def extract_latest_news_contents_and_items
   items = contents.split(/^ \* /)
   items.shift while items.first == ""
 
-  return [contents, items]
+  [ contents, items ]
 end
 
 desc "Convert the Changelog items for the latest release to HTML"
@@ -154,7 +155,7 @@ task :contributors do
   entries.push "Yichun Zhang"
 
   File.open("CONTRIBUTORS", "w") do |f|
-    f.puts(entries.sort{ |a, b| a.downcase <=> b.downcase }.uniq.join("\n"))
+    f.puts(entries.sort { |a, b| a.downcase <=> b.downcase }.uniq.join("\n"))
   end
   puts "Updated CONTRIBUTORS"
 end
@@ -168,9 +169,9 @@ dependencies = [
   COMMON_LIBRARY.link_objects,
   LIBBOOST_OXT,
   LIBEV_TARGET,
-  LIBUV_TARGET
+  LIBUV_TARGET,
 ].flatten.compact
-task :compile_app => dependencies do
+task compile_app: dependencies do
   source = ENV['SOURCE'] || ENV['FILE'] || ENV['F']
   if !source
     STDERR.puts "Please specify the source filename with SOURCE=(...)"
@@ -187,11 +188,11 @@ task :compile_app => dependencies do
   begin
     compile_cxx(object,
       source,
-      :include_paths => [
+      include_paths: [
         "src/agent",
-        *CXX_SUPPORTLIB_INCLUDE_PATHS
+        *CXX_SUPPORTLIB_INCLUDE_PATHS,
       ],
-      :flags => [
+      flags: [
         OPTIMIZE ? "-O" : nil,
         "-DSTANDALONE",
         libev_cflags,
@@ -200,7 +201,7 @@ task :compile_app => dependencies do
     )
     create_cxx_executable(exe,
       object,
-      :flags => [
+      flags: [
         "-DSTANDALONE",
         libev_cflags,
         libuv_cflags,
@@ -211,7 +212,7 @@ task :compile_app => dependencies do
         PlatformInfo.curl_libs,
         PlatformInfo.zlib_libs,
         PlatformInfo.crypto_libs,
-        PlatformInfo.portability_cxx_ldflags
+        PlatformInfo.portability_cxx_ldflags,
       ]
     )
   ensure

data/build/nginx.rb

@@ -22,7 +22,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-auto_generated_sources = %w(
+auto_generated_sources = %w[
   src/nginx_module/ConfigGeneral/AutoGeneratedDefinitions.c
   src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c
   src/nginx_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.c
@@ -34,41 +34,41 @@ auto_generated_sources = %w(
   src/nginx_module/LocationConfig/AutoGeneratedMergeFunction.c
   src/nginx_module/LocationConfig/AutoGeneratedHeaderSerialization.c
   src/nginx_module/LocationConfig/AutoGeneratedManifestGeneration.c
-)
+]
 
 desc "Build Nginx support files"
-task :nginx => [
+task nginx: [
   :nginx_without_native_support,
-  NATIVE_SUPPORT_TARGET
+  NATIVE_SUPPORT_TARGET,
 ].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
+  NATIVE_SUPPORT_TARGET,
 ].compact
 
 # Workaround for https://github.com/jimweirich/rake/issues/274
-task :_nginx => :nginx
+task _nginx: :nginx
 
-task :nginx_without_native_support => [
+task nginx_without_native_support: [
   auto_generated_sources,
   AGENT_TARGET,
-  COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).link_objects
+  COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).link_objects,
 ].flatten
 
 # define_tasks creates an extra compilation to the specified output_dir, with extra compiler flags;
 # it also creates a namespace:clean task to clean up the output_dir
-task :nginx_dynamic_without_native_support => [
+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").
-    link_objects
+    link_objects,
 ].flatten
 
-task :clean => 'nginx:clean'
+task clean: 'nginx:clean'
 desc "Clean all compiled Nginx files"
 task 'nginx:clean' => 'common:clean' do
   # Nothing extra to clean at this time.
@@ -77,7 +77,7 @@ end
 def create_nginx_auto_generated_source_task(source)
   dependencies = [
     "#{source}.cxxcodebuilder",
-    'src/ruby_supportlib/phusion_passenger/nginx/config_options.rb'
+    'src/ruby_supportlib/phusion_passenger/nginx/config_options.rb',
   ]
   file(source => dependencies) do
     template = CxxCodeTemplateRenderer.new("#{source}.cxxcodebuilder")