Version bump to 6.0.4

diff --git a/configure.ac b/configure.ac
index c751bd8a6da2fe0b8ee817e77f82b04f9286b74a..49c4e2f8a247d098daa63e3f0627191ab0f4bb21 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 #  initialize & set some vars
 # ============================
 
-AC_INIT([strongSwan],[6.0.4rc1])
+AC_INIT([strongSwan],[6.0.4])
 AM_INIT_AUTOMAKE(m4_esyscmd([
        echo tar-ustar
        echo subdir-objects

diff --git a/testing/testing.conf b/testing/testing.conf
index 69f4ee77b843161cb71cd9e814a2b92b47701d05..55e93e2d010e0d8b4e3e60ba74d3cc065ee3e193 100644 (file)
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -31,7 +31,7 @@ fi
 : ${KERNELPATCH=ha-6.17-abicompat.patch.bz2}
 
 # strongSwan version used in tests
-: ${SWANVERSION=6.0.4rc1}
+: ${SWANVERSION=6.0.4}
 
 # Build directory where the guest kernel and images will be built
 : ${BUILDDIR=$TESTDIR/build}