Disable building the charon-nm package, which we do not use.

The practical reason for removing it completely for the time being is that
libnm is not in jessie.

3 files changed, 1 insertions, 20 deletions

diff --git a/debian/control b/debian/control
index 44a2f8515..1f200fdf1 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,6 @@ Build-Depends: bison,
                libgmp3-dev,
                libkrb5-dev,
                libldap2-dev,
-               libnm-dev [linux-any],
                libpam0g-dev,
                libsqlite3-dev,
                libssl-dev (>= 0.9.8),
@@ -239,20 +238,6 @@ Description: strongSwan Internet Key Exchange daemon
  It is written from scratch using a fully multi-threaded design and a modular
  architecture. Various plugins can provide additional functionality.
 
-Package: strongswan-nm
-Architecture: linux-any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: network-manager-strongswan
-Replaces: network-manager-strongswan (<= 1.4.1-1~)
-Description: strongSwan plugin to interact with NetworkManager
- The strongSwan VPN suite uses the native IPsec stack in the standard
- Linux kernel. It supports both the IKEv1 and IKEv2 protocols.
- .
- This plugin provides an interface which allows NetworkManager to configure
- and control the IKEv2 daemon directly through D-Bus. It is designed to work
- in conjunction with the network-manager-strongswan package, providing
- a simple graphical frontend to configure IPsec based VPNs.
-
 Package: charon-cmd
 Architecture: any
 Depends: libstrongswan (= ${binary:Version}),
diff --git a/debian/rules b/debian/rules
index ca02a0635..99bdc21c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,9 +65,7 @@ endif
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	# only enable network-manager and capabilities dropping on linux hosts
 	# some plugins are linux-only too
-	CONFIGUREARGS += --enable-nm \
-		--with-nm-ca-dir=/etc/ssl/certs \
-		--with-capabilities=libcap \
+	CONFIGUREARGS += --with-capabilities=libcap \
 		--enable-farp \
 		--enable-dhcp \
 		--enable-af-alg \
diff --git a/debian/strongswan-nm.install b/debian/strongswan-nm.install
deleted file mode 100644
index 12665af1f..000000000
--- a/debian/strongswan-nm.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/ipsec/charon-nm
-etc/dbus-1/system.d/nm-strongswan-service.conf