community/yubico-piv-tool: upgrade to 2.6.1

This commit is contained in:
Will Sinatra 2024-09-12 16:30:46 -04:00 committed by Patrycja Rosa
parent be523047ed
commit 279cd68c04
3 changed files with 3 additions and 58 deletions

View file

@ -1,7 +1,7 @@
# Contributor: Christophe BERAUD-DUFOUR <christophe.berauddufour@gmail.com>
# Maintainer: Will Sinatra <wpsinatra@gmail.com>
pkgname=yubico-piv-tool
pkgver=2.6.0
pkgver=2.6.1
pkgrel=0
pkgdesc="PIV Tools for yubikey"
url="https://developers.yubico.com/yubico-piv-tool"
@ -18,10 +18,7 @@ makedepends="
zlib-dev
"
subpackages="$pkgname-static $pkgname-dev $pkgname-libs $pkgname-doc"
source="https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-$pkgver.tar.gz
werror.patch
fix-incompatible-args.patch
"
source="https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-$pkgver.tar.gz"
build() {
cmake -B build -G Ninja \
@ -40,7 +37,5 @@ package() {
}
sha512sums="
11efcc12cdcdddc8f6a946460ee8be40d0652478f9884b01945ec048f95e03e706f00737607a20e75135667ece0de06627cd0a4f441d9048ad9e19f3f67fee00 yubico-piv-tool-2.6.0.tar.gz
1475032b9588bb56026a9850a041e7e287502fc53a7efe038c11ea60d719c166199f990a2760ff18b31c57be287825553de76dc79faf59e9d4064bfa8c01b31f werror.patch
e1169988fc95bb59dd861998b061c3b7bf7d07a3d75a4932be6ded6529b557e3e7f5278ffe603f72b28929d622ed6c5c90758d9044a77ac5639f28432ed7a483 fix-incompatible-args.patch
39c947db1ecbdda3ebd97614d0dbad75c603de5624941c90c4dcfa7d23523766d81d00fed6c7d9bd41f9b3013ebea77aa7b244230dfc76105756b0c493484b38 yubico-piv-tool-2.6.1.tar.gz
"

View file

@ -1,30 +0,0 @@
tests: Avoid passing incompatible arguments to OpenSSL
https://github.com/Yubico/yubico-piv-tool/commit/653ce43556535504d7901a897ef5e96557b374af
--- yubico-piv-tool-2.6.0-origin/ykcs11/tests/ykcs11_tests_util.c
+++ yubico-piv-tool-2.6.0/ykcs11/tests/ykcs11_tests_util.c
@@ -307,7 +307,7 @@
CK_BYTE id = 1;
CK_BYTE value_c[255] = {0};
CK_CHAR pvt[255] = {0};
- CK_ULONG pvt_len = sizeof(pvt);
+ size_t pvt_len = sizeof(pvt);
CK_ATTRIBUTE privateKeyTemplate[] = {
@@ -375,7 +375,7 @@
CK_ULONG kt = CKK_EC_MONTGOMERY;
CK_BYTE id = 1;
CK_CHAR pvt[255] = {0};
- CK_ULONG pvt_len = sizeof(pvt);
+ size_t pvt_len = sizeof(pvt);
CK_ATTRIBUTE privateKeyTemplate[] = {
@@ -1731,4 +1731,4 @@
}
}
asrt(found, CK_TRUE, "EXPECTED OBJECT FOUND");
-}
\ No newline at end of file
+}

View file

@ -1,20 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2d20ac..4d7fac6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,7 +104,7 @@ if(MSVC)
else()
find_package (PkgConfig REQUIRED)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-braces")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat -Wformat-security")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
@@ -185,4 +185,4 @@ if(ENABLE_HARDWARE_TESTS)
message(" Hardware tests: Enabled. *** WARNING: RUNNING THE TESTS WILL ERASE ALL DATA ON CONNECTED YUBIKEYS *** ")
else(ENABLE_HARDWARE_TESTS)
message(" Hardware tests: Disabled")
-endif(ENABLE_HARDWARE_TESTS)
\ No newline at end of file
+endif(ENABLE_HARDWARE_TESTS)