From 7f8fe26d5bc58a1d117700f9aee1b6542bc47806 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Sun, 22 Oct 2017 22:02:33 -0400
Subject: [PATCH] - Updated to 3.22 - many bugfixes, and unbound ipsecmod
 support

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

diff --git a/.gitignore b/.gitignore
index b491166..5778aea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /libreswan-3.20dr4.tar.gz
 /libreswan-3.20.tar.gz
 /libreswan-3.21.tar.gz
+/libreswan-3.22.tar.gz
diff --git a/libreswan.spec b/libreswan.spec
index 8e9d6a3..84a9ca5 100644
--- a/libreswan.spec
+++ b/libreswan.spec
@@ -21,7 +21,7 @@
 Name: libreswan
 Summary: IPsec implementation with IKEv1 and IKEv2 keying protocols
 # version is generated in the release script
-Version: 3.21
+Version: 3.22
 Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
 License: GPLv2
 Url: https://libreswan.org/
@@ -212,13 +212,13 @@ bunzip2 *.fax.bz2
 export NSS_DISABLE_HW_GCM=1
 
 : starting CAVS test for IKEv2
-OBJ.linux.%{_arch}/testing/cavp/cavp -v2 ikev2.fax | \
+OBJ.linux.%{_arch}/programs/cavp/cavp -v2 ikev2.fax | \
     diff -u ikev2.fax - > /dev/null
 : starting CAVS test for IKEv1 RSASIG
-OBJ.linux.%{_arch}/testing/cavp/cavp -v1sig ikev1_dsa.fax | \
+OBJ.linux.%{_arch}/programs/cavp/cavp -v1sig ikev1_dsa.fax | \
     diff -u ikev1_dsa.fax - > /dev/null
 : starting CAVS test for IKEv1 PSK
-OBJ.linux.%{_arch}/testing/cavp/cavp -v1psk ikev1_psk.fax | \
+OBJ.linux.%{_arch}/programs/cavp/cavp -v1psk ikev1_psk.fax | \
     diff -u ikev1_psk.fax - > /dev/null
 : CAVS tests passed
 %endif
@@ -238,7 +238,6 @@ OBJ.linux.%{_arch}/testing/cavp/cavp -v1psk ikev1_psk.fax | \
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipsec.conf
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ipsec.secrets
 %attr(0700,root,root) %dir %{_sysconfdir}/ipsec.d
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipsec.d/v6neighbor-hole.conf
 %attr(0700,root,root) %dir %{_sysconfdir}/ipsec.d/policies
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipsec.d/policies/*
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysctl.d/50-libreswan.conf
@@ -257,6 +256,9 @@ OBJ.linux.%{_arch}/testing/cavp/cavp -v1psk ikev1_psk.fax | \
 %endif
 
 %changelog
+* Mon Oct 23 2017 Paul Wouters <pwouters@redhat.com> - 3.22-1
+- Updated to 3.22 - many bugfixes, and unbound ipsecmod support
+
 * Wed Aug  9 2017 Paul Wouters <pwouters@redhat.com> - 3.21-1
 - Updated to 3.21
 
diff --git a/sources b/sources
index 0a9065d..05bd9ff 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
-SHA512 (ikev1_dsa.fax.bz2) = 627cbac14248bd68e8d22fbca247668a7749ef0c2e41df8d776d62df9a21403d3a246c0bd82c3faedce62de90b9f91a87f753e17b056319000bba7d2038461ac
-SHA512 (ikev1_psk.fax.bz2) = 1b2daec32edc56b410c036db2688c92548a9bd9914994bc7e555b301dd6db4497a6b3e89dc12ddf36826ae90b40fcde501a5a45c0d59098e07839073d219d467
-SHA512 (ikev2.fax.bz2) = 0d3748d1bd574f6f1f3e4db847eca126ce649566ea710ef227426f433122752b80d1d6b8acf9d0df07b5597c1e45447e3a2fcb3391756e834e8e75f99df8e51e
-SHA512 (libreswan-3.21.tar.gz) = f1ef002b3e0869920edfebfc8efd73d9a9f84f64a77ad4832f46b12dfdd3c31cdf48c1473522b63f155058592c46af05995756af5440ca3e9c0fa5207436e0fc
+SHA512 (libreswan-3.22.tar.gz) = 93868327394527750590e1297443d3eb1c9a528d680348098fd2913123dac52c9fecd73b855ee00586c2516b8aa00f7f0d158d8e9b19d7487b5fb26432b86aff