lp://staging/ubuntu/trusty-proposed/rsyslog

Branch merges

Propose for merging

1 branch proposed for merging into this one.

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1425398: Apparmor uses rsyslogd profile for different processes - utopic HWE

Undecided

Confirmed

Link a bug report

Related blueprints

61. By Steve Beattie on 2015-04-30

debian/usr.sbin.rsyslog: grant read access to /dev/log to cope with
behaviorial change of apparmor in utopic HWE kernel (LP: #1425398)

60. By Paul Donohue <email address hidden> on 2015-01-09

Applied updated upstream patch fixing infinite loop on OpenVZ VMs.
(LP: #1366829)

59. By Brian Murray on 2015-01-05

Applied upstream patch fixing infinite loop on OpenVZ VMs. Thanks to Paul
Donohue for the patch. (LP: #1366829)

58. By Chris J Arges on 2014-08-19

Enable non-kernel facility klog messages. (LP: #1274444)

57. By Colin Watson on 2013-12-04

* debian/rsyslog.postinst: Make sure /var/log is owned by group syslog and
  is group-writeable (LP: #1256695).
* Ensure that rsyslogd can create files in group adm, even when dropping
  group privileges to syslog (LP: #484336):
  - debian/patches/10-initgroups.patch: Try to set appropriate
    supplementary groups before dropping UID.
  - debian/rsyslog.postinst: Add syslog user to group adm.

56. By Steve Langasek on 2013-10-21

* Merge from Debian unstable, remaining changes:
  - Run as rsyslog:rsyslog, set $FileOwner to syslog
  - Replace init script with debian/rsyslog.upstart.
  - debian/rsyslog.logrotate: Use reload command to restart rsyslog
  - debian/rsyslog.conf: enable $RepeatedMsgReduction
    to avoid bloating the syslog file.
  - Add debian/rsyslog.dmesg.upstart to save initial dmesg into a file.
    Install it in debian/rules.
  - debian/50-default.conf: set of default rules for syslog (forwarded to
    Debian #603160). remove file in postrm on purge. manage with ucf.
  - Add disabled by default AppArmor profile:
    + debian/rsyslog.upstart: add pre-start stanza to load profile
    + add debian/usr.sbin.rsyslogd profile
    + debian/rules: use dh_apparmor to install profile before rsyslog is
      restarted
    + debian/control: suggests apparmor (>= 2.3)
    + debian/rsyslog.install: install profile to /etc/apparmor.d
    + debian/rsyslog.dirs: install /etc/apparmor.d/force-complain,
      and /etc/apparmor.d/disable
    + debian/rsyslog.preinst: disable profile on clean install or upgrades
      from earlier than when we shipped the profile
    + debian/control: Build-Depends on dh-apparmor
  - debian/rsyslog.postrm: fixed typo "dissappear" to "disappear".
  - debian/rsyslog.postinst: fix ownership of /var/spool/rsyslog.
  - Adjust rsyslog init script to detect upstart, making the upstart
    patches upstreamable to Debian.
  - Add versioned dependency on lsb-base for the use of init_is_upstart.
* Dropped changes:
  - debian/patches/04-fix_startup_deadlock.patch: superseded upstream.
  - debian/patches/201-PreserveFQDN-not-working: originally from upstream.
  - debian/patches/202-off-by-one-regression-1187808.patch: originally
    from upstream.
* debian/rules: filter out -Wl,-Bsymbolic-functions only, instead of
  overriding all LDFLAGS.
* Drop rsyslog-mongodb package, depends on libmongo-client which is not
  in main.
* Drop mmnormalize module, which depends on liblognorm from universe.
* Build with --disable-silent-rules to get useful build logs.

55. By Steve Langasek on 2013-06-05

* Adjust rsyslog init script to detect upstart, making the upstart
  patches upstreamable to Debian.
* Add versioned dependency on lsb-base for the use of init_is_upstart.
* debian/patches/202-off-by-one-regression-1187808.patch: upstream fix
  for an off-by-one error introduced in the previous cherry-pick, causing
  rsyslog to fail to start in some environments. Closes LP: #1187808.

54. By Louis Bouchard on 2013-04-25

* Fixes LP: #1022545 : $PreserveFQDN is not working properly
  - Backport upstream fix

53. By Adam Stokes on 2013-04-17

[ Pierre Carrier ]
* debian/patches/04-fix_startup_deadlock.patch:
  - Fixes deadlock during startup (LP: #1169740)

52. By James Page on 2012-12-07

* Merge from Debian unstable. Remaining changes:
  - Run as rsyslog:rsyslog, set $FileOwner to syslog
  - Replace init script with debian/rsyslog.upstart.
  - debian/rsyslog.logrotate: Use reload command to restart rsyslog
  - debian/rsyslog.conf: enable $RepeatedMsgReduction
    to avoid bloating the syslog file.
  - Add debian/rsyslog.dmesg.upstart to save initial dmesg into a file.
    Install it in debian/rules.
  - debian/50-default.conf: set of default rules for syslog (forwarded to
    Debian #603160). remove file in postrm on purge. manage with ucf.
  - debian/rules: build with LDFLAGS=""
  - Add disabled by default AppArmor profile:
    + debian/rsyslog.upstart: add pre-start stanza to load profile
    + add debian/usr.sbin.rsyslogd profile
    + debian/rules: use dh_apparmor to install profile before rsyslog is
      restarted
    + debian/control: suggests apparmor (>= 2.3)
    + debian/rsyslog.install: install profile to /etc/apparmor.d
    + debian/rsyslog.dirs: install /etc/apparmor.d/force-complain,
      and /etc/apparmor.d/disable
    + debian/rsyslog.preinst: disable profile on clean install or upgrades
      from earlier than when we shipped the profile
    + debian/control: Build-Depends on dh-apparmor
  - debian/rsyslog.postrm: fixed typo "dissappear" to "disappear".
  - debian/rsyslog.postinst: fix ownership of /var/spool/rsyslog.
* Dropped:
  - All Ubuntu specific patches; included upstream.
  - debian/rsyslog.dirs: add /var/spool/rsyslog/.
  - debian/rsyslog.conf: set $WorkDirectory to /var/spool/rsyslog.