~xypron/ubuntu/+source/rsyslog:merge-lp2045033-noble-8.2312.0-3

Branch merges

Propose for merging

Merged into ubuntu/+source/rsyslog:debian/sid at revision 96f77e6c77817b97792bfecb8ffd2a1a98547688

Graham Inggs (community): Approve on 2024-01-17

git-ubuntu import: Pending requested 2024-01-16

Nick Rosbrook: Pending requested 2024-01-16

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

96f77e6... by Heinrich Schuchardt on 2024-01-12

update-maintainer

Signed-off-by: Heinrich Schuchardt <email address hidden>

9384d91... by Heinrich Schuchardt on 2024-01-12

update-changelog

Signed-off-by: Heinrich Schuchardt <email address hidden>

9fcd531... by Heinrich Schuchardt on 2024-01-12

merge-changelogs

204ef04... by Heinrich Schuchardt on 2024-01-16

+ d/p/plugins-FromHost-must-be-63-characters-long.patch

Signed-off-by: Heinrich Schuchardt <email address hidden>

d35eb7e... by Heinrich Schuchardt on 2023-12-14

ubuntu: fix double free in tools/omusrmsg.c

omusrmsg frees a string which points to OS/system library memory. When
the os/libs clean up, it frees the memory as well. This results in a
double free.

d/p/omusrmsg-bugfix-potential-double-free-which-can-caus.patch

Signed-off-by: Heinrich Schuchardt <email address hidden>

e175f5c... by Heinrich Schuchardt on 2023-12-13

ubuntu: adjust sandboxing

While Debian runs the rsyslog service as root we use user syslog and group
syslog. The sandboxing rules that Debian added are not compatible with
this.

Remove:

- PrivateTmp=yes
- PrivateDevices=yes
- ProtectSystem=full
- ProtectKernelTunables=yes
- ProtectKernelModules=yes
- ProtectControlGroups=yes

Change:

- ProtectHome=yes -> ProtectHome=readonly

Signed-off-by: Heinrich Schuchardt <email address hidden>

cb73692... by Heinrich Schuchardt on 2023-12-13

ubuntu: add CAP_MAC_ADMIN, CAP_SETUID, CAP_SETGID

While Debian runs the rsyslog service as root we use user syslog and group
syslog. Dropping from root requires CAP_SETUID and CAP_SETGID.

CAP_MAC_ADMIN is needed for reloading the apparmor profile via
ExecStartPre.

Signed-off-by: Heinrich Schuchardt <email address hidden>

1796f65... by Lukas Märdian on 2023-09-05

Amend list of expected messages d/rsyslog.logcheck.ignore.server

to fix armhf autopkgtest (LP: #2028935)

12ad8fb... by Heinrich Schuchardt on 2023-08-23

ubuntu: fix debian/tests/logcheck - timing

When stopping rsyslogd allow some time to finish writing the log file.

Ensure that we evaluate the log written by rsyslogd and collected via
journalctl for the same time interval.

Signed-off-by: Heinrich Schuchardt <email address hidden>

817c030... by Heinrich Schuchardt on 2023-08-22

ubuntu: update debian/rsyslog.logcheck.ignore.server

The changes of the userid and the groupid when running rsyslogd.service are
new log messages.

Signed-off-by: Heinrich Schuchardt <email address hidden>