Update version numbers

NEWS

@@ -1,6 +1,6 @@
 NEWS for SoftHSM -- History of user visible changes
 
-SoftHSM develop
+SoftHSM 2.5.0
 
 * Issue #323: Support for EDDSA with vendor defined mechanisms.
   (Patch from Francis Dupont)
@@ -11,6 +11,8 @@ SoftHSM develop
   OpenSSL.
 * Issue #387: Windows: Add VS2017 detection to Configure.py.
   (Patch from Jaroslav Imrich)
+* Issue #412: Replace PKCS11 headers with a version from p11-kit.
+  (Patch from Alexander Bokovoy)
 
 Bugfixes:
 * Issue #366: Support cross-compilation.

configure.ac

@@ -7,9 +7,9 @@
 # Program version
 
 define([SOFTHSM_VERSION_MAJOR], [2])
-define([SOFTHSM_VERSION_MINOR], [4])
+define([SOFTHSM_VERSION_MINOR], [5])
 define([SOFTHSM_VERSION_FIX], [0])
-define([PACKAGE_SUFFIX], [])
+define([PACKAGE_SUFFIX], [rc1])
 
 # Library version
 
@@ -20,7 +20,7 @@ define([PACKAGE_SUFFIX], [])
 
 define([SOFTHSM_VERSION_CURRENT], [2])
 define([SOFTHSM_VERSION_AGE], [1])
-define([SOFTHSM_VERSION_REVISION], [4])
+define([SOFTHSM_VERSION_REVISION], [5])
 
 ##################
 #                #

win32/config.h.in

@@ -66,7 +66,7 @@
 #define PACKAGE_NAME "SoftHSM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "SoftHSM 2.4.0"
+#define PACKAGE_STRING "SoftHSM 2.5.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "softhsm"
@@ -75,7 +75,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION  "2.4.0"
+#define PACKAGE_VERSION  "2.5.0"
 
 /* Non-paged memory for secure storage */
 @IF NONPAGE
@@ -88,13 +88,13 @@
 #undef STDC_HEADERS
 
 /* Version number of package */
-#define VERSION  "2.4.0"
+#define VERSION  "2.5.0"
 
 /* SoftHSM major version number via PKCS#11 */
 #define VERSION_MAJOR 2
 
 /* SoftHSM minor version number via PKCS#11 */
-#define VERSION_MINOR 4
+#define VERSION_MINOR 5
 
 /* Compile with Botan support */
 @IF BOTAN