diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2013-01-02 14:24:31 +0100 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2013-01-02 14:28:05 +0100 |
| commit | 08031a3aafea27f2bb81f60cb1c9939590d3ed46 (patch) | |
| tree | c3a989fc6b3e64246ed0f27059335f232b838a99 | |
| parent | cbdc495f328e27095825683f60dfea673734283f (diff) | |
| download | vyos-strongswan-08031a3aafea27f2bb81f60cb1c9939590d3ed46.tar.gz vyos-strongswan-08031a3aafea27f2bb81f60cb1c9939590d3ed46.zip | |
03_Pass-lo-as-faked-tundev-to-NM-as-it-now-needs-a-vali removed, included upstream.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/03_Pass-lo-as-faked-tundev-to-NM-as-it-now-needs-a-vali.patch | 28 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 2 insertions, 29 deletions
diff --git a/debian/changelog b/debian/changelog index 11305f9db..bd734eebe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ strongswan (5.0.1-1) UNRELEASED; urgency=low * debian/patches: - 01_fix-manpages refreshed. - 02_add-LICENSE dropped, included upstream. + - 03_Pass-lo-as-faked-tundev-to-NM-as-it-now-needs-a-vali removed, + included upstream. -- Yves-Alexis Perez <corsac@debian.org> Wed, 02 Jan 2013 14:18:34 +0100 diff --git a/debian/patches/03_Pass-lo-as-faked-tundev-to-NM-as-it-now-needs-a-vali.patch b/debian/patches/03_Pass-lo-as-faked-tundev-to-NM-as-it-now-needs-a-vali.patch deleted file mode 100644 index 68cf1c3bf..000000000 --- a/debian/patches/03_Pass-lo-as-faked-tundev-to-NM-as-it-now-needs-a-vali.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 49e918021b16f2be8650f3aa24c464a829758b26 Mon Sep 17 00:00:00 2001 -From: Martin Willi <martin@revosec.ch> -Date: Mon, 25 Jun 2012 16:02:20 +0200 -Subject: [PATCH 2/2] Pass "lo" as faked tundev to NM, as it now needs a valid - interface since 0.9 - ---- - src/libcharon/plugins/nm/nm_service.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - ---- a/src/libcharon/plugins/nm/nm_service.c -+++ b/src/libcharon/plugins/nm/nm_service.c -@@ -89,11 +89,12 @@ static void signal_ipv4_config(NMVPNPlug - me = ike_sa->get_my_host(ike_sa); - handler = NM_STRONGSWAN_PLUGIN_GET_PRIVATE(plugin)->handler; - -- /* NM requires a tundev, but netkey does not use one. Passing an invalid -- * iface makes NM complain, but it accepts it without fiddling on eth0. */ -+ /* NM requires a tundev, but netkey does not use one. Passing the physical -+ * interface does not work, as NM fiddles around with it. Passing the -+ * loopback seems to work, though... */ - val = g_slice_new0 (GValue); - g_value_init (val, G_TYPE_STRING); -- g_value_set_string (val, "none"); -+ g_value_set_string (val, "lo"); - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, val); - - val = g_slice_new0(GValue); diff --git a/debian/patches/series b/debian/patches/series index 266c16194..ff73ad310 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 01_fix-manpages.patch -03_Pass-lo-as-faked-tundev-to-NM-as-it-now-needs-a-vali.patch 04-Fixed-IPv6-source-address-lookup.patch |