From 011195f1a9d90a7d67fd545f696779995337e93e Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Mon, 14 Nov 2016 16:20:10 +0100
Subject: [PATCH] Version bump to 5.5.2dr2

---
 NEWS                 | 3 +++
 configure.ac         | 2 +-
 testing/testing.conf | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 66ffcdd2a1..9ce311dea6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
 strongswan-5.5.2
 ----------------
 
+- Support of Diffie-Hellman group 31 using Curve25519 for IKE as defined
+  by RFC 8031.
+
 - In-place update of cached base and delta CRLs does no leave dozens
   of stale copies in cache memory.
 
diff --git a/configure.ac b/configure.ac
index 769c38c05f..dba52dab7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
 #  initialize & set some vars
 # ============================
 
-AC_INIT([strongSwan],[5.5.2dr1])
+AC_INIT([strongSwan],[5.5.2dr2])
 AM_INIT_AUTOMAKE(m4_esyscmd([
 	echo tar-ustar
 	echo subdir-objects
diff --git a/testing/testing.conf b/testing/testing.conf
index f6a295b017..154b130f05 100644
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -24,14 +24,14 @@ fi
 : ${TESTDIR=/srv/strongswan-testing}
 
 # Kernel configuration
-: ${KERNELVERSION=4.8.5}
+: ${KERNELVERSION=4.8.7}
 : ${KERNEL=linux-$KERNELVERSION}
 : ${KERNELTARBALL=$KERNEL.tar.xz}
 : ${KERNELCONFIG=$DIR/../config/kernel/config-4.8}
 : ${KERNELPATCH=ha-4.4-abicompat.patch.bz2}
 
 # strongSwan version used in tests
-: ${SWANVERSION=5.5.2dr1}
+: ${SWANVERSION=5.5.2dr2}
 
 # Build directory where the guest kernel and images will be built
 : ${BUILDDIR=$TESTDIR/build}