Version in base suite: 2.38.0-4

Base version: at-spi2-core_2.38.0-4
Target version: at-spi2-core_2.38.0-4+deb11u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/a/at-spi2-core/at-spi2-core_2.38.0-4.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/a/at-spi2-core/at-spi2-core_2.38.0-4+deb11u1.dsc

 changelog           |    6 ++++++
 patches/series      |    1 +
 patches/timeoutstop |   27 +++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)

diff -Nru at-spi2-core-2.38.0/debian/changelog at-spi2-core-2.38.0/debian/changelog
--- at-spi2-core-2.38.0/debian/changelog	2021-04-22 11:10:24.000000000 +0000
+++ at-spi2-core-2.38.0/debian/changelog	2023-01-25 22:30:27.000000000 +0000
@@ -1,3 +1,9 @@
+at-spi2-core (2.38.0-4+deb11u1) bullseye; urgency=medium
+
+  * patches/timeoutstop: Set stop timeout to 5s (Closes: #890833).
+
+ -- Samuel Thibault <sthibault@debian.org>  Wed, 25 Jan 2023 23:30:27 +0100
+
 at-spi2-core (2.38.0-4) unstable; urgency=medium
 
   * Re-upload to get arch:all built on buildd.
diff -Nru at-spi2-core-2.38.0/debian/patches/series at-spi2-core-2.38.0/debian/patches/series
--- at-spi2-core-2.38.0/debian/patches/series	2021-04-21 22:09:27.000000000 +0000
+++ at-spi2-core-2.38.0/debian/patches/series	2023-01-25 22:30:27.000000000 +0000
@@ -3,3 +3,4 @@
 test_disable_teamspaces
 tests
 double-free
+timeoutstop
diff -Nru at-spi2-core-2.38.0/debian/patches/timeoutstop at-spi2-core-2.38.0/debian/patches/timeoutstop
--- at-spi2-core-2.38.0/debian/patches/timeoutstop	1970-01-01 00:00:00.000000000 +0000
+++ at-spi2-core-2.38.0/debian/patches/timeoutstop	2023-01-25 22:30:27.000000000 +0000
@@ -0,0 +1,27 @@
+commit 145f9c53ca9ed73d0edb39abac12141cd40a2526
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Wed Jan 25 20:07:12 2023 +0100
+
+    at-spi-dbus-bus service: set stop timeout to 5s
+    
+    As reported on
+    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=890833
+    
+    sometimes the at-spi bus may hang, and system shutdown then gets stuck.
+    We'd better avoid hanging the whole system shutdown just for this, and
+    just wait for 5s, like many other gnome user service pieces.
+    
+    Of course, at-spi2-core shouldn't be getting stuck, but better avoid
+    hurting people, which makes them tend to just disable accessibility...
+
+---
+ bus/at-spi-dbus-bus.service.in |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/bus/at-spi-dbus-bus.service.in
++++ b/bus/at-spi-dbus-bus.service.in
+@@ -5,3 +5,4 @@ Description=Accessibility services bus
+ Type=dbus
+ BusName=org.a11y.Bus
+ ExecStart=@libexecdir@/at-spi-bus-launcher
++TimeoutStopSec=5