~ogayot/ubuntu/+source/dbus:merge-lp2036180-mantic

Branch merges

Propose for merging

Merged into ubuntu/+source/dbus:debian/sid at revision 37feb97a4e0e6aac3d23e3defbdd49a4b1c969e2

Jeremy Bícha (community): Approve on 2023-09-15

git-ubuntu import: Pending requested 2023-09-15

Diff: 942 lines (+771/-7)

7 files modified

debian/changelog (+470/-3)
debian/control (+2/-1)
debian/dbus.postinst (+5/-0)
debian/patches/series (+2/-0)
debian/patches/ubuntu/aa-get-connection-apparmor-security-context.patch (+192/-0)
debian/patches/ubuntu/dont-stop-dbus.patch (+98/-0)
debian/rules (+2/-3)

api

Superseded for merging into ubuntu/+source/dbus:ubuntu/devel

git-ubuntu import: Pending requested 2023-09-15

Diff: 1005 lines (+363/-76) (has conflicts)

27 files modified

AUTHORS (+2/-0)
Makefile.in (+1/-1)
NEWS (+19/-0)
aminclude_static.am (+1/-1)
build-aux/ltmain.sh (+8/-20)
bus/Makefile.in (+1/-1)
bus/bus.c (+33/-2)
bus/bus.h (+1/-0)
bus/connection.c (+12/-6)
bus/policy.c (+1/-1)
cmake/DBus1ConfigVersion.cmake (+1/-1)
configure (+13/-13)
configure.ac (+2/-2)
dbus/Makefile.in (+1/-1)
dbus/dbus-sysdeps-unix.c (+2/-7)
dbus/dbus-sysdeps-util-unix.c (+4/-2)
dbus/dbus-sysdeps-util-win.c (+12/-3)
dbus/dbus-sysdeps.h (+2/-1)
dbus/dbus-userdb-util.c (+10/-5)
dbus/dbus-userdb.h (+2/-1)
debian/20dbus_xdg-runtime (+5/-1)
debian/changelog (+51/-0)
test/CMakeLists.txt (+1/-0)
test/Makefile.am (+4/-0)
test/Makefile.in (+28/-4)
test/internals/misc-internals.c (+3/-3)
test/internals/userdb.c (+143/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

37feb97... by Olivier Gayot on 2023-09-15

update-maintainer

b5b6c2f... by Olivier Gayot on 2023-09-15

reconstruct-changelog

de6cd5e... by Olivier Gayot on 2023-09-15

merge-changelogs

5ae27a6... by Dave Jones on 2022-01-27

    - 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)

d5e5371... by Dave Jones on 2022-01-27

    - 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)

7df1bc9... by Dave Jones on 2022-01-27

    - 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.

49f7248... by Simon McVittie on 2023-09-01

1.14.10-1 (patches unapplied)

Imported using git-ubuntu import.

f5fecb6... by Simon McVittie on 2023-07-11

1.14.8-2 (patches unapplied)

Imported using git-ubuntu import.

db5a28f... by Simon McVittie on 2023-06-06

1.14.8-1 (patches unapplied)

Imported using git-ubuntu import.

4a65664... by Simon McVittie on 2023-02-08

1.14.6-1 (patches unapplied)

Imported using git-ubuntu import.