[Pkg-freeipa-devel] [Git][freeipa-team/dogtag-pki][master] control, links, patches: Tomcat9 -> 10.
Timo Aaltonen (@tjaalton)
gitlab at salsa.debian.org
Mon Oct 5 18:18:12 BST 2026
Timo Aaltonen pushed to branch master at FreeIPA packaging / dogtag-pki
Commits:
16277056 by Timo Aaltonen at 2026-10-05T20:17:32+03:00
control, links, patches: Tomcat9 -> 10.
- - - - -
10 changed files:
- debian/control
- debian/dogtag-pki-ca.links
- debian/dogtag-pki-kra.links
- debian/dogtag-pki-ocsp.links
- debian/dogtag-pki-tks.links
- debian/dogtag-pki-tps.links
- debian/patches/debian-support.diff
- debian/patches/debianize-service-files.diff
- debian/patches/fix-tomcat-jars.diff
- debian/patches/fix-tomcat-paths.diff
Changes:
=====================================
debian/control
=====================================
@@ -198,7 +198,7 @@ Depends:
python3-ldap,
python3-lxml,
python3-selinux,
- tomcat9-user,
+ tomcat10-user,
${java:Depends},
${misc:Depends},
${python3:Depends},
=====================================
debian/dogtag-pki-ca.links
=====================================
@@ -1 +1 @@
-/etc/tomcat9/policy.d usr/share/pki/ca/conf/policy.d
+/etc/tomcat10/policy.d usr/share/pki/ca/conf/policy.d
=====================================
debian/dogtag-pki-kra.links
=====================================
@@ -1 +1 @@
-/etc/tomcat9/policy.d usr/share/pki/kra/conf/policy.d
+/etc/tomcat10/policy.d usr/share/pki/kra/conf/policy.d
=====================================
debian/dogtag-pki-ocsp.links
=====================================
@@ -1 +1 @@
-/etc/tomcat9/policy.d usr/share/pki/ocsp/conf/policy.d
+/etc/tomcat10/policy.d usr/share/pki/ocsp/conf/policy.d
=====================================
debian/dogtag-pki-tks.links
=====================================
@@ -1 +1 @@
-/etc/tomcat9/policy.d usr/share/pki/tks/conf/policy.d
+/etc/tomcat10/policy.d usr/share/pki/tks/conf/policy.d
=====================================
debian/dogtag-pki-tps.links
=====================================
@@ -1 +1 @@
-/etc/tomcat9/policy.d usr/share/pki/tps/conf/policy.d
+/etc/tomcat10/policy.d usr/share/pki/tps/conf/policy.d
=====================================
debian/patches/debian-support.diff
=====================================
@@ -12,7 +12,7 @@ Description: changes for Debian
pki_systemd_service_create=True
-CATALINA_HOME=/usr/share/tomcat
-+CATALINA_HOME=/usr/share/tomcat9
++CATALINA_HOME=/usr/share/tomcat10
pki_tomcat_bin_path=%(CATALINA_HOME)s/bin
pki_tomcat_lib_path=%(CATALINA_HOME)s/lib
=====================================
debian/patches/debianize-service-files.diff
=====================================
@@ -5,7 +5,7 @@
Type=simple
EnvironmentFile=/usr/share/pki/etc/tomcat.conf
-EnvironmentFile=/etc/tomcat/tomcat.conf
-+Environment="CATALINA_HOME=/usr/share/tomcat9"
++Environment="CATALINA_HOME=/usr/share/tomcat10"
Environment="NAME=%i"
Environment="STARTED_BY_SYSTEMD=1"
Environment="WD_PIPE_NAME=%i"
@@ -14,13 +14,15 @@
EnvironmentFile=/usr/share/pki/etc/pki.conf
EnvironmentFile=/etc/pki/pki.conf
-@@ -17,13 +17,13 @@ ExecStartPre=+/usr/bin/pki-server-nuxwdo
- ExecStartPre=/usr/sbin/pki-server upgrade %i
+@@ -23,15 +23,14 @@ ExecStartPre=/usr/sbin/pki-server upgrad
ExecStartPre=/usr/sbin/pki-server migrate %i
ExecStartPre=/usr/bin/pkidaemon start %i
--ExecStart=/usr/libexec/tomcat/server start
--ExecStop=/usr/libexec/tomcat/server stop
+
+-# Use abstraction wrappers - work for both old and new Tomcat
+-ExecStart=/usr/sbin/pki-tomcat-start
+-ExecStop=/usr/sbin/pki-tomcat-stop
+ExecStart=/bin/sh /usr/share/pki/tomcat-start.sh
+
ExecStopPost=+/usr/bin/pki-server-nuxwdog --clear
KeyringMode=shared
@@ -32,28 +34,30 @@
Restart=on-failure
--- a/base/server/share/lib/systemd/system/pki-tomcatd at .service
+++ b/base/server/share/lib/systemd/system/pki-tomcatd at .service
-@@ -5,19 +5,20 @@ PartOf=pki-tomcatd.target
+@@ -5,9 +5,9 @@ PartOf=pki-tomcatd.target
[Service]
Type=simple
EnvironmentFile=/usr/share/pki/etc/tomcat.conf
-EnvironmentFile=/etc/tomcat/tomcat.conf
-+Environment="CATALINA_HOME=/usr/share/tomcat9"
++Environment="CATALINA_HOME=/usr/share/tomcat10"
Environment="NAME=%i"
-EnvironmentFile=-/etc/sysconfig/%i
+EnvironmentFile=-/etc/default/%i
EnvironmentFile=/usr/share/pki/etc/pki.conf
EnvironmentFile=/etc/pki/pki.conf
- ExecStartPre=/usr/sbin/pki-server upgrade %i
+@@ -20,11 +20,11 @@ ExecStartPre=/usr/sbin/pki-server upgrad
ExecStartPre=/usr/sbin/pki-server migrate %i
ExecStartPre=/usr/bin/pkidaemon start %i
--ExecStart=/usr/libexec/tomcat/server start
--ExecStop=/usr/libexec/tomcat/server stop
-+#ExecStartPre=+/usr/libexec/tomcat9/tomcat-update-policy.sh
+
+-# Use abstraction wrappers - work for both old and new Tomcat
+-ExecStart=/usr/sbin/pki-tomcat-start
+-ExecStop=/usr/sbin/pki-tomcat-stop
++#ExecStartPre=+/usr/libexec/tomcat10/tomcat-update-policy.sh
+ExecStart=/bin/sh /usr/share/pki/tomcat-start.sh
SuccessExitStatus=143
+SyslogIdentifier=%i
+ Restart=on-failure
User=pkiuser
Group=pkiuser
-
=====================================
debian/patches/fix-tomcat-jars.diff
=====================================
@@ -1,6 +1,6 @@
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
-@@ -6,6 +6,7 @@ find_file(SERVLET_JAR
+@@ -14,6 +14,7 @@ find_file(SERVLET_JAR
servlet-api-3.1.jar
tomcat-servlet-api.jar
tomcat9-servlet-api.jar
=====================================
debian/patches/fix-tomcat-paths.diff
=====================================
@@ -1,17 +1,18 @@
--- a/base/server/python/pki/server/__init__.py
+++ b/base/server/python/pki/server/__init__.py
-@@ -73,13 +73,13 @@ parser = etree.XMLParser(remove_blank_te
+@@ -101,14 +101,14 @@ parser = etree.XMLParser(remove_blank_te
class Tomcat(object):
BASE_DIR = '/var/lib/tomcats'
- CONF_DIR = '/etc/tomcat'
- LIB_DIR = '/usr/share/java/tomcat'
- SHARE_DIR = '/usr/share/tomcat'
-- EXECUTABLE = '/usr/sbin/tomcat'
-+ CONF_DIR = '/usr/share/tomcat9/skel/conf'
++ CONF_DIR = '/usr/share/tomcat10/skel/conf'
+ LIB_DIR = '/usr/share/java'
-+ SHARE_DIR = '/usr/share/tomcat9'
-+ EXECUTABLE = '/usr/share/tomcat9/bin/version.sh'
++ SHARE_DIR = '/usr/share/tomcat10'
+ OLD_EXECUTABLE = '/usr/sbin/tomcat'
+- EXECUTABLE = '/usr/share/tomcat/bin/catalina.sh'
++ EXECUTABLE = '/usr/share/tomcat10/bin/version.sh'
UNIT_FILE = '/lib/systemd/system/tomcat at .service'
SERVER_XML = CONF_DIR + '/server.xml'
- TOMCAT_CONF = CONF_DIR + '/tomcat.conf'
@@ -19,15 +20,15 @@
@classmethod
def get_version(cls):
-@@ -311,7 +311,7 @@ class PKIServer(object):
+@@ -421,7 +421,7 @@ class PKIServer(object):
content = f.read()
# add Tomcat's default policy
- filename = '/usr/share/tomcat/conf/catalina.policy'
-+ filename = '/usr/share/tomcat9/skel/policy/catalina.policy'
- logger.info('Appending %s', filename)
- with open(filename, 'r', encoding='utf-8') as f:
- content += f.read()
++ filename = '/usr/share/tomcat10/skel/policy/catalina.policy'
+ new_filename = '/etc/tomcat/catalina.policy'
+
+ if os.path.exists(filename):
--- a/base/server/upgrade/10.6.0/02-FixServerConfiguration.py
+++ b/base/server/upgrade/10.6.0/02-FixServerConfiguration.py
@@ -44,12 +44,12 @@ class FixServerConfiguration(pki.server.
@@ -35,26 +36,26 @@
instance,
'context.xml',
- '/usr/share/tomcat/conf/context.xml')
-+ '/usr/share/tomcat9/conf/context.xml')
++ '/usr/share/tomcat10/conf/context.xml')
self.replace_with_link(
instance,
'web.xml',
- '/usr/share/tomcat/conf/web.xml')
-+ '/usr/share/tomcat9/conf/web.xml')
++ '/usr/share/tomcat10/conf/web.xml')
def replace_with_link(self, instance, filename, target):
---- a/base/tomcat-9.0/conf/catalina.properties
-+++ b/base/tomcat-9.0/conf/catalina.properties
+--- a/base/tomcat-10.1/conf/catalina.properties
++++ b/base/tomcat-10.1/conf/catalina.properties
@@ -114,17 +114,17 @@ shared.loader=
# - Common non-Tomcat JARs
# - Test JARs (JUnit, Cobertura and dependencies)
tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
-bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,\
-annotations-api.jar,el-api.jar,jsp-api.jar,servlet-api.jar,websocket-api.jar,\
-+bootstrap.jar,commons-daemon.jar,tomcat9-juli.jar,\
-+annotations-api.jar,tomcat9-el-api.jar,jsp-api.jar,tomcat9-servlet-api.jar,websocket-api.jar,\
++bootstrap.jar,commons-daemon.jar,tomcat10-juli.jar,\
++annotations-api.jar,tomcat10-el-api.jar,jsp-api.jar,tomcat10-servlet-api.jar,websocket-api.jar,\
jaspic-api.jar,\
catalina.jar,catalina-ant.jar,catalina-ha.jar,catalina-storeconfig.jar,\
catalina-tribes.jar,\
@@ -64,28 +65,28 @@
-tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,\
-tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,\
-tomcat-jdbc.jar,\
-+tomcat9-api.jar,tomcat9-util.jar,tomcat9-util-scan.jar,tomcat9-coyote.jar,\
-+tomcat9-dbcp.jar,tomcat9-jni.jar,tomcat9-websocket.jar,\
-+tomcat9-i18n-en.jar,tomcat9-i18n-es.jar,tomcat9-i18n-fr.jar,tomcat9-i18n-ja.jar,\
-+tomcat9-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,\
-+tomcat9-jdbc.jar,\
++tomcat10-api.jar,tomcat10-util.jar,tomcat10-util-scan.jar,tomcat10-coyote.jar,\
++tomcat10-dbcp.jar,tomcat10-jni.jar,tomcat10-websocket.jar,\
++tomcat10-i18n-en.jar,tomcat10-i18n-es.jar,tomcat10-i18n-fr.jar,tomcat10-i18n-ja.jar,\
++tomcat10-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,\
++tomcat10-jdbc.jar,\
tools.jar,\
commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,\
commons-dbcp*.jar,commons-digester*.jar,commons-fileupload*.jar,\
--- a/base/server/share/conf/pki.policy
+++ b/base/server/share/conf/pki.policy
-@@ -33,12 +33,12 @@ grant codeBase "file:${catalina.base}/li
+@@ -40,12 +40,12 @@ grant codeBase "file:${catalina.base}/li
permission java.security.AllPermission;
};
-grant codeBase "file:/usr/share/java/tomcat-el-api.jar" {
-+grant codeBase "file:/usr/share/java/tomcat9-el-api.jar" {
++grant codeBase "file:/usr/share/java/tomcat10-el-api.jar" {
permission java.security.AllPermission;
};
// required for Fedora
-grant codeBase "file:/usr/share/java/tomcat-servlet-api.jar" {
-+grant codeBase "file:/usr/share/java/tomcat9-servlet-api.jar" {
++grant codeBase "file:/usr/share/java/tomcat10-servlet-api.jar" {
permission java.security.AllPermission;
};
View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/commit/16277056e13cd14cce99ab360e426bf6e44fd208
--
View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/commit/16277056e13cd14cce99ab360e426bf6e44fd208
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20261005/0f4b53d6/attachment-0001.htm>
More information about the Pkg-freeipa-devel
mailing list