network-manager-strongswan (1.4.0-1) unstable; urgency=medium

  * new major upstream version
  * dropped cdbs in favor of debhelper
  * removed obsolete patches
  * temporarily add dbus policy file, to be provided by strongswan 5.5.1

[dgit import unpatched network-manager-strongswan 1.4.0-1]

15 files changed, 303 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..2197077
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,90 @@
+network-manager-strongswan (1.4.0-1) unstable; urgency=medium
+
+  * new major upstream version
+  * dropped cdbs in favor of debhelper
+  * removed obsolete patches
+  * temporarily add dbus policy file, to be provided by strongswan 5.5.1
+
+ -- Harald Dunkel <harri@afaics.de>  Mon, 19 Sep 2016 09:42:42 +0200
+
+network-manager-strongswan (1.3.1-2) unstable; urgency=medium
+
+  * fix broken configuration GUI. Patch provided by Michal Bruncko
+    and Michael Terry. Verified by David Härdeman. Thanx to all.
+    (Closes: #799200)
+  * follow standards version 3.9.8
+  * linitian cleanups
+
+ -- Harald Dunkel <harri@afaics.de>  Wed, 28 Aug 2016 09:47:28 +0100
+
+network-manager-strongswan (1.3.1-1) unstable; urgency=low
+
+  * new upstream version 1.3.1
+  * refresh patches
+
+ -- Harald Dunkel <harri@afaics.de>  Fri, 11 Sep 2015 07:48:41 +0200
+
+network-manager-strongswan (1.3.0-2) unstable; urgency=medium
+
+  * changed maintainer to Harald Dunkel <harri@afaics.de>, as agreed
+    with Martin Willi
+  * fix nm-strongswan-service.name (Closes: #773764)
+  * fix FTBFS on Jessie (Closes: #759826)
+  * set format to '3.0 (quilt)'
+  * set compat to 9
+
+ -- Harald Dunkel <harri@afaics.de>  Tue, 17 Feb 2015 13:24:00 +0100
+
+network-manager-strongswan (1.3.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * use charon-nm instead of charon (Closes: #741415)
+
+ -- Harald Dunkel <hdunkel@aixigo.de>  Wed, 16 Jul 2014 13:14:52 +0200
+
+network-manager-strongswan (1.3.0-1) unstable; urgency=low
+
+  * New upstream release, support for NetworkManager 0.9 (Closes: #639400)
+
+ -- Martin Willi <martin@strongswan.org>  Mon, 02 Jul 2012 09:55:20 +0200
+
+network-manager-strongswan (1.1.2-2) unstable; urgency=low
+
+  * Do not install unused libtool and static libraries
+    (Closes: #622499)
+
+ -- Martin Willi <martin@strongswan.org>  Tue, 19 Apr 2011 11:07:10 +0200
+
+network-manager-strongswan (1.1.2-1) unstable; urgency=low
+
+  * New upstream release, fixes pkgconfig for new libnm-glib packages
+    (Closes: #569302)
+
+ -- Martin Willi <martin@strongswan.org>  Thu, 18 Feb 2010 09:41:39 +0100
+
+network-manager-strongswan (1.1.1-2) unstable; urgency=low
+
+  * Added ${shlibs:Depends} dependency
+  * Reload network-manager after installation, reloading dbus is insufficient.
+  * Fixed debhelper-but-no-misc-depends, out-of-date-standards-version and
+    copyright-without-copyright-notice lintian warnings
+
+ -- Martin Willi <martin@strongswan.org>  Mon, 12 Oct 2009 10:19:40 +0200
+
+network-manager-strongswan (1.1.1-1) unstable; urgency=low
+
+  * New upstream release fixing a crasher when saving connections
+  * Fix "Wrong path to network-manager initscript in postinst"
+    Reload dbus instead of network-manager, as other VPN plugins do.
+    (Closes: #529189)
+  * Fix "FTBFS: No package 'libnm-util' found"
+    added dependencies to libnm-util-dev and libnm-glib-vpn-dev
+    (Closes: #528977)
+
+ -- Martin Willi <martin@strongswan.org>  Tue, 19 May 2009 13:16:51 +0200
+
+network-manager-strongswan (1.1.0-1) unstable; urgency=low
+
+  * Initial Debian packaging of NetworkManager plugin for strongSwan
+
+ -- Martin Willi <martin@strongswan.org>  Wed, 25 Mar 2009 09:07:05 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..6280e22
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,35 @@
+Source: network-manager-strongswan
+Section: net
+Priority: extra
+Homepage: https://wiki.strongswan.org/projects/strongswan/wiki/NetworkManager
+Maintainer: Harald Dunkel <harri@afaics.de>
+Build-Depends: debhelper (>= 9)
+	, network-manager-dev (>= 1.1)
+	, libnm-util-dev (>= 1.1)
+	, libnm-glib-dev (>= 1.1)
+	, libnm-glib-vpn-dev (>= 1.1)
+	, libnm-gtk-dev (>= 1.1)
+	, libnma-dev (>= 1.1)
+	, libnm-dev (>= 1.1)
+	, libdbus-glib-1-dev
+	, libgnomeui-dev
+	, libgtk-3-dev
+	, libsecret-1-dev
+	, automake
+	, gnome-common
+	, intltool
+	, pkg-config
+Standards-Version: 3.9.8
+
+Package: network-manager-strongswan
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, strongswan-nm (>= 5.5.0-2), network-manager (>= 1.1)
+Description: network management framework (strongSwan plugin)
+ NetworkManager attempts to keep an active network connection available at
+ all times.  It is intended primarily for laptops where it allows easy
+ switching between local wireless networks, it's also useful on desktops
+ with a selection of different interfaces to use.  It is not intended for
+ usage on servers.
+ .
+ This package provides a VPN plugin for strongSwan, providing easy access to
+ IKEv2 IPSec VPN's.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..8aac8f7
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,14 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: NetworkManager-strongswan
+Upstream-Contact: Martin Willi <martin@strongswan.org>
+Source: http://download.strongswan.org/NetworkManager
+
+Files: *
+Copyright: 2008-2009, Martin Willi <martin@strongswan.org>
+           2005-2008, Dan Williams
+           2005, David Zeuthen
+License: GPL-2
+
+License: GPL-2
+ On Debian systems the full text of the GNU General Public License can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
diff --git a/debian/network-manager-strongswan.postinst b/debian/network-manager-strongswan.postinst
new file mode 100644
index 0000000..9eab09c
--- /dev/null
+++ b/debian/network-manager-strongswan.postinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+	configure)
+		invoke-rc.d network-manager force-reload || true
+		;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/nm-strongswan-service.conf b/debian/nm-strongswan-service.conf
new file mode 100644
index 0000000..dccc19a
--- /dev/null
+++ b/debian/nm-strongswan-service.conf
@@ -0,0 +1,16 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+	<policy user="root">
+		<allow own="org.freedesktop.NetworkManager.strongswan"/>
+		<allow send_destination="org.freedesktop.NetworkManager.strongswan"/>
+		<allow send_interface="org.freedesktop.NetworkManager.strongswan"/>
+	</policy>
+	<policy context="default">
+		<deny own="org.freedesktop.NetworkManager.strongswan"/>
+		<deny send_destination="org.freedesktop.NetworkManager.strongswan"/>
+		<deny send_interface="org.freedesktop.NetworkManager.strongswan"/>
+	</policy>
+</busconfig>
+
diff --git a/debian/patches.disabled/allow_deprecated_keyring_functions.diff b/debian/patches.disabled/allow_deprecated_keyring_functions.diff
new file mode 100644
index 0000000..c2cf5fb
--- /dev/null
+++ b/debian/patches.disabled/allow_deprecated_keyring_functions.diff
@@ -0,0 +1,24 @@
+Index: network-manager-strongswan-1.3.1/auth-dialog/Makefile.am
+===================================================================
+--- network-manager-strongswan-1.3.1.orig/auth-dialog/Makefile.am
++++ network-manager-strongswan-1.3.1/auth-dialog/Makefile.am
+@@ -9,6 +9,7 @@ nm_strongswan_auth_dialog_CPPFLAGS = \
+ 	$(NM_UTILS_CFLAGS) \
+ 	-DG_DISABLE_DEPRECATED \
+ 	-DGNOME_DISABLE_DEPRECATED \
++	-DGNOME_KEYRING_COMPILATION \
+ 	-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+ 	-DVERSION=\"$(VERSION)\"
+ 
+Index: network-manager-strongswan-1.3.1/auth-dialog/Makefile.in
+===================================================================
+--- network-manager-strongswan-1.3.1.orig/auth-dialog/Makefile.in
++++ network-manager-strongswan-1.3.1/auth-dialog/Makefile.in
+@@ -261,6 +261,7 @@ nm_strongswan_auth_dialog_CPPFLAGS = \
+ 	$(NM_UTILS_CFLAGS) \
+ 	-DG_DISABLE_DEPRECATED \
+ 	-DGNOME_DISABLE_DEPRECATED \
++	-DGNOME_KEYRING_COMPILATION \
+ 	-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+ 	-DVERSION=\"$(VERSION)\"
+ 
diff --git a/debian/patches.disabled/fix-vbox-parent.patch b/debian/patches.disabled/fix-vbox-parent.patch
new file mode 100644
index 0000000..c802e87
--- /dev/null
+++ b/debian/patches.disabled/fix-vbox-parent.patch
@@ -0,0 +1,22 @@
+Index: network-manager-strongswan-1.3.0/properties/nm-strongswan-dialog.ui
+===================================================================
+--- network-manager-strongswan-1.3.0.orig/properties/nm-strongswan-dialog.ui
++++ network-manager-strongswan-1.3.0/properties/nm-strongswan-dialog.ui
+@@ -1,10 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <interface>
+   <!-- interface-requires gtk+ 2.12 -->
+-  <object class="GtkWindow" id="strongswan-widget">
+-    <property name="can_focus">False</property>
+-    <property name="title" translatable="yes">window1</property>
+-    <child>
+       <object class="GtkVBox" id="strongswan-vbox">
+         <property name="visible">True</property>
+         <property name="can_focus">False</property>
+@@ -374,6 +370,4 @@
+           </packing>
+         </child>
+       </object>
+-    </child>
+-  </object>
+ </interface>
diff --git a/debian/patches.disabled/nm-strongswan-service.name.diff b/debian/patches.disabled/nm-strongswan-service.name.diff
new file mode 100644
index 0000000..962bae8
--- /dev/null
+++ b/debian/patches.disabled/nm-strongswan-service.name.diff
@@ -0,0 +1,8 @@
+--- a/nm-strongswan-service.name.in
++++ b/nm-strongswan-service.name.in
+@@ -5,4 +5,4 @@
+ 
+ [GNOME]
+ auth-dialog=@LIBEXECDIR@/nm-strongswan-auth-dialog
+-properties=libnm-strongswan-properties
++properties=/usr/lib/NetworkManager/libnm-strongswan-properties
diff --git a/debian/patches.disabled/series b/debian/patches.disabled/series
new file mode 100644
index 0000000..1ef4191
--- /dev/null
+++ b/debian/patches.disabled/series
@@ -0,0 +1,3 @@
+nm-strongswan-service.name.diff
+allow_deprecated_keyring_functions.diff
+fix-vbox-parent.patch
diff --git a/debian/patches/add_dbus_policy.diff b/debian/patches/add_dbus_policy.diff
new file mode 100644
index 0000000..4b23596
--- /dev/null
+++ b/debian/patches/add_dbus_policy.diff
@@ -0,0 +1,45 @@
+Index: network-manager-strongswan-1.4.0/Makefile.am
+===================================================================
+--- network-manager-strongswan-1.4.0.orig/Makefile.am
++++ network-manager-strongswan-1.4.0/Makefile.am
+@@ -2,6 +2,9 @@ AUTOMAKE_OPTIONS = foreign
+ 
+ SUBDIRS = properties auth-dialog po
+ 
++dbusservicedir = $(sysconfdir)/dbus-1/system.d
++dbusservice_DATA = nm-strongswan-service.conf
++
+ nmvpnservicedir = $(prefix)/lib/NetworkManager/VPN
+ nmvpnservice_DATA = nm-strongswan-service.name
+ 
+@@ -34,8 +37,8 @@ nm-strongswan-service.name: $(srcdir)/nm
+ 	    -e 's|[@]NM_PLUGINDIR_ABS[@]/|$(nm_plugindir_abs)|g' \
+ 	    -e 's|[@]CHARON[@]|$(charon)|' $< >$@
+ 
+-EXTRA_DIST = \
+-    nm-strongswan-service.name.in  \
++EXTRA_DIST = nm-strongswan-service.name.in  \
++    $(dbusservice_DATA)  \
+     $(appdata_in_files)  \
+     $(appdata_DATA)      \
+     intltool-extract.in  \
+Index: network-manager-strongswan-1.4.0/nm-strongswan-service.conf
+===================================================================
+--- /dev/null
++++ network-manager-strongswan-1.4.0/nm-strongswan-service.conf
+@@ -0,0 +1,15 @@
++<!DOCTYPE busconfig PUBLIC
++ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
++ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
++<busconfig>
++	<policy user="root">
++		<allow own="org.freedesktop.NetworkManager.strongswan"/>
++		<allow send_destination="org.freedesktop.NetworkManager.strongswan"/>
++		<allow send_interface="org.freedesktop.NetworkManager.strongswan"/>
++	</policy>
++	<policy context="default">
++		<deny own="org.freedesktop.NetworkManager.strongswan"/>
++		<deny send_destination="org.freedesktop.NetworkManager.strongswan"/>
++	</policy>
++</busconfig>
++
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5722f5c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+add_dbus_policy.diff
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..0737730
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@ --with autoreconf
+
+override_dh_auto_configure:
+	dh_auto_configure -- --with-charon=/usr/lib/ipsec/charon-nm --libexecdir="\$$(prefix)/lib/NetworkManager"
+
+override_dh_clean:
+	dh_clean -XNetworkManager-strongswan.appdata.xml nm-strongswan-service.name
+
+override_dh_makeshlibs:
+	dh_makeshlibs -X/usr/lib/NetworkManager/
+
diff --git a/debian/rules.cdbs b/debian/rules.cdbs
new file mode 100755
index 0000000..188dc38
--- /dev/null
+++ b/debian/rules.cdbs
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS := --with-charon=/usr/lib/ipsec/charon-nm
+
+DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager"
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -X/usr/lib/NetworkManager/
+
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+
+
+install/network-manager-strongswan::
+	rm debian/network-manager-strongswan/usr/lib/NetworkManager/libnm-strongswan-properties.*a
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)