diff options
author | Simon McVittie <smcv@debian.org> | 2014-11-06 21:05:43 +0000 |
---|---|---|
committer | Simon McVittie <smcv@debian.org> | 2014-11-06 21:05:43 +0000 |
commit | acd824dea246a39328c5519a325d92b691c5c9c6 (patch) | |
tree | 55e63b87768e500ef118ee52eeca4f5fe6a1a521 | |
parent | 2a087a61bea9fd725162e3e663533ab6e78c016e (diff) | |
parent | 03ad53daa50db39a74e04b374c45995670acbc0d (diff) | |
download | dbus-acd824dea246a39328c5519a325d92b691c5c9c6.tar.gz |
Merge branch 'master' into experimental
Conflicts:
NEWS
configure
configure.ac
-rw-r--r-- | debian/changelog | 8 | ||||
-rw-r--r-- | debian/dbus.init | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 7620d060..fb3ec60e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,14 @@ dbus (1.9.0-2) UNRELEASED; urgency=medium * Merge from unstable - Remove Build-Profiles control field until the syntax settles down (Closes: #764222) + - Start 'dbus-daemon --system' as root under sysvinit (it already + starts as root under systemd), so it can increase its file + descriptor limit + * New upstream release 1.9.2 + - raise dbus-daemon's file descriptor limit to 65536 to avoid an + opportunity for denial of service + (CVE-2014-7824, an incomplete fix for CVE-2014-3636) + - don't package dbus-test-tool for now, to avoid the NEW queue -- Simon McVittie <smcv@debian.org> Mon, 06 Oct 2014 19:17:04 +0100 diff --git a/debian/dbus.init b/debian/dbus.init index 9f9453a8..4f41293f 100644 --- a/debian/dbus.init +++ b/debian/dbus.init @@ -69,7 +69,7 @@ start_it_up() log_daemon_msg "Starting $DESC" "$NAME" start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS + --exec $DAEMON -- --system $PARAMS log_end_msg $? } |