From 95aafad86342705c6a1e831659b5dcaf96b229f2 Mon Sep 17 00:00:00 2001
From: Trey Dockendorf <tdockendorf@osc.edu>
Date: Thu, 7 Nov 2024 10:11:39 -0500
Subject: [PATCH] Upgrade Passenger to 6.0.23 and NGINX to 1.26.1

---
 lib/ood_packaging/version.rb                           | 2 +-
 packages/passenger/deb/debian/changelog                | 2 +-
 packages/passenger/deb/debian/ondemand-nginx.changelog | 2 +-
 packages/passenger/deb/debian/rules                    | 2 +-
 packages/passenger/rpm/passenger.spec                  | 4 ++--
 release-manifest.yaml                                  | 8 ++++----
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/ood_packaging/version.rb b/lib/ood_packaging/version.rb
index ff23ad8..b4fdb4f 100644
--- a/lib/ood_packaging/version.rb
+++ b/lib/ood_packaging/version.rb
@@ -14,7 +14,7 @@ module OodPackaging
     },
     'ondemand-runtime'        => '4.0.0',
     'scl-utils'               => '2.0.3',
-    'passenger'               => '6.0.20',
+    'passenger'               => '6.0.23',
     '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
index ab89a2f..7badda3 100644
--- a/packages/passenger/deb/debian/changelog
+++ b/packages/passenger/deb/debian/changelog
@@ -1,4 +1,4 @@
-passenger (6.0.20.ood4.0) UNRELEASED; urgency=low
+passenger (6.0.23.ood4.0) 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
index ab7c766..874c355 100644
--- a/packages/passenger/deb/debian/ondemand-nginx.changelog
+++ b/packages/passenger/deb/debian/ondemand-nginx.changelog
@@ -1,4 +1,4 @@
-passenger (1.24.0.p6.0.20.ood4.0) UNRELEASED; urgency=low
+passenger (1.26.1.p6.0.23.ood4.0) 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
index a633557..488d58c 100755
--- 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.24.0
+export NGINX_VERSION = 1.26.1
 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
index f8fb5ce..69d2eb3 100644
--- 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.24.0
+%define nginx_version 1.26.1
 %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.83.0
+%global bundled_boost_version 1.85.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
index 86e8913..f4dbde7 100644
--- a/release-manifest.yaml
+++ b/release-manifest.yaml
@@ -40,9 +40,9 @@ ondemand-nginx:
     - ondemand-nginx
     - ondemand-nginx-debuginfo
   versions:
-    - 1.24.0-1.p6.0.20.ood{runtime}
+    - 1.26.1-1.p6.0.23.ood{runtime}
     # deb package
-    - 1.24.0.p6.0.20.ood{major}
+    - 1.26.1.p6.0.23.ood{major}
 ondemand-passenger:
   packages:
     - ondemand-passenger
@@ -51,9 +51,9 @@ ondemand-passenger:
     - ondemand-passenger-dev
     - ondemand-passenger-doc
   versions:
-    - 6.0.20-1.ood{runtime}
+    - 6.0.23-1.ood{runtime}
     # deb package
-    - 6.0.20.ood{major}
+    - 6.0.23.ood{major}
 ondemand-runtime:
   packages:
     - ondemand-apache