Prepare 2.6.1 release

Yubico · Sep 12, 2024 · f68be6f · f68be6f
1 parent 12a8cd0
commit f68be6f
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 7 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.6.0
+      RELEASE_VERSION: 2.6.1
       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.6.0
+      RELEASE_VERSION: 2.6.1
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:
     needs: job_1
     runs-on: windows-latest
     env:
-      RELEASE_VERSION: 2.6.0
+      RELEASE_VERSION: 2.6.1
     steps:
       - name: Download source from job_1
         uses: actions/download-artifact@v4
@@ -95,7 +95,7 @@ jobs:
     needs: job_1
     runs-on: windows-latest
     env:
-      RELEASE_VERSION: 2.6.0
+      RELEASE_VERSION: 2.6.1
     steps:
       - name: Download source from job_1
         uses: actions/download-artifact@v4

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,7 +40,7 @@ project (yubico-piv-tool)
 
 set (yubico_piv_tool_VERSION_MAJOR 2)
 set (yubico_piv_tool_VERSION_MINOR 6)
-set (yubico_piv_tool_VERSION_PATCH 0)
+set (yubico_piv_tool_VERSION_PATCH 1)
 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,10 @@
 yubico-piv-tool NEWS -- History of user-visible changes.        -*- outline -*-
 
+* Version 2.6.1 (released 2024-09-12)
+
+** cmd: Fix performing bio verification
+** ykcs11: Fix handling ED25519 and X25519 keys
+
 * Version 2.6.0 (released 2024-08-21)
 
 ** cmd: Add support for biometric verification and match policy

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+yubico-piv-tool (2.6.1) stable; urgency=medium
+
+  * cmd: Fix performing bio verification
+  * ykcs11: Fix handling ED25519 and X25519 keys
+
+ -- Aveen Ismail <[email protected]>  Thu, 12 Sep 2024 12:48:34 +0100
+
 yubico-piv-tool (2.6.0) stable; urgency=medium
 
   * cmd: Add support for biometric verification and match policy

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.6.0" ?>
+  <?define ProductVersion="2.6.1" ?>
   <?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.6.0" ?>
+  <?define ProductVersion="2.6.1" ?>
   <?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">