From e965b0fc5c1daf9646095e0ea0f6a1ffd135498a Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Thu, 24 Mar 2022 14:10:29 +0100 Subject: [PATCH] Update to upstream version 1.4.0 Signed-off-by: Ondrej Mosnacek --- 0001-Use-GCCs-__symver__-attribute.patch | 49 ------------------------ libkcapi.spec | 25 ++++++++---- sources | 4 +- 3 files changed, 19 insertions(+), 59 deletions(-) delete mode 100644 0001-Use-GCCs-__symver__-attribute.patch diff --git a/0001-Use-GCCs-__symver__-attribute.patch b/0001-Use-GCCs-__symver__-attribute.patch deleted file mode 100644 index d900222..0000000 --- a/0001-Use-GCCs-__symver__-attribute.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 2abf7fecb5162e4b59ba134c813ebee839eb45e9 Mon Sep 17 00:00:00 2001 -From: Simo Sorce -Date: Wed, 14 Jul 2021 10:52:01 -0400 -Subject: [PATCH] Use GCCs __symver__ attribute - -This is needed to allow LTO builds, as the __asm__ directives do not give -enough context to the compiler and the build fails when the -flto flag is -passed in. - -Unfotunately __symver__ is avilbel only startig from GCC 10, so we need -more macro juggling. - -Signed-off-by: Simo Sorce ---- - lib/internal.h | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/lib/internal.h b/lib/internal.h -index 29fdb7b..64dad24 100644 ---- a/lib/internal.h -+++ b/lib/internal.h -@@ -350,6 +350,16 @@ static inline int io_getevents(__attribute__((unused)) aio_context_t ctx, - #if __GNUC__ >= 4 - # define DSO_PUBLIC __attribute__ ((visibility ("default"))) - -+#if __GNUC__ >= 10 -+# define IMPL_SYMVER(name, version) \ -+ __attribute__ ((visibility ("default"))) \ -+ __attribute__((__symver__("kcapi_" #name "@@LIBKCAPI_" version))) -+ -+# define ORIG_SYMVER(name, version) \ -+ __attribute__ ((visibility ("default"))) \ -+ __attribute__((__symver__("kcapi_" #name "@LIBKCAPI_" version))) -+ -+#else - # define IMPL_SYMVER(name, version) \ - __asm__(".global impl_" #name ";"\ - ".symver impl_" #name ",kcapi_" #name "@@LIBKCAPI_" version);\ -@@ -359,6 +369,7 @@ static inline int io_getevents(__attribute__((unused)) aio_context_t ctx, - __asm__(".global orig_" #name ";"\ - ".symver orig_" #name ",kcapi_" #name "@LIBKCAPI_" version);\ - __attribute__ ((visibility ("default"))) -+#endif - - #else - # error "Compiler version too old" --- -2.31.1 - diff --git a/libkcapi.spec b/libkcapi.spec index a5952c4..a88ee1e 100644 --- a/libkcapi.spec +++ b/libkcapi.spec @@ -1,7 +1,7 @@ # Shared object version of libkcapi. %global vmajor 1 -%global vminor 3 -%global vpatch 1 +%global vminor 4 +%global vpatch 0 # Do we build the replacements packages? %bcond_with replace_coreutils @@ -84,8 +84,8 @@ %global hmaccalc_evr 0.9.14-10%{?dist} %endif -%global apps_hmaccalc sha1hmac sha224hmac sha256hmac sha384hmac sha512hmac -%global apps_fipscheck sha1sum sha224sum sha256sum sha384sum sha512sum md5sum fipscheck fipshmac +%global apps_hmaccalc sha1hmac sha224hmac sha256hmac sha384hmac sha512hmac sm3hmac +%global apps_fipscheck sha1sum sha224sum sha256sum sha384sum sha512sum md5sum sm3sum fipscheck fipshmac # On old kernels use mock hashers implemented via openssl %if %{lua:print(rpm.vercmp(posix.uname('%r'), '3.19'));} >= 0 @@ -123,7 +123,7 @@ done \ Name: libkcapi Version: %{vmajor}.%{vminor}.%{vpatch} -Release: 5%{?dist} +Release: 1%{?dist} Summary: User space interface to the Linux Kernel Crypto API License: BSD or GPLv2 @@ -133,8 +133,6 @@ Source1: https://www.chronox.de/%{name}/%{name}-%{version}.tar.xz.asc Source2: sha512hmac-openssl.sh Source3: fipshmac-openssl.sh -Patch1: 0001-Use-GCCs-__symver__-attribute.patch - BuildRequires: bash BuildRequires: coreutils BuildRequires: gcc @@ -376,7 +374,8 @@ EOF %if !%{with replace_coreutils} %{__rm} -f \ %{buildroot}%{_bindir}/md5sum \ - %{buildroot}%{_bindir}/sha*sum + %{buildroot}%{_bindir}/sha*sum \ + %{buildroot}%{_bindir}/sm*sum %endif %if !%{with replace_fipscheck} @@ -385,6 +384,7 @@ EOF %if !%{with replace_hmaccalc} %{__rm} -f %{buildroot}%{_bindir}/sha*hmac +%{__rm} -f %{buildroot}%{_bindir}/sm*hmac %endif # We don't ship autocrap dumplings. @@ -477,8 +477,10 @@ popd %files checksum %{_bindir}/md5sum %{_bindir}/sha*sum +%{_bindir}/sm*sum /%{_lib}/fipscheck/md5sum.hmac /%{_lib}/fipscheck/sha*sum.hmac +/%{_lib}/fipscheck/sm*sum.hmac %endif %if %{with replace_fipscheck} @@ -490,7 +492,9 @@ popd %if %{with replace_hmaccalc} %files hmaccalc %{_bindir}/sha*hmac +%{_bindir}/sm*hmac /%{_lib}/hmaccalc/sha*hmac.hmac +/%{_lib}/hmaccalc/sm*hmac.hmac %endif @@ -510,6 +514,11 @@ popd %changelog +* Sat Aug 13 2022 Ondrej Mosnáček - 1.4.0-1 +- Update to upstream version 1.4.0 +- Re-enable cppcheck scanning on Fedora +- Resolves: rhbz#2056732 + * Thu Jul 21 2022 Fedora Release Engineering - 1.3.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 02e03e8..7e8a98f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libkcapi-1.3.1.tar.xz) = 2240e5410e1df4b54f42182bf294ac13d82fd78d60466cafef7644bf7c9144c064ba1fd78d110d66bc41fd220ad2f211081eb64a0da5c8740716a3146d72ba30 -SHA512 (libkcapi-1.3.1.tar.xz.asc) = fb5f85401921e884e7eb7b989baed2c98371a90b61056c929bf8348e7864fc001b67d7e5bf5f799d61befbefa6ab60b296c1d781fc30069936edc3eb40134954 +SHA512 (libkcapi-1.4.0.tar.xz) = fa3df1fe22eba32585de5df044f907d3ad189c33f5704fe29b0fdeda92e772ef077055b80e17bc1646a8cdedaf4f195aadf0b133f493597f0f7657b04ea93a99 +SHA512 (libkcapi-1.4.0.tar.xz.asc) = a41303cba88b214c82537bb5de2584a72a239670318753ba6873a2c3ebe3b56ffd381fdf7ae266aa21857e850bebdfbfdec487c98655ddbc2b9a0ba0d4f383ca