Update ondemand-passenger dependencies to include 'ps' command

Fixes #291
OSC · Jan 21, 2025 · 957aed9 · 957aed9
1 parent 5f5525a
commit 957aed9
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/lib/ood_packaging/version.rb b/lib/ood_packaging/version.rb
@@ -14,7 +14,10 @@ module OodPackaging
     },
     'ondemand-runtime'        => '4.0.3',
     'scl-utils'               => '2.0.3',
-    'passenger'               => '6.0.23',
+    'passenger'               => {
+      '(ubuntu|debian)' => '6.0.23',
+      'default'         => '6.0.23-2'
+    },
     'ondemand_exporter'       => '0.11.2',
     'ondemand-compute'        => {
       '(ubuntu|debian)' => '4.0.0',

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

diff --git a/packages/passenger/deb/debian/control b/packages/passenger/deb/debian/control
@@ -13,7 +13,7 @@ Package: ondemand-passenger
 Architecture: any
 Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends},
-  ruby
+  ruby, procps
 Description: Phusion Passenger application server for OnDemand
 
 Package: ondemand-passenger-dev

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

diff --git a/packages/passenger/rpm/passenger.spec b/packages/passenger/rpm/passenger.spec
@@ -4,7 +4,7 @@
 %define passenger_version %{package_version}
 %define nginx_version 1.26.1
 %define release_version %{package_release}
-%define ngix_release_version 1
+%define ngix_release_version 2
 
 %define runtime_version 4.0.3
 
@@ -101,6 +101,7 @@ BuildRequires: libev-devel >= 4.0.0
 Requires: gd
 Requires: openssl
 Requires: pcre
+Requires: procps-ng
 
 %description -n %{?scl_prefix}nginx
 Nginx is a web server and a reverse proxy server for HTTP, SMTP, POP3 and

diff --git a/release-manifest.yaml b/release-manifest.yaml
@@ -21,9 +21,9 @@ ondemand-nginx:
     - ondemand-nginx
     - ondemand-nginx-debuginfo
   versions:
-    - 1.26.1-1.p6.0.23.ood{runtime}
+    - 1.26.1-2.p6.0.23.ood{runtime}
     # deb package
-    - 1.26.1.p6.0.23.ood{major}
+    - 1.26.1.p6.0.23.ood{major}.1
 ondemand-passenger:
   packages:
     - ondemand-passenger
@@ -32,9 +32,9 @@ ondemand-passenger:
     - ondemand-passenger-dev
     - ondemand-passenger-doc
   versions:
-    - 6.0.23-1.ood{runtime}
+    - 6.0.23-2.ood{runtime}
     # deb package
-    - 6.0.23.ood{major}
+    - 6.0.23.ood{major}.1
 ondemand-runtime:
   packages:
     - ondemand-apache