From 8a3074a72ceccc29dd2ebc05de13526e007be0f1 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 16 Jun 2011 08:22:25 +0100 Subject: Mention CVE-2011-2200 in the changelog for 1.4.12-1 now it has a CVE ID --- debian/changelog | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 26a40750..86be8174 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dbus (1.4.12-3) UNRELEASED; urgency=low + + * Mention CVE-2011-2200 in the changelog for 1.4.12-1 now it has a CVE ID + + -- Simon McVittie Thu, 16 Jun 2011 08:21:35 +0100 + dbus (1.4.12-2) unstable; urgency=medium * Don't run tests during build (again), it appears they time out on most of @@ -9,7 +15,7 @@ dbus (1.4.12-2) unstable; urgency=medium dbus (1.4.12-1) unstable; urgency=medium - * New upstream release fixes local DoS (Closes: #629938, no CVE number yet) + * New upstream release fixes local DoS (Closes: #629938, CVE-2011-2200) * Don't delete jquery.js, no longer installed by recent Doxygen * Build-depend on libglib2.0-dev, libdbus-glib-1-dev for better regression test coverage (dbus-glib is a circular dependency, but both of these -- cgit v1.2.3 From 5a7c57758adc751e449767aa246f741c7a21e6bd Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 29 Jun 2011 11:10:23 +0100 Subject: run dbus-uuidgen --ensure in postinst --- debian/changelog | 2 ++ debian/dbus.postinst | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 86be8174..6bc5ae70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ dbus (1.4.12-3) UNRELEASED; urgency=low * Mention CVE-2011-2200 in the changelog for 1.4.12-1 now it has a CVE ID + * Merge some things from Ubuntu, via experimental: + - run dbus-uuidgen --ensure in postinst -- Simon McVittie Thu, 16 Jun 2011 08:21:35 +0100 diff --git a/debian/dbus.postinst b/debian/dbus.postinst index 29fc2bc6..a2d4519a 100644 --- a/debian/dbus.postinst +++ b/debian/dbus.postinst @@ -20,6 +20,9 @@ if [ "$1" = configure ]; then chown root:"$MESSAGEUSER" "$LAUNCHER" chmod 4754 "$LAUNCHER" fi + + # this is idempotent, the init script also does it + dbus-uuidgen --ensure fi # Remove stop symlinks for runlevel 1 as killprocs already does the job for us. -- cgit v1.2.3 From 4978d544f3e75a909b23d48b0a594f205b3e5099 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 8 Jun 2011 12:18:17 +0100 Subject: call ReloadConfig with dbus-send in the postinst, since that'll work regardless of whether dbus was started with sysvinit or Upstart; just call it unconditionally, and ignore any failures we might see (in chroots or if dbus-daemon wasn't running) --- debian/changelog | 4 ++++ debian/dbus.postinst | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6bc5ae70..b2e4a23f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ dbus (1.4.12-3) UNRELEASED; urgency=low * Mention CVE-2011-2200 in the changelog for 1.4.12-1 now it has a CVE ID * Merge some things from Ubuntu, via experimental: - run dbus-uuidgen --ensure in postinst + - call ReloadConfig with dbus-send in the postinst, since that'll work + regardless of whether dbus was started with sysvinit or Upstart; just + call it unconditionally, and ignore any failures we might see (in + chroots or if dbus-daemon wasn't running) -- Simon McVittie Thu, 16 Jun 2011 08:21:35 +0100 diff --git a/debian/dbus.postinst b/debian/dbus.postinst index a2d4519a..f58b73ad 100644 --- a/debian/dbus.postinst +++ b/debian/dbus.postinst @@ -33,20 +33,20 @@ fi if [ "$1" = configure ] && [ -n "$2" ] && [ -x "/etc/init.d/dbus" ]; then # Do not restart dbus on upgrades, only on fresh installations. # (dh_installinit -r creates a start action) - # But do reload it so the machine-id can be generated + # We don't use the init script to reload here either, to reduce divergence + # between Debian (sysvinit) and Ubuntu (Upstart) - the thing to do is the + # same in either case so just do it + if /etc/init.d/dbus status > /dev/null; then # trigger an update notification which recommends to reboot [ -x /usr/share/update-notifier/notify-reboot-required ] && \ /usr/share/update-notifier/notify-reboot-required || true - if [ -x "/etc/init.d/dbus" ]; then - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d dbus reload || true - else - /etc/init.d/dbus reload || true - fi - fi fi + # If it's not running (perhaps we're in a chroot) this will just fail + # harmlessly + dbus-send --print-reply --system --type=method_call \ + --dest=org.freedesktop.DBus \ + / org.freedesktop.DBus.ReloadConfig > /dev/null || true fi #DEBHELPER# - -- cgit v1.2.3 From 18ea5828f9ed8e0d0516b7a422db366d162f4dcb Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 29 Jun 2011 11:12:09 +0100 Subject: Improve comments in postinst explaining why it behaves as it does --- debian/changelog | 2 ++ debian/dbus.postinst | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index b2e4a23f..41051858 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ dbus (1.4.12-3) UNRELEASED; urgency=low regardless of whether dbus was started with sysvinit or Upstart; just call it unconditionally, and ignore any failures we might see (in chroots or if dbus-daemon wasn't running) + * and more things from experimental: + - improve comments in postinst explaining why it behaves as it does -- Simon McVittie Thu, 16 Jun 2011 08:21:35 +0100 diff --git a/debian/dbus.postinst b/debian/dbus.postinst index f58b73ad..e7a6b8a3 100644 --- a/debian/dbus.postinst +++ b/debian/dbus.postinst @@ -21,7 +21,10 @@ if [ "$1" = configure ]; then chmod 4754 "$LAUNCHER" fi - # this is idempotent, the init script also does it + # This is idempotent, so it's OK to do every time. The system bus' init + # script does this anyway, but you also have to do this before a session + # bus will work, so we do this here for the benefit of people starting + # a temporary session bus in a chroot dbus-uuidgen --ensure fi @@ -33,17 +36,17 @@ fi if [ "$1" = configure ] && [ -n "$2" ] && [ -x "/etc/init.d/dbus" ]; then # Do not restart dbus on upgrades, only on fresh installations. # (dh_installinit -r creates a start action) - # We don't use the init script to reload here either, to reduce divergence - # between Debian (sysvinit) and Ubuntu (Upstart) - the thing to do is the - # same in either case so just do it if /etc/init.d/dbus status > /dev/null; then # trigger an update notification which recommends to reboot [ -x /usr/share/update-notifier/notify-reboot-required ] && \ /usr/share/update-notifier/notify-reboot-required || true fi + + # This is what the init script would do, but it's simpler (and less + # dependent on sysvinit vs. Upstart) if we do it directly. # If it's not running (perhaps we're in a chroot) this will just fail - # harmlessly + # harmlessly, so there's no need to condition on status. dbus-send --print-reply --system --type=method_call \ --dest=org.freedesktop.DBus \ / org.freedesktop.DBus.ReloadConfig > /dev/null || true -- cgit v1.2.3 From c330da94a4871b8762fb7b19fc6e5fa9cbae3a0a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 9 Jun 2011 14:15:07 +0100 Subject: Only condition the check for dbus status on whether the init script exists We can try ReloadConfig on any upgrade, regardless of whether there's an init script. --- debian/dbus.postinst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/dbus.postinst b/debian/dbus.postinst index e7a6b8a3..707d31d4 100644 --- a/debian/dbus.postinst +++ b/debian/dbus.postinst @@ -33,11 +33,12 @@ if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 1.2.24-1; then rm -f /etc/rc1.d/K??dbus fi -if [ "$1" = configure ] && [ -n "$2" ] && [ -x "/etc/init.d/dbus" ]; then - # Do not restart dbus on upgrades, only on fresh installations. - # (dh_installinit -r creates a start action) +if [ "$1" = configure ] && [ -n "$2" ]; then + # On upgrades, we only reload config, and don't restart (restarting the + # system bus is not supported by upstream). The code added by + # dh_installinit -r creates a start action, below. - if /etc/init.d/dbus status > /dev/null; then + if [ -x "/etc/init.d/dbus" ] && /etc/init.d/dbus status > /dev/null; then # trigger an update notification which recommends to reboot [ -x /usr/share/update-notifier/notify-reboot-required ] && \ /usr/share/update-notifier/notify-reboot-required || true -- cgit v1.2.3 From dfb55798ed78a2badff31f0a83d3f25bef78af15 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 29 Jun 2011 11:27:02 +0100 Subject: Move libraries into multiarch locations --- debian/changelog | 4 ++++ debian/control | 7 ++++++- debian/dbus-1-dbg.install | 2 +- debian/libdbus-1-3.install | 1 - debian/libdbus-1-dev.install | 7 ++++--- debian/rules | 18 ++++++++++++------ 6 files changed, 27 insertions(+), 12 deletions(-) delete mode 100644 debian/libdbus-1-3.install diff --git a/debian/changelog b/debian/changelog index 41051858..51827b27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ dbus (1.4.12-3) UNRELEASED; urgency=low * Mention CVE-2011-2200 in the changelog for 1.4.12-1 now it has a CVE ID * Merge some things from Ubuntu, via experimental: + - move libraries into multiarch locations (but don't move binaries + from /usr to /, which is not needed on Debian) - run dbus-uuidgen --ensure in postinst - call ReloadConfig with dbus-send in the postinst, since that'll work regardless of whether dbus was started with sysvinit or Upstart; just @@ -9,6 +11,8 @@ dbus (1.4.12-3) UNRELEASED; urgency=low chroots or if dbus-daemon wasn't running) * and more things from experimental: - improve comments in postinst explaining why it behaves as it does + - libdbus-1-dev: explicitly pre-depend on multiarch-support to work around + debhelper and lintian disagreeing whether it's necessary -- Simon McVittie Thu, 16 Jun 2011 08:21:35 +0100 diff --git a/debian/control b/debian/control index f1c78e6e..250aae7d 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Uploaders: Sjoerd Simons , # but if you have them in Build-Depends, more tests can be run Build-Depends: automake (>= 1:1.10), autotools-dev, - debhelper (>= 8), + debhelper (>= 8.1.3), dh-autoreconf, doxygen, dpkg-dev (>= 1.16.0~ubuntu4), @@ -74,6 +74,8 @@ Description: simple interprocess messaging system (X11 deps) Package: libdbus-1-3 Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: kdebase-workspace-bin (<< 4:4.4.5-9), @@ -113,6 +115,8 @@ Description: simple interprocess messaging system (documentation) Package: libdbus-1-dev Section: libdevel Architecture: any +Pre-Depends: multiarch-support, + ${misc:Pre-Depends} Depends: libdbus-1-3 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, @@ -128,6 +132,7 @@ Package: dbus-1-dbg Section: debug Priority: extra Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: libdbus-1-3 (= ${binary:Version}), dbus (= ${binary:Version}), dbus-x11 (= ${binary:Version}), diff --git a/debian/dbus-1-dbg.install b/debian/dbus-1-dbg.install index 06e9212f..2734d21f 100644 --- a/debian/dbus-1-dbg.install +++ b/debian/dbus-1-dbg.install @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/dbus-1.0/test +debian/tmp/usr/lib/*/dbus-1.0/test debian/tmp/usr/lib/*/dbus-1.0/debug-build/bin debian/tmp/usr/lib/*/dbus-1.0/debug-build/lib diff --git a/debian/libdbus-1-3.install b/debian/libdbus-1-3.install deleted file mode 100644 index 8a2fd07b..00000000 --- a/debian/libdbus-1-3.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbus-1*.so.* lib/ diff --git a/debian/libdbus-1-dev.install b/debian/libdbus-1-dev.install index 536b4939..5afb4af4 100644 --- a/debian/libdbus-1-dev.install +++ b/debian/libdbus-1-dev.install @@ -1,4 +1,5 @@ debian/tmp/usr/include/dbus*/dbus/dbus*.h -debian/tmp/usr/lib/dbus*/include/dbus/dbus*.h -debian/tmp/usr/lib/pkgconfig/dbus-1.pc -debian/tmp/usr/lib/libdbus-1*.a +debian/tmp/usr/lib/*/dbus-1.0/include/dbus/dbus*.h +debian/tmp/usr/lib/*/libdbus-1*.a +debian/tmp/usr/lib/*/pkgconfig/dbus-1.pc +debian/tmp/usr/lib/*/libdbus-1*.so diff --git a/debian/rules b/debian/rules index a034add6..4f9eac1f 100755 --- a/debian/rules +++ b/debian/rules @@ -8,8 +8,9 @@ dh $@ --builddirectory=build --with autoreconf --parallel libdbusN := $(shell sed -rn 's/Package:[[:space:]]*(libdbus-[0-9-]+)[[:space:]]*$$/\1/p' debian/control | head -n 1) +libdbus_soname := $(patsubst libdbus-1-%,libdbus-1.so.%,$(libdbusN)) -multiarch := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) cflags := $(shell dpkg-buildflags --get CFLAGS) ldflags := $(shell dpkg-buildflags --get LDFLAGS) ldflags += -Wl,--as-needed @@ -33,7 +34,8 @@ override_dh_auto_configure: -- \ $(common_configure_flags) \ --enable-xml-docs \ - --enable-doxygen-docs + --enable-doxygen-docs \ + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) dh_auto_configure \ --builddirectory=build-debug \ -- \ @@ -44,7 +46,7 @@ override_dh_auto_configure: --enable-checks \ --enable-tests \ --enable-verbose-mode \ - --prefix=/usr/lib/$(multiarch)/dbus-1.0/debug-build + --prefix=/usr/lib/$(DEB_HOST_MULTIARCH)/dbus-1.0/debug-build override_dh_auto_build: dh_auto_build @@ -61,15 +63,19 @@ override_dh_auto_install: make -C build-debug install-exec DESTDIR=$(CURDIR)/debian/tmp override_dh_link: - dh_link -plibdbus-1-dev lib/$$(basename $$(readlink debian/tmp/usr/lib/libdbus-1.so)) usr/lib/libdbus-1.so + dh_link -plibdbus-1-dev lib/$(DEB_HOST_MULTIARCH)/$$(basename $$(readlink debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdbus-1.so)) usr/lib/$(DEB_HOST_MULTIARCH)/libdbus-1.so dh_link --remaining-packages # if bootstrapping (without dbus-glib), no tests will get installed - create # the directory in case that's happened, so the .install file doesn't need # modification override_dh_install: - install -d debian/tmp/usr/lib/dbus-1.0/test - dh_install -Xlibdbus-1.la --list-missing + install -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/dbus-1.0/test + rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdbus-1.la + dh_install -p$(libdbusN) \ + "usr/lib/$(DEB_HOST_MULTIARCH)/$(libdbus_soname)*" \ + lib/$(DEB_HOST_MULTIARCH) + dh_install --remaining-packages --list-missing install -m 644 -D debian/dbus-Xsession debian/dbus-x11/etc/X11/Xsession.d/75dbus_dbus-launch override_dh_installinit: -- cgit v1.2.3 From b61a7533c6270560700f69767afade6f0a56ab9b Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 30 Jun 2011 17:11:49 +0100 Subject: Remove bonus pre-dependency, which was a workaround for #629648 --- debian/changelog | 2 -- debian/control | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 51827b27..57f4c177 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,6 @@ dbus (1.4.12-3) UNRELEASED; urgency=low chroots or if dbus-daemon wasn't running) * and more things from experimental: - improve comments in postinst explaining why it behaves as it does - - libdbus-1-dev: explicitly pre-depend on multiarch-support to work around - debhelper and lintian disagreeing whether it's necessary -- Simon McVittie Thu, 16 Jun 2011 08:21:35 +0100 diff --git a/debian/control b/debian/control index 250aae7d..7498e3cd 100644 --- a/debian/control +++ b/debian/control @@ -115,8 +115,7 @@ Description: simple interprocess messaging system (documentation) Package: libdbus-1-dev Section: libdevel Architecture: any -Pre-Depends: multiarch-support, - ${misc:Pre-Depends} +Pre-Depends: ${misc:Pre-Depends} Depends: libdbus-1-3 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, -- cgit v1.2.3 From 83799f5a28ca70077e6fb4b06736740ec763fd00 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 30 Jun 2011 17:20:49 +0100 Subject: Run dbus-launch for X sessions in a way that doesn't consume characters from startx's stdin, or the stdin of certain display managers' init scripts (known to affect slim, but not xdm or gdm) (Closes: #453755) --- debian/changelog | 3 +++ debian/dbus-Xsession | 14 +++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 57f4c177..cda03d04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ dbus (1.4.12-3) UNRELEASED; urgency=low chroots or if dbus-daemon wasn't running) * and more things from experimental: - improve comments in postinst explaining why it behaves as it does + * Run dbus-launch for X sessions in a way that doesn't consume characters + from startx's stdin, or the stdin of certain display managers' init scripts + (known to affect slim, but not xdm or gdm) (Closes: #453755) -- Simon McVittie Thu, 16 Jun 2011 08:21:35 +0100 diff --git a/debian/dbus-Xsession b/debian/dbus-Xsession index af7ba492..f55f844e 100644 --- a/debian/dbus-Xsession +++ b/debian/dbus-Xsession @@ -3,15 +3,11 @@ # simply place use-session-dbus into your /etc/X11/Xsession.options file # -STARTDBUS= DBUSLAUNCH=/usr/bin/dbus-launch -if has_option use-session-dbus; then - if [ -x "$DBUSLAUNCH" ]; then - STARTDBUS=yes - fi -fi - -if [ -n "$STARTDBUS" ]; then - STARTUP="$DBUSLAUNCH --exit-with-session $STARTUP" +if has_option use-session-dbus && [ -x "$DBUSLAUNCH" ]; then + # we're doing it this way instead of setting + # STARTUP="$DBUSLAUNCH --exit-with-session $STARTUP" + # due to + eval `$DBUSLAUNCH --sh-syntax --exit-with-session < /dev/null` fi -- cgit v1.2.3 From 5952aa5b8962f761d9aaa9a9595570d29884b1eb Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 30 Jun 2011 18:42:41 +0100 Subject: Remove the .la file for the debug build, not just the normal build --- debian/changelog | 1 + debian/rules | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index cda03d04..9dfff5aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ dbus (1.4.12-3) UNRELEASED; urgency=low * Run dbus-launch for X sessions in a way that doesn't consume characters from startx's stdin, or the stdin of certain display managers' init scripts (known to affect slim, but not xdm or gdm) (Closes: #453755) + * Remove the .la file for the debug build, not just the normal build -- Simon McVittie Thu, 16 Jun 2011 08:21:35 +0100 diff --git a/debian/rules b/debian/rules index 4f9eac1f..ce644158 100755 --- a/debian/rules +++ b/debian/rules @@ -72,6 +72,7 @@ override_dh_link: override_dh_install: install -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/dbus-1.0/test rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdbus-1.la + rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/dbus-1.0/debug-build/lib/libdbus-1.la dh_install -p$(libdbusN) \ "usr/lib/$(DEB_HOST_MULTIARCH)/$(libdbus_soname)*" \ lib/$(DEB_HOST_MULTIARCH) -- cgit v1.2.3 From 526768b8273d7e9ff830b71a7c6b7f1262d6e44d Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 30 Jun 2011 18:43:05 +0100 Subject: release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9dfff5aa..d4325a54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dbus (1.4.12-3) UNRELEASED; urgency=low +dbus (1.4.12-3) unstable; urgency=low * Mention CVE-2011-2200 in the changelog for 1.4.12-1 now it has a CVE ID * Merge some things from Ubuntu, via experimental: @@ -16,7 +16,7 @@ dbus (1.4.12-3) UNRELEASED; urgency=low (known to affect slim, but not xdm or gdm) (Closes: #453755) * Remove the .la file for the debug build, not just the normal build - -- Simon McVittie Thu, 16 Jun 2011 08:21:35 +0100 + -- Simon McVittie Thu, 30 Jun 2011 17:21:03 +0100 dbus (1.4.12-2) unstable; urgency=medium -- cgit v1.2.3 From 94c3c2e5c06b85598dca3c3da0d7e34981266ba1 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 1 Jul 2011 08:13:15 +0100 Subject: Override missing-pre-dependency-on-multiarch-support for the -dev package, ftp-master doesn't have lintian 2.5.1 yet --- debian/changelog | 7 +++++++ debian/libdbus-1-dev.lintian-overrides | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 debian/libdbus-1-dev.lintian-overrides diff --git a/debian/changelog b/debian/changelog index d4325a54..72e7af24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +dbus (1.4.12-4) unstable; urgency=low + + * Override missing-pre-dependency-on-multiarch-support for the -dev + package, ftp-master doesn't have lintian 2.5.1 yet + + -- Simon McVittie Fri, 01 Jul 2011 07:55:01 +0100 + dbus (1.4.12-3) unstable; urgency=low * Mention CVE-2011-2200 in the changelog for 1.4.12-1 now it has a CVE ID diff --git a/debian/libdbus-1-dev.lintian-overrides b/debian/libdbus-1-dev.lintian-overrides new file mode 100644 index 00000000..40b89218 --- /dev/null +++ b/debian/libdbus-1-dev.lintian-overrides @@ -0,0 +1,3 @@ +# false positive, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629648 +# remove this override when the ftp-masters install lintian 2.5.1 +libdbus-1-dev: missing-pre-dependency-on-multiarch-support -- cgit v1.2.3 From 845cc07013afdfedf072d2a7700463ddd6579403 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 1 Jul 2011 08:17:52 +0100 Subject: Check all Description fields for correct use of dbus (package name) vs. D-Bus (project name), and override lintian false-positives --- debian/changelog | 2 ++ debian/dbus-1-dbg.lintian-overrides | 2 ++ debian/dbus-1-doc.lintian-overrides | 2 ++ debian/dbus-x11.lintian-overrides | 2 ++ debian/libdbus-1-3.lintian-overrides | 2 ++ debian/libdbus-1-dev.lintian-overrides | 3 +++ 6 files changed, 13 insertions(+) create mode 100644 debian/dbus-1-dbg.lintian-overrides create mode 100644 debian/dbus-1-doc.lintian-overrides create mode 100644 debian/dbus-x11.lintian-overrides create mode 100644 debian/libdbus-1-3.lintian-overrides diff --git a/debian/changelog b/debian/changelog index 72e7af24..2a7809d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ dbus (1.4.12-4) unstable; urgency=low * Override missing-pre-dependency-on-multiarch-support for the -dev package, ftp-master doesn't have lintian 2.5.1 yet + * Check all Description fields for correct use of dbus (package name) + vs. D-Bus (project name), and override lintian false-positives -- Simon McVittie Fri, 01 Jul 2011 07:55:01 +0100 diff --git a/debian/dbus-1-dbg.lintian-overrides b/debian/dbus-1-dbg.lintian-overrides new file mode 100644 index 00000000..4281e3e2 --- /dev/null +++ b/debian/dbus-1-dbg.lintian-overrides @@ -0,0 +1,2 @@ +# false positive: we only say dbus when talking about a package name +dbus-1-dbg: capitalization-error-in-description dbus D-Bus diff --git a/debian/dbus-1-doc.lintian-overrides b/debian/dbus-1-doc.lintian-overrides new file mode 100644 index 00000000..b8fb8251 --- /dev/null +++ b/debian/dbus-1-doc.lintian-overrides @@ -0,0 +1,2 @@ +# false positive: we only say dbus when talking about a package name +dbus-1-doc: capitalization-error-in-description dbus D-Bus diff --git a/debian/dbus-x11.lintian-overrides b/debian/dbus-x11.lintian-overrides new file mode 100644 index 00000000..af6061fa --- /dev/null +++ b/debian/dbus-x11.lintian-overrides @@ -0,0 +1,2 @@ +# false positive: we only say dbus when talking about a package name +dbus-x11: capitalization-error-in-description dbus D-Bus diff --git a/debian/libdbus-1-3.lintian-overrides b/debian/libdbus-1-3.lintian-overrides new file mode 100644 index 00000000..30ebce0a --- /dev/null +++ b/debian/libdbus-1-3.lintian-overrides @@ -0,0 +1,2 @@ +# false positive: we only say dbus when talking about a package name +libdbus-1-3: capitalization-error-in-description dbus D-Bus diff --git a/debian/libdbus-1-dev.lintian-overrides b/debian/libdbus-1-dev.lintian-overrides index 40b89218..891b7215 100644 --- a/debian/libdbus-1-dev.lintian-overrides +++ b/debian/libdbus-1-dev.lintian-overrides @@ -1,3 +1,6 @@ # false positive, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629648 # remove this override when the ftp-masters install lintian 2.5.1 libdbus-1-dev: missing-pre-dependency-on-multiarch-support + +# false positive: we only say dbus when talking about a package name +libdbus-1-dev: capitalization-error-in-description dbus D-Bus -- cgit v1.2.3 From 32a19140e802a777ad0bc67022ebbc2d08386cad Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 15 Jul 2011 10:35:11 +0100 Subject: Revert "Run dbus-launch for X sessions in a way that doesn't consume characters from startx's stdin, or the stdin of certain display managers' init scripts (known to affect slim, but not xdm or gdm) (Closes: #453755)" This reverts commit 83799f5a28ca70077e6fb4b06736740ec763fd00. --- debian/changelog | 8 ++++++++ debian/dbus-Xsession | 14 +++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2a7809d9..b3dfebf9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +dbus (1.4.12-5) UNRELEASED; urgency=low + + * Undo the changed invocation for dbus-launch, which seems to cause + more problems than it solves (LP: #807614, LP: #809900, probably also + Closes: #633652) + + -- Simon McVittie Fri, 15 Jul 2011 10:26:34 +0100 + dbus (1.4.12-4) unstable; urgency=low * Override missing-pre-dependency-on-multiarch-support for the -dev diff --git a/debian/dbus-Xsession b/debian/dbus-Xsession index f55f844e..af7ba492 100644 --- a/debian/dbus-Xsession +++ b/debian/dbus-Xsession @@ -3,11 +3,15 @@ # simply place use-session-dbus into your /etc/X11/Xsession.options file # +STARTDBUS= DBUSLAUNCH=/usr/bin/dbus-launch -if has_option use-session-dbus && [ -x "$DBUSLAUNCH" ]; then - # we're doing it this way instead of setting - # STARTUP="$DBUSLAUNCH --exit-with-session $STARTUP" - # due to - eval `$DBUSLAUNCH --sh-syntax --exit-with-session < /dev/null` +if has_option use-session-dbus; then + if [ -x "$DBUSLAUNCH" ]; then + STARTDBUS=yes + fi +fi + +if [ -n "$STARTDBUS" ]; then + STARTUP="$DBUSLAUNCH --exit-with-session $STARTUP" fi -- cgit v1.2.3 From fcb171029710740a4de56c820294f3831c07bdbe Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 15 Jul 2011 10:45:47 +0100 Subject: Work around #453755 by just reopening stdin from /dev/null instead, until fd.o #39197 gets fixed --- debian/changelog | 2 ++ debian/dbus-Xsession | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/debian/changelog b/debian/changelog index b3dfebf9..ea5a346c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ dbus (1.4.12-5) UNRELEASED; urgency=low * Undo the changed invocation for dbus-launch, which seems to cause more problems than it solves (LP: #807614, LP: #809900, probably also Closes: #633652) + * Work around #453755 by just reopening stdin from /dev/null instead, + until fd.o #39197 gets fixed -- Simon McVittie Fri, 15 Jul 2011 10:26:34 +0100 diff --git a/debian/dbus-Xsession b/debian/dbus-Xsession index af7ba492..14390231 100644 --- a/debian/dbus-Xsession +++ b/debian/dbus-Xsession @@ -13,5 +13,19 @@ if has_option use-session-dbus; then fi if [ -n "$STARTDBUS" ]; then + # dbus-launch misbehaves when stdin is a console: + # - http://bugs.debian.org/453755 + # - https://bugs.freedesktop.org/show_bug.cgi?id=39197 + # + # While we sort out with upstream what the right solution is, + # work around it by ensuring that stdin is not a console (this is a no-op + # on xdm and gdm, but not on startx, slim, nodm). + # + # It isn't really D-Bus' place to do this - we're changing the environment + # of everything executed from Xsession.d, not just dbus-launch - but having + # X apps whose stdin is the console makes very little sense, so arguably + # startx, slim, nodm etc. should be doing this themselves. + exec < /dev/null + STARTUP="$DBUSLAUNCH --exit-with-session $STARTUP" fi -- cgit v1.2.3 From 3587051e061b12cb0b5219432e496ab21f2be794 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 15 Jul 2011 10:46:26 +0100 Subject: release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ea5a346c..22431f86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dbus (1.4.12-5) UNRELEASED; urgency=low +dbus (1.4.12-5) unstable; urgency=low * Undo the changed invocation for dbus-launch, which seems to cause more problems than it solves (LP: #807614, LP: #809900, probably also @@ -6,7 +6,7 @@ dbus (1.4.12-5) UNRELEASED; urgency=low * Work around #453755 by just reopening stdin from /dev/null instead, until fd.o #39197 gets fixed - -- Simon McVittie Fri, 15 Jul 2011 10:26:34 +0100 + -- Simon McVittie Fri, 15 Jul 2011 10:45:56 +0100 dbus (1.4.12-4) unstable; urgency=low -- cgit v1.2.3