From 4c016b1d7b78fd90448fae55fa346ec65f0d23c5 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Sun, 16 Sep 2018 23:04:22 -0400
Subject: [PATCH] - Updated to 3.26 (CHACHA20POLY1305, ECDSA and RSA-PSS
 support)

---
 .gitignore     |  1 +
 libreswan.spec | 12 +++++-------
 sources        |  5 +----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 94447b8..a77f163 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /libreswan-3.23.tar.gz
 /libreswan-3.24.tar.gz
 /libreswan-3.25.tar.gz
+/libreswan-3.26.tar.gz
diff --git a/libreswan.spec b/libreswan.spec
index ef19910..df89596 100644
--- a/libreswan.spec
+++ b/libreswan.spec
@@ -29,8 +29,8 @@
 Name: libreswan
 Summary: IPsec implementation with IKEv1 and IKEv2 keying protocols
 # version is generated in the release script
-Version: 3.25
-Release: %{?prever:0.}3%{?prever:.%{prever}}%{?dist}.1
+Version: 3.26
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
 License: GPLv2
 Url: https://libreswan.org/
 Source0: https://download.libreswan.org/%{?prever:development/}%{name}-%{version}%{?prever}.tar.gz
@@ -40,9 +40,6 @@ Source2: https://download.libreswan.org/cavs/ikev1_psk.fax.bz2
 Source3: https://download.libreswan.org/cavs/ikev2.fax.bz2
 %endif
 
-Patch1: libreswan-3.25-relax-delete.patch
-Patch2: libreswan-3.25-unbound-hook.patch
-
 Requires(post): bash coreutils systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -107,8 +104,6 @@ sed -i "s:/usr/bin/python:/usr/bin/python3:" testing/pluto/ikev2-15-fuzzer/send_
 sed -i "s:/usr/bin/python:/usr/bin/python3:" testing/x509/dist_certs.py
 # enable crypto-policies support
 sed -i "s:#[ ]*include \(.*\)\(/crypto-policies/back-ends/libreswan.config\)$:include \1\2:" programs/configs/ipsec.conf.in
-%patch1 -p1
-%patch2 -p1
 
 %build
 %if 0%{with_efence}
@@ -215,6 +210,9 @@ export NSS_DISABLE_HW_GCM=1
 %{_libdir}/fipscheck/pluto.hmac
 
 %changelog
+* Mon Sep 17 2018 Paul Wouters <pwouters@redhat.com> - 3.26-1
+- Updated to 3.26 (CHACHA20POLY1305, ECDSA and RSA-PSS support)
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.25-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 4633056..0d7554a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
-SHA512 (libreswan-3.25.tar.gz) = 246649cb5bef1d0690217d1080f3f6f175a0d7a5f27e5a7affdf291b2f418a11937e96b64716a33e6312530409a2c1b10b90e2fa5ec339a27c94c990d86ed517
-SHA512 (ikev1_dsa.fax.bz2) = 627cbac14248bd68e8d22fbca247668a7749ef0c2e41df8d776d62df9a21403d3a246c0bd82c3faedce62de90b9f91a87f753e17b056319000bba7d2038461ac
-SHA512 (ikev1_psk.fax.bz2) = 1b2daec32edc56b410c036db2688c92548a9bd9914994bc7e555b301dd6db4497a6b3e89dc12ddf36826ae90b40fcde501a5a45c0d59098e07839073d219d467
-SHA512 (ikev2.fax.bz2) = 0d3748d1bd574f6f1f3e4db847eca126ce649566ea710ef227426f433122752b80d1d6b8acf9d0df07b5597c1e45447e3a2fcb3391756e834e8e75f99df8e51e
+SHA512 (libreswan-3.26.tar.gz) = 10965a23197ef5d21a66dc0838066ceb620b2653f64471553284e0043fbc993584e497742b498e0be410427aeed3d8ce5bfdc6dfab59b8a1a1ba9a363473c4a4