[Pkg-freeipa-devel] [Git][freeipa-team/dogtag-pki][master] 3 commits: control: Replace libsrvcore-dev build-dep with 389-ds-base-dev.

Timo Aaltonen gitlab at salsa.debian.org
Fri Dec 7 09:14:43 GMT 2018 

Timo Aaltonen pushed to branch master at FreeIPA packaging / dogtag-pki


Commits:
8f75537a by Timo Aaltonen at 2018-12-05T23:27:08Z
control: Replace libsrvcore-dev build-dep with 389-ds-base-dev.

- - - - -
22844cc8 by Timo Aaltonen at 2018-12-07T09:04:32Z
Migrate to tomcat9.

- - - - -
0d0e1d2a by Timo Aaltonen at 2018-12-07T09:14:06Z
releasing package dogtag-pki version 10.6.8-2

- - - - -


13 changed files:

- debian/changelog
- debian/control
- debian/patches/debian-support.diff
- + debian/patches/fix-tomcat-jars.diff
- debian/patches/fix-tomcat-paths.diff
- debian/patches/hardcode-tomcat-version.diff
- debian/patches/series
- debian/pki-ca.links
- debian/pki-kra.links
- debian/pki-ocsp.links
- debian/pki-server.pki-tomcatd.init
- debian/pki-tks.links
- debian/pki-tps.links


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+dogtag-pki (10.6.8-2) unstable; urgency=medium
+
+  * control: Replace libsrvcore-dev build-dep with 389-ds-base-dev.
+  * Migrate to tomcat9.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Fri, 07 Dec 2018 10:55:22 +0200
+
 dogtag-pki (10.6.8-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/control
=====================================
@@ -32,9 +32,8 @@ Build-Depends:
  libresteasy3.0-java (>= 3.0.19-5),
  libservlet3.1-java,
  libslf4j-java,
- libsvrcore-dev,
- libtomcat8-java,
- libtomcatjss-java (>= 7.3.6),
+ libtomcat9-java,
+ libtomcatjss-java (>= 7.3.6-2),
  libxalan2-java,
  libxerces2-java,
  pkg-config,
@@ -49,6 +48,7 @@ Build-Depends:
  python3-distutils,
  velocity,
  zlib1g-dev,
+ 389-ds-base-dev (>= 1.4.0.16-1),
 Standards-Version: 4.1.4
 Homepage: http://pki.fedoraproject.org
 Vcs-Git: https://salsa.debian.org/freeipa-team/dogtag-pki.git
@@ -188,7 +188,7 @@ Depends:
  libjs-jquery,
  libjs-underscore,
  libsymkey-java (= ${source:Version}),
- libtomcatjss-java (>= 7.3.6),
+ libtomcatjss-java (>= 7.3.6-2),
  libnuxwdog-java (>= 1.0.5),
  libxml-commons-external-java,
  libxml-commons-resolver1.1-java,
@@ -199,7 +199,7 @@ Depends:
  python-ldap,
  python-lxml,
  python-selinux,
- tomcat8-user,
+ tomcat9-user,
  velocity,
  ${java:Depends},
  ${misc:Depends},


=====================================
debian/patches/debian-support.diff
=====================================
@@ -30,7 +30,7 @@ Description: changes for Debian
  pki_cgroup_cpu_systemd_service=%(pki_cgroup_cpu_systemd_service_path)s/%(pki_systemd_service)s
  
 -CATALINA_HOME=/usr/share/tomcat
-+CATALINA_HOME=/usr/share/tomcat8
++CATALINA_HOME=/usr/share/tomcat9
  pki_tomcat_bin_path=%(CATALINA_HOME)s/bin
  pki_tomcat_lib_path=%(CATALINA_HOME)s/lib
  
@@ -96,6 +96,15 @@ Description: changes for Debian
          for root, _dirs, names in os.walk(deployment_root):
 --- a/base/server/scripts/operations
 +++ b/base/server/scripts/operations
+@@ -922,7 +922,7 @@ verify_symlinks()
+     # Dogtag 10 Conditional Variables
+     if $debian ; then
+         jni_jar_dir="/usr/share/java"
+-        tomcat_dir="/usr/share/tomcat8"
++        tomcat_dir="/usr/share/tomcat9"
+     else
+         jni_jar_dir="$JNI_JAR_DIR"
+         tomcat_dir="/usr/share/tomcat"
 @@ -1096,6 +1096,10 @@ start_deb_instance()
  
          catalina_sh start $SECURITY
@@ -107,6 +116,15 @@ Description: changes for Debian
  
          if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \
              --user $TOMCAT_USER --exec "$JAVA_HOME/bin/java" \
+@@ -1481,7 +1485,7 @@ catalina_sh() {
+ set_debian_tomcat_parameters()
+ {
+     set_java_home
+-    CATALINA_HOME=/usr/share/tomcat8
++    CATALINA_HOME=/usr/share/tomcat9
+     CATALINA_BASE=/var/lib/pki/${PKI_INSTANCE_NAME}
+     DESC="Tomcat instance for ${PKI_INSTANCE_NAME}"
+ 
 --- a/base/server/scripts/pkidaemon
 +++ b/base/server/scripts/pkidaemon
 @@ -31,7 +31,7 @@ command="$1"


=====================================
debian/patches/fix-tomcat-jars.diff
=====================================
@@ -0,0 +1,56 @@
+--- a/base/CMakeLists.txt
++++ b/base/CMakeLists.txt
+@@ -222,7 +222,7 @@ find_file(SYMKEY_JAR
+ find_file(JASPIC_API_JAR
+     NAMES
+         jaspic-api.jar
+-        tomcat8-jaspic-api.jar
++        tomcat9-jaspic-api.jar
+     PATHS
+         /usr/share/java/tomcat
+         /usr/share/java
+@@ -231,7 +231,7 @@ find_file(JASPIC_API_JAR
+ find_file(TOMCAT_API_JAR
+     NAMES
+         tomcat-api.jar
+-        tomcat8-api.jar
++        tomcat9-api.jar
+     PATHS
+         /usr/share/java/tomcat
+         /usr/share/java
+@@ -240,7 +240,7 @@ find_file(TOMCAT_API_JAR
+ find_file(TOMCAT_CATALINA_JAR
+     NAMES
+         catalina.jar
+-        tomcat8-catalina.jar
++        tomcat9-catalina.jar
+     PATHS
+         /usr/share/java/tomcat
+         /usr/share/java
+@@ -249,7 +249,7 @@ find_file(TOMCAT_CATALINA_JAR
+ find_file(TOMCAT_COYOTE_JAR
+     NAMES
+         tomcat-coyote.jar
+-        tomcat8-coyote.jar
++        tomcat9-coyote.jar
+     PATHS
+         /usr/share/java/tomcat
+         /usr/share/java
+@@ -258,7 +258,7 @@ find_file(TOMCAT_COYOTE_JAR
+ find_file(TOMCAT_UTIL_JAR
+     NAMES
+         tomcat-util.jar
+-        tomcat8-util.jar
++        tomcat9-util.jar
+     PATHS
+         /usr/share/java/tomcat
+         /usr/share/java
+@@ -267,7 +267,7 @@ find_file(TOMCAT_UTIL_JAR
+ find_file(TOMCAT_UTIL_SCAN_JAR
+     NAMES
+         tomcat-util-scan.jar
+-        tomcat8-util-scan.jar
++        tomcat9-util-scan.jar
+     PATHS
+         /usr/share/java/tomcat
+         /usr/share/java


=====================================
debian/patches/fix-tomcat-paths.diff
=====================================
@@ -25,13 +25,13 @@
              instance,
              'context.xml',
 -            '/usr/share/tomcat/conf/context.xml')
-+            '/usr/share/tomcat8/skel/conf/context.xml')
++            '/usr/share/tomcat9/skel/conf/context.xml')
  
          self.replace_with_link(
              instance,
              'web.xml',
 -            '/usr/share/tomcat/conf/web.xml')
-+            '/usr/share/tomcat8/skel/conf/web.xml')
++            '/usr/share/tomcat9/skel/conf/web.xml')
  
      def replace_with_link(self, instance, filename, target):
  
@@ -42,7 +42,7 @@
              os.remove(path)
  
 -        tomcat_dir = '/usr/share/tomcat/lib'
-+        tomcat_dir = '/usr/share/tomcat8/lib'
++        tomcat_dir = '/usr/share/tomcat9/lib'
  
          # create new links
          for filename in os.listdir(tomcat_dir):


=====================================
debian/patches/hardcode-tomcat-version.diff
=====================================
@@ -5,7 +5,7 @@
      def get_version(cls):
          # run "tomcat version"
 -        output = subprocess.check_output(['/usr/sbin/tomcat', 'version'])
-+        output = 'Server version: Apache Tomcat/8.5.32'
++        output = 'Server version: Apache Tomcat/9.0.x'
          output = output.decode('utf-8')
  
          # find "Server version: Apache Tomcat/<version>"


=====================================
debian/patches/series
=====================================
@@ -15,3 +15,4 @@ create-target-wants.diff
 fix-tomcat-paths.diff
 hardcode-tomcat-version.diff
 use-new-pkcs11-interface.diff
+fix-tomcat-jars.diff


=====================================
debian/pki-ca.links
=====================================
@@ -1 +1 @@
-/etc/tomcat8/policy.d	usr/share/pki/ca/conf/policy.d
+/etc/tomcat9/policy.d	usr/share/pki/ca/conf/policy.d


=====================================
debian/pki-kra.links
=====================================
@@ -1 +1 @@
-/etc/tomcat8/policy.d	usr/share/pki/kra/conf/policy.d
+/etc/tomcat9/policy.d	usr/share/pki/kra/conf/policy.d


=====================================
debian/pki-ocsp.links
=====================================
@@ -1 +1 @@
-/etc/tomcat8/policy.d	usr/share/pki/ocsp/conf/policy.d
+/etc/tomcat9/policy.d	usr/share/pki/ocsp/conf/policy.d


=====================================
debian/pki-server.pki-tomcatd.init
=====================================
@@ -27,7 +27,7 @@
 # All rights reserved.
 # --- END COPYRIGHT BLOCK ---
 #
-# pki-tomcatd    Startup script for pki-tomcat instances with tomcat8
+# pki-tomcatd    Startup script for pki-tomcat instances with tomcat9
 #
 # chkconfig:    - 81 19
 # description:  Dogtag Certificates Subsystems (Tomcat 8)


=====================================
debian/pki-tks.links
=====================================
@@ -1 +1 @@
-/etc/tomcat8/policy.d	usr/share/pki/tks/conf/policy.d
+/etc/tomcat9/policy.d	usr/share/pki/tks/conf/policy.d


=====================================
debian/pki-tps.links
=====================================
@@ -1 +1 @@
-/etc/tomcat8/policy.d	usr/share/pki/tps/conf/policy.d
+/etc/tomcat9/policy.d	usr/share/pki/tps/conf/policy.d



View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/compare/ab923e423c3c8f08f175662efcf7c42fbf43b62e...0d0e1d2aa4b25fbbc9766d18ae916496f98bbd63

-- 
View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/compare/ab923e423c3c8f08f175662efcf7c42fbf43b62e...0d0e1d2aa4b25fbbc9766d18ae916496f98bbd63
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20181207/49f124d6/attachment-0001.html>

More information about the Pkg-freeipa-devel mailing list