[Pkg-swan-devel] [strongswan] 01/01: Add patch to fix initialization of NM plugin

[Yves-Alexis Perez]

This is an automated email from the git hooks/post-receive script.

corsac pushed a commit to branch wheezy
in repository strongswan.

commit 9b9b49d83437df1676bce9812e0a3f88cbc74968
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Tue Feb 4 20:36:35 2014 +0100

    Add patch to fix initialization of NM plugin
    
    * debian/patches:
      - 0001-Fix-initialization-of-NM-plugin added, fix NetworkManager plugin
        not working at all.                                       closes: #692606
---
 debian/changelog                                   |  8 +++++++
 .../0001-Fix-initialization-of-NM-plugin.patch     | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 11b7f3d..c141ee8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+strongswan (4.5.2-1.5+deb7u3) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - 0001-Fix-initialization-of-NM-plugin added, fix NetworkManager plugin
+      not working at all.                                       closes: #692606
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 04 Feb 2014 09:38:28 +0100
+
 strongswan (4.5.2-1.5+deb7u2) wheezy-security; urgency=high
 
   * Non-maintainer upload by the Security Team.
diff --git a/debian/patches/0001-Fix-initialization-of-NM-plugin.patch b/debian/patches/0001-Fix-initialization-of-NM-plugin.patch
new file mode 100644
index 0000000..daa724b
--- /dev/null
+++ b/debian/patches/0001-Fix-initialization-of-NM-plugin.patch
@@ -0,0 +1,26 @@
+From c140757221ed62c1ab1c193d9914c18a986bd9a0 Mon Sep 17 00:00:00 2001
+From: Martin Willi <martin at revosec.ch>
+Date: Tue, 31 May 2011 18:12:56 +0200
+Subject: [PATCH] Fix initialization of NM plugin
+
+---
+ src/libcharon/plugins/nm/nm_plugin.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libcharon/plugins/nm/nm_plugin.c b/src/libcharon/plugins/nm/nm_plugin.c
+index fb8c16f..84b7c81 100644
+--- a/src/libcharon/plugins/nm/nm_plugin.c
++++ b/src/libcharon/plugins/nm/nm_plugin.c
+@@ -118,8 +118,8 @@ plugin_t *nm_plugin_create()
+ 		},
+ 		.creds = nm_creds_create(),
+ 		.handler = nm_handler_create(),
+-		.plugin = nm_strongswan_plugin_new(this->creds, this->handler),
+ 	);
++	this->plugin = nm_strongswan_plugin_new(this->creds, this->handler);
+ 
+ 	hydra->attributes->add_handler(hydra->attributes, &this->handler->handler);
+ 	lib->credmgr->add_set(lib->credmgr, &this->creds->set);
+-- 
+1.9.rc1
+
diff --git a/debian/patches/series b/debian/patches/series
index 8cbdabe..9f9f766 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ debian-changes-4.5.2-1.1
 0001-Added-support-for-the-resolvconf-framework-in-resolv.patch
 0001-Check-return-value-of-ECDSA_Verify-correctly.patch
 CVE-2013-6075.patch
+0001-Fix-initialization-of-NM-plugin.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-swan/strongswan.git