Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian@packages.debian.org
Usertags: pu
X-Debbugs-Cc: network-manager-strongs...@packages.debian.org,
ijack...@chiark.greenend.org.uk, harald.dun...@aixigo.com
Control: affects -1 + src:network-manager-strongswan
[ Reason ]
The old network-manager-strongswan 1.6.0-1 was built for GTK3 only,
leaving the Gnome Netork Settings menu (GTK4) behind, see #1020495.
The package worked fine with the nm-connection-editor, but using
Gnome Network Settings there was just a message "Error: unable to
load VPN connection editor" instead of the expected config menu.
The bug was introduced on the integration of the new upstream version
on July 16th 2022.
[ Impact ]
Configuring an IPsec network connection using the Gnome Network
Settings on the Gnome desktop is not possible. You have to use
the nm-connection-editor instead.
[ Tests ]
I could reproduce the bug in the old package. Trying to configure an
IPsec connection Gnome Network Settings showed "Error: unable to load
VPN connection editor" instead of the config menu provided by network-
manager-strongswan.
I have built the proposed new package for Bookworm (pbuilder).
I have verified it on Bookworm using nm-connection-editor (GTK3) on
Gnome, Gnome Network Settings (GTK4), and xfce4 network settings.
n-m-s worked for all, esp the error message in Gnome Network Settings
is gone. The expected config menu is shown instead.
[ Risks ]
Upstreams code is identical to the current package in Stable. No
source code changes have been introduced. The fix affects just
debian/control and debian/rules.
The binaries provided by the proposed new package support GTK4 in
addition to GTK3. Risk is low.
[ 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 (old)stable
[X] the issue is verified as fixed in unstable
[ Changes ]
debian/control adds a several GTK4 packages to the build environment.
debian/rules adds an option to the configure command line
[ Other info ]
none
diff -Nru network-manager-strongswan-1.6.0/debian/changelog
network-manager-strongswan-1.6.0/debian/changelog
--- network-manager-strongswan-1.6.0/debian/changelog 2022-07-16
14:07:25.0 +0200
+++ network-manager-strongswan-1.6.0/debian/changelog 2023-06-11
10:20:41.0 +0200
@@ -1,3 +1,11 @@
+network-manager-strongswan (1.6.0-1+deb12u1) bookworm; urgency=medium
+
+ [ Harald Dunkel ]
+ * Build editor component with GTK 4, too (fix provided by Moritz Schlarb)
+(Closes: #1020495, #1036607)
+
+ -- Harald Dunkel Sun, 11 Jun 2023 10:20:41 +0200
+
network-manager-strongswan (1.6.0-1) unstable; urgency=medium
* new upstream version 1.6.0:
diff -Nru network-manager-strongswan-1.6.0/debian/control
network-manager-strongswan-1.6.0/debian/control
--- network-manager-strongswan-1.6.0/debian/control 2022-07-16
14:07:25.0 +0200
+++ network-manager-strongswan-1.6.0/debian/control 2023-06-11
10:20:41.0 +0200
@@ -6,9 +6,12 @@
Build-Depends: debhelper-compat (= 13)
, network-manager-dev (>= 1.14)
, libnma-dev (>= 1.8)
+ , libnma-gtk4-dev (>= 1.8)
, libnm-dev (>= 1.14)
, libdbus-glib-1-dev
, libgtk-3-dev
+ , libgtk-4-dev
+ , libgtk-4-bin
, libsecret-1-dev
, automake
, gnome-common
diff -Nru network-manager-strongswan-1.6.0/debian/rules
network-manager-strongswan-1.6.0/debian/rules
--- network-manager-strongswan-1.6.0/debian/rules 2022-07-16
14:07:25.0 +0200
+++ network-manager-strongswan-1.6.0/debian/rules 2023-06-11
10:20:41.0 +0200
@@ -4,7 +4,7 @@
dh $@ --with autoreconf
override_dh_auto_configure:
- dh_auto_configure -- --without-libnm-glib
--with-charon=/usr/lib/ipsec/charon-nm
--libexecdir="\$$(prefix)/lib/NetworkManager"
+ dh_auto_configure -- --with-gtk4 --without-libnm-glib
--with-charon=/usr/lib/ipsec/charon-nm
--libexecdir="\$$(prefix)/lib/NetworkManager"
override_dh_clean:
dh_clean -XNetworkManager-strongswan.metainfo.xml
nm-strongswan-service.name