-
Committer:
Package Import Robot
-
Author(s):
James Page
-
Date:
2012-12-07 13:17:45 UTC
-
mfrom:
(16.1.30 sid)
-
Revision ID:
package-import@ubuntu.com-20121207131745-0gylkni4ivu314v6
Tags: 5.8.11-2ubuntu1
* 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.