[Pkg-freeipa-devel] [Git][freeipa-team/dogtag-pki][master] 7 commits: control: IDM framework got merged, cleanup
Timo Aaltonen (@tjaalton)
gitlab at salsa.debian.org
Mon Oct 5 09:17:41 BST 2026
Timo Aaltonen pushed to branch master at FreeIPA packaging / dogtag-pki
Commits:
19caff94 by Timo Aaltonen at 2026-10-05T09:57:31+03:00
control: IDM framework got merged, cleanup
- - - - -
fe327ac9 by Jarl Gullberg at 2026-10-05T09:59:15+03:00
control: set section of python3-dogtag-pki
- - - - -
6ceeb1aa by Jarl Gullberg at 2026-10-05T09:59:15+03:00
control: Set dogtag-pki-server arch:all.
- - - - -
b071c0c2 by Jarl Gullberg at 2026-10-05T09:59:15+03:00
use dh_installdocs over dh_install
dh_installdocs handles docfiles better than plain dh_install, primarily
when it comes to the nodoc build profile.
- - - - -
eac70a8d by Jarl Gullberg at 2026-10-05T10:54:02+03:00
control, patches: Migrate to jakarta-annotations
- - - - -
47998b9f by Timo Aaltonen at 2026-10-05T10:55:27+03:00
patches: Drop modifying runuser path, it's in usr/sbin now.
- - - - -
6cbd6d46 by Jarl Gullberg at 2026-10-05T11:08:16+03:00
patches: fix fontawesome path detection
- - - - -
14 changed files:
- debian/control
- + debian/dogtag-pki-base.docs
- debian/dogtag-pki-base.install
- debian/dogtag-pki-console.classpath
- + debian/dogtag-pki-java.docs
- + debian/dogtag-pki-javadoc.docs
- − debian/dogtag-pki-javadoc.install
- debian/dogtag-pki-server.docs
- debian/dogtag-pki.docs
- − debian/dogtag-pki.install
- + debian/patches/fix-fontawesome-path.diff
- debian/patches/fix-javax-annotations.diff → debian/patches/fix-jakarta-annotation-jars.diff
- − debian/patches/fix-runuser-path.diff
- debian/patches/series
Changes:
=====================================
debian/control
=====================================
@@ -9,6 +9,7 @@ Build-Depends:
debhelper-compat (= 13),
default-jdk,
dh-python,
+ fonts-font-awesome,
go-md2man,
javahelper,
junit4,
@@ -20,10 +21,10 @@ Build-Depends:
libcommons-net-java,
libhttpclient-java,
libhttpcore-java,
- libidm-console-framework-java (>= 2.0.0),
libjackson2-annotations-java,
libjackson2-core-java,
libjackson2-databind-java,
+ libjakarta-annotation-api-java,
libjaxb-java,
libjss-java (>= 5.4.0),
libldap-java (>= 5.4.0),
@@ -128,6 +129,7 @@ Description: Dogtag Public Key Infrastructure (PKI) Suite -- java client support
Package: python3-dogtag-pki
Architecture: all
+Section: python
Depends:
openssl,
python3-cryptography,
@@ -169,7 +171,7 @@ Description: Dogtag Public Key Infrastructure (PKI) Suite -- PKI tools
This tool is useful to test TPS server without risking an actual smart card.
Package: dogtag-pki-server
-Architecture: any
+Architecture: all
Depends:
dogtag-pki-java (= ${binary:Version}),
dogtag-pki-tools (>= ${source:Version}),
@@ -269,7 +271,6 @@ Architecture: all
Depends:
dogtag-pki-java (= ${binary:Version}),
dogtag-pki-console-theme (= ${binary:Version}),
- libidm-console-framework-java (>= 2.0.0),
libjss-java,
libldap-java,
${java:Depends},
=====================================
debian/dogtag-pki-base.docs
=====================================
@@ -0,0 +1 @@
+build/pki-base/html
\ No newline at end of file
=====================================
debian/dogtag-pki-base.install
=====================================
@@ -1,6 +1,5 @@
etc/pki/pki.conf
usr/sbin/pki-upgrade
-usr/share/doc/pki-base/html
usr/share/man/man1/pki-python-client.1
usr/share/man/man5/pki-logging.5
usr/share/man/man8/pki-upgrade.8
=====================================
debian/dogtag-pki-console.classpath
=====================================
@@ -1 +1 @@
-usr/share/java/pki/pki-console.jar /usr/share/java/idm-console-base.jar /usr/share/java/jss.jar /usr/share/java/ldapjdk.jar
+usr/share/java/pki/pki-console.jar /usr/share/java/jss.jar /usr/share/java/ldapjdk.jar
=====================================
debian/dogtag-pki-java.docs
=====================================
@@ -0,0 +1 @@
+usr/share/pki/examples/java/
\ No newline at end of file
=====================================
debian/dogtag-pki-javadoc.docs
=====================================
@@ -0,0 +1 @@
+usr/share/javadoc/pki
\ No newline at end of file
=====================================
debian/dogtag-pki-javadoc.install deleted
=====================================
@@ -1 +0,0 @@
-usr/share/javadoc/pki usr/share/doc/pki-javadoc/
=====================================
debian/dogtag-pki-server.docs
=====================================
@@ -1 +1,3 @@
-base/common/THIRD_PARTY_LICENSES
+base/server/README
+usr/share/pki/server/docs
+usr/share/pki/server/examples
\ No newline at end of file
=====================================
debian/dogtag-pki.docs
=====================================
@@ -1 +1,2 @@
debian/README.Debian
+usr/share/doc/pki/README
\ No newline at end of file
=====================================
debian/dogtag-pki.install deleted
=====================================
@@ -1 +0,0 @@
-usr/share/doc/pki/README
=====================================
debian/patches/fix-fontawesome-path.diff
=====================================
@@ -0,0 +1,17 @@
+Description: Fix fontawesome path
+ Debian installs fontawesome fonts in a different directory.
+Author: Jarl Gullberg <jarl.gullberg at visar-systems.com>
+Forwarded: not-needed
+Last-Update: 2026-09-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/base/CMakeLists.txt
++++ b/base/CMakeLists.txt
+@@ -861,6 +861,7 @@
+ PATHS
+ /usr/share/fonts/fontawesome/
+ /usr/share/fonts/fontawesome4/
++ /usr/share/fonts-font-awesome/fonts/
+ )
+
+ add_subdirectory(common)
=====================================
debian/patches/fix-javax-annotations.diff → debian/patches/fix-jakarta-annotation-jars.diff
=====================================
@@ -1,10 +1,17 @@
+Description: Fix name of Jakarta annotation jar
+ On Debian, the Jakarta annotation jar has a dash, not a dot.
+Author: Jarl Gullberg <jarl.gullberg at visar-systems.com>
+Forwarded: no
+Last-Update: 2026-09-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
-@@ -330,6 +330,7 @@ else()
+@@ -606,6 +606,7 @@
+ find_file(JAKARTA_ANNOTATION_API_JAR
NAMES
jakarta.annotation-api.jar
++ jakarta-annotation-api.jar
jboss-annotations-api_1.2_spec.jar
-+ geronimo-annotation-1.3-spec.jar
PATHS
/usr/share/java/jakarta-annotations
- /usr/share/java/jboss-annotations-1.2-api
=====================================
debian/patches/fix-runuser-path.diff deleted
=====================================
@@ -1,33 +0,0 @@
---- a/base/server/python/pki/server/__init__.py
-+++ b/base/server/python/pki/server/__init__.py
-@@ -630,7 +630,7 @@ grant codeBase "file:%s" {
-
- # switch to systemd user if different from current user
- if current_user != self.user:
-- prefix.extend(['/usr/sbin/runuser', '-u', self.user, '--'])
-+ prefix.extend(['/sbin/runuser', '-u', self.user, '--'])
-
- java_home = self.config.get('JAVA_HOME')
- java_opts = self.config.get('JAVA_OPTS')
---- a/base/server/python/pki/server/instance.py
-+++ b/base/server/python/pki/server/instance.py
-@@ -205,7 +205,7 @@ class PKIInstance(pki.server.PKIServer):
-
- # switch to systemd user if different from current user
- if current_user != self.user:
-- prefix.extend(['/usr/sbin/runuser', '-u', self.user, '--'])
-+ prefix.extend(['/sbin/runuser', '-u', self.user, '--'])
-
- if not skip_upgrade:
- # run pki-server upgrade <instance>
---- a/base/server/python/pki/server/subsystem.py
-+++ b/base/server/python/pki/server/subsystem.py
-@@ -2492,7 +2492,7 @@ class PKISubsystem(object):
- # switch to systemd user if different from current user
- username = pwd.getpwuid(os.getuid()).pw_name
- if username != self.instance.user:
-- cmd.extend(['/usr/sbin/runuser', '-u', self.instance.user, '--'])
-+ cmd.extend(['/sbin/runuser', '-u', self.instance.user, '--'])
-
- cmd.extend([java_home + '/bin/java'])
-
=====================================
debian/patches/series
=====================================
@@ -11,7 +11,7 @@ create-target-wants.diff
fix-tomcat-paths.diff
fix-tomcat-jars.diff
fix-healthcheck-install.diff
-fix-runuser-path.diff
force-request-timeout-default.diff
-fix-javax-annotations.diff
+fix-jakarta-annotation-jars.diff
fix-python-dist-packages.diff
+fix-fontawesome-path.diff
View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/compare/3e4d14d7ac02c492121ab46a87247cd7b182a0d0...6cbd6d462e8e9e18197f87906d0e5ab76a1c6d52
--
View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/compare/3e4d14d7ac02c492121ab46a87247cd7b182a0d0...6cbd6d462e8e9e18197f87906d0e5ab76a1c6d52
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/380e1a87/attachment-0001.htm>
More information about the Pkg-freeipa-devel
mailing list