From ba32f0728cb02ed41b9bb85df2baa801a4e6500a Mon Sep 17 00:00:00 2001 From: Eduard Abdullin Date: Wed, 22 Jul 2026 10:56:05 +0000 Subject: [PATCH] Fix build.sh to recognize AlmaLinux as RHEL-compatible --- 1000-fix-build-sh-recognize-almalinux.patch | 31 +++++++++++++++++++++ dogtag-pki.spec | 8 +++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 1000-fix-build-sh-recognize-almalinux.patch diff --git a/1000-fix-build-sh-recognize-almalinux.patch b/1000-fix-build-sh-recognize-almalinux.patch new file mode 100644 index 0000000..15c7ee2 --- /dev/null +++ b/1000-fix-build-sh-recognize-almalinux.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Eduard Abdullin +Date: Thu, 13 Mar 2026 12:00:00 +0000 +Subject: [PATCH] Fix build.sh to recognize AlmaLinux as RHEL-compatible + +build.sh only handles centos, rhel, and fedora. +On AlmaLinux (ID=almalinux), it falls into the default case which echoes +an undefined $def_app_server variable (empty string), causing cmake to +receive an empty APP_SERVER and fail with: + CMake Error at base/CMakeLists.txt (add_subdirectory): + add_subdirectory called with incorrect number of arguments +--- + build.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/build.sh b/build.sh +--- a/build.sh ++++ b/build.sh +@@ -192,6 +192,10 @@ + distro="rhel" + ver=$VERSION_ID + ;; ++ "almalinux") ++ distro="rhel" ++ ver=$VERSION_ID ++ ;; + *) + echo $def_app_server + return +-- +2.43.0 diff --git a/dogtag-pki.spec b/dogtag-pki.spec index a330f0d..46636b2 100644 --- a/dogtag-pki.spec +++ b/dogtag-pki.spec @@ -30,7 +30,7 @@ URL: https://www.dogtagpki.org # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2 License: GPL-2.0-only AND LGPL-2.0-only Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.alma.1 # To create a tarball from a version tag: # $ git archive \ @@ -66,6 +66,9 @@ Source15: resteasy-servlet-initializer-3.0.26.Final.jar Patch: 0001-Fix-bundled-jackson-version-mismatch.patch +# AlmaLinux Patch +Patch: 1000-fix-build-sh-recognize-almalinux.patch + %if 0%{?java_arches:1} ExclusiveArch: %{java_arches} %else @@ -2176,6 +2179,9 @@ fi ################################################################################ %changelog +* Wed Jul 22 2026 Eduard Abdullin - 11.9.0-4.alma.1 +- Fix build.sh to recognize AlmaLinux as RHEL-compatible + * Thu Jul 16 2026 Red Hat PKI Team - 11.9.0-4 - Update jackson bundled to 2.21.4 - Resolves: RHEL-188290