From efc202e0cdf6d4425283e27234198a54088d505e Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Dec 19 2020 17:23:16 +0000
Subject: Revert to 4.1-3 state to rebuild for ldns soname bump


---

diff --git a/.gitignore b/.gitignore
index ea529fe..390dc0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,4 +36,3 @@
 /libreswan-4.0rc1.tar.gz
 /libreswan-4.0.tar.gz
 /libreswan-4.1.tar.gz
-/libreswan-4.2rc1.tar.gz
diff --git a/libreswan.spec b/libreswan.spec
index 1175111..01ba6ee 100644
--- a/libreswan.spec
+++ b/libreswan.spec
@@ -28,16 +28,16 @@
     USE_NM=true \\\
     USE_SECCOMP=true \\\
     USE_XAUTHPAM=true \\\
-    USE_NSS_KDF=false \\\
+    USE_NSS_KDF=true \\\
 %{nil}
 
-%global prever rc1
+#global prever rc1
 
 Name: libreswan
 Summary: IKE implementation for IPsec with IKEv1 and IKEv2 support
 # version is generated in the release script
-Version: 4.2
-Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}
+Version: 4.1
+Release: %{?prever:0.}3%{?prever:.%{prever}}%{?dist}
 License: GPLv2
 Url: https://libreswan.org/
 Source0: https://download.libreswan.org/%{?prever:with_development/}%{name}-%{version}%{?prever}.tar.gz
@@ -207,12 +207,6 @@ certutil -N -d sql:$tmpdir --empty-password
 %attr(0644,root,root) %doc %{_mandir}/*/*
 
 %changelog
-* Sat Dec 19 2020 Adam Williamson <awilliam@redhat.com> - 4.2-0.2.rc1
-- Rebuild for ldns soname bump
-
-* Thu Dec 17 13:45:52 EST 2020 Paul Wouters <pwouters@redhat.com> - 4.2-0.1.rc1
-- Update to 4.2rc1 and disable USE_NSS_KDF for testing
-
 * Mon Nov 23 11:50:41 EST 2020 Paul Wouters <pwouters@redhat.com> - 4.1-3
 - Resolves: rhbz#1894381 Libreswan 4.1-2 breaks l2tp connection to Windows VPN server
 
diff --git a/sources b/sources
index ee22754..5b6a525 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (libreswan-4.2rc1.tar.gz) = e218a3edc0d16dcf12fac7e59d4672fa96e867b6d739e05f54db6646af00092c25980aaeb0d93285ce147329d90a4e998cfc2d8b86d69aa885e0e464b4869ea0
+SHA512 (libreswan-4.1.tar.gz) = c98dfdf6bff17eda6f028e35653b822941665989e37974266bcc54fda20e05f71b86c1dfee858a8ba9a544f86e9217e8e08fa2dfe03ab011f6c2d039b4ee05fe
 SHA512 (ikev1_dsa.fax.bz2) = 627cbac14248bd68e8d22fbca247668a7749ef0c2e41df8d776d62df9a21403d3a246c0bd82c3faedce62de90b9f91a87f753e17b056319000bba7d2038461ac
 SHA512 (ikev1_psk.fax.bz2) = 1b2daec32edc56b410c036db2688c92548a9bd9914994bc7e555b301dd6db4497a6b3e89dc12ddf36826ae90b40fcde501a5a45c0d59098e07839073d219d467
 SHA512 (ikev2.fax.bz2) = 0d3748d1bd574f6f1f3e4db847eca126ce649566ea710ef227426f433122752b80d1d6b8acf9d0df07b5597c1e45447e3a2fcb3391756e834e8e75f99df8e51e