diff --git a/cmake-flags-upstream-issue-474.patch b/cmake-flags-upstream-issue-474.patch index 449bcbd..134b6ee 100644 --- a/cmake-flags-upstream-issue-474.patch +++ b/cmake-flags-upstream-issue-474.patch @@ -11,10 +11,10 @@ Date: Thu Feb 15 10:23:03 2024 +0100 Fixes https://github.com/Yubico/yubico-piv-tool/issues/474 -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ae6654e..1bc068a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt +Index: yubico-piv-tool-2.5.2/CMakeLists.txt +=================================================================== +--- yubico-piv-tool-2.5.2.orig/CMakeLists.txt ++++ yubico-piv-tool-2.5.2/CMakeLists.txt @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -24,10 +24,10 @@ index ae6654e..1bc068a 100644 # policy CMP0025 is to get AppleClang identifier rather than Clang for both # this matters since the apple compiler accepts different flags. cmake_policy(SET CMP0025 NEW) -diff --git a/cmake/openssl.cmake b/cmake/openssl.cmake -index e650d81..ec29ee3 100644 ---- a/cmake/openssl.cmake -+++ b/cmake/openssl.cmake +Index: yubico-piv-tool-2.5.2/cmake/openssl.cmake +=================================================================== +--- yubico-piv-tool-2.5.2.orig/cmake/openssl.cmake ++++ yubico-piv-tool-2.5.2/cmake/openssl.cmake @@ -84,8 +84,9 @@ macro (find_libcrypto) endif(WIN32 OR OPENSSL_STATIC_LINK) @@ -40,10 +40,10 @@ index e650d81..ec29ee3 100644 link_directories(${LIBCRYPTO_LIBRARY_DIRS}) include_directories(${LIBCRYPTO_INCLUDE_DIRS}) -diff --git a/cmake/pcscd.cmake b/cmake/pcscd.cmake -index 4222693..5fe0ad9 100644 ---- a/cmake/pcscd.cmake -+++ b/cmake/pcscd.cmake +Index: yubico-piv-tool-2.5.2/cmake/pcscd.cmake +=================================================================== +--- yubico-piv-tool-2.5.2.orig/cmake/pcscd.cmake ++++ yubico-piv-tool-2.5.2/cmake/pcscd.cmake @@ -75,7 +75,7 @@ macro (find_pcscd) set(ENV{PKG_CONFIG_PATH} "${PCSCLITE_PKG_PATH}:$ENV{PKG_CONFIG_PATH}") pkg_check_modules(PCSC REQUIRED libpcsclite) @@ -53,15 +53,11 @@ index 4222693..5fe0ad9 100644 if(VERBOSE_CMAKE) message("PCSC_FOUND: ${PCSC_FOUND}") message("PCSC_LIBRARY_DIRS: ${PCSC_LIBRARY_DIRS}") -@@ -100,8 +100,9 @@ macro (find_pcscd) - else(${PCSC_DIR} NOT STREQUAL "") - set(PCSC_CUSTOM_LIBS "-Wl,-l${PCSC_LIB}") - endif(${PCSC_DIR} NOT STREQUAL "") -- set(CMAKE_C_FLAGS ${PCSC_CFLAGS} ${CMAKE_C_FLAGS}) -- set(PCSC_LIBRARIES ${PCSC_LIBRARIES} ${PCSC_CUSTOM_LIBS}) -+ list(JOIN PCSC_CFLAGS " " PCSC_CFLAGS_STRING) -+ set(CMAKE_C_FLAGS "${PCSC_CFLAGS_STRING} ${CMAKE_C_FLAGS}") -+ set(PCSC_LIBRARIES "${PCSC_LIBRARIES} ${PCSC_CUSTOM_LIBS}") - unset(PCSC_MACOSX_LIBS) - unset(PCSC_WIN_LIBS) - unset(PCSC_LIBS) +@@ -124,4 +124,5 @@ macro (find_pcscd) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PCSC_CFLAGS}") + link_directories(${PCSC_LIBRARY_DIRS}) + +-endmacro() +\ No newline at end of file ++endmacro() ++ diff --git a/yubico-piv-tool-2.5.1.tar.gz b/yubico-piv-tool-2.5.1.tar.gz deleted file mode 100644 index 4904dd9..0000000 --- a/yubico-piv-tool-2.5.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4262df01eec5c5ef942be9694db5bceac79f457e94879298a4934f6b5e44ff5f -size 1340147 diff --git a/yubico-piv-tool-2.5.1.tar.gz.sig b/yubico-piv-tool-2.5.1.tar.gz.sig deleted file mode 100644 index 140eab7..0000000 Binary files a/yubico-piv-tool-2.5.1.tar.gz.sig and /dev/null differ diff --git a/yubico-piv-tool-2.5.2.tar.gz b/yubico-piv-tool-2.5.2.tar.gz new file mode 100644 index 0000000..7e38e31 --- /dev/null +++ b/yubico-piv-tool-2.5.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:918e76bad99463dc0a858a4771ec674a579fad284d99d90c57fb9cf44fb059b8 +size 1324642 diff --git a/yubico-piv-tool-2.5.2.tar.gz.sig b/yubico-piv-tool-2.5.2.tar.gz.sig new file mode 100644 index 0000000..0b78a1b Binary files /dev/null and b/yubico-piv-tool-2.5.2.tar.gz.sig differ diff --git a/yubico-piv-tool.changes b/yubico-piv-tool.changes index 65301b3..cdfd7d8 100644 --- a/yubico-piv-tool.changes +++ b/yubico-piv-tool.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 7 09:05:14 UTC 2024 - Wolfgang Frisch + +- update to 2.5.2: + * cmd: Fix signing selfsigned certificate for ED25519 key. +- update cmake-flags-upstream-issue-474.patch + ------------------------------------------------------------------- Wed Feb 14 09:05:14 UTC 2024 - Wolfgang Frisch diff --git a/yubico-piv-tool.spec b/yubico-piv-tool.spec index 4bdf87a..0ed1050 100644 --- a/yubico-piv-tool.spec +++ b/yubico-piv-tool.spec @@ -18,7 +18,7 @@ %define sover 2 Name: yubico-piv-tool -Version: 2.5.1 +Version: 2.5.2 Release: 0 Summary: Yubico YubiKey NEO CCID Manager License: BSD-2-Clause