Compare commits
No commits in common. "rawhide" and "f35" have entirely different histories.
5 changed files with 79 additions and 175 deletions
26
.gitignore
vendored
26
.gitignore
vendored
|
|
@ -15,29 +15,3 @@
|
|||
/yubihsm-shell-2.2.0.tar.gz.sig
|
||||
/yubihsm-shell-2.3.0.tar.gz
|
||||
/yubihsm-shell-2.3.0.tar.gz.sig
|
||||
/yubihsm-shell-2.3.0b.tar.gz
|
||||
/yubihsm-shell-2.3.0b.tar.gz.sig
|
||||
/yubihsm-shell-2.3.1.tar.gz
|
||||
/yubihsm-shell-2.3.1.tar.gz.sig
|
||||
/yubihsm-shell-2.3.2.tar.gz
|
||||
/yubihsm-shell-2.3.2.tar.gz.sig
|
||||
/yubihsm-shell-2.4.0.tar.gz
|
||||
/yubihsm-shell-2.4.0.tar.gz.sig
|
||||
/yubihsm-shell-2.4.1.tar.gz
|
||||
/yubihsm-shell-2.4.1.tar.gz.sig
|
||||
/yubihsm-shell-2.4.2.tar.gz
|
||||
/yubihsm-shell-2.4.2.tar.gz.sig
|
||||
/yubihsm-shell-2.5.0.tar.gz
|
||||
/yubihsm-shell-2.5.0.tar.gz.sig
|
||||
/yubihsm-shell-2.6.0.tar.gz
|
||||
/yubihsm-shell-2.6.0.tar.gz.sig
|
||||
/yubihsm-shell-2.7.0.tar.gz
|
||||
/yubihsm-shell-2.7.0.tar.gz.sig
|
||||
/yubihsm-shell-2.7.1.tar.gz
|
||||
/yubihsm-shell-2.7.1.tar.gz.sig
|
||||
/yubihsm-shell-2.7.2.tar.gz
|
||||
/yubihsm-shell-2.7.2.tar.gz.sig
|
||||
/yubihsm-shell-2.7.3.tar.gz
|
||||
/yubihsm-shell-2.7.3.tar.gz.sig
|
||||
/yubihsm-shell-2.8.0.tar.gz
|
||||
/yubihsm-shell-2.8.0.tar.gz.sig
|
||||
|
|
|
|||
93
changelog
93
changelog
|
|
@ -1,93 +0,0 @@
|
|||
* Tue Apr 28 2026 Simo Sorce <ssorce@redhat.com> - 2.7.3-2
|
||||
- OpenSSL 4.0 build fixes
|
||||
|
||||
* Thu Apr 16 2026 Jakub Jelen <jjelen@redhat.com> - 2.7.3-1
|
||||
- New upstream release (#2458149)
|
||||
|
||||
* Fri Mar 13 2026 Jakub Jelen <jjelen@redhat.com> - 2.7.2-1
|
||||
- New upstream release (#2447224)
|
||||
|
||||
* Tue Jan 20 2026 Jakub Jelen <jjelen@redhat.com> - 2.7.1-1
|
||||
- New upstream release (#2431274)
|
||||
|
||||
* Tue Jun 17 2025 Jakub Jelen <jjelen@redhat.com> - 2.7.0-1
|
||||
- New upstream release (#2372452)
|
||||
|
||||
* Wed Feb 05 2025 Jakub Jelen <jjelen@redhat.com> - 2.6.0-3
|
||||
- Fix gcc15 warnings (#2341598)
|
||||
|
||||
* Wed Sep 11 2024 Jakub Jelen <jjelen@redhat.com> - 2.6.0-1
|
||||
- New upstream release (#2311424)
|
||||
|
||||
* Tue Jul 30 2024 Jakub Jelen <jjelen@redhat.com> - 2.5.0-4
|
||||
- Fix build against pcsc-lite >= 2.2 (#2301379)
|
||||
|
||||
* Wed Jul 24 2024 Miroslav Suchý <msuchy@redhat.com> - 2.5.0-3
|
||||
- convert license to SPDX
|
||||
|
||||
* Tue Apr 02 2024 Jakub Jelen <jjelen@redhat.com> - 2.5.0-1
|
||||
- New upstream release (#2272123)
|
||||
|
||||
* Wed Nov 08 2023 Jakub Jelen <jjelen@redhat.com> - 2.4.2-1
|
||||
- New upstream release (#2248609)
|
||||
|
||||
* Thu Aug 17 2023 Jakub Jelen <jjelen@redhat.com> - 2.4.1-1
|
||||
- New upstream release (#2232340)
|
||||
|
||||
* Mon Jan 30 2023 Jakub Jelen <jjelen@redhat.com> - 2.4.0-1
|
||||
- New upstream release (#2165239)
|
||||
|
||||
* Mon Jun 27 2022 Jakub Jelen <jjelen@redhat.com> - 2.3.2-1
|
||||
- New upstream release (#2100542)
|
||||
|
||||
* Tue Feb 22 2022 Veronika Hanulikova <vhanulik@redhat.com> - 2.3.1-1
|
||||
- New upstream release (#2050104)
|
||||
|
||||
* Mon Jan 03 2022 Jakub Jelen <jjelen@redhat.com> - 2.3.0b-1
|
||||
- New upstream release (#2035159)
|
||||
|
||||
* Mon Dec 13 2021 Jakub Jelen <jjelen@redhat.com> - 2.3.0-1
|
||||
- New upstream release (#2030694)
|
||||
|
||||
* Thu Nov 18 2021 Jakub Jelen <jjelen@redhat.com> - 2.2.0-5
|
||||
- Rebuild with deprecated OpenSSL 3.0 functions (#2021878)
|
||||
|
||||
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.2.0-4
|
||||
- Rebuilt with OpenSSL 3.0.0
|
||||
|
||||
* Tue Aug 03 2021 Jakub Jelen <jjelen@redhat.com> - 2.2.0-3
|
||||
- Disable rpath to allow build in Fedora 35 (#1988058)
|
||||
|
||||
* Fri Apr 16 2021 Jakub Jelen <jjelen@redhat.com> - 2.2.0-1
|
||||
- New upstream release (#1950207)
|
||||
|
||||
* Thu Mar 18 2021 Jakub Jelen <jjelen@redhat.com> - 2.1.0-1
|
||||
- New upstream release (#1936041)
|
||||
|
||||
* Wed Oct 21 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.3-1
|
||||
- New upstream release (#1889941)
|
||||
|
||||
* Thu Aug 06 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.2-7
|
||||
- Workaround FTBFS on s390x (#1865658)
|
||||
|
||||
* Thu Aug 06 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.2-6
|
||||
- Rebuild after libz3 soname bump (#1865658)
|
||||
|
||||
* Mon Mar 16 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.2-3
|
||||
- Avoid warnings/errors with new gcc on s390x (#1800289)
|
||||
|
||||
* Tue Jan 07 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.2-1
|
||||
- New upstream release (#1772013)
|
||||
|
||||
* Tue Apr 02 2019 Jakub Jelen <jjelen@redhat.com> - 2.0.1-1
|
||||
- New upstream release (#1692935)
|
||||
|
||||
* Wed Feb 13 2019 Jakub Jelen <jjelen@redhat.com> - 2.0.0-4
|
||||
- Workaround unreasonagle error from GCC9 (#1676257)
|
||||
|
||||
* Mon Dec 03 2018 Jakub Jelen <jjelen@redhat.com> - 2.0.0-2
|
||||
- Pull the latest signed tarballs
|
||||
- Address review comments (#1654689)
|
||||
|
||||
* Thu Nov 29 2018 Jakub Jelen <jjelen@redhat.com> - 2.0.0-1
|
||||
- Initial release
|
||||
4
sources
4
sources
|
|
@ -1,3 +1,3 @@
|
|||
SHA512 (yubihsm-shell-2.8.0.tar.gz) = 9d3153444b3ae71fee344ed81f7b7229d62c5d9b40ebd31e38026c69d36f5a6f92ef411d029861cf2cd33fc1a8689c1ec3576cc076f91e81312795b344da8a58
|
||||
SHA512 (yubihsm-shell-2.8.0.tar.gz.sig) = 77ee4399c7e05d1daed4fd1164f8bacde8e69d69e4bbb6f35fc58a15e212f9455207c529b4f144814ee972e6dd8eb7f3804e7ad15a9d4a853ea187876f5a2630
|
||||
SHA512 (yubihsm-shell-2.3.0.tar.gz) = f49a7f99219ffafb88ab99209a4e58171d8c0c925c6028b09d41c5a5b6523209c581f12964f2f82efd141f7ece2f8baaa54f754c002c62f5b70b0d20223f6085
|
||||
SHA512 (yubihsm-shell-2.3.0.tar.gz.sig) = 39cf039a840c357c0afac2b03a591ebbbd59cd3a36e645fdbe128090f4f909ea4c7af970b9658724c74147a2e660f91ccc2fa5e03f459512c3ee38242544c0bd
|
||||
SHA512 (gpgkey-9588EA0F.gpg) = ff3fb773cf95c8d28fb9630c8525539c7ba497a046292a9eda816dd77c4a8b199b74467c7639bbbb0236e439b4db4d0a8b1694a40b33e074072d3ecac46acd87
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
From 440ba3ad140732ab51bc2df56ae0c82684d02922 Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Jelen <jjelen@redhat.com>
|
||||
Date: Tue, 30 Jul 2024 10:18:02 +0200
|
||||
Subject: [PATCH] cmake: Fix build against pcsc-lite >= 2.2
|
||||
|
||||
The pcsc-lite 2.2.0 switched from autotools to meson and reworked the
|
||||
pkgconfig files. The new pkg config provides CFLAGS that work ok, but
|
||||
the yubihsm-shell ignores them and hopes that all included files are in
|
||||
the default include directory (with the PCSC prefix).
|
||||
|
||||
Note, the value ${LIBPCSC_CFLAGS} is a semicolon separated list which
|
||||
we need to split to separate items here.
|
||||
|
||||
This solution works with both old and new versions.
|
||||
|
||||
Fixes: #404
|
||||
|
||||
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
|
||||
---
|
||||
CMakeLists.txt | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index acbb392..ecf3df8 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -194,6 +194,8 @@ if(NOT BUILD_ONLY_LIB)
|
||||
set(LIBPCSC_REQ "Linux" "FreeBSD")
|
||||
if(${CMAKE_SYSTEM_NAME} IN_LIST LIBPCSC_REQ)
|
||||
pkg_search_module (LIBPCSC REQUIRED libpcsclite)
|
||||
+ string (REPLACE ";" " " MY_LIBPCSC_CFLAGS "${LIBPCSC_CFLAGS}")
|
||||
+ string (APPEND CMAKE_C_FLAGS " ${MY_LIBPCSC_CFLAGS}")
|
||||
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
|
||||
set (LIBPCSC_LDFLAGS "winscard.lib")
|
||||
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
|
@ -1,18 +1,15 @@
|
|||
%undefine __cmake_in_source_build
|
||||
|
||||
Name: yubihsm-shell
|
||||
Version: 2.8.0
|
||||
Release: %autorelease
|
||||
Version: 2.3.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Tools to interact with YubiHSM 2
|
||||
|
||||
# Automatically converted from old format: ASL 2.0 - review is highly recommended.
|
||||
License: Apache-2.0
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/Yubico/%{name}/
|
||||
Source0: https://developers.yubico.com/%{name}/Releases/%{name}-%{version}.tar.gz
|
||||
Source1: https://developers.yubico.com/%{name}/Releases/%{name}-%{version}.tar.gz.sig
|
||||
Source2: gpgkey-9588EA0F.gpg
|
||||
# https://github.com/Yubico/yubihsm-shell/pull/411
|
||||
Patch2: yubihsm-shell-2.5.0-pcsc-lite.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: cppcheck
|
||||
|
|
@ -28,7 +25,7 @@ BuildRequires: libedit-devel
|
|||
BuildRequires: pcsc-lite-devel
|
||||
BuildRequires: clang
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: libusb-compat-0.1-devel
|
||||
BuildRequires: libusb-devel
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: gnupg2
|
||||
|
||||
|
|
@ -45,7 +42,7 @@ Development libraries for working with yubihsm 2.
|
|||
|
||||
%prep
|
||||
gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
|
||||
%autosetup -p1
|
||||
%setup -q
|
||||
|
||||
|
||||
%build
|
||||
|
|
@ -58,11 +55,7 @@ export CFLAGS="$CFLAGS -Wno-error=format-overflow"
|
|||
%endif
|
||||
# OpenSSL 3.0 deprecates a lot of functions still widely used here
|
||||
export CFLAGS="$CFLAGS -Wno-error=deprecated-declarations"
|
||||
%cmake -DCMAKE_SKIP_INSTALL_RPATH=ON \
|
||||
%if "%{?_lib}" == "lib64"
|
||||
%{?_cmake_lib_suffix64}
|
||||
%endif
|
||||
%{nil}
|
||||
%cmake -DCMAKE_SKIP_INSTALL_RPATH=ON
|
||||
%cmake_build
|
||||
|
||||
|
||||
|
|
@ -103,10 +96,78 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/pkcs11/yubihsm_pkcs11.so
|
|||
%dir %{_includedir}/pkcs11
|
||||
%{_includedir}/pkcs11/pkcs11.h
|
||||
%{_includedir}/pkcs11/pkcs11y.h
|
||||
%{_includedir}/pkcs11/pkcs11f.h
|
||||
%{_includedir}/pkcs11/pkcs11t.h
|
||||
%{_datadir}/pkgconfig/yubihsm.pc
|
||||
%{_datadir}/pkgconfig/ykhsmauth.pc
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Dec 13 2021 Jakub Jelen <jjelen@redhat.com> - 2.3.0-1
|
||||
- New upstream release (#2030694)
|
||||
|
||||
* Thu Nov 18 2021 Jakub Jelen <jjelen@redhat.com> - 2.2.0-5
|
||||
- Rebuild with deprecated OpenSSL 3.0 functions (#2021878)
|
||||
|
||||
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.2.0-4
|
||||
- Rebuilt with OpenSSL 3.0.0
|
||||
|
||||
* Tue Aug 03 2021 Jakub Jelen <jjelen@redhat.com> - 2.2.0-3
|
||||
- Disable rpath to allow build in Fedora 35 (#1988058)
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri Apr 16 2021 Jakub Jelen <jjelen@redhat.com> - 2.2.0-1
|
||||
- New upstream release (#1950207)
|
||||
|
||||
* Thu Mar 18 2021 Jakub Jelen <jjelen@redhat.com> - 2.1.0-1
|
||||
- New upstream release (#1936041)
|
||||
|
||||
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Oct 21 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.3-1
|
||||
- New upstream release (#1889941)
|
||||
|
||||
* Thu Aug 06 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.2-7
|
||||
- Workaround FTBFS on s390x (#1865658)
|
||||
|
||||
* Thu Aug 06 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.2-6
|
||||
- Rebuild after libz3 soname bump (#1865658)
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-5
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Mar 16 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.2-3
|
||||
- Avoid warnings/errors with new gcc on s390x (#1800289)
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Jan 07 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.2-1
|
||||
- New upstream release (#1772013)
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue Apr 02 2019 Jakub Jelen <jjelen@redhat.com> - 2.0.1-1
|
||||
- New upstream release (#1692935)
|
||||
|
||||
* Wed Feb 13 2019 Jakub Jelen <jjelen@redhat.com> - 2.0.0-4
|
||||
- Workaround unreasonagle error from GCC9 (#1676257)
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Dec 03 2018 Jakub Jelen <jjelen@redhat.com> - 2.0.0-2
|
||||
- Pull the latest signed tarballs
|
||||
- Address review comments (#1654689)
|
||||
|
||||
* Thu Nov 29 2018 Jakub Jelen <jjelen@redhat.com> - 2.0.0-1
|
||||
- Initial release
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue