Merge branch 'main' into epel8

.gitignore

@@ -15,3 +15,4 @@
 /NetworkManager-l2tp-1.2.16.tar.xz
 /NetworkManager-l2tp-1.8.0.tar.xz
 /NetworkManager-l2tp-1.8.2.tar.xz
+/NetworkManager-l2tp-1.8.6.tar.xz

NetworkManager-l2tp.spec

@@ -1,13 +1,14 @@
 Summary:   NetworkManager VPN plugin for L2TP and L2TP/IPsec
 Name:      NetworkManager-l2tp
-Version:   1.8.2
-Release:   1%{?dist}
+Version:   1.8.6
+Release:   4%{?dist}
 License:   GPLv2+
 URL:       https://github.com/nm-l2tp/NetworkManager-l2tp
 Source:    https://github.com/nm-l2tp/NetworkManager-l2tp/releases/download/%{version}/%{name}-%{version}.tar.xz
 
 %global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad)
 
+BuildRequires: make
 BuildRequires: glib2-devel
 BuildRequires: gtk3-devel
 BuildRequires: NetworkManager-libnm-devel >= 1:1.8.0
@@ -22,7 +23,11 @@ Requires: dbus
 Requires: NetworkManager >= 1:1.8.0
 Requires: ppp = %{ppp_version}
 Requires: xl2tpd
+%if 0%{?rhel} == 8
 Recommends: (libreswan or strongswan)
+%else
+Recommends: (libreswan >= 4.0 or strongswan)
+%endif
 
 %global __provides_exclude ^libnm-.*\\.so
 
@@ -50,6 +55,9 @@ fi
     --disable-static \
 %if 0%{?rhel} == 8
     --enable-libreswan-dh2 \
+    --with-nm-ipsec-nss-dir=%{_sysconfdir}/ipsec.d \
+%else
+    --with-nm-ipsec-nss-dir=%{_sharedstatedir}/ipsec/nss \
 %endif
     --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
     --with-dist-version=%{version}-%{release}
@@ -79,7 +87,7 @@ exit 0
 
 %files -f %{name}.lang
 %{_libdir}/NetworkManager/libnm-vpn-plugin-l2tp.so
-%{_sysconfdir}/dbus-1/system.d/nm-l2tp-service.conf
+%{_datadir}/dbus-1/system.d/nm-l2tp-service.conf
 %{_prefix}/lib/NetworkManager/VPN/nm-l2tp-service.name
 %{_libexecdir}/nm-l2tp-service
 %{_libdir}/pppd/%{ppp_version}/nm-l2tp-pppd-plugin.so
@@ -91,15 +99,34 @@ exit 0
 %files gnome
 %{_libexecdir}/nm-l2tp-auth-dialog
 %{_libdir}/NetworkManager/libnm-vpn-plugin-l2tp-editor.so
-%{_datadir}/appdata/network-manager-l2tp.metainfo.xml
+%{_datadir}/metainfo/network-manager-l2tp.metainfo.xml
 
 %changelog
-* Sun Apr 12 2020 Douglas Kosovic <doug@uq.edu.au> - 1.8.2-1
+* Sun Feb 07 2021 Douglas Kosovic <doug@uq.edu.au> - 1.8.6-5
+- Correct EPEL8 conditional
+
+* Sun Feb 07 2021 Douglas Kosovic <doug@uq.edu.au> - 1.8.6-4
+- Sync with EPEL8
+
+* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan  8 12:30:58 CET 2021 Tomas Hrcka <thrcka@redhat.com> - 1.8.6-2
+- rebuilt for new version of ppp
+
+* Tue Nov 03 2020 Douglas Kosovic <doug@uq.edu.au> - 1.8.6-1
+- Updated to 1.8.6 release
+- Remove redundant libnm_glib conditionals
+- explictly recommend libreswan >= 4.0 because of change in NSS DB location.
+- AppData file now in %%{_datadir}/metainfo/
+- D-Bus policy file now in %%{_datadir}/dbus-1/system.d/
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Mar 26 2020 Douglas Kosovic <doug@uq.edu.au> - 1.8.2-1
 - Updated to 1.8.2 release
 - Remove redundant patches
-- Remove redundant libnm_glib conditionals as can not be built with RHEL < 8
-- Correct BuildRequires version dependencies
-- Use --enable-libreswan-dh2 configure switch with RHEL8
 - Recommends (libreswan or strongswan) instead of just libreswan
 
 * Thu Feb 27 2020 Douglas Kosovic <doug@uq.edu.au> - 1.8.0-5

sources

@@ -1 +1 @@
-SHA512 (NetworkManager-l2tp-1.8.2.tar.xz) = fc7f4037a4e2d442231f3c72692b7d405f13507625828dc4b975fab3717c7c0daaeaa757ef2ed875f347a87ac4ccaf5a0df1834235d8879f3d1e0d1b450531b8
+SHA512 (NetworkManager-l2tp-1.8.6.tar.xz) = 968e8c9140f800935e57e6a58fb4cc8a92385427b8a070a5106c37f5a9d05cfcc1333fe706dfa5ae79dfdcdde89e4becd7866a4e5f535b32e1edafe7171946a7