Ubuntu
rsyslog package

Merge ~xypron/ubuntu/+source/rsyslog:merge-lp2045033-noble-8.2312.0-3 into ubuntu/+source/rsyslog:debian/sid

  1. Git
  2. lp:~xypron/ubuntu/+source/rsyslog
  3. merge-lp2045033-noble-8.2312.0-3
  4. Merge into debian/sid
Proposed by Heinrich Schuchardt
Status: Merged
Approved by: Andreas Hasenack
Approved revision: 96f77e6c77817b97792bfecb8ffd2a1a98547688
Merge reported by: Andreas Hasenack
Merged at revision: 96f77e6c77817b97792bfecb8ffd2a1a98547688
Proposed branch: ~xypron/ubuntu/+source/rsyslog:merge-lp2045033-noble-8.2312.0-3
Merge into: ubuntu/+source/rsyslog:debian/sid
Diff against target: 3332 lines (+2707/-43)
38 files modified
debian/00rsyslog.conf (+12/-0)
debian/50-default.conf (+48/-0)
debian/NEWS (+30/-0)
debian/README.apparmor (+132/-0)
debian/README.apparmor.rsyslog.d (+16/-0)
debian/apparmor/rsyslog-gnutls.apparmor (+3/-0)
debian/apparmor/rsyslog-mysql.apparmor (+20/-0)
debian/apparmor/rsyslog-openssl.apparmor (+3/-0)
debian/apparmor/rsyslog-pgsql.apparmor (+9/-0)
debian/changelog (+1866/-0)
debian/clean (+6/-0)
debian/control (+7/-2)
debian/dmesg.service (+13/-0)
debian/patches/omusrmsg-bugfix-potential-double-free-which-can-caus.patch (+69/-0)
debian/patches/plugins-FromHost-must-be-63-characters-long.patch (+44/-0)
debian/patches/series (+2/-0)
debian/reload-apparmor-profile (+14/-0)
debian/rsyslog-gnutls.install (+1/-0)
debian/rsyslog-mysql.install (+1/-0)
debian/rsyslog-openssl.install (+1/-0)
debian/rsyslog-pgsql.install (+1/-0)
debian/rsyslog.conf (+10/-26)
debian/rsyslog.dirs (+1/-0)
debian/rsyslog.docs (+1/-0)
debian/rsyslog.install (+6/-1)
debian/rsyslog.logcheck.ignore.server (+3/-0)
debian/rsyslog.postinst (+29/-0)
debian/rsyslog.postrm (+13/-0)
debian/rsyslog.service (+4/-8)
debian/rules (+8/-2)
debian/tests/apparmor-include-mechanism (+92/-0)
debian/tests/control (+20/-0)
debian/tests/logcheck (+13/-4)
debian/tests/simple-logger (+24/-0)
debian/tests/simple-mysql (+29/-0)
debian/tests/simple-pgsql (+25/-0)
debian/tests/utils (+76/-0)
debian/usr.sbin.rsyslogd (+55/-0)
Reviewer Review Type Date Requested Status
Graham Inggs (community) Approve
Nick Rosbrook Pending
git-ubuntu import Pending
Review via email: mp+458725@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2024-01-16.

Description of the change

Debian removed a superfluous build dependency.

Autopkgtests failed due to column FromHost being too small. See https://github.com/rsyslog/rsyslog/pull/5310

Autopkgtest results are available here:
https://autopkgtest.ubuntu.com/results/autopkgtest-noble-xypron-rsyslog2312/noble/amd64/r/rsyslog/20240116_140602_8475c@/log.gz

To post a comment you must log in.
Revision history for this message
Nick Rosbrook (enr0n) wrote : Posted in a previous version of this proposal

Have you tested this in a PPA autopkgtest to confirm that your magic sleep mitigates the problem?

review: Needs Information
Revision history for this message
Nick Rosbrook (enr0n) wrote : Posted in a previous version of this proposal

Nice find, and thanks for forwarding the patch upstream. I left a couple inline comments about the DEP3 headers, but other than that LGTM.

review: Needs Fixing
Revision history for this message
Heinrich Schuchardt (xypron) wrote (last edit ):

DEP3 headers updated.

Revision history for this message
Graham Inggs (ginggs) wrote :

8.2312.0-3ubuntu1 was sponsored, I'll mark this Approved

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

This was uploaded, imported, and is going through noble migration at the moment. I'll mark it 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