From fe733530dff2de81256f896336014bf5c5d817cc Mon Sep 17 00:00:00 2001
From: Paul Wouters <paul.wouters@aiven.io>
Date: Tue, 24 May 2022 13:38:10 -0400
Subject: [PATCH] - Updated to 4.7 (EAPTLS support, bugfixes)

---
 .gitignore     | 2 ++
 libreswan.spec | 9 +++++----
 sources        | 5 ++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index ae89163..cb81b2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,5 @@
 /libreswan-4.6.tar.gz
 /libreswan-4.6.tar.gz.asc
 /LIBRESWAN-GPG-KEY.txt
+/libreswan-4.7.tar.gz
+/libreswan-4.7.tar.gz.asc
diff --git a/libreswan.spec b/libreswan.spec
index 5e1774d..caac19d 100644
--- a/libreswan.spec
+++ b/libreswan.spec
@@ -30,8 +30,8 @@
 Name: libreswan
 Summary: Internet Key Exchange (IKEv1 and IKEv2) implementation for IPsec
 # version is generated in the release script
-Version: 4.6
-Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.1
+Version: 4.7
+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
@@ -43,8 +43,6 @@ Source4: https://download.libreswan.org/cavs/ikev1_psk.fax.bz2
 Source5: https://download.libreswan.org/cavs/ikev2.fax.bz2
 %endif
 
-Patch1: libreswan-4.6-openssl-nss.patch
-
 BuildRequires: audit-libs-devel
 BuildRequires: bison
 BuildRequires: curl-devel
@@ -208,6 +206,9 @@ certutil -N -d sql:$tmpdir --empty-password
 %doc %{_mandir}/*/*
 
 %changelog
+* Tue May 24 2022 Paul Wouters <paul.wouters@aiven.io> - 4.7-1
+- Updated to 4.7 (EAPTLS support, bugfixes)
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.6-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index 1136740..2f11cfc 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,5 @@
-SHA512 (LIBRESWAN-GPG-KEY.txt) = 4df07b77a8026b071dbd99723cf475f76948364c7e63c59ad59444595e042b6c426e28106ba614806c11f0f1d1f32570b60d5cfbaf0beada0621dd242a399000
+SHA512 (libreswan-4.7.tar.gz) = aea958be5512e08ea809145021695edd4e7df4487a0f3ba94c4d0165113647195c1c1599cd5fbbbfae8f6a2bebf39d7514a694f86297c29c543b1a63646ca44e
+SHA512 (libreswan-4.7.tar.gz.asc) = 02a1f997c3fc5993fab307a43b6c54217a2a3ceaa5bc7a807de9971d8b1e17f84c59491f42be40a69f00647f76c9c153142bdfb82d04777a4f9aea35570232ac
 SHA512 (ikev1_dsa.fax.bz2) = 627cbac14248bd68e8d22fbca247668a7749ef0c2e41df8d776d62df9a21403d3a246c0bd82c3faedce62de90b9f91a87f753e17b056319000bba7d2038461ac
 SHA512 (ikev1_psk.fax.bz2) = 1b2daec32edc56b410c036db2688c92548a9bd9914994bc7e555b301dd6db4497a6b3e89dc12ddf36826ae90b40fcde501a5a45c0d59098e07839073d219d467
 SHA512 (ikev2.fax.bz2) = 65c65d86fd1a7539c0ad516b0f49546d5722b710225857ee2d2f5f3415ac7d023264746398f3637fd248a4ce2364957c516c31214ee33faefe58ac8e4e333a10
-SHA512 (libreswan-4.6.tar.gz.asc) = c8dca0e0800124603ec8d41ef2edcf6d9d1df999aa4127861223b9af8e376e2afd7cdbf71449299fa12a5ce7e53fb0e3bf04566f069e6543507accc88559940b
-SHA512 (libreswan-4.6.tar.gz) = c1c3efd7665dee6caaf08cb5aa50fcd37c299acad4b62648284fdb04edd50ba8fc8d33a9fb210edaf2312697f8cd251f33a6b16587eb2cfefd1269b4482dd499