diff -pruN 9.0.70-1/debian/changelog 9.0.70-1ubuntu1/debian/changelog --- 9.0.70-1/debian/changelog 2022-12-05 17:50:40.000000000 +0000 +++ 9.0.70-1ubuntu1/debian/changelog 2022-12-22 18:00:21.000000000 +0000 @@ -1,3 +1,17 @@ +tomcat9 (9.0.70-1ubuntu1) lunar; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - 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 Thu, 22 Dec 2022 15:00:21 -0300 + tomcat9 (9.0.70-1) unstable; urgency=medium * New upstream release @@ -26,6 +40,20 @@ tomcat9 (9.0.67-1) unstable; urgency=med -- Emmanuel Bourg Tue, 27 Sep 2022 00:49:00 +0200 +tomcat9 (9.0.65-1ubuntu1) kinetic; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - 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 Mon, 15 Aug 2022 09:06:28 -0300 + tomcat9 (9.0.65-1) unstable; urgency=medium * Team upload. @@ -33,6 +61,19 @@ tomcat9 (9.0.65-1) unstable; urgency=med -- Markus Koschany Fri, 12 Aug 2022 12:56:06 +0200 +tomcat9 (9.0.64-2ubuntu1) kinetic; 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 Thu, 23 Jun 2022 18:02:52 -0300 + tomcat9 (9.0.64-2) unstable; urgency=medium * Fallback to the default log formatter when systemd isn't used diff -pruN 9.0.70-1/debian/control 9.0.70-1ubuntu1/debian/control --- 9.0.70-1/debian/control 2022-12-05 15:29:55.000000000 +0000 +++ 9.0.70-1ubuntu1/debian/control 2022-12-22 18:00:21.000000000 +0000 @@ -1,7 +1,8 @@ Source: tomcat9 Section: java Priority: optional -Maintainer: Debian Java Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: tony mancill , Emmanuel Bourg diff -pruN 9.0.70-1/debian/logrotate.template 9.0.70-1ubuntu1/debian/logrotate.template --- 9.0.70-1/debian/logrotate.template 2022-12-05 15:29:55.000000000 +0000 +++ 9.0.70-1ubuntu1/debian/logrotate.template 2022-12-22 17:59:53.000000000 +0000 @@ -5,6 +5,6 @@ compress delaycompress missingok - create 640 tomcat adm - su tomcat adm + create 640 syslog adm + su syslog adm } diff -pruN 9.0.70-1/debian/rsyslog/tomcat9.conf 9.0.70-1ubuntu1/debian/rsyslog/tomcat9.conf --- 9.0.70-1/debian/rsyslog/tomcat9.conf 2022-12-05 15:29:55.000000000 +0000 +++ 9.0.70-1ubuntu1/debian/rsyslog/tomcat9.conf 2022-12-22 17:59:53.000000000 +0000 @@ -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 -pruN 9.0.70-1/debian/tomcat9.postinst 9.0.70-1ubuntu1/debian/tomcat9.postinst --- 9.0.70-1/debian/tomcat9.postinst 2022-12-05 15:29:55.000000000 +0000 +++ 9.0.70-1ubuntu1/debian/tomcat9.postinst 2022-12-22 17:59:53.000000000 +0000 @@ -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/