Bug#1043151: bookworm-pu: package network-manager-applet/1.32.0-2+deb12u1
Control: tag -1 confirmed On Mon, Aug 07, 2023 at 09:03:22PM +0200, Michael Biebl wrote: > Am 07.08.23 um 18:46 schrieb Jonathan Wiltshire: > > Control: tag -1 moreinfo > > > > On Sun, Aug 06, 2023 at 08:06:55PM +0200, Michael Biebl wrote: > > > I'd like to make a stable upload for network-manager-applet, which fixes > > > a crash in nm-connection-editor when importing a VPN configuration. > > > > > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1042712 > > > > > > It's a targetted fix, the patch has been cherry-picked from upstream Git > > > and applied to the package in unstable with not reported regressions. > > > > > > Full debdiff is attached. > > > > There's an upload pending for bookworm which doesn't match this diff and > > seems to be relative to sid, not stable - is that an error? > > This was a mistake, yes. I'm very sorry for that. > When creating the bookworm branch I accidentally picked the tag > debian/1.32.0-2 instead of the intended debian/1.30.0-2. > Not sure how I missed that. > > The debdiff was so small, that I directly uploaded. > > I wonder what to do now? > > The diff between 1.30.0 and 1.32.0 is still reasonably small (excluding > translations): > > git diff debian/1.30.0-2 debian/1.32.0-2+deb12u1 -- ":(exclude)po" | > diffstat > ... > 24 files changed, 269 insertions(+), 77 deletions(-) > > Shall I roll back the changes and upload a 1.32.0really1.30.0-something to > bookworm? > Shall we simply cancel the 1.32.0-2+deb12u1 upload to bookworm? > Or should we go with 1.32.0 in bookworm? > > Given the small amount of changes, I slightly prefer the last option, but I > would appreciate your feedback. > I would prefer the planned targetted fix. Don't worry about the versioning, do as you originally intended and I'll take care of rejecting the other one. Thanks, -- Jonathan Wiltshire j...@debian.org Debian Developer http://people.debian.org/~jmw 4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51 ed25519/0x196418AAEB74C8A1: CA619D65A72A7BADFC96D280196418AAEB74C8A1
Bug#1043151: bookworm-pu: package network-manager-applet/1.32.0-2+deb12u1
Hi Jonathan Am 07.08.23 um 18:46 schrieb Jonathan Wiltshire: Control: tag -1 moreinfo On Sun, Aug 06, 2023 at 08:06:55PM +0200, Michael Biebl wrote: I'd like to make a stable upload for network-manager-applet, which fixes a crash in nm-connection-editor when importing a VPN configuration. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1042712 It's a targetted fix, the patch has been cherry-picked from upstream Git and applied to the package in unstable with not reported regressions. Full debdiff is attached. There's an upload pending for bookworm which doesn't match this diff and seems to be relative to sid, not stable - is that an error? This was a mistake, yes. I'm very sorry for that. When creating the bookworm branch I accidentally picked the tag debian/1.32.0-2 instead of the intended debian/1.30.0-2. Not sure how I missed that. The debdiff was so small, that I directly uploaded. I wonder what to do now? The diff between 1.30.0 and 1.32.0 is still reasonably small (excluding translations): git diff debian/1.30.0-2 debian/1.32.0-2+deb12u1 -- ":(exclude)po" | diffstat ... 24 files changed, 269 insertions(+), 77 deletions(-) Shall I roll back the changes and upload a 1.32.0really1.30.0-something to bookworm? Shall we simply cancel the 1.32.0-2+deb12u1 upload to bookworm? Or should we go with 1.32.0 in bookworm? Given the small amount of changes, I slightly prefer the last option, but I would appreciate your feedback. Michael OpenPGP_signature.asc Description: OpenPGP digital signature
Bug#1043151: bookworm-pu: package network-manager-applet/1.32.0-2+deb12u1
Control: tag -1 moreinfo On Sun, Aug 06, 2023 at 08:06:55PM +0200, Michael Biebl wrote: > I'd like to make a stable upload for network-manager-applet, which fixes > a crash in nm-connection-editor when importing a VPN configuration. > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1042712 > > It's a targetted fix, the patch has been cherry-picked from upstream Git > and applied to the package in unstable with not reported regressions. > > Full debdiff is attached. There's an upload pending for bookworm which doesn't match this diff and seems to be relative to sid, not stable - is that an error? Thanks, -- Jonathan Wiltshire j...@debian.org Debian Developer http://people.debian.org/~jmw 4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51 ed25519/0x196418AAEB74C8A1: CA619D65A72A7BADFC96D280196418AAEB74C8A1
Bug#1043151: bookworm-pu: package network-manager-applet/1.32.0-2+deb12u1
Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian@packages.debian.org
Usertags: pu
X-Debbugs-Cc: network-manager-app...@packages.debian.org
Control: affects -1 + src:network-manager-applet
Hi,
I'd like to make a stable upload for network-manager-applet, which fixes
a crash in nm-connection-editor when importing a VPN configuration.
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1042712
It's a targetted fix, the patch has been cherry-picked from upstream Git
and applied to the package in unstable with not reported regressions.
Full debdiff is attached.
Regards,
Michael
diff --git a/debian/changelog b/debian/changelog
index 2e03baf9..e3e2fa50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+network-manager-applet (1.32.0-2+deb12u1) bookworm; urgency=medium
+
+ * c-e: fix crash in import_vpn_from_file_cb() when importing VPN profiles
+(Closes: #1042712)
+
+ -- Michael Biebl Sun, 06 Aug 2023 20:02:05 +0200
+
network-manager-applet (1.32.0-2) unstable; urgency=medium
* Upload to unstable
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 05e704d0..7a75dbc3 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
[DEFAULT]
pristine-tar = True
patch-numbers = False
-debian-branch = debian/master
+debian-branch = debian/bookworm
upstream-branch = upstream/latest
diff --git
a/debian/patches/c-e-fix-crash-in-import_vpn_from_file_cb-when-importing-V.patch
b/debian/patches/c-e-fix-crash-in-import_vpn_from_file_cb-when-importing-V.patch
new file mode 100644
index ..ebe3b089
--- /dev/null
+++
b/debian/patches/c-e-fix-crash-in-import_vpn_from_file_cb-when-importing-V.patch
@@ -0,0 +1,53 @@
+From: Thomas Haller
+Date: Tue, 2 May 2023 10:39:29 +0200
+Subject: c-e: fix crash in import_vpn_from_file_cb() when importing VPN
+ profiles
+
+Import code can create incomplete profiles, that don't have
+"connection.type" set. Avoid the crash.
+
+ #0 __strcmp_evex () at ../sysdeps/x86_64/multiarch/strcmp-evex.S:314
+ #1 0x0043d177 in import_vpn_from_file_cb (dialog=0x7f4650,
response=, user_data=0x7d66e0) at
src/connection-editor/connection-helpers.c:275
+ #2 0x76f564ea in g_closure_invoke (closure=0x8d5120,
return_value=0x0, n_param_values=2, param_values=0x7fffd0f0,
invocation_hint=0x7fffd070) at ../gobject/gclosure.c:832
+ #3 0x76f84d36 in signal_emit_unlocked_R.isra.0
+ (node=node@entry=0x847c70, detail=detail@entry=0,
instance=instance@entry=0x7f4650, emission_return=emission_return@entry=0x0,
instance_and_params=instance_and_params@entry=0x7fffd0f0) at
../gobject/gsignal.c:3812
+ #4 0x76f75bdd in g_signal_emit_valist (instance=,
signal_id=, detail=,
var_args=var_args@entry=0x7fffd2b0) at ../gobject/gsignal.c:3565
+ #5 0x76f75e53 in g_signal_emit (instance=,
signal_id=, detail=) at ../gobject/gsignal.c:3622
+ #6 0x76f75cda in _g_closure_invoke_va (param_types=0x0,
n_params=, args=0x7fffd520, instance=0x8ee230,
return_value=0x0, closure=0x8efbf0) at ../gobject/gclosure.c:895
+ #7 g_signal_emit_valist (instance=0x8ee230, signal_id=216, detail=0,
var_args=var_args@entry=0x7fffd520) at ../gobject/gsignal.c:3472
+ #8 0x76f75e53 in g_signal_emit (instance=instance@entry=0x8ee230,
signal_id=, detail=detail@entry=0) at ../gobject/gsignal.c:3622
+ #9 0x776dd7dd in gtk_button_clicked (button=button@entry=0x8ee230)
at ../gtk/gtkbutton.c:1541
+ #10 0x776dfad6 in gtk_button_finish_activate (do_it=1,
button=0x8ee230) at ../gtk/gtkbutton.c:2042
+ #11 button_activate_timeout (data=0x8ee230) at ../gtk/gtkbutton.c:1984
+ #12 0x77eddcad in gdk_threads_dispatch (data=data@entry=0xa5f470) at
../gdk/gdk.c:769
+ #13 0x76e55c69 in g_timeout_dispatch (source=0x711550,
callback=0x77eddc80 , user_data=0xa5f470) at
../glib/gmain.c:5054
+ #14 0x76e5539c in g_main_dispatch (context=0x4e7c70) at
../glib/gmain.c:3460
+ #15 g_main_context_dispatch (context=0x4e7c70) at ../glib/gmain.c:4200
+ #16 0x76eb3438 in g_main_context_iterate.isra.0 (context=0x4e7c70,
block=1, dispatch=1, self=) at ../glib/gmain.c:4276
+ #17 0x76e52a23 in g_main_context_iteration
(context=context@entry=0x4e7c70, may_block=may_block@entry=1) at
../glib/gmain.c:4343
+ #18 0x7708a01d in g_application_run
(application=application@entry=0x4e5010, argc=,
argv=0x7fffd9e8) at ../gio/gapplication.c:2573
+ #19 0x004133ad in main (argc=, argv=)
at src/connection-editor/main.c:259
+
+https://gitlab.gnome.org/GNOME/network-manager-applet/-/issues/178
+
+Fixes: 3ff5b6cc9841 ('c-e: support importing WireGuard profiles from wg-quick
files')
+(cherry picked from commit 01281fae6b601598cd2006bc8f2d5be98810228d)
+---
+ src/connection-editor/connection-helpers.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/connection-editor/connection-helpers.c
