From 9034b3b730be2d39f18317df1784d08de4e26ed4dffe57c6c82ff972c2be0ded Mon Sep 17 00:00:00 2001
From: Torsten Gruner <t.gruner@katodev.de>
Date: Tue, 1 Feb 2022 14:37:49 +0000
Subject: [PATCH] Accepting request 950309 from home:dirkmueller:Factory

- update to 2.2.1:
  * ykpiv: Minor bug fixes
  * ykcs11: Improved handling of object attributes
  * ykcs11: Update flags for EC related mechanisms
  * ykcs11: Minor bug fixes
  * test: Improved testing
  * doc: Improved documentation

OBS-URL: https://build.opensuse.org/request/show/950309
OBS-URL: https://build.opensuse.org/package/show/security/yubico-piv-tool?expand=0&rev=34
---
 pthread-link.patch               |  10 +++++-----
 yubico-piv-tool-2.2.0.tar.gz     |   3 ---
 yubico-piv-tool-2.2.0.tar.gz.sig | Bin 566 -> 0 bytes
 yubico-piv-tool-2.2.1.tar.gz     |   3 +++
 yubico-piv-tool-2.2.1.tar.gz.sig | Bin 0 -> 566 bytes
 yubico-piv-tool.changes          |  11 +++++++++++
 yubico-piv-tool.spec             |   4 ++--
 7 files changed, 21 insertions(+), 10 deletions(-)
 delete mode 100644 yubico-piv-tool-2.2.0.tar.gz
 delete mode 100644 yubico-piv-tool-2.2.0.tar.gz.sig
 create mode 100644 yubico-piv-tool-2.2.1.tar.gz
 create mode 100644 yubico-piv-tool-2.2.1.tar.gz.sig

diff --git a/pthread-link.patch b/pthread-link.patch
index 93e5680..83b6820 100644
--- a/pthread-link.patch
+++ b/pthread-link.patch
@@ -1,7 +1,7 @@
-Index: yubico-piv-tool-2.2.0/ykcs11/CMakeLists.txt
+Index: yubico-piv-tool-2.2.1/ykcs11/CMakeLists.txt
 ===================================================================
---- yubico-piv-tool-2.2.0.orig/ykcs11/CMakeLists.txt
-+++ yubico-piv-tool-2.2.0/ykcs11/CMakeLists.txt
+--- yubico-piv-tool-2.2.1.orig/ykcs11/CMakeLists.txt
++++ yubico-piv-tool-2.2.1/ykcs11/CMakeLists.txt
 @@ -60,6 +60,9 @@ if(${ENABLE_HARDWARE_TESTS})
      set(HW_TESTS 1)
  endif(${ENABLE_HARDWARE_TESTS})
@@ -19,5 +19,5 @@ Index: yubico-piv-tool-2.2.0/ykcs11/CMakeLists.txt
 -target_link_libraries(ykcs11_shared ${LIBCRYPTO_LDFLAGS} ykpiv_shared)
 +target_link_libraries(ykcs11_shared ${LIBCRYPTO_LDFLAGS} ykpiv_shared Threads::Threads)
  set_target_properties(ykcs11_shared PROPERTIES SOVERSION ${SO_VERSION} VERSION ${VERSION})
- set_target_properties(ykcs11_shared PROPERTIES INSTALL_RPATH "${YKPIV_INSTALL_LIB_DIR}")
- if(WIN32)
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+     set_target_properties(ykcs11_shared PROPERTIES INSTALL_RPATH "${YKPIV_INSTALL_LIB_DIR}")
diff --git a/yubico-piv-tool-2.2.0.tar.gz b/yubico-piv-tool-2.2.0.tar.gz
deleted file mode 100644
index 7e0ff21..0000000
--- a/yubico-piv-tool-2.2.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:74cb2e03c7137c0dd529f35a230b4a598121cb71b10d7e55b91fd0cdefcac457
-size 1321651
diff --git a/yubico-piv-tool-2.2.0.tar.gz.sig b/yubico-piv-tool-2.2.0.tar.gz.sig
deleted file mode 100644
index c3405896b8105bca2d095b49ab8831e7024fc98a30baa2c34558865a3816566c..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j+1*A!nbHN<pP0fL$vAy<#YXlwoj0$<x$VE_sV5E~&^
zkHlze{*65k|3YvYE(6Cw;lL$k-GmjFe~E_e<=Hh_&g1&aj#>$mTDL%c_`B8O2KEov
zleQ28ZAnmyuLsrmu2p@!{PWM3CSl3k;HY?CUS6o+0aEId_ae+MUW{Y!rEu4F_Qvn9
z4cT1SEvYR?`zIsUS-SMSlO++@cqBKDwyzSx7rxWP>scuUafuH6p(&;-8MN!);{~M9
zV#hqMfw)q7515%WszhRPSJm9;dQi9k>s5|m(wlSq1lrhju=)V)m(@)@lnXV(SHu<9
zsvGLCR#V%ro%J)evZUdS|1CBEjXcvD+#+%4JYo(`8EV?f!ocT=0dI41jKY{y<DsaD
zF>#dGfa4yk-om>14w;6bh!1uVxM&iPyy5zy#~fzYQcu~2|8RZ=FZTUGbk5ZRJdH9L
zA8<RWWc~$IApVcsN-WiHJBvpK3IjFzRBzYGy9Q%_bKV)7Zo8eS0%5NVL1?3|kS>r_
zxkIU2S*`wPyk3DCU^wLtm_MB}A1_HfO{ySI208ue-F%kF;rlEd`#v`|_RSqw<B8*G
zK|~S9vg#yd&;k08n2jC-drm?q)lwwsQ0f7haTihJCnB}5q!<xhZ75S44F+xBr#1S;
zNXq-ZWbAg;k2njNJGblfftl7>zcoM%+|?jng43aB0P1-MMD}xJ@#{ln9kZi%k@+HK
E<yFlTh5!Hn

diff --git a/yubico-piv-tool-2.2.1.tar.gz b/yubico-piv-tool-2.2.1.tar.gz
new file mode 100644
index 0000000..ca089f2
--- /dev/null
+++ b/yubico-piv-tool-2.2.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b7ede4ddc3d6e31de67b2e2ddcd319b22b40cc2e0973b9866d052a754493b14e
+size 1322579
diff --git a/yubico-piv-tool-2.2.1.tar.gz.sig b/yubico-piv-tool-2.2.1.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..5be300108e25f684aa978468e6e102a250085e24d0af7d66a441c99f6a91cbe6
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j+1*A!nbHN<pP0fL$vAy<#YXlwoj0%0-GJOBy_5E~&^
zkHlze{tQ45`T~XV1Pcr~6bac#782%JcU3MKz_c-DtI+A)5&JimM9oZ8Na%G(i4wAR
zd3_h8cbVW_)2#sBZA3(okF2V!%$>%W<mjS$Wqi&|o5V0pE`mFS(iT6<(Ro6DIiIw%
zUP0=0To0<~4E(Nst@@M_*l6M%vH(q&O}~Q=BiE!TVI*%)2b7LL%}NNe294}On#MfU
zp*UhY5CV=|EZSDzBm7mFexq$M-D|c|fmYmv;y9m}dPtuq-M_+J3LAS`@Qu9ib7U%c
z>EQKg=j`)gu+PDb!sP3I0&VC<R-2twKIous+=hm?>1Uf5(h$1V^yG$S2KCrUcu#0M
zhoFM~{B~#u-C&!pFdiY}Dm3iwWPy|jSn3?vD@ZsuCSxq@iInxZR-fffOYh%JKF2B<
z{{+{>?(8_-mcn-8{MY4PUF{WH`?}Agm3(EHpW&pyqgZa-yP?2J!g)785BbRyl9d<J
zzzLnKK)B_>V#pO7>SLtmOrFUDhkjR3hrXK|;6irCrCc=rJl;79o+v+hiiS`#l1eul
zI&|<gorDe#0~V;xp+;2kZ$C#D!G+OoI@bGnFk}GKAw5aqMTtz95uH{o0qzu3d&qmV
zHbfd!%9U$lS6}fJ>3PiYXFJl+8bKq$%bA&rW%3RIPg#IkkLdc!zGB-gU^IGA)LG#6
E%#&LZQUCw|

literal 0
HcmV?d00001

diff --git a/yubico-piv-tool.changes b/yubico-piv-tool.changes
index 308d61c..81df825 100644
--- a/yubico-piv-tool.changes
+++ b/yubico-piv-tool.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jan 31 20:31:47 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- update to 2.2.1:
+  * ykpiv: Minor bug fixes
+  * ykcs11: Improved handling of object attributes
+  * ykcs11: Update flags for EC related mechanisms
+  * ykcs11: Minor bug fixes
+  * test: Improved testing
+  * doc: Improved documentation
+
 -------------------------------------------------------------------
 Sun Feb 28 18:33:22 UTC 2021 - Dirk Müller <dmueller@suse.com>
 
diff --git a/yubico-piv-tool.spec b/yubico-piv-tool.spec
index 5abaf99..f970c28 100644
--- a/yubico-piv-tool.spec
+++ b/yubico-piv-tool.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package yubico-piv-tool
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %define sover  2
 Name:           yubico-piv-tool
-Version:        2.2.0
+Version:        2.2.1
 Release:        0
 Summary:        Yubico YubiKey NEO CCID Manager
 License:        BSD-2-Clause