Your message dated Thu, 1 Jun 2023 11:24:53 +0200
with message-id <bdcbc37d-f21f-0ed1-f200-c47f121a9...@debian.org>
and subject line Re: Bug#1036892: unblock: tomcat9/9.0.70-2
has caused the Debian Bug report #1036892,
regarding unblock: tomcat9/9.0.70-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
1036892: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1036892
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: a...@debian.org

Please unblock package tomcat9

[ Reason ]

We can support only one major Tomcat version per release. I have
dropped all server packages and kept only the libtomcat9-java binary
package for compatibility reasons. It does not require security
support. Please see #1034824 for the full discussion.

[ Impact ]

We would have to support two major Tomcat versions in Bookworm.

[ Tests ]

I have successfully rebuilt all reverse-dependencies of
libtomcat9-java. There is currently no package in testing that
build-depends or depends on other binary packages from src:tomcat9.

[ Risks ]

None, if the test results are correct.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing


unblock tomcat9/9.0.70-2
diff -Nru tomcat9-9.0.70/debian/changelog tomcat9-9.0.70/debian/changelog
--- tomcat9-9.0.70/debian/changelog     2022-12-05 18:50:40.000000000 +0100
+++ tomcat9-9.0.70/debian/changelog     2023-05-27 17:51:32.000000000 +0200
@@ -1,3 +1,13 @@
+tomcat9 (9.0.70-2) unstable; urgency=medium
+
+  * Team upload.
+  * Drop tomcat9 server packages because only one Tomcat version is supported
+    per release. Only retain libtomcat9-java because of compatibility reasons
+    for now. Users are strongly encouraged to switch to Tomcat 10 instead.
+    (Closes: #1034824)
+
+ -- Markus Koschany <a...@debian.org>  Sat, 27 May 2023 17:51:32 +0200
+
 tomcat9 (9.0.70-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru tomcat9-9.0.70/debian/control tomcat9-9.0.70/debian/control
--- tomcat9-9.0.70/debian/control       2022-12-05 16:29:55.000000000 +0100
+++ tomcat9-9.0.70/debian/control       2023-05-27 17:51:32.000000000 +0200
@@ -29,67 +29,6 @@
 Vcs-Browser: https://salsa.debian.org/java-team/tomcat9
 Homepage: http://tomcat.apache.org
 
-Package: tomcat9-common
-Architecture: all
-Depends:
- default-jre-headless | java11-runtime-headless | java11-runtime,
- libtomcat9-java (>= ${source:Version}),
- ${misc:Depends}
-Description: Apache Tomcat 9 - Servlet and JSP engine -- common files
- Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
- specifications from Oracle, and provides a "pure Java" HTTP web
- server environment for Java code to run.
- .
- This package contains common files needed by the tomcat9 and tomcat9-user
- packages (Tomcat 9 scripts and libraries).
-
-Package: tomcat9
-Architecture: all
-Depends:
- lsb-base (>= 3.0-6),
- systemd (>= 238) | systemd-sysusers,
- systemd (>= 238) | systemd-tmpfiles,
- tomcat9-common (>= ${source:Version}),
- ucf,
- ${misc:Depends}
-Recommends:
- libtcnative-1 (>= 1.2.18)
-Suggests:
- tomcat9-admin (>= ${source:Version}),
- tomcat9-docs (>= ${source:Version}),
- tomcat9-examples (>= ${source:Version}),
- tomcat9-user (>= ${source:Version})
-Description: Apache Tomcat 9 - Servlet and JSP engine
- Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
- specifications from Oracle, and provides a "pure Java" HTTP web
- server environment for Java code to run.
- .
- This package contains only the startup scripts for the system-wide daemon.
- No documentation or web applications are included here, please install
- the tomcat9-docs and tomcat9-examples packages if you want them.
- Install tomcat9-user instead of this package if you don't want Tomcat to
- start as a service.
-
-Package: tomcat9-user
-Architecture: all
-Depends:
- netcat-openbsd,
- tomcat9-common (>= ${source:Version}),
- ${misc:Depends}
-Suggests:
- tomcat9 (>= ${source:Version}),
- tomcat9-admin (>= ${source:Version}),
- tomcat9-docs (>= ${source:Version}),
- tomcat9-examples (>= ${source:Version})
-Description: Apache Tomcat 9 - Servlet and JSP engine -- tools to create user 
instances
- Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
- specifications from Oracle, and provides a "pure Java" HTTP web
- server environment for Java code to run.
- .
- This package contains files needed to create a user Tomcat instance.
- This user Tomcat instance can be started and stopped using the scripts
- provided in the Tomcat instance directory.
-
 Package: libtomcat9-java
 Architecture: all
 Depends: libeclipse-jdt-core-java (>= 3.26.0), ${misc:Depends}
@@ -102,48 +41,4 @@
  This package contains the Tomcat core classes which can be used by other
  Java applications to embed Tomcat.
 
-Package: libtomcat9-embed-java
-Architecture: all
-Depends: libeclipse-jdt-core-java (>= 3.26.0), ${misc:Depends}
-Description: Apache Tomcat 9 - Servlet and JSP engine -- embed libraries
- Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
- specifications from Oracle, and provides a "pure Java" HTTP web
- server environment for Java code to run.
- .
- This package contains the libraries required to embed Tomcat into Java
- applications.
-
-Package: tomcat9-admin
-Architecture: all
-Depends: tomcat9-common (>= ${source:Version}), ${misc:Depends}
-Description: Apache Tomcat 9 - Servlet and JSP engine -- admin web applications
- Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
- specifications from Oracle, and provides a "pure Java" HTTP web
- server environment for Java code to run.
- .
- This package contains the administrative web interfaces.
-
-Package: tomcat9-examples
-Architecture: all
-Depends:
- libtaglibs-standard-impl-java,
- libtaglibs-standard-spec-java,
- tomcat9-common (>= ${source:Version}),
- ${misc:Depends}
-Description: Apache Tomcat 9 - Servlet and JSP engine -- example web 
applications
- Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
- specifications from Oracle, and provides a "pure Java" HTTP web
- server environment for Java code to run.
- .
- This package contains the default Tomcat example webapps.
 
-Package: tomcat9-docs
-Section: doc
-Architecture: all
-Depends: tomcat9-common (>= ${source:Version}), ${misc:Depends}
-Description: Apache Tomcat 9 - Servlet and JSP engine -- documentation
- Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
- specifications from Oracle, and provides a "pure Java" HTTP web
- server environment for Java code to run.
- .
- This package contains the online documentation web application.
diff -Nru tomcat9-9.0.70/debian/libtomcat9-embed-java.manifest 
tomcat9-9.0.70/debian/libtomcat9-embed-java.manifest
--- tomcat9-9.0.70/debian/libtomcat9-embed-java.manifest        2022-12-05 
16:29:55.000000000 +0100
+++ tomcat9-9.0.70/debian/libtomcat9-embed-java.manifest        1970-01-01 
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/share/java/tomcat9-embed-jasper.jar:
- Class-Path: eclipse-jdt-core.jar
diff -Nru tomcat9-9.0.70/debian/libtomcat9-embed-java.poms 
tomcat9-9.0.70/debian/libtomcat9-embed-java.poms
--- tomcat9-9.0.70/debian/libtomcat9-embed-java.poms    2022-12-05 
16:29:55.000000000 +0100
+++ tomcat9-9.0.70/debian/libtomcat9-embed-java.poms    1970-01-01 
01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-debian/poms/tomcat-embed-core.pom         --java-lib 
--usj-name=tomcat9-embed-core         
--artifact=output/embed/tomcat-embed-core.jar
-debian/poms/tomcat-embed-el.pom           --java-lib 
--usj-name=tomcat9-embed-el           
--artifact=output/embed/tomcat-embed-el.jar
-debian/poms/tomcat-embed-jasper.pom       --java-lib 
--usj-name=tomcat9-embed-jasper       
--artifact=output/embed/tomcat-embed-jasper.jar
-debian/poms/tomcat-embed-websocket.pom    --java-lib 
--usj-name=tomcat9-embed-websocket    
--artifact=output/embed/tomcat-embed-websocket.jar
diff -Nru tomcat9-9.0.70/debian/logging.properties 
tomcat9-9.0.70/debian/logging.properties
--- tomcat9-9.0.70/debian/logging.properties    2022-12-05 16:29:55.000000000 
+0100
+++ tomcat9-9.0.70/debian/logging.properties    1970-01-01 01:00:00.000000000 
+0100
@@ -1,58 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-handlers = 1catalina.org.apache.juli.AsyncFileHandler, 
2localhost.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
-
-.handlers = 1catalina.org.apache.juli.AsyncFileHandler, 
java.util.logging.ConsoleHandler
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-1catalina.org.apache.juli.AsyncFileHandler.level = FINE
-1catalina.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
-1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.
-1catalina.org.apache.juli.AsyncFileHandler.maxDays = 90
-
-2localhost.org.apache.juli.AsyncFileHandler.level = FINE
-2localhost.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
-2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.
-2localhost.org.apache.juli.AsyncFileHandler.maxDays = 90
-
-java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = org.apache.juli.SystemdFormatter
-
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 
2localhost.org.apache.juli.AsyncFileHandler
-
-# For example, set the org.apache.catalina.util.LifecycleBase logger to log
-# each component that extends LifecycleBase changing state:
-#org.apache.catalina.util.LifecycleBase.level = FINE
-
-# To see debug messages in TldLocationsCache, uncomment the following line:
-#org.apache.jasper.compiler.TldLocationsCache.level = FINE
-
-# To see debug messages for HTTP/2 handling, uncomment the following line:
-#org.apache.coyote.http2.level = FINE
-
-# To see debug messages for WebSocket handling, uncomment the following line:
-#org.apache.tomcat.websocket.level = FINE
diff -Nru tomcat9-9.0.70/debian/logrotate.template 
tomcat9-9.0.70/debian/logrotate.template
--- tomcat9-9.0.70/debian/logrotate.template    2022-12-05 16:29:55.000000000 
+0100
+++ tomcat9-9.0.70/debian/logrotate.template    1970-01-01 01:00:00.000000000 
+0100
@@ -1,10 +0,0 @@
-/var/log/tomcat9/catalina.out {
-  copytruncate
-  weekly
-  rotate 52
-  compress
-  delaycompress
-  missingok
-  create 640 tomcat adm
-  su tomcat adm
-}
diff -Nru tomcat9-9.0.70/debian/rules tomcat9-9.0.70/debian/rules
--- tomcat9-9.0.70/debian/rules 2022-12-05 16:29:55.000000000 +0100
+++ tomcat9-9.0.70/debian/rules 2023-05-27 17:51:32.000000000 +0200
@@ -26,7 +26,3 @@
 override_dh_install-indep:
        dh_install -i --exclude=.bat --exclude=Thumbs.db
 
-       # update the checksum for the root webapp
-       unset rwmd5sum \
-               && rwmd5sum=`cat debian/default_root/index.html 
debian/default_root/META-INF/context.xml | md5sum - 2>/dev/null | cut -d " " 
-f1` \
-               && sed "s/\@ROOT_WEBAPP_MD5SUM\@/$$rwmd5sum/" 
debian/tomcat9.postrm.in > debian/tomcat9.postrm
diff -Nru tomcat9-9.0.70/debian/tomcat9-admin.install 
tomcat9-9.0.70/debian/tomcat9-admin.install
--- tomcat9-9.0.70/debian/tomcat9-admin.install 2022-12-05 16:29:55.000000000 
+0100
+++ tomcat9-9.0.70/debian/tomcat9-admin.install 1970-01-01 01:00:00.000000000 
+0100
@@ -1,4 +0,0 @@
-debian/context/manager.xml          /etc/tomcat9/Catalina/localhost/
-debian/context/host-manager.xml     /etc/tomcat9/Catalina/localhost/
-output/build/webapps/manager        /usr/share/tomcat9-admin/
-output/build/webapps/host-manager   /usr/share/tomcat9-admin/
diff -Nru tomcat9-9.0.70/debian/tomcat9-common.docs 
tomcat9-9.0.70/debian/tomcat9-common.docs
--- tomcat9-9.0.70/debian/tomcat9-common.docs   2022-12-05 16:29:55.000000000 
+0100
+++ tomcat9-9.0.70/debian/tomcat9-common.docs   1970-01-01 01:00:00.000000000 
+0100
@@ -1,2 +0,0 @@
-RELEASE-NOTES
-RUNNING.txt
diff -Nru tomcat9-9.0.70/debian/tomcat9-common.install 
tomcat9-9.0.70/debian/tomcat9-common.install
--- tomcat9-9.0.70/debian/tomcat9-common.install        2022-12-05 
16:29:55.000000000 +0100
+++ tomcat9-9.0.70/debian/tomcat9-common.install        1970-01-01 
01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-output/build/bin/bootstrap.jar /usr/share/tomcat9/bin/
-bin/*                          /usr/share/tomcat9/bin/
-
-debian/libexec/tomcat-locate-java.sh /usr/libexec/tomcat9/
diff -Nru tomcat9-9.0.70/debian/tomcat9-common.links 
tomcat9-9.0.70/debian/tomcat9-common.links
--- tomcat9-9.0.70/debian/tomcat9-common.links  2022-12-05 16:29:55.000000000 
+0100
+++ tomcat9-9.0.70/debian/tomcat9-common.links  1970-01-01 01:00:00.000000000 
+0100
@@ -1,26 +0,0 @@
-/usr/share/java/tomcat9-annotations-api.jar      
/usr/share/tomcat9/lib/annotations-api.jar
-/usr/share/java/tomcat9-api.jar                  
/usr/share/tomcat9/lib/tomcat-api.jar
-/usr/share/java/tomcat9-catalina.jar             
/usr/share/tomcat9/lib/catalina.jar
-/usr/share/java/tomcat9-catalina-ant.jar         
/usr/share/tomcat9/lib/catalina-ant.jar
-/usr/share/java/tomcat9-catalina-ha.jar          
/usr/share/tomcat9/lib/catalina-ha.jar
-/usr/share/java/tomcat9-coyote.jar               
/usr/share/tomcat9/lib/tomcat-coyote.jar
-/usr/share/java/tomcat9-dbcp.jar                 
/usr/share/tomcat9/lib/tomcat-dbcp.jar
-/usr/share/java/tomcat9-el-api.jar               
/usr/share/tomcat9/lib/el-api.jar
-/usr/share/java/tomcat9-i18n-es.jar              
/usr/share/tomcat9/lib/tomcat-i18n-es.jar
-/usr/share/java/tomcat9-i18n-fr.jar              
/usr/share/tomcat9/lib/tomcat-i18n-fr.jar
-/usr/share/java/tomcat9-i18n-ja.jar              
/usr/share/tomcat9/lib/tomcat-i18n-ja.jar
-/usr/share/java/tomcat9-i18n-ru.jar              
/usr/share/tomcat9/lib/tomcat-i18n-ru.jar
-/usr/share/java/tomcat9-jasper.jar               
/usr/share/tomcat9/lib/jasper.jar
-/usr/share/java/tomcat9-jasper-el.jar            
/usr/share/tomcat9/lib/jasper-el.jar
-/usr/share/java/tomcat9-jaspic-api.jar           
/usr/share/tomcat9/lib/jaspic-api.jar
-/usr/share/java/tomcat9-jdbc.jar                 
/usr/share/tomcat9/lib/tomcat-jdbc.jar
-/usr/share/java/tomcat9-jni.jar                  
/usr/share/tomcat9/lib/tomcat-jni.jar
-/usr/share/java/tomcat9-jsp-api.jar              
/usr/share/tomcat9/lib/jsp-api.jar
-/usr/share/java/tomcat9-juli.jar                 
/usr/share/tomcat9/bin/tomcat-juli.jar
-/usr/share/java/tomcat9-servlet-api.jar          
/usr/share/tomcat9/lib/servlet-api.jar
-/usr/share/java/tomcat9-storeconfig.jar          
/usr/share/tomcat9/lib/catalina-storeconfig.jar
-/usr/share/java/tomcat9-tribes.jar               
/usr/share/tomcat9/lib/catalina-tribes.jar
-/usr/share/java/tomcat9-util.jar                 
/usr/share/tomcat9/lib/tomcat-util.jar
-/usr/share/java/tomcat9-util-scan.jar            
/usr/share/tomcat9/lib/tomcat-util-scan.jar
-/usr/share/java/tomcat9-websocket.jar            
/usr/share/tomcat9/lib/tomcat-websocket.jar
-/usr/share/java/tomcat9-websocket-api.jar        
/usr/share/tomcat9/lib/websocket-api.jar
diff -Nru tomcat9-9.0.70/debian/tomcat9.cron.daily 
tomcat9-9.0.70/debian/tomcat9.cron.daily
--- tomcat9-9.0.70/debian/tomcat9.cron.daily    2022-12-05 16:29:55.000000000 
+0100
+++ tomcat9-9.0.70/debian/tomcat9.cron.daily    1970-01-01 01:00:00.000000000 
+0100
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-NAME=tomcat9
-DEFAULT=/etc/default/$NAME
-LOGEXT="log txt"
-
-# The following variables can be overwritten in $DEFAULT
-
-# Whether to compress logfiles older than today's
-LOGFILE_COMPRESS=1
-
-# Overwrite settings from default file
-if [ -f "$DEFAULT" ]; then
-       . "$DEFAULT"
-fi
-
-if [ -d /var/log/$NAME ]; then
-       for EXT in $LOGEXT; do
-               # Compress the log files
-               if [ $LOGFILE_COMPRESS = 1 ]; then
-                       find /var/log/$NAME/ -name \*.$EXT -daystart -mtime +0 
-print0 -maxdepth 1 \
-                               | xargs --no-run-if-empty -0 gzip -9
-                       EXT=$EXT.gz
-               fi
-       done
-fi
diff -Nru tomcat9-9.0.70/debian/tomcat9.dirs tomcat9-9.0.70/debian/tomcat9.dirs
--- tomcat9-9.0.70/debian/tomcat9.dirs  2022-12-05 16:29:55.000000000 +0100
+++ tomcat9-9.0.70/debian/tomcat9.dirs  1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-var/cache/tomcat9/
-var/lib/tomcat9/lib
-var/lib/tomcat9/webapps
-var/log/tomcat9/
-etc/tomcat9/Catalina
-etc/logrotate.d
diff -Nru tomcat9-9.0.70/debian/tomcat9-docs.doc-base 
tomcat9-9.0.70/debian/tomcat9-docs.doc-base
--- tomcat9-9.0.70/debian/tomcat9-docs.doc-base 2022-12-05 16:29:55.000000000 
+0100
+++ tomcat9-9.0.70/debian/tomcat9-docs.doc-base 1970-01-01 01:00:00.000000000 
+0100
@@ -1,10 +0,0 @@
-Document: tomcat9
-Title: Apache Tomcat 9.0 Documentation
-Author: Apache Software Foundation
-Abstract: Documentation bundle for Apache Tomcat 9.0 Servlet/JSP container.
-Section: System/Administration
-
-Format: HTML
-Index: /usr/share/doc/tomcat9-docs/docs/index.html
-Files: /usr/share/doc/tomcat9-docs/docs/*
-
diff -Nru tomcat9-9.0.70/debian/tomcat9-docs.install 
tomcat9-9.0.70/debian/tomcat9-docs.install
--- tomcat9-9.0.70/debian/tomcat9-docs.install  2022-12-05 16:29:55.000000000 
+0100
+++ tomcat9-9.0.70/debian/tomcat9-docs.install  1970-01-01 01:00:00.000000000 
+0100
@@ -1,2 +0,0 @@
-debian/context/docs.xml    /etc/tomcat9/Catalina/localhost/
-output/build/webapps/docs  /usr/share/tomcat9-docs/
diff -Nru tomcat9-9.0.70/debian/tomcat9-docs.links 
tomcat9-9.0.70/debian/tomcat9-docs.links
--- tomcat9-9.0.70/debian/tomcat9-docs.links    2022-12-05 16:29:55.000000000 
+0100
+++ tomcat9-9.0.70/debian/tomcat9-docs.links    1970-01-01 01:00:00.000000000 
+0100
@@ -1 +0,0 @@
-/usr/share/tomcat9-docs/docs /usr/share/doc/tomcat9-docs/docs
diff -Nru tomcat9-9.0.70/debian/tomcat9-docs.lintian-overrides 
tomcat9-9.0.70/debian/tomcat9-docs.lintian-overrides
--- tomcat9-9.0.70/debian/tomcat9-docs.lintian-overrides        2022-12-05 
16:29:55.000000000 +0100
+++ tomcat9-9.0.70/debian/tomcat9-docs.lintian-overrides        1970-01-01 
01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-# The documentation is packaged as a web application and is intended to be 
served
-# from Tomcat at http://localhost:8080/docs, not read directly from 
/usr/share/doc
-tomcat9-docs: package-contains-documentation-outside-usr-share-doc
-
-# 'docs' is the name of the web application shipped upstream
-tomcat9-docs: unusual-documentation-package-name
-
-# Web font used within a web application
-tomcat9-docs: font-outside-font-dir
diff -Nru tomcat9-9.0.70/debian/tomcat9-examples.install 
tomcat9-9.0.70/debian/tomcat9-examples.install
--- tomcat9-9.0.70/debian/tomcat9-examples.install      2022-12-05 
16:29:55.000000000 +0100
+++ tomcat9-9.0.70/debian/tomcat9-examples.install      1970-01-01 
01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-debian/policy/examples/*.policy /etc/tomcat9/policy.d/
-debian/context/examples.xml     /etc/tomcat9/Catalina/localhost/
-output/build/webapps/examples   /usr/share/tomcat9-examples/
diff -Nru tomcat9-9.0.70/debian/tomcat9-examples.links 
tomcat9-9.0.70/debian/tomcat9-examples.links
--- tomcat9-9.0.70/debian/tomcat9-examples.links        2022-12-05 
16:29:55.000000000 +0100
+++ tomcat9-9.0.70/debian/tomcat9-examples.links        1970-01-01 
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-/usr/share/java/taglibs-standard-spec.jar 
/usr/share/tomcat9-examples/examples/WEB-INF/lib/taglibs-standard-spec.jar
-/usr/share/java/taglibs-standard-impl.jar 
/usr/share/tomcat9-examples/examples/WEB-INF/lib/taglibs-standard-impl.jar
diff -Nru tomcat9-9.0.70/debian/tomcat9.install 
tomcat9-9.0.70/debian/tomcat9.install
--- tomcat9-9.0.70/debian/tomcat9.install       2022-12-05 16:29:55.000000000 
+0100
+++ tomcat9-9.0.70/debian/tomcat9.install       1970-01-01 01:00:00.000000000 
+0100
@@ -1,12 +0,0 @@
-debian/rsyslog/*           /etc/rsyslog.d/
-conf/catalina.properties   /usr/share/tomcat9/etc/
-debian/logging.properties  /usr/share/tomcat9/etc/
-conf/*.xml                 /usr/share/tomcat9/etc/
-debian/policy/*.policy     /etc/tomcat9/policy.d/
-debian/default_root        /usr/share/tomcat9-root/
-debian/default.template    /usr/share/tomcat9/
-debian/logrotate.template  /usr/share/tomcat9/
-debian/sysusers/*.conf     /usr/lib/sysusers.d/
-
-debian/libexec/tomcat-start.sh         /usr/libexec/tomcat9/
-debian/libexec/tomcat-update-policy.sh /usr/libexec/tomcat9/
diff -Nru tomcat9-9.0.70/debian/tomcat9-instance-create 
tomcat9-9.0.70/debian/tomcat9-instance-create
--- tomcat9-9.0.70/debian/tomcat9-instance-create       2022-12-05 
16:29:55.000000000 +0100
+++ tomcat9-9.0.70/debian/tomcat9-instance-create       1970-01-01 
01:00:00.000000000 +0100
@@ -1,139 +0,0 @@
-#!/bin/sh
-# Script to create a CATALINA_BASE directory for your own tomcat
-
-PROG=`basename $0`
-TARGET=""
-HPORT=8080
-CPORT=8005
-CWORD="SHUTDOWN"
-warned=0
-warnlowport=0
-
-usage() {
-  echo "Usage: $PROG [options] <directoryname>"
-  echo "  directoryname: name of the tomcat instance directory to create"
-  echo "Options:"
-  echo "  -h, --help       Display this help message"
-  echo "  -p httpport      HTTP port to be used by Tomcat (default is $HPORT)"
-  echo "  -c controlport   Server shutdown control port (default is $CPORT)"
-  echo "  -w magicword     Word to send to trigger shutdown (default is 
$CWORD)"
-}
-
-checkport() {
-  type=$1
-  port=$2
-  # Fail if port is non-numeric
-  num=`expr ${port} + 1 2> /dev/null`
-  if [ $? != 0 ] || [ $num -lt 2 ]; then
-    echo "Error: ${type} port '${port}' is not a valid TCP port number."
-    exit 1
-  fi
-
-  # Fail if port is above 65535
-  if [ ${port} -gt 65535 ]; then
-    echo "Error: ${type} port ${port} is above TCP port numbers (> 65535)."
-    exit 1
-  fi
-
-  # Warn if port is below 1024 (once)
-  if [ ${warnlowport} -eq 0 ]; then 
-    if [ ${port} -lt 1024 ]; then
-      echo "Warning: ports below 1024 are reserved to the super-user."
-      warnlowport=1
-      warned=1
-    fi
-  fi
-
-  # Warn if port appears to be in use
-  if nc localhost "${port}" -z > /dev/null; then
-       echo "Warning: ${type} port ${port} appears to be in use."
-       warned=1
-  fi
-}
-
-if [ "$#" -lt 1 ]; then
-  usage
-  exit 1
-fi
-if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
-  usage
-  exit 0
-fi
-
-
-
-while getopts ":p:c:w:h" options; do
-  case $options in
-    p ) HPORT=$OPTARG ;;
-    c ) CPORT=$OPTARG ;;
-    w ) CWORD=$OPTARG ;;
-    h ) usage;;
-    * ) echo "Error: Unknown parameter '$OPTARG'."
-        exit 1;;
-  esac
-done
-
-shift $(($OPTIND - 1))
-TARGET=$1
-shift
-echo "You are about to create a Tomcat instance in directory '$TARGET'"
-
-# Fail if no target specified
-if [ -z "${TARGET}" ]; then
-  echo "Error: No target directory specified (use -d)."
-  exit 1
-fi
-
-# Fail if ports are the same
-if [ "${HPORT}" = "${CPORT}" ]; then
-  echo "Error: HTTP port and control port must be different."
-  exit 1
-fi
-
-# Fail if target directory already exists
-if [ -d "${TARGET}" ]; then
-  echo "Error: Target directory already exists."
-  exit 1
-fi
-
-# Check ports
-checkport HTTP "${HPORT}"
-checkport Control "${CPORT}"
-
-# Ask for confirmation if warnings were printed out
-if [ ${warned} -eq 1 ]; then 
-  echo "Type <ENTER> to continue, <CTRL-C> to abort."
-  read answer
-fi
-
-mkdir -p "${TARGET}"
-
-FULLTARGET=`cd "${TARGET}" > /dev/null && pwd`
-
-mkdir "${TARGET}/conf"
-mkdir "${TARGET}/logs"
-mkdir "${TARGET}/webapps"
-mkdir "${TARGET}/work"
-mkdir "${TARGET}/temp"
-cp -r /usr/share/tomcat9/skel/* "${TARGET}"
-
-sed -i -e "s/Connector port=\"8080\"/Connector port=\"${HPORT}\"/;s/Server 
port=\"-1\" shutdown=\"SHUTDOWN\"/Server port=\"${CPORT}\" 
shutdown=\"${CWORD}\"/" "${TARGET}/conf/server.xml"
-
-cat > "${TARGET}/bin/startup.sh" << EOT
-#!/bin/sh
-export CATALINA_BASE="${FULLTARGET}"
-/usr/share/tomcat9/bin/startup.sh
-echo "Tomcat started"
-EOT
-
-cat > "${TARGET}/bin/shutdown.sh" << EOT
-#!/bin/sh
-export CATALINA_BASE="${FULLTARGET}"
-/usr/share/tomcat9/bin/shutdown.sh
-echo "Tomcat stopped"
-EOT
-
-chmod a+x "${TARGET}/bin/startup.sh" "${TARGET}/bin/shutdown.sh"
-echo "* New Tomcat instance created in ${TARGET}"
-echo "* You might want to edit default configuration in ${TARGET}/conf"
-echo "* Run ${TARGET}/bin/startup.sh to start your Tomcat instance"
diff -Nru tomcat9-9.0.70/debian/tomcat9-instance-create.1 
tomcat9-9.0.70/debian/tomcat9-instance-create.1
--- tomcat9-9.0.70/debian/tomcat9-instance-create.1     2022-12-05 
16:29:55.000000000 +0100
+++ tomcat9-9.0.70/debian/tomcat9-instance-create.1     1970-01-01 
01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-.TH "TOMCAT9-INSTANCE-CREATE" "2" "Feb 2010" "" ""
-.SH "NAME"
-tomcat9\-instance\-create \- creates a Tomcat 9 instance
-.SH "SYNOPSIS"
-.B tomcat9\-instance\-create [\fIOPTIONS\fR] \fIDIRECTORYNAME\fR
-.SH "DESCRIPTION"
-The
-.B tomcat9\-instance\-create
-script creates a directory with all required Tomcat 9 CATALINA_BASE elements 
so that a separate Tomcat 9 instance with its own configuration, libraries or 
web applications can be run by a user. bin/startup.sh and bin/shutdown.sh 
scripts are also generated to allow the instance to be started and stopped.
-.TP 
-.B DIRECTORYNAME
-The name of the directory where the instance will be created. It should not 
exist and will be created automatically.
-.SH "OPTIONS"
-.TP 
-.B \-p HTTPPORT
-The TCP port to use for the default HTTP connector in the instance. The 
default port is 8080.
-.TP 
-.B \-c CONTROLPORT
-The TCP port to use for Tomcat shutdown control port. The default port is 8005.
-.TP 
-.B \-w MAGICWORD
-The magic word that sent to the control port will trigger the shutdown of the 
Tomcat instance. The default word is SHUTDOWN.
-.SH "AUTHOR"
-This man page was written by Thierry Carrez <thierry.car...@ubuntu.com> and is 
copyright (C) 2008 Canonical Ltd.
diff -Nru tomcat9-9.0.70/debian/tomcat9.links 
tomcat9-9.0.70/debian/tomcat9.links
--- tomcat9-9.0.70/debian/tomcat9.links 2022-12-05 16:29:55.000000000 +0100
+++ tomcat9-9.0.70/debian/tomcat9.links 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-/etc/tomcat9                                /var/lib/tomcat9/conf
-/var/cache/tomcat9                          /var/lib/tomcat9/work
-/var/log/tomcat9                            /var/lib/tomcat9/logs
-/usr/share/doc/tomcat9-common/README.Debian 
/usr/share/doc/tomcat9/README.Debian
diff -Nru tomcat9-9.0.70/debian/tomcat9.postinst 
tomcat9-9.0.70/debian/tomcat9.postinst
--- tomcat9-9.0.70/debian/tomcat9.postinst      2022-12-05 16:29:55.000000000 
+0100
+++ tomcat9-9.0.70/debian/tomcat9.postinst      1970-01-01 01:00:00.000000000 
+0100
@@ -1,78 +0,0 @@
-#!/bin/sh
-#
-# Post installation script for Tomcat
-#
-
-set -e
-
-TOMCAT_USER="tomcat"
-TOMCAT_GROUP="tomcat"
-
-CONFFILES="tomcat-users.xml web.xml server.xml logging.properties context.xml 
catalina.properties jaspic-providers.xml"
-
-case "$1" in
-    configure)
-       # Create the tomcat user as defined in /usr/lib/sysusers.d/tomcat9.conf
-       systemd-sysusers
-
-       # Install the configuration files
-       for conffile in $CONFFILES;
-       do
-               ucf --debconf-ok --three-way /usr/share/tomcat9/etc/$conffile 
/etc/tomcat9/$conffile
-
-               # Configuration files should not be modifiable by the tomcat 
user, as this can be
-               # a security issue (an attacker may insert code in a webapp and 
rewrite the tomcat
-               # configuration) but those files should be readable by tomcat, 
so we set the group
-               # to tomcat.
-               if [ -f "/etc/tomcat9/$conffile" ]; then
-                       chown root:$TOMCAT_GROUP /etc/tomcat9/$conffile
-                       chmod 640 /etc/tomcat9/$conffile
-               fi
-       done
-
-       # Install /etc/logrotate.d/tomcat9
-       ucf --debconf-ok --three-way /usr/share/tomcat9/logrotate.template 
/etc/logrotate.d/tomcat9
-
-       # Install /etc/default/tomcat9
-       ucf --debconf-ok --three-way /usr/share/tomcat9/default.template 
/etc/default/tomcat9
-
-       # Install the policy files for the security manager. These files should 
not be modifiable
-       # by the tomcat user. Only diverge from default permissions for known 
Debian files.
-       chown root:$TOMCAT_GROUP /etc/tomcat9/policy.d
-       for policyfile in 01system.policy 02debian.policy 03catalina.policy 
04webapps.policy 50local.policy;
-       do
-               if [ -f "/etc/tomcat9/policy.d/$policyfile" ]; then
-                       chown root:$TOMCAT_GROUP 
/etc/tomcat9/policy.d/$policyfile
-                       chmod 640 /etc/tomcat9/policy.d/$policyfile
-               fi
-       done
-
-       # Grant the tomcat group read/write access to /var/lib/tomcat9/lib. 
This allows
-       # a non-root administrator in the tomcat group to add jar files to the 
classpath
-       # (for example database drivers).
-       chown -Rh $TOMCAT_USER:$TOMCAT_GROUP /var/lib/tomcat9/lib
-
-       # Grant the tomcat group read/write access to the /etc/tomcat9/Catalina 
directory
-       # to write the hosts/contexts configuration files.
-       chown -Rh root:$TOMCAT_GROUP /etc/tomcat9/Catalina
-       chmod 775 /etc/tomcat9/Catalina
-
-       # Grant read/write access to tomcat to the webapps directory (needed 
for extracting
-       # war files and for deploying webapps by non-root administrators in the 
tomcat group).
-       chown -Rh $TOMCAT_USER:$TOMCAT_GROUP /var/lib/tomcat9/webapps
-       chmod 775 /var/lib/tomcat9/webapps
-
-       # Grant read/write access to tomcat to the log and cache directories
-       chown -Rh $TOMCAT_USER:adm /var/log/tomcat9/
-       chmod 2770 /var/log/tomcat9/
-       chown -Rh $TOMCAT_USER:$TOMCAT_GROUP /var/cache/tomcat9/
-       chmod 750 /var/cache/tomcat9/
-    ;;
-esac
-
-# Install the default root webapp if there isn't one already
-if [ ! -d /var/lib/tomcat9/webapps/ROOT ]; then
-    cp -r /usr/share/tomcat9-root/default_root /var/lib/tomcat9/webapps/ROOT
-fi
-
-#DEBHELPER#
diff -Nru tomcat9-9.0.70/debian/tomcat9.postrm.in 
tomcat9-9.0.70/debian/tomcat9.postrm.in
--- tomcat9-9.0.70/debian/tomcat9.postrm.in     2022-12-05 16:29:55.000000000 
+0100
+++ tomcat9-9.0.70/debian/tomcat9.postrm.in     1970-01-01 01:00:00.000000000 
+0100
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# Post removal script for Tomcat
-#
-
-set -e
-
-#DEBHELPER#
-
-CONFFILES="tomcat-users.xml web.xml server.xml logging.properties context.xml 
catalina.properties jaspic-providers.xml"
-
-case "$1" in
-    remove)
-        # Remove the ROOT webapp if not modified
-        RWLOC="/var/lib/tomcat9/webapps/ROOT"
-        RWFILES="$RWLOC/index.html $RWLOC/META-INF/context.xml"
-        if [ "`(cat $RWFILES | md5sum -) 2>/dev/null | cut -d ' ' -f 1`" \
-                            = "@ROOT_WEBAPP_MD5SUM@" ] ; then
-            rm $RWFILES
-            rmdir --ignore-fail-on-non-empty \
-                /var/lib/tomcat9/webapps/ROOT/META-INF \
-                /var/lib/tomcat9/webapps/ROOT \
-                /var/lib/tomcat9/webapps \
-                /var/lib/tomcat9 || true
-        fi
-
-        # Remove CATALINA_BASE/lib if not empty
-        if [ -d /var/lib/tomcat9/lib ] && [ -z "`(find 
var/lib/tomcat9/lib/classes -type f)`" ] ; then
-            rmdir --ignore-fail-on-non-empty \
-                /var/lib/tomcat9/lib/classes \
-                /var/lib/tomcat9/lib || true
-        fi
-
-        # Remove the cache files (compiled JSP files)
-        if [ -d "/var/cache/tomcat9" ] ; then
-            rm -rf /var/cache/tomcat9
-        fi
-
-        # Remove the auto-generated catalina.policy file
-        if [ -d "/var/lib/tomcat9/policy" ] ; then
-            rm -rf /var/lib/tomcat9/policy
-        fi
-    ;;
-
-    purge)
-        # Ignore errors during purge
-        set +e
-
-        # Remove the configuration files
-        rm -rf /etc/logrotate.d/tomcat9
-        rm -rf /etc/default/tomcat9
-        for conffile in $CONFFILES;
-        do
-            rm -f /etc/tomcat9/$conffile
-        done
-
-        # Unregister the configuration files from ucf
-        if which ucf >/dev/null; then
-            ucf --purge /etc/logrotate.d/tomcat9
-            ucf --purge /etc/default/tomcat9
-            for conffile in $CONFFILES;
-            do
-                ucf --purge /etc/tomcat9/$conffile
-            done
-        fi
-
-        # Remove the log files
-        rm -rf /var/log/tomcat9
-
-        # Remove the temp directory
-        rm -rf /var/lib/tomcat9/temp
-
-        # Remove the CATALINA_BASE directory if empty
-        if [ -d "/var/lib/tomcat9" ] ; then
-            rmdir --ignore-fail-on-non-empty /var/lib/tomcat9
-        fi
-
-        # Remove the configuration directories
-        rmdir --ignore-fail-on-non-empty /etc/tomcat9/policy.d 
/etc/tomcat9/Catalina/* /etc/tomcat9/Catalina /etc/tomcat9
-
-        set -e
-    ;;
-
-    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-        # Nothing to do here
-    ;;
-
-    *)
-        echo "$0 called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
diff -Nru tomcat9-9.0.70/debian/tomcat9.service 
tomcat9-9.0.70/debian/tomcat9.service
--- tomcat9-9.0.70/debian/tomcat9.service       2022-12-05 16:29:55.000000000 
+0100
+++ tomcat9-9.0.70/debian/tomcat9.service       1970-01-01 01:00:00.000000000 
+0100
@@ -1,43 +0,0 @@
-#
-# Systemd unit file for Apache Tomcat
-#
-
-[Unit]
-Description=Apache Tomcat 9 Web Application Server
-Documentation=https://tomcat.apache.org/tomcat-9.0-doc/index.html
-After=network.target
-RequiresMountsFor=/var/log/tomcat9 /var/lib/tomcat9
-
-[Service]
-
-# Configuration
-Environment="CATALINA_HOME=/usr/share/tomcat9"
-Environment="CATALINA_BASE=/var/lib/tomcat9"
-Environment="CATALINA_TMPDIR=/tmp"
-Environment="JAVA_OPTS=-Djava.awt.headless=true"
-
-# Lifecycle
-Type=simple
-ExecStartPre=+/usr/libexec/tomcat9/tomcat-update-policy.sh
-ExecStart=/bin/sh /usr/libexec/tomcat9/tomcat-start.sh
-SuccessExitStatus=143
-Restart=on-abort
-
-# Logging
-SyslogIdentifier=tomcat9
-
-# Security
-User=tomcat
-Group=tomcat
-PrivateTmp=yes
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-NoNewPrivileges=true
-CacheDirectory=tomcat9
-CacheDirectoryMode=750
-ProtectSystem=strict
-ReadWritePaths=/etc/tomcat9/Catalina/
-ReadWritePaths=/var/lib/tomcat9/webapps/
-ReadWritePaths=/var/log/tomcat9/
-
-[Install]
-WantedBy=multi-user.target
diff -Nru tomcat9-9.0.70/debian/tomcat9.tmpfiles 
tomcat9-9.0.70/debian/tomcat9.tmpfiles
--- tomcat9-9.0.70/debian/tomcat9.tmpfiles      2022-12-05 16:29:55.000000000 
+0100
+++ tomcat9-9.0.70/debian/tomcat9.tmpfiles      1970-01-01 01:00:00.000000000 
+0100
@@ -1,6 +0,0 @@
-# Tomcat log directory permissions
-
-# See tmpfiles.d(5) for details
-
-# Type Path        Mode UID    GID  Age Argument
-d /var/log/tomcat9 2770 tomcat adm  -
diff -Nru tomcat9-9.0.70/debian/tomcat9-user.install 
tomcat9-9.0.70/debian/tomcat9-user.install
--- tomcat9-9.0.70/debian/tomcat9-user.install  2022-12-05 16:29:55.000000000 
+0100
+++ tomcat9-9.0.70/debian/tomcat9-user.install  1970-01-01 01:00:00.000000000 
+0100
@@ -1,6 +0,0 @@
-conf/*.xml                       /usr/share/tomcat9/skel/conf/
-conf/catalina.properties         /usr/share/tomcat9/skel/conf/
-conf/catalina.policy             /usr/share/tomcat9/skel/policy/
-debian/logging.properties        /usr/share/tomcat9/skel/conf/
-debian/setenv.sh                 /usr/share/tomcat9/skel/bin/
-debian/tomcat9-instance-create   /usr/bin/
diff -Nru tomcat9-9.0.70/debian/tomcat9-user.manpages 
tomcat9-9.0.70/debian/tomcat9-user.manpages
--- tomcat9-9.0.70/debian/tomcat9-user.manpages 2022-12-05 16:29:55.000000000 
+0100
+++ tomcat9-9.0.70/debian/tomcat9-user.manpages 1970-01-01 01:00:00.000000000 
+0100
@@ -1 +0,0 @@
-debian/tomcat9-instance-create.1

--- End Message ---
--- Begin Message ---
Hi,

On 28-05-2023 20:54, Markus Koschany wrote:
I have successfully rebuilt all reverse-dependencies of
libtomcat9-java. There is currently no package in testing that
build-depends or depends on other binary packages from src:tomcat9.

I did one additional check. I rebuild -2 with the timestamp of -1 in the changelog and confirmed with diffoscope that nothing weird pops up. There's a bit of noise, but it indeed looks OK.

unblock tomcat9/9.0.70-2

unblocked and aged. Thanks for taking care and bearing with us in search of an acceptable solution to most parties involved. And I've said it before, for the future, please plan and coordinate these kind of transitions *before* the transition freeze.

Paul

Attachment: OpenPGP_signature
Description: OpenPGP digital signature


--- End Message ---

Reply via email to