Control: retitle -1 unblock: dbus/1.8.12-3
Hi,
On Sat, Dec 20, 2014 at 11:23:45PM +0100, Cyril Brulebois wrote:
> Julien Cristau <jcris...@debian.org> (2014-12-15):
> > Control: tag -1 confirmed d-i
> >
> > On Mon, Dec 15, 2014 at 11:05:51 +0000, Simon McVittie wrote:
> >
> > > Package: release.debian.org
> > > Severity: wishlist
> > > User: release.debian....@packages.debian.org
> > > Usertags: unblock
> > >
> > > I just uploaded a dbus version to experimental with more robust
> > > owner/permissions setting for dbus-daemon-launch-helper (debdiff
> > > attached). Would you be willing to consider equivalent changes via
> > > unstable (probably as dbus/1.8.12-2) for jessie?
> > >
> > Seems fine to me, though it should be d-i-acked.
>
> No objection.
Another dbus upload happened, which was unblocked by Niels, but needs an
unblock-udeb:
diff -Nru dbus-1.8.12/debian/changelog dbus-1.8.12/debian/changelog
--- dbus-1.8.12/debian/changelog 2014-11-24 13:46:14.000000000 +0000
+++ dbus-1.8.12/debian/changelog 2014-12-23 21:24:31.000000000 +0000
@@ -1,3 +1,29 @@
+dbus (1.8.12-3) unstable; urgency=medium
+
+ * preinst: partially revert change from 1.8.12-2. It seems that the
+ preinst is too late to add a useful dpkg-statoverride entry: dpkg has
+ already loaded the statoverride database by this point, and if we add
+ the entry in the preinst, dpkg-statoverride won't run and have
+ its --update side-effect in the postinst. (Closes: #773107, #773838)
+ * postinst: don't run dpkg-statoverride with 2>/dev/null: in the unlikely
+ event that it fails for a reason other than "not overridden" (which
+ results in silently exiting 1), we'll want to know about it.
+
+ -- Simon McVittie <s...@debian.org> Tue, 23 Dec 2014 21:21:20 +0000
+
+dbus (1.8.12-2) unstable; urgency=medium
+
+ * postinst: use dpkg-statoverride to set the permissions for
+ dbus-daemon-launch-helper (expected to be 04754 root:messagebus)
+ as suggested in Policy ยง10.9. This avoids a temporarily broken state
+ when an upgraded dbus is unpacked but not yet configured (Closes: #773107)
+ * preinst: opportunistically set up the same dpkg-statoverride entry
+ if the group already exists, to avoid the same broken state during
+ upgrades from older versions without needing Pre-Depends: adduser
+ * postrm: delete the dpkg-statoverride entry on purge
+
+ -- Simon McVittie <s...@debian.org> Sun, 21 Dec 2014 15:02:22 +0000
+
dbus (1.8.12-1) unstable; urgency=medium
* New upstream release 1.8.12
diff -Nru dbus-1.8.12/debian/dbus.postinst dbus-1.8.12/debian/dbus.postinst
--- dbus-1.8.12/debian/dbus.postinst 2014-11-24 13:46:14.000000000 +0000
+++ dbus-1.8.12/debian/dbus.postinst 2014-12-23 21:24:31.000000000 +0000
@@ -31,9 +31,8 @@
--disabled-password \
--group "$MESSAGEUSER"
- if ! dpkg-statoverride --list "$LAUNCHER" >/dev/null 2>&1; then
- chown root:"$MESSAGEUSER" "$LAUNCHER"
- chmod 4754 "$LAUNCHER"
+ if ! dpkg-statoverride --list "$LAUNCHER" >/dev/null; then
+ dpkg-statoverride --update --add root "$MESSAGEUSER" 4754 "$LAUNCHER"
fi
# This is idempotent, so it's OK to do every time. The system bus' init
diff -Nru dbus-1.8.12/debian/dbus.postrm dbus-1.8.12/debian/dbus.postrm
--- dbus-1.8.12/debian/dbus.postrm 2014-11-24 13:46:14.000000000 +0000
+++ dbus-1.8.12/debian/dbus.postrm 2014-12-23 21:24:31.000000000 +0000
@@ -7,6 +7,12 @@
rm -f /var/lib/dbus/machine-id
rmdir /var/lib/dbus || true
+
+ LAUNCHER=/usr/lib/dbus-1.0/dbus-daemon-launch-helper
+
+ if dpkg-statoverride --list "$LAUNCHER" >/dev/null 2>&1 ; then
+ dpkg-statoverride --remove "$LAUNCHER"
+ fi
fi
#DEBHELPER#
Cheers,
Ivo
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
