Ubuntu
tomcat9 package

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

  1. Git
  2. lp:~ahasenack/ubuntu/+source/tomcat9
  3. focal-tomcat9-logging-fix
  4. Merge into ubuntu/focal-devel
Proposed by Andreas Hasenack
Status: Merged
Merge reported by: Andreas Hasenack
Merged at revision: 2292a624945e40ee9340151052d2ee0c4e860bcb
Proposed branch: ~ahasenack/ubuntu/+source/tomcat9:focal-tomcat9-logging-fix
Merge into: ubuntu/+source/tomcat9:ubuntu/focal-devel
Diff against target: 58 lines (+19/-3)
4 files modified
debian/changelog (+12/-0)
debian/logrotate.template (+2/-1)
debian/tomcat9.postinst (+4/-1)
debian/tomcat9.tmpfile (+1/-1)
Reviewer Review Type Date Requested Status
Robie Basak ubuntu-sru Approve
Canonical Server Reporter Pending
Review via email: mp+427218@code.qastaging.launchpad.net

Description of the change

Apply the kinetic[1] fix, with a few changes due to the package being slightly different in focal.

a) The d/rsyslog/tomcat9.conf file is not trying to set an owner, so we don't have to remove that
b) The d/tomcat9.tmpfile was still using 02750 instead of 02770 for /var/log/tomcat9 (this was fun to troubleshoot: "what is setting /var/log/tomcat9 back to 02750 when I set it to 02770 in postinst??)
c) The d/logrotate.template file in focal wasn't using "su" yet, that's a bug fixed later in the debian packaging.

Here git range-diff can be used to compare with jammy, if you want, and if you have the jammy branch as well:

git range-diff pkg/ubuntu/focal-devel..focal-tomcat9-logging-fix pkg/ubuntu/jammy-devel..jammy-tomcat9-logging-fix

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

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

To post a comment you must log in.
Revision history for this message
Robie Basak (racb) wrote :

+1, including for SRU accept

review: Approve (ubuntu-sru)
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Focal uploaded

$ dput ubuntu ../tomcat9_9.0.31-1ubuntu0.3_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 placeholderbug: Stop if using common placeholder numbers as bug reference.
running suite-mismatch: check the target distribution for common errors
running gpg: check GnuPG signatures before the upload
running gitubuntu: Warn if uploading without git-ubuntu Vcs-* entries.
running badauthor: Stop if uploading with root@ or ubuntu@ email adresses.
running updatemaintainer: Stop if ubuntu changes are without ubuntu maintainer.
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 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 nobug: Stop if uploading without any bug reference.
running checksum: verify checksums before uploading
running releasemismatch: Warn about mismatching suffixesg e.g. focal with a XX.YY not being 20.04
Uploading tomcat9_9.0.31-1ubuntu0.3.dsc
Uploading tomcat9_9.0.31-1ubuntu0.3.debian.tar.xz
Uploading tomcat9_9.0.31-1ubuntu0.3_source.buildinfo
Uploading tomcat9_9.0.31-1ubuntu0.3_source.changes

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

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

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches