Please merge dbus 1.14.10-3 (main) from Debian unstable

Tagging rls-nn-incoming so that we can discuss the new dependency on usr-is-merged (>= 38).

While src:usrmerge is in main, usr-is-merged is currently in universe.

 usrmerge | 9 | xenial/universe | source, all
 usrmerge | 17 | bionic/universe | source, all
 usrmerge | 23 | focal/universe | source, all
 usrmerge | 25ubuntu2 | jammy | source, all
 usrmerge | 33ubuntu1 | lunar | source, all
 usrmerge | 35ubuntu1 | mantic | source, all
 usrmerge | 35ubuntu1 | noble | source, all

ubuntu:
 usr-is-merged | 33ubuntu1 | lunar/universe | all
 usr-is-merged | 35ubuntu1 | mantic/universe | all
 usr-is-merged | 35ubuntu1 | noble/universe | all

Untagging rls-nn-incoming based on insights from the MIR team in #ubuntu-devel [1]

<slyon> schopin: ogayot: usr-is-merged seems to be an empty meta-package. It's source package src:usrmerge is already in main
<schopin> does that mean we can just ask an AA to promote it, no paperwork?
<slyon> so I'd say this doesn't need a MIR, as there is no new code. Maybe this new binary was added after the source package got promoted. You should not block on this.
<slyon> I don't think paperwork would be involved. It might show up as a component-mismatch, but should be resolved on the fast-path, by asking an AA.

[1] https://irclogs.ubuntu.com/2023/12/05/%23ubuntu-devel.html

usr-is-merged should probably be in main, it serves as an indicator that the system is already using the usrmerge layout. From: https://lists.debian.org/debian-ctte/2022/07/msg00019.html

The usrmerge package has been updated to pick up a few fixes from
Ubuntu, and most importantly to provide a new lightweight metapackage,
usr-is-merged, that can only be installed on merged-usr systems, to
provide a way for installers to avoid the additional dependencies of
usrmerge when they set up the filesystem correctly by themselves (eg:
debootstrap), and for users who already completed the transition. It
also gained a flag file that stops the package from updating the
system, clearly marked as making the system unsupported.

Subscribing Ubuntu Package Archive.

The binary package usr-is-merged is currently in universe whereas its source package src:usrmerge is in main.

Package: usr-is-merged
Description: Transitional package to assert a merged-/usr system
 This package can be successfully installed only on merged-/usr systems.
 .
 It can be safely removed once no other package depends on it anymore.

DBus 1.14.10-3 adds a new dependency on usr-is-merged so we would need to promote usr-is-merged to main.

The usrmerge transition was completed already in Ubuntu several cycles ago. We should not promote usr-is-merged to main, we should drop the dependencies on it instead.

usrmerge can also be dropped from main now. It is only in main because it is seeded with the rationale:

 * (usrmerge) # xnox Default since Disco. Will be mandatory in 22.10. Only recommend, such that it is installed on upgrades, can be removed afterwards.

The comment is misleading, the commit talking about "mandatory in 22.10" was made in November 2020. We've had a full LTS cycle since then where users, whether on new installs or upgrades, have been in a usrmerge configuration and there is no support for non-usrmerged filesystems in Ubuntu 21.04 or later.

So we should drop this recommends, drop usrmerge source from main, and drop dbus's dependency on usr-is-merged.

Thanks vorlon. This makes sense. I'll do go ahead and remove dbus's dependency on usr-is-merged.

Unsubscribing Ubuntu Package Archive.

This bug was fixed in the package dbus - 1.14.10-3ubuntu1

---------------
dbus (1.14.10-3ubuntu1) noble; urgency=medium

  * Merge with Debian unstable (LP: #2045668). Remaining changes:
    - Add aa-get-connection-apparmor-security-context.patch: This is not
      intended for upstream inclusion. It implements a bus method
      (GetConnectionAppArmorSecurityContext) to get a connection's AppArmor
      security context but upstream D-Bus has recently added a generic way of
      getting a connection's security credentials (GetConnectionCredentials).
      Ubuntu should carry this patch until packages in the archive are moved
      over to the new, generic method of getting a connection's credentials.
      (LP #1489489).
    - Add dont-stop-dbus.patch: Don't stop D-Bus in the service unit
      (LP #1438612)
      - Reworked to actually make dbus.service _and_ dbus.socket to not
        be part of the shutdown transaction. And yet make it possible
        to still stop/kill/restart dbus.service if one really
        wants to, because it is stuck and stopped responding to any
        commands. This allows allows to restart dbus.service with
        needrestart. However a finalrd hook might still be needed, to kill
        dbus-daemon for good, once we pivot off rootfs.
      - Reworked to avoid a deadlock during boot (LP #1936948)
    - debian/dbus.postinst, debian/rules: Don't start D-Bus on package
      installation, as that doesn't work any more with dont-stop-dbus.patch.
      Instead, start dbus.socket in postinst, which will then start D-Bus
      on demand after package installation.
      - Prevent dbus from being restarted on upgrade (LP #1962036)
  * Drop dependency on usr-is-merged; this transition is long completed
    in Ubuntu.

dbus (1.14.10-3) unstable; urgency=medium

  * d/control: dbus Depends on usr-is-merged (>= 38~).
    Non-merged /usr has been unsupported since Debian 12, as per Technical
    Committee resolutions #978636 and #994388 (please see the Debian 12
    release notes for details).
    The version of usr-is-merged shipped in Debian 12 had an undocumented
    opt-out mechanism intended for use on buildds and QA systems targeting
    Debian 12 (piuparts, reproducible-builds, autopkgtest and similar),
    to ensure that the upgrade path from Debian 11 to 12 will continue
    to work and continue to undergo automated tests. That opt-out is
    no longer applicable or available in trixie/sid, and was removed in
    usrmerge version 38.
    Since version 1.14.10-2, dbus ships its systemd units in
    /usr/lib/systemd/system, as part of the distro-wide transition
    away from making use of "aliased" paths. This is entirely valid on
    merged-/usr systems, but will no longer work in the unsupported
    filesystem layout with non-merged /usr, because for historical
    reasons, current versions of systemd on non-merged-/usr systems will
    only read units from /lib/systemd/system.
    In the case of dbus, the symptom when this assumption is broken is
    particularly bad (various key system services will not start, with
    long delays during boot, login and shutdown), so let's hold back
    this upgrade on unsup...