Prepare 2.6.0 release

Yubico · Aug 20, 2024 · 3a26f80 · 3a26f80
1 parent 2489166
commit 3a26f80
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 8 deletions.
diff --git a/.github/workflows/macos_release.yml b/.github/workflows/macos_release.yml
@@ -17,7 +17,7 @@ jobs:
           - os: macos-latest-xlarge
             arch: arm
     env:
-      RELEASE_VERSION: 2.5.2
+      RELEASE_VERSION: 2.6.0
       SO_VERSION: 2
     steps:
       - name: checkout

diff --git a/.github/workflows/windows_release.yml b/.github/workflows/windows_release.yml
@@ -12,7 +12,7 @@ jobs:
     name: Build dist with Linux
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 2.5.2
+      RELEASE_VERSION: 2.6.0
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -40,7 +40,7 @@ jobs:
     needs: job_1
     runs-on: windows-latest
     env:
-      RELEASE_VERSION: 2.5.2
+      RELEASE_VERSION: 2.6.0
     steps:
       - name: Download source from job_1
         uses: actions/download-artifact@v1
@@ -96,7 +96,7 @@ jobs:
     needs: job_1
     runs-on: windows-latest
     env:
-      RELEASE_VERSION: 2.5.2
+      RELEASE_VERSION: 2.6.0
     steps:
       - name: Download source from job_1
         uses: actions/download-artifact@v1

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,8 +39,8 @@ set (CMAKE_C_STANDARD 11)
 project (yubico-piv-tool)
 
 set (yubico_piv_tool_VERSION_MAJOR 2)
-set (yubico_piv_tool_VERSION_MINOR 5)
-set (yubico_piv_tool_VERSION_PATCH 2)
+set (yubico_piv_tool_VERSION_MINOR 6)
+set (yubico_piv_tool_VERSION_PATCH 0)
 set (VERSION "${yubico_piv_tool_VERSION_MAJOR}.${yubico_piv_tool_VERSION_MINOR}.${yubico_piv_tool_VERSION_PATCH}")
 set (SO_VERSION 2)
 

diff --git a/NEWS b/NEWS
@@ -1,5 +1,13 @@
 yubico-piv-tool NEWS -- History of user-visible changes.        -*- outline -*-
 
+* Version 2.6.0 (released 2024-08-21)
+
+** cmd: Add support for biometric verification and match policy
+** ykcs11: Add support for PKCS11 3.0
+** ykpiv: cmd: ykcs11: Improve error traceability
+** ykpiv: cmd: ykcs11: Fix minor bugs
+** build: Make building with zlib optional
+
 * Version 2.5.2 (released 2024-05-07)
 
 ** cmd: Fix signing selfsigned certificate for ED25519 key.

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,13 @@
+yubico-piv-tool (2.6.0) stable; urgency=medium
+
+  * cmd: Add support for biometric verification and match policy
+  * ykcs11: Add support for PKCS11 3.0
+  * ykpiv: cmd: ykcs11: Improve error traceability
+  * ykpiv: cmd: ykcs11: Fix minor bugs
+  * build: Make building with zlib optional
+
+ -- Aveen Ismail <[email protected]>  Tue, 20 Aug 2024 20:49:49 +0100
+
 yubico-piv-tool (2.5.2) stable; urgency=medium
 
   * cmd: Fix signing selfsigned certificate for ED25519 key.

diff --git a/resources/win/yubico-piv-tool_x64.wxs b/resources/win/yubico-piv-tool_x64.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <?define ProductVersion="2.5.2" ?>
+  <?define ProductVersion="2.6.0" ?>
   <?define ProductName="Yubico PIV Tool (x64)" ?>
 
    <Product Id="*" UpgradeCode="e4f980c4-5dd5-4d39-95b7-c6362ae65be8" Name="$(var.ProductName)" Version="$(var.ProductVersion)" Manufacturer="Yubico AB" Language="1033">

diff --git a/resources/win/yubico-piv-tool_x86.wxs b/resources/win/yubico-piv-tool_x86.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <?define ProductVersion="2.5.2" ?>
+  <?define ProductVersion="2.6.0" ?>
   <?define ProductName="Yubico PIV Tool (x86)" ?>
 
    <Product Id="*" UpgradeCode="1aa2f085-add9-4556-9e21-299b078e6273" Name="$(var.ProductName)" Version="$(var.ProductVersion)" Manufacturer="Yubico AB" Language="1033">