Merge ~ahasenack/ubuntu/+source/tomcat9:jammy-tomcat9-logging-fix into ubuntu/+source/tomcat9:ubuntu/jammy-devel

[Andreas Hasenack]

Apply the kinetic[1] fix

The linked bug[2] has the SRU template filled out including test cases.

Unfortunately git range-diff is not useful to compare this branch with the kinetic fix because this package suffers from the git empty directory problem and the rich history was not imported into launchpad upon the kinetic upload.

1. https://code.launchpad.net/~ahasenack/ubuntu/+source/tomcat9/+git/tomcat9/+merge/425340
2. https://bugs.launchpad.net/ubuntu/+source/tomcat9/+bug/1964881

[Robie Basak (racb)]

+1, including for SRU accept

review: Approve (ubuntu-sru)

[Andreas Hasenack (ahasenack)]

Thanks, jammy uploaded

$ dput ubuntu ../tomcat9_9.0.58-1ubuntu0.1_source.changes
Uploading tomcat9 using ftp to ubuntu (host: upload.ubuntu.com; directory: /ubuntu)
running check-debs: makes sure the upload contains a binary package
running supported-distribution: check whether the target distribution is currently supported (using distro-info)
{'allowed': ['release', 'proposed', 'backports', 'security'], 'known': ['release', 'proposed', 'updates', 'backports', 'security']}
running badauthor: Stop if uploading with root@ or ubuntu@ email adresses.
running gitubuntu: Warn if uploading without git-ubuntu Vcs-* entries.
running releasemismatch: Warn about mismatching suffixesg e.g. focal with a XX.YY not being 20.04
running gpg: check GnuPG signatures before the upload
running nobug: Stop if uploading without any bug reference.
running updatemaintainer: Stop if ubuntu changes are without ubuntu maintainer.
running placeholderbug: Stop if using common placeholder numbers as bug reference.
running checksum: verify checksums before uploading
running required-fields: check whether a field is present and non-empty in the changes file
running ppaforppaonly: Stop uploads to the archive with or to ppa without ~ppa suffix.
running suite-mismatch: check the target distribution for common errors
Uploading tomcat9_9.0.58-1ubuntu0.1.dsc
Uploading tomcat9_9.0.58-1ubuntu0.1.debian.tar.xz
Uploading tomcat9_9.0.58-1ubuntu0.1_source.buildinfo
Uploading tomcat9_9.0.58-1ubuntu0.1_source.changes

[Andreas Hasenack (ahasenack)]

This was accepted by the SRU team, marking as merged.

diff --git a/debian/changelog b/debian/changelog
index c80fe74..eb14427 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tomcat9 (9.0.58-1ubuntu0.1) jammy; urgency=medium
+
+  * Fix logging for unprivileged rsyslogd (LP: #1964881):
+    - d/logrotate.template: use syslog:adm for log rotation so that
+      rsyslog can write to the file
+    - d/rsyslog/tomcat9.conf: drop "fileOwner" as it cannot be set by an
+      unprivileged rsyslogd
+    - d/tomcat9.postinst: adjust ownership of catalina.out so that
+      rsyslogd can write to it. Also change the rotated log files for
+      consistency.
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 20 Jul 2022 16:05:45 -0300
+
 tomcat9 (9.0.58-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index d2e67d6..ac98f0d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: tomcat9
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders:
  tony mancill <[e-mail]>,
  Emmanuel Bourg <[e-mail]>
diff --git a/debian/logrotate.template b/debian/logrotate.template
index 1cf0315..3d76318 100644
--- a/debian/logrotate.template
+++ b/debian/logrotate.template
@@ -5,6 +5,6 @@
   compress
   delaycompress
   missingok
-  create 640 tomcat adm
-  su tomcat adm
+  create 640 syslog adm
+  su syslog adm
 }
diff --git a/debian/rsyslog/tomcat9.conf b/debian/rsyslog/tomcat9.conf
index f09f4f9..0ed099e 100644
--- a/debian/rsyslog/tomcat9.conf
+++ b/debian/rsyslog/tomcat9.conf
@@ -2,6 +2,6 @@
 $template TomcatFormat,"[%timegenerated:::date-year%-%timegenerated:::date-month%-%timegenerated:::date-day% %timegenerated:::date-hour%:%timegenerated:::date-minute%:%timegenerated:::date-second%] [%syslogseverity-text%]%msg%\n"
 
 :programname, startswith, "tomcat9" {
-  action(type="omfile" file="/var/log/tomcat9/catalina.out" Template="TomcatFormat" fileOwner="tomcat" fileCreateMode="0640")
+  action(type="omfile" file="/var/log/tomcat9/catalina.out" Template="TomcatFormat" fileCreateMode="0640")
   stop
 }
diff --git a/debian/tomcat9.postinst b/debian/tomcat9.postinst
index 7e4c9ba..2dad7e2 100644
--- a/debian/tomcat9.postinst
+++ b/debian/tomcat9.postinst
@@ -64,6 +64,9 @@ case "$1" in
 
 	# Grant read/write access to tomcat to the log and cache directories
 	chown -Rh $TOMCAT_USER:adm /var/log/tomcat9/
+	# catalina.out is written to by rsyslogd, which runs as the "syslog" user in Ubuntu
+	# also include rotated catalina.out files, usually with an extension of [0-9]+[.gz]
+	chown syslog:adm /var/log/tomcat9/catalina.out* 2>/dev/null || : # file might not exist yet
 	chmod 2770 /var/log/tomcat9/
 	chown -Rh $TOMCAT_USER:$TOMCAT_GROUP /var/cache/tomcat9/
 	chmod 750 /var/cache/tomcat9/