75 lines
2.5 KiB
Diff
75 lines
2.5 KiB
Diff
From 19540347037ee6f16db00f1b401d64fa695dadf1 Mon Sep 17 00:00:00 2001
|
|
From: Marco Fargetta <mfargett@redhat.com>
|
|
Date: Wed, 21 Jan 2026 10:41:43 +0100
|
|
Subject: [PATCH 1/2] Fix python pylint error in EST upgrade script
|
|
|
|
---
|
|
base/server/upgrade/11.9.0/01-EnableEST.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/base/server/upgrade/11.9.0/01-EnableEST.py b/base/server/upgrade/11.9.0/01-EnableEST.py
|
|
index d877485fb6..e886aca39d 100644
|
|
--- a/base/server/upgrade/11.9.0/01-EnableEST.py
|
|
+++ b/base/server/upgrade/11.9.0/01-EnableEST.py
|
|
@@ -202,7 +202,7 @@ class EnableEST(pki.server.upgrade.PKIServerUpgradeScriptlet):
|
|
logger.info('Group %s already exist', group_id)
|
|
return
|
|
except subprocess.CalledProcessError:
|
|
- logger.info("Group %s has to be created.")
|
|
+ logger.info("Group '%s' will be created.", group_id)
|
|
|
|
subsystem.add_group(
|
|
group_id,
|
|
--
|
|
2.52.0
|
|
|
|
|
|
From a7f4fd64c9a25f742c6d5320bb20404b10bd73d5 Mon Sep 17 00:00:00 2001
|
|
From: Marco Fargetta <mfargett@redhat.com>
|
|
Date: Thu, 22 Jan 2026 15:52:27 +0100
|
|
Subject: [PATCH 2/2] Fix CMake build with tomcat10
|
|
|
|
CMake build had tomcat-9 library hard-coded and has been removed to get
|
|
it from the `build.sh`.
|
|
|
|
The `build.sh` test to identify the tomcat version to use was not
|
|
working with dotted version (e.g. 10.2) and it has been fixed.
|
|
---
|
|
base/server/CMakeLists.txt | 2 +-
|
|
build.sh | 6 +-----
|
|
2 files changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt
|
|
index f62b2bfa05..9fb6c7a98a 100644
|
|
--- a/base/server/CMakeLists.txt
|
|
+++ b/base/server/CMakeLists.txt
|
|
@@ -29,7 +29,7 @@ javac(pki-server-classes
|
|
OUTPUT_DIR
|
|
${CMAKE_CURRENT_BINARY_DIR}/classes
|
|
DEPENDS
|
|
- pki-common-jar pki-tools-jar pki-tomcat-jar pki-tomcat-9.0-jar
|
|
+ pki-common-jar pki-tools-jar pki-tomcat-jar pki-${APP_SERVER}-jar
|
|
)
|
|
|
|
add_dependencies(java pki-server-classes)
|
|
diff --git a/build.sh b/build.sh
|
|
index 62876a45c9..ed858a6beb 100755
|
|
--- a/build.sh
|
|
+++ b/build.sh
|
|
@@ -204,11 +204,7 @@ get_tomcat_app_server() {
|
|
app_server=$def_app_server
|
|
fi
|
|
else
|
|
- if [ $ver -ge $rhel_cutoff ]; then
|
|
- app_server=$app_server_10
|
|
- else
|
|
- app_server=$def_app_server
|
|
- fi
|
|
+ echo "$rhel_cutoff $ver" | tr " " "\n" | sort -V -C && app_server=$app_server_10 || app_server=$def_app_server
|
|
fi
|
|
|
|
echo $app_server
|
|
--
|
|
2.52.0
|
|
|