From 9fe14be8a56e0f79250fc02453d870295230b3ca6c5fad95ccec49e4efe8248b Mon Sep 17 00:00:00 2001 From: Torsten Gruner Date: Sat, 11 May 2024 07:20:15 +0000 Subject: [PATCH] Accepting request 1172684 from home:wfrisch:branches:security - update to 2.5.2: * cmd: Fix signing selfsigned certificate for ED25519 key. - update cmake-flags-upstream-issue-474.patch OBS-URL: https://build.opensuse.org/request/show/1172684 OBS-URL: https://build.opensuse.org/package/show/security/yubico-piv-tool?expand=0&rev=45 --- cmake-flags-upstream-issue-474.patch | 44 ++++++++++++--------------- yubico-piv-tool-2.5.1.tar.gz | 3 -- yubico-piv-tool-2.5.1.tar.gz.sig | Bin 566 -> 0 bytes yubico-piv-tool-2.5.2.tar.gz | 3 ++ yubico-piv-tool-2.5.2.tar.gz.sig | Bin 0 -> 566 bytes yubico-piv-tool.changes | 7 +++++ yubico-piv-tool.spec | 2 +- 7 files changed, 31 insertions(+), 28 deletions(-) delete mode 100644 yubico-piv-tool-2.5.1.tar.gz delete mode 100644 yubico-piv-tool-2.5.1.tar.gz.sig create mode 100644 yubico-piv-tool-2.5.2.tar.gz create mode 100644 yubico-piv-tool-2.5.2.tar.gz.sig 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 140eab7b12cf159fe49cec3ec2bee4ef149a4521ef0dc2d024191491a6380f74..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+v&K7wT?&31JBYRX3%EXo~1INq-0%gl*>HrD}5D?15 zmM#Ow%pax?{0Wlh0oK-%;bp~f==6+I=7V&Gk^lUeK?rT9vk57%}sb{{7K9|9F zQ(EEkUo^XREQyt_+($Jtl((FiGn9uy6Fw^U>D?i!$j{K(Bx~9?$vU6rgey@Ys9s8i zkj!XB*)|AL;~jn{_MbO+Bf#nUmS%5UP=oC_8rG*M_lTD-yt3}54M;lBxk*Sw;At|V zIP5uI-vMRj*VAsL*9~{K!u7mI2d#!H6g@5E^epmV?d=Uvc9GAJEi40Oc{8G)k8BuS z$%BMk#SUjvn87Z$$^1=BOUBgd!EtipVY@sK6`^xj@xZDFDXZJ_ONPF2>G5GFoB=&M zpXWCcesbclnIt3|8g(oY%BD|A(^sL2_~ehT?Vm;whqxU~ApI!v}kLF9t{TS|i>DE3gDA|v|S1F{makgQXr_aAhumu>F4 z#P-~>aT7-iG16pSg(%W``_Yz*V2k$E32TIxO@9)+A2zRnv+-X-oJLMvB;RaNUUcUx z4qmIP&knNAniYG~SdR%vFl7_5bdSk}^Xwbm#w%9KWPG+Ib(9rQw@89Y&hcB&?2lW= z@=&(sT$g8}G~&4EUWx(bRl&@IOnc|RCA8O)W<$lcC(0J9UgP|v4$9|i!Vcm{oF#>4 zxQsr@FnR0TxljHA)xsE0jjO*?x5_76!sZDom>CQCS9SWUSrKRhZYkUMTOA|TDT`_42md6j!5eEE`W8M(n_@vz z2!PG+aeP=x8So6M-m%H8mV+$G%VpJS&oL#n86#+Vng$Yr`Br$JHs0qk*r + +- 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