Upgrade passenger to 6.0.20 and NGINX to 1.24.0

Fixes #272
OSC · Apr 25, 2024 · 1eb725d · 1eb725d
1 parent 431bbe8
commit 1eb725d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/lib/ood_packaging/version.rb b/lib/ood_packaging/version.rb
@@ -14,7 +14,7 @@ module OodPackaging
     },
     'ondemand-runtime'        => '3.1.5',
     'scl-utils'               => '2.0.3',
-    'passenger'               => '6.0.17',
+    'passenger'               => '6.0.20',
     'cjose'                   => '0.6.1',
     'mod_auth_openidc'        => '2.4.14.1',
     'ondemand_exporter'       => '0.10.0',

diff --git a/packages/passenger/deb/debian/changelog b/packages/passenger/deb/debian/changelog
@@ -1,4 +1,4 @@
-passenger (6.0.17.ood3.1) UNRELEASED; urgency=low
+passenger (6.0.20.ood3.1) UNRELEASED; urgency=low
 
   * Initial release. Closes: #nnnn
     <nnnn is the bug number of your ITP>

diff --git a/packages/passenger/deb/debian/ondemand-nginx.changelog b/packages/passenger/deb/debian/ondemand-nginx.changelog
@@ -1,4 +1,4 @@
-passenger (1.22.1.p6.0.17.ood3.1) UNRELEASED; urgency=low
+passenger (1.24.0.p6.0.20.ood3.1) UNRELEASED; urgency=low
 
   * Initial release. Closes: #nnnn
     <nnnn is the bug number of your ITP>

diff --git a/packages/passenger/deb/debian/rules b/packages/passenger/deb/debian/rules
@@ -7,7 +7,7 @@ export PREFIX = /opt/ood/ondemand/root
 export DEV_DESTDIR = $(CURDIR)/debian/ondemand-passenger-dev
 export DOC_DESTDIR = $(CURDIR)/debian/ondemand-passenger-doc
 export RUBY_LIBDIR = $(PREFIX)/usr/share/ruby/vendor_ruby
-export NGINX_VERSION = 1.20.1
+export NGINX_VERSION = 1.24.0
 export NGINX_DESTDIR = $(CURDIR)/debian/ondemand-nginx
 export NGINX_DATADIR = $(PREFIX)/usr/share/nginx
 export NGINX_CONFDIR = $(PREFIX)/etc/nginx

diff --git a/packages/passenger/rpm/passenger.spec b/packages/passenger/rpm/passenger.spec
@@ -2,7 +2,7 @@
 %define pkg_name passenger
 %scl_package passenger
 %define passenger_version %{package_version}
-%define nginx_version 1.22.1
+%define nginx_version 1.24.0
 %define release_version %{package_release}
 %define ngix_release_version 1
 
@@ -17,7 +17,7 @@
 %global  nginx_logdir        %{_root_localstatedir}/log/%{?scl_prefix}nginx
 %global  nginx_webroot       %{nginx_datadir}/html
 
-%global bundled_boost_version 1.81.0
+%global bundled_boost_version 1.83.0
 %global apache_module_package_name mod_passenger
 %global ruby_vendorlibdir %{_datadir}/ruby/vendor_ruby
 %global ruby_vendorarchdir %{_libdir}/ruby/vendor_ruby

diff --git a/release-manifest.yaml b/release-manifest.yaml
@@ -39,9 +39,9 @@ ondemand-nginx:
     - ondemand-nginx
     - ondemand-nginx-debuginfo
   versions:
-    - 1.22.1-1.p6.0.17.ood{runtime}
+    - 1.24.0-1.p6.0.20.ood{runtime}
     # deb package
-    - 1.22.1.p6.0.17.ood{major}
+    - 1.24.0.p6.0.20.ood{major}
 ondemand-passenger:
   packages:
     - ondemand-passenger
@@ -50,9 +50,9 @@ ondemand-passenger:
     - ondemand-passenger-dev
     - ondemand-passenger-doc
   versions:
-    - 6.0.17-1.ood{runtime}
+    - 6.0.20-1.ood{runtime}
     # deb package
-    - 6.0.17.ood{major}
+    - 6.0.20.ood{major}
 ondemand-runtime:
   packages:
     - ondemand-apache