From 439d5bb8a3046b8d111feb5785695b94bdbd153f Mon Sep 17 00:00:00 2001
From: Douglas Kosovic <doug@uq.edu.au>
Date: Sun, 7 Feb 2021 21:47:33 +1000
Subject: [PATCH] Sync with EPEL8

---
 NetworkManager-l2tp.spec | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/NetworkManager-l2tp.spec b/NetworkManager-l2tp.spec
index 00aff64..c69e040 100644
--- a/NetworkManager-l2tp.spec
+++ b/NetworkManager-l2tp.spec
@@ -1,7 +1,7 @@
 Summary:   NetworkManager VPN plugin for L2TP and L2TP/IPsec
 Name:      NetworkManager-l2tp
 Version:   1.8.6
-Release:   3%{?dist}
+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
@@ -23,7 +23,11 @@ Requires: dbus
 Requires: NetworkManager >= 1:1.8.0
 Requires: ppp = %{ppp_version}
 Requires: xl2tpd
+%if 0%{?rhel} < 9
+Recommends: (libreswan or strongswan)
+%else
 Recommends: (libreswan >= 4.0 or strongswan)
+%endif
 
 %global __provides_exclude ^libnm-.*\\.so
 
@@ -49,8 +53,11 @@ if [ ! -f configure ]; then
 fi
 %configure \
     --disable-static \
-%if 0%{?rhel} == 8
+%if 0%{?rhel} < 9
     --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}
@@ -95,6 +102,9 @@ exit 0
 %{_datadir}/metainfo/network-manager-l2tp.metainfo.xml
 
 %changelog
+* 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