From 16eb6174efe34e004df417f862bf2333e3438e9c Mon Sep 17 00:00:00 2001
From: Douglas Kosovic <doug@uq.edu.au>
Date: Wed, 26 Feb 2020 00:11:59 +1000
Subject: [PATCH] Patch to support libreswan 3.30 which is no longer built with
 modp1024 support

---
 NetworkManager-l2tp-1.8.0-libreswan-3.30.patch | 13 +++++++++++++
 NetworkManager-l2tp.spec                       |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 NetworkManager-l2tp-1.8.0-libreswan-3.30.patch

diff --git a/NetworkManager-l2tp-1.8.0-libreswan-3.30.patch b/NetworkManager-l2tp-1.8.0-libreswan-3.30.patch
new file mode 100644
index 0000000..d95d8d7
--- /dev/null
+++ b/NetworkManager-l2tp-1.8.0-libreswan-3.30.patch
@@ -0,0 +1,13 @@
+diff --git a/src/nm-l2tp-service.c b/src/nm-l2tp-service.c
+index c80135f..1c6cbb4 100644
+--- a/src/nm-l2tp-service.c
++++ b/src/nm-l2tp-service.c
+@@ -98,7 +98,7 @@ typedef struct {
+ #define STRONGSWAN_IKEV1_ALGORITHMS_PHASE1 "aes256-sha2_256-modp2048,aes256-sha2_256-modp1536,aes256-sha2_256-modp1024,aes256-sha1-modp2048,aes256-sha1-modp1536,aes256-sha1-modp1024,aes256-sha1-ecp384,aes128-sha1-modp1024,aes128-sha1-ecp256,3des-sha1-modp2048,3des-sha1-modp1024!"
+ #define STRONGSWAN_IKEV1_ALGORITHMS_PHASE2 "aes256-sha1,aes128-sha1,3des-sha1!"
+ 
+-#define LIBRESWAN_IKEV1_ALGORITHMS_PHASE1 "aes256-sha2_256-modp2048,aes256-sha2_256-modp1536,aes256-sha2_256-modp1024,aes256-sha1-modp2048,aes256-sha1-modp1536,aes256-sha1-modp1024,aes256-sha1-ecp_384,aes128-sha1-modp1024,aes128-sha1-ecp_256,3des-sha1-modp2048,3des-sha1-modp1024"
++#define LIBRESWAN_IKEV1_ALGORITHMS_PHASE1 "aes256-sha2_256-modp2048,aes256-sha2_256-modp1536,aes256-sha1-modp2048,aes256-sha1-modp1536,aes256-sha1-ecp_384,aes128-sha1-ecp_256,3des-sha1-modp2048"
+ #define LIBRESWAN_IKEV1_ALGORITHMS_PHASE2 "aes256-sha1,aes128-sha1,3des-sha1"
+ 
+ /*****************************************************************************/
diff --git a/NetworkManager-l2tp.spec b/NetworkManager-l2tp.spec
index 62142cc..62b85fc 100644
--- a/NetworkManager-l2tp.spec
+++ b/NetworkManager-l2tp.spec
@@ -7,10 +7,11 @@
 Summary:   NetworkManager VPN plugin for L2TP and L2TP/IPsec
 Name:      NetworkManager-l2tp
 Version:   1.8.0
-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
+Patch1:    NetworkManager-l2tp-1.8.0-libreswan-3.30.patch
 
 %global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad)
 
@@ -54,6 +55,7 @@ IPsec VPN support with the NetworkManager (GNOME files).
 
 %prep
 %setup -q
+%patch1 -p1 -b .modp1024
 
 %build
 if [ ! -f configure ]; then
@@ -113,6 +115,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Feb 26 2020 Douglas Kosovic <doug@uq.edu.au> - 1.8.0-1
+- Patch to support libreswan 3.30 which is no longer built with modp1024 support
+
 * Sat Feb 22 2020 Adam Williamson <awilliam@redhat.com> - 1.8.0-3
 - Rebuild for new ppp