debian/changelog

+dogtag-pki (10.6.6-2) unstable; urgency=medium
+
+  * hardcode-tomcat-version.diff: Our tomcat doesn't have a script to
+    query the version, so hardcode it here so that 'pki-server migrate'
+    works.
+  * run-pki-server-migrate-on-start.diff: Run 'pki-server migrate' on
+    startup to match what the systemd service does.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 27 Aug 2018 20:30:44 +0300
+
 dogtag-pki (10.6.6-1) unstable; urgency=medium
 
   * New upstream release.

debian/patches/hardcode-tomcat-version.diff

+--- a/base/server/python/pki/server/__init__.py
++++ b/base/server/python/pki/server/__init__.py
+@@ -1067,7 +1067,7 @@ class Tomcat(object):
+     def get_version(cls):
+ 
+         # run "tomcat version"
+-        output = subprocess.check_output(['/usr/sbin/tomcat', 'version'])
++        output = 'Server version: Apache Tomcat/8.5.32'
+         output = output.decode('utf-8')
+ 
+         # find "Server version: Apache Tomcat/<version>"

debian/patches/run-pki-server-migrate-on-start.diff

+--- a/base/server/scripts/operations
++++ b/base/server/scripts/operations
+@@ -1078,6 +1078,8 @@ verify_symlinks()
+ 
+ start_deb_instance()
+ {
++    /usr/sbin/pki-server migrate --instance pki-tomcat
++
+     if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \
+         --user $TOMCAT_USER --exec "$JAVA_HOME/bin/java" \
+         >/dev/null; then

debian/patches/series

 # upstreamed
+run-pki-server-migrate-on-start.diff
 
 # not upstreamable
 dont-install-deleted-files.diff
@@ -12,3 +13,4 @@ use-bash.diff
 create-target-wants.diff
 #use-resteasy-legacy.diff
 fix-tomcat-paths.diff
+hardcode-tomcat-version.diff