From 7f99bedae002f0dd04ceeb8d86d59fc4a68a69a0 Mon Sep 17 00:00:00 2001
From: "(Berry) A.W. van Halderen" <berry@halderen.net>
Date: Wed, 29 Apr 2020 10:52:04 +0200
Subject: [PATCH] Prepare for release 2.6.1

---
 CMakeLists.txt | 4 ++--
 NEWS           | 6 ++++++
 configure.ac   | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a01670d9..6a7766652 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,10 +61,10 @@ set(DEFAULT_TOKENDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/softhsm/tokens/"
 set(MAX_PIN_LEN 255 CACHE STRING "Maximum PIN length")
 set(MIN_PIN_LEN 4 CACHE STRING "Minimum PIN length")
 
-set(VERSION "2.6.0")
+set(VERSION "2.6.1")
 set(VERSION_MAJOR 2)
 set(VERSION_MINOR 6)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
 
 set(PACKAGE "softhsm")
 set(PACKAGE_BUGREPORT)
diff --git a/NEWS b/NEWS
index 8e7aacd86..bf83c4bff 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 NEWS for SoftHSM -- History of user visible changes
 
+SoftHSM 2.6.1 - 2020-04-29
+
+* Issue #542: Support Ed448/X448 for OpenSSL
+* Issue #538: Improved warning and compilation issues for GCC10
+* Issue #527: Fixed compilation issues for MacOS 10.15.4/Xcode 11.4
+
 SoftHSM 2.6.0 - 2020-03-17
 
 * Issue #493: Upgrade to Botan 2.
diff --git a/configure.ac b/configure.ac
index 2032423a2..d4dad4356 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@
 
 define([SOFTHSM_VERSION_MAJOR], [2])
 define([SOFTHSM_VERSION_MINOR], [6])
-define([SOFTHSM_VERSION_FIX], [0])
+define([SOFTHSM_VERSION_FIX], [1])
 define([PACKAGE_SUFFIX], [])
 
 # Library version