rpm/yubico-piv-tool
SHA256
1
0
Fork 0
forked from pool/yubico-piv-tool
Code Pull Requests Activity

Accepting request 1173398 from security

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1173398
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yubico-piv-tool?expand=0&rev=21
This commit is contained in:
Dominique Leuenberger 2024-05-11 16:23:42 +00:00 committed by Git OBS Bridge
commit 30ed852650
7 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
cmake-flags-upstream-issue-474.patch
View File

@ -11,10 +11,10 @@ Date: Thu Feb 15 10:23:03 2024 +0100
Fixes https://github.com/Yubico/yubico-piv-tool/issues/474 Fixes https://github.com/Yubico/yubico-piv-tool/issues/474
diff --git a/CMakeLists.txt b/CMakeLists.txt Index: yubico-piv-tool-2.5.2/CMakeLists.txt
index ae6654e..1bc068a 100644 ===================================================================
--- a/CMakeLists.txt --- yubico-piv-tool-2.5.2.orig/CMakeLists.txt
+++ b/CMakeLists.txt +++ yubico-piv-tool-2.5.2/CMakeLists.txt
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # 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 # policy CMP0025 is to get AppleClang identifier rather than Clang for both
# this matters since the apple compiler accepts different flags. # this matters since the apple compiler accepts different flags.
cmake_policy(SET CMP0025 NEW) cmake_policy(SET CMP0025 NEW)
diff --git a/cmake/openssl.cmake b/cmake/openssl.cmake Index: yubico-piv-tool-2.5.2/cmake/openssl.cmake
index e650d81..ec29ee3 100644 ===================================================================
--- a/cmake/openssl.cmake --- yubico-piv-tool-2.5.2.orig/cmake/openssl.cmake
+++ b/cmake/openssl.cmake +++ yubico-piv-tool-2.5.2/cmake/openssl.cmake
@@ -84,8 +84,9 @@ macro (find_libcrypto) @@ -84,8 +84,9 @@ macro (find_libcrypto)
endif(WIN32 OR OPENSSL_STATIC_LINK) endif(WIN32 OR OPENSSL_STATIC_LINK)
@ -40,10 +40,10 @@ index e650d81..ec29ee3 100644
link_directories(${LIBCRYPTO_LIBRARY_DIRS}) link_directories(${LIBCRYPTO_LIBRARY_DIRS})
include_directories(${LIBCRYPTO_INCLUDE_DIRS}) include_directories(${LIBCRYPTO_INCLUDE_DIRS})
diff --git a/cmake/pcscd.cmake b/cmake/pcscd.cmake Index: yubico-piv-tool-2.5.2/cmake/pcscd.cmake
index 4222693..5fe0ad9 100644 ===================================================================
--- a/cmake/pcscd.cmake --- yubico-piv-tool-2.5.2.orig/cmake/pcscd.cmake
+++ b/cmake/pcscd.cmake +++ yubico-piv-tool-2.5.2/cmake/pcscd.cmake
@@ -75,7 +75,7 @@ macro (find_pcscd) @@ -75,7 +75,7 @@ macro (find_pcscd)
set(ENV{PKG_CONFIG_PATH} "${PCSCLITE_PKG_PATH}:$ENV{PKG_CONFIG_PATH}") set(ENV{PKG_CONFIG_PATH} "${PCSCLITE_PKG_PATH}:$ENV{PKG_CONFIG_PATH}")
pkg_check_modules(PCSC REQUIRED libpcsclite) pkg_check_modules(PCSC REQUIRED libpcsclite)
@ -53,15 +53,11 @@ index 4222693..5fe0ad9 100644
if(VERBOSE_CMAKE) if(VERBOSE_CMAKE)
message("PCSC_FOUND: ${PCSC_FOUND}") message("PCSC_FOUND: ${PCSC_FOUND}")
message("PCSC_LIBRARY_DIRS: ${PCSC_LIBRARY_DIRS}") message("PCSC_LIBRARY_DIRS: ${PCSC_LIBRARY_DIRS}")
@@ -100,8 +100,9 @@ macro (find_pcscd) @@ -124,4 +124,5 @@ macro (find_pcscd)
else(${PCSC_DIR} NOT STREQUAL "") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PCSC_CFLAGS}")
set(PCSC_CUSTOM_LIBS "-Wl,-l${PCSC_LIB}") link_directories(${PCSC_LIBRARY_DIRS})
endif(${PCSC_DIR} NOT STREQUAL "")
- set(CMAKE_C_FLAGS ${PCSC_CFLAGS} ${CMAKE_C_FLAGS}) -endmacro()
- set(PCSC_LIBRARIES ${PCSC_LIBRARIES} ${PCSC_CUSTOM_LIBS}) \ No newline at end of file
+ list(JOIN PCSC_CFLAGS " " PCSC_CFLAGS_STRING) +endmacro()
+ 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)

3
yubico-piv-tool-2.5.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4262df01eec5c5ef942be9694db5bceac79f457e94879298a4934f6b5e44ff5f
size 1340147

BIN
yubico-piv-tool-2.5.1.tar.gz.sig
View File

Binary file not shown.

3
yubico-piv-tool-2.5.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:918e76bad99463dc0a858a4771ec674a579fad284d99d90c57fb9cf44fb059b8
size 1324642

BIN
yubico-piv-tool-2.5.2.tar.gz.sig Normal file
View File

Binary file not shown.

7
yubico-piv-tool.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 7 09:05:14 UTC 2024 - Wolfgang Frisch <wolfgang.frisch@suse.com>
- 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 <wolfgang.frisch@suse.com> Wed Feb 14 09:05:14 UTC 2024 - Wolfgang Frisch <wolfgang.frisch@suse.com>

2
yubico-piv-tool.spec
View File

@ -18,7 +18,7 @@
%define sover 2 %define sover 2
Name: yubico-piv-tool Name: yubico-piv-tool
Version: 2.5.1 Version: 2.5.2
Release: 0 Release: 0
Summary: Yubico YubiKey NEO CCID Manager Summary: Yubico YubiKey NEO CCID Manager
License: BSD-2-Clause License: BSD-2-Clause