From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Mon, 7 Jul 2025 08:57:25 +0000 (+0200)
Subject: Version bump to 6.0.2rc1
X-Git-Tag: 6.0.2rc1^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd65a21ce0234d011e4183b520be66b99d41c5ae;p=thirdparty%2Fstrongswan.git

Version bump to 6.0.2rc1
---

diff --git a/configure.ac b/configure.ac
index 4af35c2fd5..d8e5c3688c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 #  initialize & set some vars
 # ============================
 
-AC_INIT([strongSwan],[6.0.2dr3])
+AC_INIT([strongSwan],[6.0.2rc1])
 AM_INIT_AUTOMAKE(m4_esyscmd([
 	echo tar-ustar
 	echo subdir-objects
diff --git a/testing/testing.conf b/testing/testing.conf
index 93ed4fbc37..2a223e91ff 100644
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -24,14 +24,14 @@ fi
 : ${TESTDIR=/srv/strongswan-testing}
 
 # Kernel configuration
-: ${KERNELVERSION=6.15.4}
+: ${KERNELVERSION=6.15.5}
 : ${KERNEL=linux-$KERNELVERSION}
 : ${KERNELTARBALL=$KERNEL.tar.xz}
 : ${KERNELCONFIG=$DIR/../config/kernel/config-6.15}
 : ${KERNELPATCH=ha-6.14-abicompat.patch.bz2}
 
 # strongSwan version used in tests
-: ${SWANVERSION=6.0.2dr3}
+: ${SWANVERSION=6.0.2rc1}
 
 # Build directory where the guest kernel and images will be built
 : ${BUILDDIR=$TESTDIR/build}
diff --git a/testing/tests/ikev1/dpd-restart/hosts/carol/etc/strongswan.conf b/testing/tests/ikev1/dpd-restart/hosts/carol/etc/strongswan.conf
index 373d144b19..ddddb951c7 100644
--- a/testing/tests/ikev1/dpd-restart/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/ikev1/dpd-restart/hosts/carol/etc/strongswan.conf
@@ -2,4 +2,5 @@
 
 charon {
   load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default
+  retransmit_timeout = 4.0
 }