debian/changelog

+strongswan (5.6.2-2) unstable; urgency=medium
+
+  * charon-nm: Fix building list of DNS/MDNS servers with libnm
+  * d/control: drop b-d on n-m-dev and make libnm-dev linux-any
+    (closes: #895434)
+  * d/compat bumped to 10
+  * d/rules: drop parallel and autoreconf from dh, done with compat 10
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Fri, 13 Apr 2018 13:46:04 +0200
+
 strongswan (5.6.2-1) unstable; urgency=medium
 
   * d/NEWS: add information about disabled algorithms (closes: #883072)

debian/compat

-9
+10

debian/control

@@ -9,9 +9,8 @@ Vcs-Browser: https://salsa.debian.org/debian/strongswan
 Vcs-Git: https://salsa.debian.org/debian/strongswan.git
 Build-Depends: bison,
                bzip2,
-               debhelper (>= 9.20160709),
+               debhelper (>= 10),
                dh-apparmor,
-               dh-autoreconf,
                dpkg-dev (>= 1.16.2),
                flex,
                gperf,
@@ -22,14 +21,13 @@ Build-Depends: bison,
                libgmp3-dev,
                libkrb5-dev,
                libldap2-dev,
-               libnm-dev,
+               libnm-dev [linux-any],
                libpam0g-dev,
                libsqlite3-dev,
                libssl-dev (>= 0.9.8),
                libsystemd-dev [linux-any],
                libtool,
                libxml2-dev,
-               network-manager-dev (>= 0.7) [linux-any],
                pkg-config,
                po-debconf,
                systemd [linux-any],

debian/patches/05_charon-nm-Fix-building-list-of-DNS-MDNS-servers-with.patch

+From ee8c25516a97a2c880a8033e1663628b6b05646a Mon Sep 17 00:00:00 2001
+From: Tobias Brunner <tobias@strongswan.org>
+Date: Wed, 21 Feb 2018 11:53:55 +0100
+Subject: [PATCH] charon-nm: Fix building list of DNS/MDNS servers with libnm
+
+g_variant_builder_add() creates a new GVariant using g_variant_new() and
+then adds it to the builder.  Passing a GVariant probably adds the
+pointer to the array, not the value.  I think an alternative fix would
+be to use "@u" as type string for the g_variant_builder_add() call, then
+the already allocated GVariant is adopted.
+
+Fixes: 9a71b7219ca3 ("charon-nm: Port to libnm")
+---
+ src/charon-nm/nm/nm_service.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c
+index 9beac392a..c42733181 100644
+--- a/src/charon-nm/nm/nm_service.c
++++ b/src/charon-nm/nm/nm_service.c
+@@ -65,8 +65,7 @@ static GVariant* handler_to_variant(nm_handler_t *handler,
+ 	enumerator = handler->create_enumerator(handler, type);
+ 	while (enumerator->enumerate(enumerator, &chunk))
+ 	{
+-		g_variant_builder_add (&builder, "u",
+-							   g_variant_new_uint32 (*(uint32_t*)chunk.ptr));
++		g_variant_builder_add (&builder, "u", *(uint32_t*)chunk.ptr);
+ 	}
+ 	enumerator->destroy(enumerator);
+ 
+-- 
+2.16.1
+

debian/patches/series

@@ -2,3 +2,4 @@
 02_disable-bypass-lan.patch
 03_systemd-service.patch
 04_disable-libtls-tests.patch
+05_charon-nm-Fix-building-list-of-DNS-MDNS-servers-with.patch

debian/rules

@@ -256,4 +256,4 @@ override_dh_missing-indep:
 	dh_missing --list-missing
 
 %:
-	dh $@ --parallel --with autoreconf,systemd
+	dh $@ --with systemd