Update to 1.2 git snapshot with libnm-based properties plugin

.gitignore

@@ -3,3 +3,4 @@
 /NetworkManager-l2tp-0.9.8.5.tar.gz
 /NetworkManager-l2tp-0.9.8.6.tar.gz
 /NetworkManager-l2tp-0.9.8.7.tar.gz
+/NetworkManager-l2tp-1.2.0.tar.xz

NetworkManager-l2tp-Check-var-run-pluto-ipsec-info.patch

@@ -1,35 +0,0 @@
-From cf9073df710b4c650b7617a88720d4d4cd0a51bf 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@gmail.com>
-Date: Mon, 9 Sep 2013 03:52:02 +0400
-Subject: [PATCH] Check /var/run/pluto/ipsec.info for existence before sourcing
- it. Thanks to Gordon Messmer
- https://bugzilla.redhat.com/show_bug.cgi?id=887674#c45
-
----
- src/nm-l2tp-service.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/nm-l2tp-service.c b/src/nm-l2tp-service.c
-index 38f67ef..1cc605a 100644
---- a/src/nm-l2tp-service.c
-+++ b/src/nm-l2tp-service.c
-@@ -899,13 +899,13 @@ nm_l2tp_start_ipsec(NML2tpPlugin *plugin,
- 	}
- 	sprintf(session_name, "nm-ipsec-l2tpd-%d", getpid());
- 
--	sys += system(". /var/run/pluto/ipsec.info;"
-+	sys += system("test -e /var/run/pluto/ipsec.info && . /var/run/pluto/ipsec.info;"
- 	"PATH=/usr/local/sbin:/usr/sbin:/sbin; export PATH;"
- 	"[ \"x$defaultrouteaddr\" = \"x\" ] && ipsec setup restart");
- 
- 	sys += system("PATH=/usr/local/sbin:/usr/sbin:/sbin ipsec whack"
- 			" --listen");
--	sprintf(cmd1,". /var/run/pluto/ipsec.info;"
-+	sprintf(cmd1,"test -e /var/run/pluto/ipsec.info && . /var/run/pluto/ipsec.info;"
- 	"PATH=/usr/local/sbin:/usr/sbin:/sbin ipsec addconn "
- 		" ${defaultrouteaddr:+--defaultroute} $defaultrouteaddr"
- 		" ${defaultroutenexthop:+--defaultroutenexthop} $defaultroutenexthop"
--- 
-1.8.3.1
-

NetworkManager-l2tp-noccp-pppd-option.patch

@@ -1,29 +0,0 @@
-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@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
-

NetworkManager-l2tp.spec

@@ -1,43 +1,34 @@
-%global nm_version          1:0.9.2
-%global dbus_version        1.1
+%global nm_version          1:1.2.0-0.3
 %global gtk3_version        3.0
 %global ppp_version         %(rpm -q ppp --queryformat '%{VERSION}')
 %global shared_mime_version 0.16-3
 
 Summary:   NetworkManager VPN plugin for l2tp
 Name:      NetworkManager-l2tp
-Version:   0.9.8.7
-Release:   4%{?dist}
+Version:   1.2.0
+Release:   0.1.20151023git3239062%{?dist}
 # The most of code uses GPLv2+ license.
 # Only vpn-password-dialog has LGPLv2+.
 License:   GPLv2+ and LGPLv2+
 URL:       https://launchpad.net/~seriy-pr/+archive/network-manager-l2tp
-Source:    https://github.com/seriyps/NetworkManager-l2tp/archive/%{version}/%{name}-%{version}.tar.gz
+Source:    https://github.com/seriyps/NetworkManager-l2tp/archive/%{version}/%{name}-%{version}.tar.xz
 
 BuildRequires: libtool
 BuildRequires: gtk3-devel             >= %{gtk3_version}
-BuildRequires: dbus-devel             >= %{dbus_version}
-BuildRequires: dbus-glib-devel        >= 0.74
-BuildRequires: NetworkManager-devel   >= %{nm_version}
 BuildRequires: NetworkManager-glib-devel >= %{nm_version}
+BuildRequires: NetworkManager-libnm-devel >= %{nm_version}
 BuildRequires: libgnome-keyring-devel
 BuildRequires: intltool gettext
 BuildRequires: ppp-devel
 
-# nm-connection-editor was a part of NetworkManager-gnome but since F18 it splits
-%if 0%{?fedora} > 17
 Requires: nm-connection-editor
-%else
-Requires: NetworkManager-gnome
-%endif
-Requires: dbus             >= %{dbus_version}
+Requires: dbus
 Requires: NetworkManager   >= %{nm_version}
 Requires: ppp              = %{ppp_version}
 Requires: shared-mime-info >= %{shared_mime_version}
 Requires: pptp
-Requires: gnome-keyring
 Requires: xl2tpd
-Requires: openswan
+Requires: libreswan
 
 %filter_provides_in %{_libdir}/pppd/%{ppp_version}/nm-l2tp-pppd-plugin.so
 %filter_provides_in %{_libdir}/NetworkManager/lib*.so
@@ -50,11 +41,11 @@ the NetworkManager and the GNOME desktop.
 %setup -q
 
 %build
-./autogen.sh
 %configure \
     --disable-static \
     --enable-more-warnings=yes \
-    --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version}
+    --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
+    --with-dist-version=%{version}-%{release}
 
 make %{?_smp_mflags}
 
@@ -63,25 +54,28 @@ make %{?_smp_mflags}
 make install DESTDIR=%{buildroot} INSTALL="/usr/bin/install -p"
 
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
-rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.a
 
 rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/nm-l2tp-pppd-plugin.la
-rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/nm-l2tp-pppd-plugin.a
 
 %find_lang %{name}
 
 %files -f %{name}.lang
-%doc AUTHORS
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/nm-l2tp-service.conf
 # Content must not be changed
 %config %{_sysconfdir}/NetworkManager/VPN/nm-l2tp-service.name
+%{_prefix}/lib/NetworkManager/VPN/nm-l2tp-service.name
 %{_libdir}/NetworkManager/lib*.so
 %{_libdir}/pppd/2.*/nm-l2tp-pppd-plugin.so
 %{_libexecdir}/nm-l2tp-auth-dialog
 %{_libexecdir}/nm-l2tp-service
 %{_datadir}/gnome-vpn-properties/l2tp
+%doc AUTHORS NEWS README
+%license COPYING
 
 %changelog
+* Fri Oct 23 2015 Lubomir Rintel <lkundrak@v3.sk> - 1.2.0-0.1.20151023git3239062
+- Update to 1.2 git snapshot with libnm-based properties plugin
+
 * Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

sources

@@ -1 +0,0 @@
-5626971b69120583f59e1eace54f5371  NetworkManager-l2tp-0.9.8.7.tar.gz