From 66f0d3fa9711c6a6d67704f5b986cf8856f70d7e Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Tue, 20 Sep 2022 19:10:01 +0800 Subject: [PATCH] fix passenger load error (cherry picked from commit 4d4deadce6d8f1d606eec96cf7459ac0552b616d) --- passenger.spec | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/passenger.spec b/passenger.spec index 6f05da7..1750304 100644 --- a/passenger.spec +++ b/passenger.spec @@ -2,11 +2,14 @@ %{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}} %{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}} %{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}} +%{!?ruby_vendorlibdir: %global ruby_vendorlibdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]')} +%{!?ruby_vendorarchdir: %global ruby_vendorarchdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"]')} +%global passenger_ruby_libdir %{ruby_vendorlibdir} Name:passenger Summary: Phusion Passenger application server Version: 6.0.4 -Release: 3 +Release: 4 License: Boost and BSD and BSD with advertising and MIT and zlib URL: https://www.phusionpassenger.com @@ -99,8 +102,8 @@ rake fakeroot \ FS_DATADIR=%{_datadir} \ FS_LIBDIR=%{_libdir} \ FS_DOCDIR=%{_docdir} \ - RUBYLIBDIR=%{_datadir}/passenger \ - RUBYARCHDIR=%{_libdir}/passenger \ + RUBYLIBDIR=%{ruby_vendorlibdir} \ + RUBYARCHDIR=%{ruby_vendorarchdir} \ APACHE2_MODULE_PATH=%{_httpd_moddir}/mod_passenger.so @@ -117,6 +120,10 @@ export LC_ALL=en_US.UTF-8 %{__sed} -e 's|@PASSENGERROOT@|%{_datadir}/passenger/phusion_passenger/locations.ini|g' %{SOURCE100} > passenger.conf %{__sed} -i -e '/^# *Require all granted/d' passenger.conf +./dev/install_scripts_bootstrap_code.rb --ruby %{passenger_ruby_libdir} \ + %{buildroot}%{_bindir}/* \ + %{buildroot}%{_sbindir}/* \ + `find %{buildroot} -name rack_handler.rb` %if "%{_httpd_modconfdir}" == "%{_httpd_confdir}" %{__cat} %{SOURCE101} passenger.conf > passenger-combined.conf @@ -150,7 +157,7 @@ sed -i 's|^#!/usr/bin/env python$|#!/usr/bin/python3|' %{buildroot}%{_datadir}/p %files %doc LICENSE CONTRIBUTORS CHANGELOG -%{_bindir}/%{name}* +%{_bindir}/* %exclude %{_bindir}/%{name}-install-*-module %{_sbindir}/* %{_usr}/lib/tmpfiles.d/passenger.conf @@ -166,9 +173,9 @@ sed -i 's|^#!/usr/bin/env python$|#!/usr/bin/python3|' %{buildroot}%{_datadir}/p %dir %{_localstatedir}/log/passenger-analytics %dir %attr(755, root, root) %{_localstatedir}/run/passenger-instreg %{_sysconfdir}/logrotate.d/passenger -%{_datadir}/passenger/* +%{passenger_ruby_libdir}/* %{_libdir}/passenger/support-binaries -%{_libdir}/passenger/passenger_native_support.so +%{ruby_vendorarchdir}/passenger_native_support.so %files devel %{_datadir}/passenger/ngx_http_passenger_module @@ -189,6 +196,9 @@ sed -i 's|^#!/usr/bin/env python$|#!/usr/bin/python3|' %{buildroot}%{_datadir}/p %{_mandir}/*/* %changelog +* Tue Sep 20 2022 yaoxin - 6.0.4-4 +- fix passenger load error + * Mon May 18 2020 wangchen - 6.0.4-3 - rebuild for passenger -- Gitee