debian/README.Debian

-Migrating from tomcat6 or tomcat7:
+Migrating from previous Tomcat packages
+---------------------------------------
 
   * Refer to the upstream migration guides for application compatibility
-    and configuration chages:
+    and configuration changes:
     - http://tomcat.apache.org/migration-7.html
     - http://tomcat.apache.org/migration-8.html
     - http://tomcat.apache.org/migration-85.html
@@ -10,29 +11,37 @@ Migrating from tomcat6 or tomcat7:
     You may need to recursively update your application directories to be
     owned by the tomcat8 user.
 
-Getting started:
+
+Getting started
+---------------
+
   * After installing the tomcat8 package, the server should be accessible
     at http://localhost:8080/
+
   * If you install tomcat8-admin, then you need to edit 
     /etc/tomcat8/tomcat-users.xml and add to it the following:
+
       <role rolename="manager"/>
       <user username="tomcat" password="s3cret" roles="manager"/>
+
     Tomcat administration will be accessible on
     http://localhost:8080/manager/html
+
   * Tomcat is not running under a Java security manager by default. If you
     expose your Tomcat instance to the internet, please consider editing
     your /etc/default/tomcat8 file and set TOMCAT8_SECURITY="yes", then
     adjust policy files in /etc/tomcat8/policy.d/ as explained in
-    http://tomcat.apache.org/tomcat-8.0-doc/security-manager-howto.html
+    http://tomcat.apache.org/tomcat-8.5-doc/security-manager-howto.html
+
   * To run more than one Tomcat instance on your server, install the package
     tomcat8-user and run the tomcat8-instance-create utility.
     You should remove the tomcat8 package if you don't want Tomcat to
     start as a daemon at boot time.
-  * If you configure your Tomcat to listen on one
-    or more privileged ports (such as port 80 or port 443), then you
-    may now enable authbind in your /etc/default/tomcat8 file.  The
-    authbind package can allow your Tomcat JVM user (a non-root user)
-    to listen on privileged ports.  Set AUTHBIND="yes" to enable it,
-    and then configure your Tomcat to listen on any port number you
-    wish.  See the "man authbind" for information on configuring
-    authbind.
+
+  * If you configure your Tomcat to listen on one or more privileged ports
+    (such as port 80 or port 443), then you may enable authbind in your
+    /etc/default/tomcat8 file. The authbind package can allow your Tomcat
+    JVM user (a non-root user) to listen on privileged ports. Set
+    AUTHBIND="yes" to enable it, and then configure your Tomcat to listen
+    on any port number you wish. See the "man authbind" for information on
+    configuring authbind.

debian/changelog

+tomcat8 (8.5.32-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Added the missing Maven rules to use the 8.x generic version for
+    tomcat-jaspic-api, tomcat-storeconfig and tomcat-util-scan
+  * No longer set JSSE_HOME in the init script (JSSE is enabled by default)
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 07 Aug 2018 15:15:03 +0200
+
 tomcat8 (8.5.32-1) unstable; urgency=medium
 
   * Team upload.

debian/maven.rules

@@ -21,12 +21,15 @@ org.apache.tomcat tomcat-i18n-fr * s/.*/8.x/
 org.apache.tomcat tomcat-i18n-ja * s/.*/8.x/
 org.apache.tomcat tomcat-jasper * s/.*/8.x/
 org.apache.tomcat tomcat-jasper-el * s/.*/8.x/
+org.apache.tomcat tomcat-jaspic-api * s/.*/8.x/
 org.apache.tomcat tomcat-jdbc * s/.*/8.x/
 org.apache.tomcat tomcat-jni * s/.*/8.x/
 org.apache.tomcat tomcat-jsp-api * s/.*/8.x/
 org.apache.tomcat tomcat-juli * s/.*/8.x/
 org.apache.tomcat tomcat-servlet-api * s/.*/8.x/
+org.apache.tomcat tomcat-storeconfig * s/.*/8.x/
 org.apache.tomcat tomcat-tribes * s/.*/8.x/
 org.apache.tomcat tomcat-util * s/.*/8.x/
+org.apache.tomcat tomcat-util-scan * s/.*/8.x/
 org.apache.tomcat tomcat-websocket * s/.*/8.x/
 org.apache.tomcat tomcat-websocket-api * s/.*/8.x/

debian/tomcat8.init

@@ -134,11 +134,6 @@ fi
 CATALINA_PID="/var/run/$NAME.pid"
 CATALINA_SH="$CATALINA_HOME/bin/catalina.sh"
 
-# Look for Java Secure Sockets Extension (JSSE) JARs
-if [ -z "${JSSE_HOME}" -a -r "${JAVA_HOME}/jre/lib/jsse.jar" ]; then
-    JSSE_HOME="${JAVA_HOME}/jre/"
-fi
-
 catalina_sh() {
 	# Escape any double quotes in the value of JAVA_OPTS
 	JAVA_OPTS="$(echo $JAVA_OPTS | sed 's/\"/\\\"/g')"
@@ -156,7 +151,7 @@ catalina_sh() {
 		JAVA_OPTS=\"$JAVA_OPTS\"; \
 		CATALINA_PID=\"$CATALINA_PID\"; \
 		CATALINA_TMPDIR=\"$CATALINA_TMPDIR\"; \
-		LANG=\"$LANG\"; JSSE_HOME=\"$JSSE_HOME\"; \
+		LANG=\"$LANG\"; \
 		cd \"$CATALINA_BASE\"; \
 		\"$CATALINA_SH\" $@"