Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rubygem-passenger for openSUSE:Factory checked in at 2021-04-21 21:00:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-passenger (Old) and /work/SRC/openSUSE:Factory/.rubygem-passenger.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-passenger" Wed Apr 21 21:00:14 2021 rev:10 rq:887121 version:6.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-passenger/rubygem-passenger.changes 2020-12-11 20:16:32.524655325 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-passenger.new.12324/rubygem-passenger.changes 2021-04-21 21:00:54.542344009 +0200 @@ -1,0 +2,36 @@ +Tue Apr 20 13:48:32 UTC 2021 - Manuel Schnitzer <mschnit...@suse.com> + +- updated to version 6.0.8 + + * [Apache] Fixes crash when restarting Apache on CentOS 8. Closes GH-2318. + * [Standalone] fix abort websockets on shutdown. Closes GH-2211. + * Fixes application process titles. They are now properly set to something like "Passenger RubyApp: ..." instead of "Passenger AppPreloader: ... (forking)". + * Upgrades Boost to 1.74. + * Allow passenger-status to detect passenger instance registry dir when systemd PrivateTmp dir is in use. + * Reduce the likelihood of a crash when using systemd PrivateTmp dir with Apache. + * Removed CentOS 6, and Debian Jessie prebuilt binaries and packages. Both are EOL. + * No-longer build 32 bit prebuilt binaries, as HBB dropped support. + * Updated various library versions used in precompiled binaries (used for e.g. gem installs): + + - ccache_version: 4.0 ??? 4.2 + - cmake_version: 3.18.4 ??? 3.19.7 + - curl_version: 7.73.0 ??? 7.75.0 + - git_version: 2.29.1 ??? 2.31.0 + - gnupg_version: 2.2.23 ??? 2.2.27 + - libassuan_version: 2.5.4 ??? 2.5.5 + - libgcrypt_version: 1.8.7 ??? 1.9.2 + - libgpg_error_version: 1.39 ??? 1.42 + - libksba_version: 1.4.0 ??? 1.5.0 + - openssl_version: 1.1.1h ??? 1.1.1k + - pinentry_version: 1.1.0 ??? 1.1.1 + - rubygems_version: 3.1.4 ??? 3.2.15 + - zstd_version: 1.4.5 ??? 1.4.9 + - ruby_versions + 3.0.0 + +- renamed suse.patch to 0001-suse.patch + +- updated 0001-suse.patch to apply again + +- renamed fix_shebangs.patch to 0002-fix-shebangs.patch + +------------------------------------------------------------------- Old: ---- fix_shebangs.patch passenger-6.0.7.gem suse.patch New: ---- 0001-suse.patch 0002-fix-shebangs.patch passenger-6.0.8.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-passenger.spec ++++++ --- /var/tmp/diff_new_pack.wZ9Xum/_old 2021-04-21 21:00:55.174345004 +0200 +++ /var/tmp/diff_new_pack.wZ9Xum/_new 2021-04-21 21:00:55.178345010 +0200 @@ -1,7 +1,7 @@ # # spec file for package rubygem-passenger # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ # Name: rubygem-passenger -Version: 6.0.7 +Version: 6.0.8 Release: 0 %define mod_name passenger %define mod_full_name %{mod_name}-%{version} @@ -76,8 +76,8 @@ Source7: rubygem-passenger-rpmlintrc Source8: gem2rpm.yml # MANUAL -Patch0: suse.patch -Patch1: fix_shebangs.patch +Patch0: 0001-suse.patch +Patch1: 0002-fix-shebangs.patch # /MANUAL Summary: A fast and robust web server and application server for Ruby, Python License: MIT AND GPL-2.0-only @@ -92,6 +92,20 @@ %gem_unpack %patch0 -p1 %patch1 -p1 +# MANUAL +# those files have been committed accidentally by the developers of passenger with version 6.0.8. they are not needed so +# we have to remove them (otherwise a suse-filelist-forbidden linter error with a badness of 10000 is raised when .orig +# files are in the file list). Patching src/ruby_supportlib/phusion_passenger/packaging.rb to exclude these files from +# the packaging process did not work out, because it's getting parsed before the patch even applies. +# If you find a better solution, feel free to improve this section here. +# +# The files will probably be removed with a later release, so feel free to drop this section if the building fails +# because of those files being missing. +sed -i 's/"src\/cxx_supportlib\/vendor-modified\/boost\/thread\/detail\/thread.hpp.orig".freeze, //g' passenger-*.gemspec +sed -i 's/"src\/cxx_supportlib\/vendor-modified\/boost\/thread\/once.hpp.orig".freeze, //g' passenger-*.gemspec +rm src/cxx_supportlib/vendor-modified/boost/thread/detail/thread.hpp.orig +rm src/cxx_supportlib/vendor-modified/boost/thread/once.hpp.orig +# /MANUAL find -type f -print0 | xargs -0 touch -r %{S:0} %gem_build @@ -198,7 +212,7 @@ Group: Development/Languages/Ruby Supplements: packageand(apache2:rubygem-passenger) -# Requires: rubygem-passenger = 6.0.7 +# Requires: rubygem-passenger = 6.0.8 %description apache2 A modern web server and application server for Ruby, Python and Node.js, @@ -218,7 +232,7 @@ Group: Development/Languages/Ruby Supplements: packageand(nginx:rubygem-passenger) -# Requires: rubygem-passenger = 6.0.7 +# Requires: rubygem-passenger = 6.0.8 %description nginx A modern web server and application server for Ruby, Python and Node.js, ++++++ 0001-suse.patch ++++++ commit 715d7cc7781264c27b7294b35f1647f5b648e783 Author: Marcus R??ckert <da...@nordisch.org> Date: Wed Sep 30 17:39:13 2015 +0200 suse patch Index: passenger-5.2.2/src/cxx_supportlib/ResourceLocator.h =================================================================== --- passenger-5.2.2.orig/src/cxx_supportlib/ResourceLocator.h +++ passenger-5.2.2/src/cxx_supportlib/ResourceLocator.h @@ -105,12 +105,12 @@ originallyPackaged = true; - packagingMethod = "unknown"; + packagingMethod = "rpm"; binDir = root + "/bin"; - supportBinariesDir = root + "/buildout/support-binaries"; - helperScriptsDir = root + "/src/helper-scripts"; + supportBinariesDir = root + "/support-binaries"; + helperScriptsDir = root + "/helper-scripts"; resourcesDir = root + "/resources"; docDir = root + "/doc"; rubyLibDir = root + "/src/ruby_supportlib"; - nodeLibDir = root + "/src/nodejs_supportlib"; + nodeLibDir = root + "/nodejs_supportlib"; buildSystemDir = root; } } Index: passenger-5.0.26/src/cxx_supportlib/Utils.cpp =================================================================== --- passenger-5.0.26.orig/src/cxx_supportlib/Utils.cpp +++ passenger-5.0.26/src/cxx_supportlib/Utils.cpp @@ -636,7 +636,7 @@ const char * getSystemTempDir() { const char *temp_dir = getenv("TMPDIR"); if (temp_dir == NULL || *temp_dir == '\0') { - temp_dir = "/tmp"; + temp_dir = "/var/run/passenger"; } return temp_dir; } Index: passenger-5.0.26/src/helper-scripts/meteor-loader.rb =================================================================== --- passenger-5.0.26.orig/src/helper-scripts/meteor-loader.rb +++ passenger-5.0.26/src/helper-scripts/meteor-loader.rb @@ -107,9 +107,8 @@ abort "This program may only be invoked from Passenger (error: $PASSENGER_SPAWN_WORK_DIR not set)." end - ruby_libdir = File.read("#{work_dir}/args/ruby_libdir").strip passenger_root = File.read("#{work_dir}/args/passenger_root").strip - require "#{ruby_libdir}/phusion_passenger" + require "phusion_passenger" PhusionPassenger.locate_directories(passenger_root) PhusionPassenger.require_passenger_lib 'loader_shared_helpers' Index: passenger-5.0.26/src/helper-scripts/rack-loader.rb =================================================================== --- passenger-5.0.26.orig/src/helper-scripts/rack-loader.rb +++ passenger-5.0.26/src/helper-scripts/rack-loader.rb @@ -46,9 +46,8 @@ record_journey_step_end('SUBPROCESS_EXEC_WRAPPER', 'STEP_PERFORMED') record_journey_step_begin('SUBPROCESS_WRAPPER_PREPARATION', 'STEP_IN_PROGRESS') - ruby_libdir = File.read("#{work_dir}/args/ruby_libdir").strip passenger_root = File.read("#{work_dir}/args/passenger_root").strip - require "#{ruby_libdir}/phusion_passenger" + require "phusion_passenger" PhusionPassenger.locate_directories(passenger_root) PhusionPassenger.require_passenger_lib 'loader_shared_helpers' Index: passenger-5.0.26/src/helper-scripts/rack-preloader.rb =================================================================== --- passenger-5.0.26.orig/src/helper-scripts/rack-preloader.rb +++ passenger-5.0.26/src/helper-scripts/rack-preloader.rb @@ -48,9 +48,8 @@ record_journey_step_end('SUBPROCESS_EXEC_WRAPPER', 'STEP_PERFORMED') record_journey_step_begin('SUBPROCESS_WRAPPER_PREPARATION', 'STEP_IN_PROGRESS') - ruby_libdir = File.read("#{work_dir}/args/ruby_libdir").strip passenger_root = File.read("#{work_dir}/args/passenger_root").strip - require "#{ruby_libdir}/phusion_passenger" + require "phusion_passenger" PhusionPassenger.locate_directories(passenger_root) PhusionPassenger.require_passenger_lib 'loader_shared_helpers' Index: passenger-5.0.26/src/ruby_supportlib/phusion_passenger.rb =================================================================== --- passenger-5.0.26.orig/src/ruby_supportlib/phusion_passenger.rb +++ passenger-5.0.26/src/ruby_supportlib/phusion_passenger.rb @@ -111,18 +111,20 @@ module PhusionPassenger instance_variable_set("@#{field}", value) end else + require 'rbconfig' + shared_basedir = File.join(RbConfig::CONFIG['libdir'], 'passenger', VERSION_STRING) source_root = File.dirname(File.dirname(File.dirname(FILE_LOCATION))) @install_spec = source_root @custom_packaged = false - @bin_dir = "#{source_root}/bin".freeze - @support_binaries_dir = "#{source_root}/buildout/support-binaries".freeze - @lib_dir = "#{source_root}/buildout".freeze - @helper_scripts_dir = "#{source_root}/src/helper-scripts".freeze - @resources_dir = "#{source_root}/resources".freeze - @include_dir = "#{source_root}/src".freeze + @bin_dir = "#{shared_basedir}/bin".freeze + @support_binaries_dir = "#{shared_basedir}/support-binaries".freeze + @lib_dir = "#{shared_basedir}".freeze + @helper_scripts_dir = "#{shared_basedir}/helper-scripts".freeze + @resources_dir = "#{shared_basedir}/resources".freeze + @include_dir = "#{shared_basedir}".freeze @doc_dir = "#{source_root}/doc".freeze @ruby_libdir = File.dirname(FILE_LOCATION).freeze - @node_libdir = "#{source_root}/src/nodejs_supportlib".freeze + @node_libdir = "#{shared_basedir}/nodejs_supportlib".freeze @apache2_module_path = "#{source_root}/buildout/apache2/mod_passenger.so".freeze @ruby_extension_source_dir = "#{source_root}/src/ruby_native_extension".freeze @nginx_module_source_dir = "#{source_root}/src/nginx_module".freeze @@ -232,7 +234,7 @@ module PhusionPassenger # 2. It is faster than plan require() because it doesn't need to # scan the entire load path. def self.require_passenger_lib(name) - require("#{ruby_libdir}/phusion_passenger/#{name}") + require("phusion_passenger/#{name}") end # Forward define public_api.rb methods for code that tries to hook Index: passenger-6.0.8/src/ruby_supportlib/phusion_passenger/admin_tools.rb =================================================================== --- passenger-6.0.8.orig/src/ruby_supportlib/phusion_passenger/admin_tools.rb 2021-04-20 17:08:10.314555766 +0200 +++ passenger-6.0.8/src/ruby_supportlib/phusion_passenger/admin_tools.rb 2021-04-20 17:12:59.480306216 +0200 @@ -31,7 +31,7 @@ return ENV[name] end end - return Dir['/tmp/systemd-private-*-{httpd,nginx}.service-*/tmp'].first || "/tmp" + return Dir['/tmp/systemd-private-*-{httpd,nginx}.service-*/tmp'].first || '/var/run/passenger' end def self.process_is_alive?(pid) Index: passenger-6.0.8/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb =================================================================== --- passenger-6.0.8.orig/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb 2021-04-20 17:08:10.314555766 +0200 +++ passenger-6.0.8/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb 2021-04-20 17:17:11.349831019 +0200 @@ -105,7 +105,7 @@ # # systemd's PrivateTmp feature works like an inverted OSX, apache gets its own # TMPDIR and users use /tmp - [string_env("TMPDIR"), "/tmp", "/var/run/passenger-instreg",*Dir['/tmp/systemd-private-*-{httpd,nginx}.service-*/tmp']].compact + [string_env("TMPDIR"), "/var/run/passenger", "/var/run/passenger-instreg",*Dir['/tmp/systemd-private-*-{httpd,nginx}.service-*/tmp']].compact end def string_env(name) ++++++ 0002-fix-shebangs.patch ++++++ >From 06910e90a5bfc182acf4827da6b7f33561986b13 Mon Sep 17 00:00:00 2001 From: Manuel Schnitzer <webmas...@mschnitzer.de> Date: Sat, 7 Apr 2018 03:46:44 +0200 Subject: [PATCH] Fix shebangs for SUSE packaging --- bin/passenger | 2 +- bin/passenger-config | 2 +- bin/passenger-install-apache2-module | 2 +- bin/passenger-install-nginx-module | 2 +- bin/passenger-memory-stats | 2 +- bin/passenger-status | 2 +- src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py | 2 +- src/helper-scripts/backtrace-sanitizer.rb | 2 +- src/helper-scripts/crash-watch.rb | 2 +- src/helper-scripts/meteor-loader.rb | 2 +- src/helper-scripts/prespawn | 2 +- .../winston/node_modules/async/support/sync-package-managers.js | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/bin/passenger b/bin/passenger index 3760e5342..d8a62a6ee 100755 --- passenger-5.2.2.orig/bin/passenger +++ passenger-5.2.2/bin/passenger @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/ruby # Phusion Passenger - https://www.phusionpassenger.com/ # Copyright (c) 2010-2017 Phusion Holding B.V. # diff --git a/bin/passenger-config b/bin/passenger-config index a38e4e914..1209cb5ed 100755 --- passenger-5.2.2.orig/bin/passenger-config +++ passenger-5.2.2/bin/passenger-config @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/ruby # Phusion Passenger - https://www.phusionpassenger.com/ # Copyright (c) 2010-2017 Phusion Holding B.V. # diff --git a/bin/passenger-install-apache2-module b/bin/passenger-install-apache2-module index f0b5a5f72..fe804b49f 100755 --- passenger-5.2.2.orig/bin/passenger-install-apache2-module +++ passenger-5.2.2/bin/passenger-install-apache2-module @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/ruby # encoding: binary # Phusion Passenger - https://www.phusionpassenger.com/ # Copyright (c) 2010-2017 Phusion Holding B.V. diff --git a/bin/passenger-install-nginx-module b/bin/passenger-install-nginx-module index b5a50b6b9..db31cc38f 100755 --- passenger-5.2.2.orig/bin/passenger-install-nginx-module +++ passenger-5.2.2/bin/passenger-install-nginx-module @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/ruby # Phusion Passenger - https://www.phusionpassenger.com/ # Copyright (c) 2010-2017 Phusion Holding B.V. # diff --git a/bin/passenger-memory-stats b/bin/passenger-memory-stats index c958cd938..b729b30be 100755 --- passenger-5.2.2.orig/bin/passenger-memory-stats +++ passenger-5.2.2/bin/passenger-memory-stats @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/ruby # Phusion Passenger - https://www.phusionpassenger.com/ # Copyright (c) 2010-2017 Phusion Holding B.V. # diff --git a/bin/passenger-status b/bin/passenger-status index eec9b9977..f7ad838cf 100755 --- passenger-5.2.2.orig/bin/passenger-status +++ passenger-5.2.2/bin/passenger-status @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/ruby # Phusion Passenger - https://www.phusionpassenger.com/ # Copyright (c) 2010-2017 Phusion Holding B.V. # diff --git a/src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py b/src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py index 39933f624..e237123d0 100755 --- passenger-5.2.2.orig/src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py +++ passenger-5.2.2/src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python import os import platform diff --git a/src/helper-scripts/backtrace-sanitizer.rb b/src/helper-scripts/backtrace-sanitizer.rb index bfde23ef8..cdc3eb473 100755 --- passenger-5.2.2.orig/src/helper-scripts/backtrace-sanitizer.rb +++ passenger-5.2.2/src/helper-scripts/backtrace-sanitizer.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/ruby # Phusion Passenger - https://www.phusionpassenger.com/ # Copyright (c) 2013-2017 Phusion Holding B.V. # diff --git a/src/helper-scripts/crash-watch.rb b/src/helper-scripts/crash-watch.rb index d2de4bee0..0d48310bf 100755 --- passenger-5.2.2.orig/src/helper-scripts/crash-watch.rb +++ passenger-5.2.2/src/helper-scripts/crash-watch.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/ruby # Copyright (c) 2015-2017 Phusion Holding B.V. # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/src/helper-scripts/meteor-loader.rb b/src/helper-scripts/meteor-loader.rb index 7aa92b366..7eafa5e10 100755 --- passenger-5.2.2.orig/src/helper-scripts/meteor-loader.rb +++ passenger-5.2.2/src/helper-scripts/meteor-loader.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/ruby # encoding: binary # Phusion Passenger - https://www.phusionpassenger.com/ # Copyright (c) 2010-2017 Phusion Holding B.V. diff --git a/src/helper-scripts/prespawn b/src/helper-scripts/prespawn index 51ac81a3c..c5c5e454c 100755 --- passenger-5.2.2.orig/src/helper-scripts/prespawn +++ passenger-5.2.2/src/helper-scripts/prespawn @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/ruby # Phusion Passenger - https://www.phusionpassenger.com/ # Copyright (c) 2010-2017 Phusion Holding B.V. # diff --git a/src/nodejs_supportlib/vendor-copy/winston/node_modules/async/support/sync-package-managers.js b/src/nodejs_supportlib/vendor-copy/winston/node_modules/async/support/sync-package-managers.js index 5b261197a..eb72e509c 100755 --- passenger-5.2.2.orig/src/nodejs_supportlib/vendor-copy/winston/node_modules/async/support/sync-package-managers.js +++ passenger-5.2.2/src/nodejs_supportlib/vendor-copy/winston/node_modules/async/support/sync-package-managers.js @@ -1,4 +1,4 @@ -#!/usr/bin/env node +#!/usr/bin/node // This should probably be its own module but complaints about bower/etc. // support keep coming up and I'd rather just enable the workflow here for now ++++++ gem2rpm.yml ++++++ --- /var/tmp/diff_new_pack.wZ9Xum/_old 2021-04-21 21:00:55.250345124 +0200 +++ /var/tmp/diff_new_pack.wZ9Xum/_new 2021-04-21 21:00:55.254345130 +0200 @@ -93,8 +93,21 @@ - series - rubygem-passenger-rpmlintrc :patches: - suse.patch: -p1 - fix_shebangs.patch: -p1 + 0001-suse.patch: -p1 + 0002-fix-shebangs.patch: -p1 +:post_patch: |- + # those files have been committed accidentally by the developers of passenger with version 6.0.8. they are not needed so + # we have to remove them (otherwise a suse-filelist-forbidden linter error with a badness of 10000 is raised when .orig + # files are in the file list). Patching src/ruby_supportlib/phusion_passenger/packaging.rb to exclude these files from + # the packaging process did not work out, because it's getting parsed before the patch even applies. + # If you find a better solution, feel free to improve this section here. + # + # The files will probably be removed with a later release, so feel free to drop this section if the building fails + # because of those files being missing. + sed -i 's/"src\/cxx_supportlib\/vendor-modified\/boost\/thread\/detail\/thread.hpp.orig".freeze, //g' passenger-*.gemspec + sed -i 's/"src\/cxx_supportlib\/vendor-modified\/boost\/thread\/once.hpp.orig".freeze, //g' passenger-*.gemspec + rm src/cxx_supportlib/vendor-modified/boost/thread/detail/thread.hpp.orig + rm src/cxx_supportlib/vendor-modified/boost/thread/once.hpp.orig :pre_install: |- # TODO: # currently -lev gets lost when using system libev ++++++ passenger-6.0.7.gem -> passenger-6.0.8.gem ++++++ /work/SRC/openSUSE:Factory/rubygem-passenger/passenger-6.0.7.gem /work/SRC/openSUSE:Factory/.rubygem-passenger.new.12324/passenger-6.0.8.gem differ: char 132, line 1 ++++++ series ++++++ --- /var/tmp/diff_new_pack.wZ9Xum/_old 2021-04-21 21:00:55.414345382 +0200 +++ /var/tmp/diff_new_pack.wZ9Xum/_new 2021-04-21 21:00:55.414345382 +0200 @@ -1,2 +1,2 @@ -suse.patch -fix_shebangs.patch +0001-suse.patch +0002-fix-shebangs.patch