[NetworkManager-l2tp] added NetworkManager-l2tp-noccp-pppd-option patch (#887674)

[ivanromanov]

commit ff94c1e29646295f79e68678d5b6e7dd26a8fc10
Author: Ivan Romanov <drizt at land.ru>
Date:   Mon Sep 23 06:51:13 2013 +0600

    added NetworkManager-l2tp-noccp-pppd-option patch (#887674)

 NetworkManager-l2tp-noccp-pppd-option.patch |   29 +++++++++++++++++++++++++++
 NetworkManager-l2tp.spec                    |    8 +++++-
 2 files changed, 35 insertions(+), 2 deletions(-)
---
diff --git a/NetworkManager-l2tp-noccp-pppd-option.patch b/NetworkManager-l2tp-noccp-pppd-option.patch
new file mode 100644
index 0000000..24dd0e8
--- /dev/null
+++ b/NetworkManager-l2tp-noccp-pppd-option.patch
@@ -0,0 +1,29 @@
+From 5fe98f70344e842faa28014be7ba259c2db7ae8b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=9F=D1=80=D0=BE?=
+ =?UTF-8?q?=D1=85=D0=BE=D1=80=D0=BE=D0=B2?= <seriy.pr at gmail.com>
+Date: Mon, 9 Sep 2013 04:38:52 +0400
+Subject: [PATCH] noccp pppd option added.
+
+Thanks to Gordon Messmer https://bugzilla.redhat.com/show_bug.cgi?id=887674#c26
+---
+ src/nm-l2tp-service.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/nm-l2tp-service.c b/src/nm-l2tp-service.c
+index 1cc605a..b19a44b 100644
+--- a/src/nm-l2tp-service.c
++++ b/src/nm-l2tp-service.c
+@@ -1246,6 +1246,10 @@ nm_l2tp_config_write (NML2tpPlugin *plugin,
+ 	/* Don't need to auth the L2TP server */
+ 	write_config_option (pppopt_fd, "noauth\n");
+ 
++	/* pppd and xl2tpd on Linux require this option to support Android and iOS clients,
++	   and pppd on Linux clients won't work without the same option */
++	write_config_option (pppopt_fd, "noccp\n");
++
+ 	if (service_priv && strlen (service_priv->username)) {
+ 		write_config_option (pppopt_fd, "name %s\n", service_priv->username);
+ 	}
+-- 
+1.8.3.1
+
diff --git a/NetworkManager-l2tp.spec b/NetworkManager-l2tp.spec
index 89c2582..648e944 100644
--- a/NetworkManager-l2tp.spec
+++ b/NetworkManager-l2tp.spec
@@ -7,13 +7,14 @@
 Summary:   NetworkManager VPN plugin for l2tp
 Name:      NetworkManager-l2tp
 Version:   0.9.8
-Release:   2%{?dist}
+Release:   3%{?dist}
 # The most of code uses GPLv2+ license.
 # Only vpn-password-dialog has LGPLv2+.
 License:   GPLv2+ and LGPLv2+
 Group:     System Environment/Base
 URL:       https://launchpad.net/~seriy-pr/+archive/network-manager-l2tp
 Source:    https://github.com/seriyps/NetworkManager-l2tp/archive/%{version}/%{name}-%{version}.tar.gz
+Patch0:    NetworkManager-l2tp-noccp-pppd-option.patch
 
 BuildRequires: libtool
 BuildRequires: gtk3-devel             >= %{gtk3_version}
@@ -49,7 +50,7 @@ the NetworkManager and the GNOME desktop.
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 ./autogen.sh
@@ -84,6 +85,9 @@ rm -f %{buildroot}%{_libdir}/pppd/2.*/nm-l2tp-pppd-plugin.a
 %{_datadir}/gnome-vpn-properties/l2tp
 
 %changelog
+* Mon Sep 23 2013 Ivan Romanov <drizt at land.ru> - 0.9.8-3
+- added NetworkManager-l2tp-noccp-pppd-option patch (#887674)
+
 * Fri Aug 02 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild