Bug#1034149: unblock: (pre-approval): glib2.0/2.74.6-2

2023-04-10 Thread Sebastian Ramacher
Control: tags -1 confirmed moreinfo

On 2023-04-10 13:17:32 +0100, Simon McVittie wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian@packages.debian.org
> Usertags: unblock
> X-Debbugs-Cc: glib...@packages.debian.org
> Control: affects -1 + src:glib2.0
> 
> I've been using this proposed glib2.0 update for a few days and I'd like
> to upload it to unstable. There's nothing RC here, but it seems safer and
> easier to do several small bugfix updates rather than one large one.

Please go ahead and remove the moreinfo tag once the package is
available in unstable.

Cheers

> 
> [ Reason ]
> Pick up stable-branch changes from upstream, which are expected to be
> released in 2.74.7 at some point.
> 
> [ Impact ]
> If not accepted:
> - Peer-to-peer D-Bus servers implemented with GLib, such as the ones in
>   gvfs and ibus, won't interoperate properly with sd-bus clients
>   (GNOME/glib#2916)
> - Some multi-threaded uses of GDBus will have a use-after-free
>   (GNOME/glib#2924)
> - glib2.0 will FTBFS in non-minimal Docker containers (GNOME/glib#3307)
> 
> [ Tests ]
> Automated tests continue to pass, and I've been using this version on my
> laptop for several days. There is no specific test coverage for the changes.
> 
> [ Risks ]
> High-visibility key package, but the changes are narrowly targeted.
> 
> [ Checklist ]
>   [x] all changes are documented in the d/changelog
>   [x] I reviewed all changes and I approve them
>   [x] attach debdiff against the package in testing
> 
> unblock glib2.0/2.74.6-2

> diffstat for glib2.0-2.74.6 glib2.0-2.74.6
> 
>  debian/changelog 
>   |   13 
>  debian/patches/gdbus-Fix-an-accidental-string-freeze-break.patch 
>   |   31 ++
>  debian/patches/gdbus-Never-buffer-reads-during-server-authentication.patch   
>   |  141 ++
>  
> debian/patches/gdbusconnection-Make-GDBusMethodInvocation-transfer-a-bit.patch
>  |   28 +
>  
> debian/patches/gdbusinterfaceskeleton-Fix-a-use-after-free-of-a-GDBusMet.patch
>  |   58 
>  
> debian/patches/gdbusinterfaceskeleton-Remove-an-unnecessary-helper-struc.patch
>  |   83 +
>  debian/patches/series
>   |6 
>  debian/patches/tests-Skip-assert-msg-test.py-if-gdb-fails.patch  
>   |   34 ++
>  gio/gdbusauth.c  
>   |   50 ++-
>  gio/gdbusconnection.c
>   |2 
>  gio/gdbusinterfaceskeleton.c 
>   |   24 -
>  glib/tests/assert-msg-test.py
>   |6 
>  12 files changed, 442 insertions(+), 34 deletions(-)
> 
> diff -Nru glib2.0-2.74.6/debian/changelog glib2.0-2.74.6/debian/changelog
> --- glib2.0-2.74.6/debian/changelog   2023-03-02 20:53:53.0 +
> +++ glib2.0-2.74.6/debian/changelog   2023-04-04 09:55:32.0 +0100
> @@ -1,3 +1,16 @@
> +glib2.0 (2.74.6-2) unstable; urgency=medium
> +
> +  * d/patches: Update to upstream 2.74.x branch commit
> +2.74.6-12-ga1e169129, omitting Windows-specific changes
> +- Fix GDBus server interop with sd-bus clients (GNOME/glib#2916)
> +- Fix use-after-free of a GDBusMethodInvocation in some threaded
> +  use patterns (GNOME/glib#2924)
> +- Fix a test failure resulting in FTBFS in some container environments
> +  if gdb happens to be installed, but access to ptrace and
> +  /proc/PID/mem is disallowed (GNOME/glib#3307)
> +
> + -- Simon McVittie   Tue, 04 Apr 2023 09:55:32 +0100
> +
>  glib2.0 (2.74.6-1) unstable; urgency=medium
>  
>* New upstream stable release
> diff -Nru 
> glib2.0-2.74.6/debian/patches/gdbusconnection-Make-GDBusMethodInvocation-transfer-a-bit.patch
>  
> glib2.0-2.74.6/debian/patches/gdbusconnection-Make-GDBusMethodInvocation-transfer-a-bit.patch
> --- 
> glib2.0-2.74.6/debian/patches/gdbusconnection-Make-GDBusMethodInvocation-transfer-a-bit.patch
>  1970-01-01 01:00:00.0 +0100
> +++ 
> glib2.0-2.74.6/debian/patches/gdbusconnection-Make-GDBusMethodInvocation-transfer-a-bit.patch
>  2023-04-04 09:55:32.0 +0100
> @@ -0,0 +1,28 @@
> +From: Philip Withnall 
> +Date: Wed, 22 Feb 2023 12:50:10 +
> +Subject: gdbusconnection: Make GDBusMethodInvocation transfer a bit clearer
> +
> +Add a missing steal call in `schedule_method_call()`. This introduces no
> +functional changes, but documents the ownership transfer more clearly.
> +
> +Signed-off-by: Philip Withnall 
> +Bug: https://gitlab.gnome.org/GNOME/glib/-/issues/2924
> +Origin: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3298
> +Applied-upstream: 2.74.7, commit:2da9ca2727a559a5e6b517582d14ba05d963f603
> +---
> + gio/gdbusconnection.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
> +index 

Bug#1034149: unblock: (pre-approval): glib2.0/2.74.6-2

2023-04-10 Thread Simon McVittie
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: glib...@packages.debian.org
Control: affects -1 + src:glib2.0

I've been using this proposed glib2.0 update for a few days and I'd like
to upload it to unstable. There's nothing RC here, but it seems safer and
easier to do several small bugfix updates rather than one large one.

[ Reason ]
Pick up stable-branch changes from upstream, which are expected to be
released in 2.74.7 at some point.

[ Impact ]
If not accepted:
- Peer-to-peer D-Bus servers implemented with GLib, such as the ones in
  gvfs and ibus, won't interoperate properly with sd-bus clients
  (GNOME/glib#2916)
- Some multi-threaded uses of GDBus will have a use-after-free
  (GNOME/glib#2924)
- glib2.0 will FTBFS in non-minimal Docker containers (GNOME/glib#3307)

[ Tests ]
Automated tests continue to pass, and I've been using this version on my
laptop for several days. There is no specific test coverage for the changes.

[ Risks ]
High-visibility key package, but the changes are narrowly targeted.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock glib2.0/2.74.6-2
diffstat for glib2.0-2.74.6 glib2.0-2.74.6

 debian/changelog   |   13 
 debian/patches/gdbus-Fix-an-accidental-string-freeze-break.patch   |   31 ++
 debian/patches/gdbus-Never-buffer-reads-during-server-authentication.patch |  141 ++
 debian/patches/gdbusconnection-Make-GDBusMethodInvocation-transfer-a-bit.patch |   28 +
 debian/patches/gdbusinterfaceskeleton-Fix-a-use-after-free-of-a-GDBusMet.patch |   58 
 debian/patches/gdbusinterfaceskeleton-Remove-an-unnecessary-helper-struc.patch |   83 +
 debian/patches/series  |6 
 debian/patches/tests-Skip-assert-msg-test.py-if-gdb-fails.patch|   34 ++
 gio/gdbusauth.c|   50 ++-
 gio/gdbusconnection.c  |2 
 gio/gdbusinterfaceskeleton.c   |   24 -
 glib/tests/assert-msg-test.py  |6 
 12 files changed, 442 insertions(+), 34 deletions(-)

diff -Nru glib2.0-2.74.6/debian/changelog glib2.0-2.74.6/debian/changelog
--- glib2.0-2.74.6/debian/changelog	2023-03-02 20:53:53.0 +
+++ glib2.0-2.74.6/debian/changelog	2023-04-04 09:55:32.0 +0100
@@ -1,3 +1,16 @@
+glib2.0 (2.74.6-2) unstable; urgency=medium
+
+  * d/patches: Update to upstream 2.74.x branch commit
+2.74.6-12-ga1e169129, omitting Windows-specific changes
+- Fix GDBus server interop with sd-bus clients (GNOME/glib#2916)
+- Fix use-after-free of a GDBusMethodInvocation in some threaded
+  use patterns (GNOME/glib#2924)
+- Fix a test failure resulting in FTBFS in some container environments
+  if gdb happens to be installed, but access to ptrace and
+  /proc/PID/mem is disallowed (GNOME/glib#3307)
+
+ -- Simon McVittie   Tue, 04 Apr 2023 09:55:32 +0100
+
 glib2.0 (2.74.6-1) unstable; urgency=medium
 
   * New upstream stable release
diff -Nru glib2.0-2.74.6/debian/patches/gdbusconnection-Make-GDBusMethodInvocation-transfer-a-bit.patch glib2.0-2.74.6/debian/patches/gdbusconnection-Make-GDBusMethodInvocation-transfer-a-bit.patch
--- glib2.0-2.74.6/debian/patches/gdbusconnection-Make-GDBusMethodInvocation-transfer-a-bit.patch	1970-01-01 01:00:00.0 +0100
+++ glib2.0-2.74.6/debian/patches/gdbusconnection-Make-GDBusMethodInvocation-transfer-a-bit.patch	2023-04-04 09:55:32.0 +0100
@@ -0,0 +1,28 @@
+From: Philip Withnall 
+Date: Wed, 22 Feb 2023 12:50:10 +
+Subject: gdbusconnection: Make GDBusMethodInvocation transfer a bit clearer
+
+Add a missing steal call in `schedule_method_call()`. This introduces no
+functional changes, but documents the ownership transfer more clearly.
+
+Signed-off-by: Philip Withnall 
+Bug: https://gitlab.gnome.org/GNOME/glib/-/issues/2924
+Origin: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3298
+Applied-upstream: 2.74.7, commit:2da9ca2727a559a5e6b517582d14ba05d963f603
+---
+ gio/gdbusconnection.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
+index 663cd95..368898d 100644
+--- a/gio/gdbusconnection.c
 b/gio/gdbusconnection.c
+@@ -5048,7 +5048,7 @@ schedule_method_call (GDBusConnection*connection,
+   g_source_set_priority (idle_source, G_PRIORITY_DEFAULT);
+   g_source_set_callback (idle_source,
+  call_in_idle_cb,
+- invocation,
++ g_steal_pointer (),
+  g_object_unref);
+