Merge ~paelzer/ubuntu/+source/rsyslog:merge-8.2001.0-1-focal into ubuntu/+source/rsyslog:debian/sid

Proposed by Christian Ehrhardt
Status: Merged
Approved by: Christian Ehrhardt
Approved revision: 30fbe053ca09f671c80d27a9ded55512cd5aab4b
Merge reported by: Christian Ehrhardt
Merged at revision: 30fbe053ca09f671c80d27a9ded55512cd5aab4b
Proposed branch: ~paelzer/ubuntu/+source/rsyslog:merge-8.2001.0-1-focal
Merge into: ubuntu/+source/rsyslog:debian/sid
Diff against target: 1546 lines (+1207/-48)
14 files modified
debian/00rsyslog.conf (+12/-0)
debian/50-default.conf (+48/-0)
debian/changelog (+987/-0)
debian/clean (+6/-0)
debian/control (+7/-3)
debian/dmesg.service (+12/-0)
debian/rsyslog.conf (+10/-43)
debian/rsyslog.dirs (+4/-0)
debian/rsyslog.install (+4/-1)
debian/rsyslog.postinst (+22/-0)
debian/rsyslog.postrm (+13/-0)
debian/rsyslog.preinst (+15/-0)
debian/rules (+8/-1)
debian/usr.sbin.rsyslogd (+59/-0)
Reviewer Review Type Date Requested Status
Lucas Kanashiro (community) Approve
Canonical Server packageset reviewers Pending
git-ubuntu developers Pending
Review via email: mp+378910@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt (paelzer) wrote :

Tags pushed to help review
To ssh://git.launchpad.net/~paelzer/ubuntu/+source/rsyslog
 * [new tag] lp1862762/logical/8.1901.0-1ubuntu4 -> lp1862762/logical/8.1901.0-1ubuntu4
 * [new tag] lp1862762/new/debian -> lp1862762/new/debian
 * [new tag] lp1862762/old/debian -> lp1862762/old/debian
 * [new tag] lp1862762/old/ubuntu -> lp1862762/old/ubuntu
 * [new tag] lp1862762/reconstruct/8.1901.0-1ubuntu4 -> lp1862762/reconstruct/8.1901.0-1ubuntu4
 * [new tag] lp1862762/split/8.1901.0-1ubuntu4 -> lp1862762/split/8.1901.0-1ubuntu4

Thoughts on Debian changes:
- systemd rsyslogd invocation already ignroed
  /etc/default/rsyslog, so it is no loss to properly drop it.
- rsyslog-openssl is a suggest and libssl1.1 is in main
- contains two (prio low) CVEs
- gets rsyslogd (tests) to properly work with python3

I only dropped the obvious drops, and kjept the rest as-is.
This also fixes rsyslog being an FTFBS at the moment.

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3923
Ticket: https://bileto.ubuntu.com/#/ticket/3923

Tests started there just now

Revision history for this message
Simon Déziel (sdeziel) wrote :

Basic usability tests with the PPA package showed no problem and it indeed fixes LP: #1827253\
Thanks Christian!

Revision history for this message
Christian Ehrhardt (paelzer) wrote :

Thanks, having a +1 from someone that really uses it is always great.

Revision history for this message
Christian Ehrhardt (paelzer) wrote :

Tests seem good at https://bileto.ubuntu.com/excuses/3923/focal.html

One exception: systemd@ppc64, but that is a known issue and not by this upload
=> http://autopkgtest.ubuntu.com/packages/s/systemd/focal/ppc64el

Overrides will need a version bump then, currently:
ubuntu-release:330:force-badtest systemd/244.1-0ubuntu2/ppc64el

Revision history for this message
Christian Ehrhardt (paelzer) wrote :

Upgrades seem fine:
Preparing to unpack .../rsyslog_8.2001.0-1ubuntu1~ppa1_amd64.deb ...
Unpacking rsyslog (8.2001.0-1ubuntu1~ppa1) over (8.1901.0-1ubuntu4) ...
Setting up rsyslog (8.2001.0-1ubuntu1~ppa1) ...
Installing new version of config file /etc/apparmor.d/usr.sbin.rsyslogd ...
Installing new version of config file /etc/logcheck/ignore.d.server/rsyslog ...
The user `syslog' is already a member of `adm'.
Skipping profile in /etc/apparmor.d/disable: usr.sbin.rsyslogd
Removing obsolete conffile /etc/default/rsyslog ...
Processing triggers for man-db (2.9.0-2) ...
Processing triggers for systemd (244.1-0ubuntu3) ...

qa-regression-tests are ok as well (2 fails before and after upgrade, some tests use the for ages no more used pidfile not going to fix the tests for now).
Ran 10 tests in 55.000s
FAILED (failures=2)

Revision history for this message
Christian Ehrhardt (paelzer) wrote :

All pre-checks done, waiting for a review.

There is one thing that is a bit special this time, as I'm unavailable after next Monday I'd want someone to agree to care for its proposed migration in case it didn't complete until then.

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

LGTM, just some small nitpicks (I added a couple of inline comments).

I didn't run extensive tests using the package, just regular installation/upgrade and basic usage, and it worked fine.

review: Approve
Revision history for this message
Christian Ehrhardt (paelzer) wrote :

Thanks
one resolved one explained

Revision history for this message
Christian Ehrhardt (paelzer) wrote :

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/rsyslog
 * [new tag] upload/8.2001.0-1ubuntu1 -> upload/8.2001.0-1ubuntu1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading rsyslog_8.2001.0-1ubuntu1.dsc: done.
  Uploading rsyslog_8.2001.0.orig.tar.gz: done.
  Uploading rsyslog_8.2001.0-1ubuntu1.debian.tar.xz: done.
  Uploading rsyslog_8.2001.0-1ubuntu1_source.buildinfo: done.
  Uploading rsyslog_8.2001.0-1ubuntu1_source.changes: done.
Successfully uploaded packages.

Revision history for this message
Christian Ehrhardt (paelzer) wrote :

Migrated, setting 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