From ede7dd4ae03933319a1b45666099e32aa8d5153b Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 13 Jan 2021 18:38:36 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/libfido2.git#d7458be459e54797a201e968fbdf095eb3eabef3 --- .gitignore | 2 ++ ...-casts-to-silence-warnings-on-32-bit.patch | 30 ------------------- libfido2.spec | 11 ++++--- sources | 4 +-- 4 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 0001-add-two-casts-to-silence-warnings-on-32-bit.patch diff --git a/.gitignore b/.gitignore index e751de8..5717a70 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /libfido2-1.4.0.tar.gz /libfido2-1.5.0.tar.gz /libfido2-1.5.0.tar.gz.sig +/libfido2-1.6.0.tar.gz +/libfido2-1.6.0.tar.gz.sig diff --git a/0001-add-two-casts-to-silence-warnings-on-32-bit.patch b/0001-add-two-casts-to-silence-warnings-on-32-bit.patch deleted file mode 100644 index ad8318f..0000000 --- a/0001-add-two-casts-to-silence-warnings-on-32-bit.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7a17a4e9127fb6df6278f19396760e7d60a5862c Mon Sep 17 00:00:00 2001 -From: pedro martelletto -Date: Wed, 9 Sep 2020 18:01:53 +0200 -Subject: [PATCH] add two casts to silence warnings on 32-bit - -add two casts to silence 'comparison is always false' warnings on -32-bit platforms (gcc: -Werror=type-limits, clang: --Wtautological-constant-out-of-range-compare); gh#210 ---- - src/hid_linux.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/hid_linux.c b/src/hid_linux.c -index 9788012..c554784 100644 ---- a/src/hid_linux.c -+++ b/src/hid_linux.c -@@ -385,8 +385,8 @@ timespec_to_ms(const struct timespec *ts, int upper_bound) - int64_t x; - int64_t y; - -- if (ts->tv_sec < 0 || ts->tv_sec > INT64_MAX / 1000LL || -- ts->tv_nsec < 0 || ts->tv_nsec / 1000000LL > INT64_MAX) -+ if (ts->tv_sec < 0 || (uint64_t)ts->tv_sec > INT64_MAX / 1000LL || -+ ts->tv_nsec < 0 || (uint64_t)ts->tv_nsec / 1000000LL > INT64_MAX) - return (upper_bound); - - x = ts->tv_sec * 1000LL; --- -2.26.2 - diff --git a/libfido2.spec b/libfido2.spec index ca307cc..40a3341 100644 --- a/libfido2.spec +++ b/libfido2.spec @@ -1,7 +1,7 @@ Name: libfido2 -Version: 1.5.0 -Release: 4%{?dist} +Version: 1.6.0 +Release: 1%{?dist} Summary: FIDO2 library License: BSD @@ -9,10 +9,6 @@ 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: yubico-release-gpgkeys.asc -# -# Upstream patch for building on 32-bit platforms -# -Patch0001: 0001-add-two-casts-to-silence-warnings-on-32-bit.patch # Work around false positive from gcc-11 until its fixed upstream # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97631 Patch0002: %{name}-gcc11.patch @@ -92,6 +88,9 @@ find %{buildroot} -type f -name "*.a" -delete -print %changelog +* Wed Jan 13 2021 Gary Buhrmaster 1.6.0-1 +- 1.6.0 release (#1910101) + * Thu Dec 17 2020 Gary Buhrmaster 1.5.0-4 - Use gpgverify macro and ascii armored yubico release keys diff --git a/sources b/sources index a907078..fcbbb74 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libfido2-1.5.0.tar.gz.sig) = 8d99183635d95f4e3a5e4132272a317e1bb622f338909ed18a5cf6fa61facb0a9348e4751a4f9b616863dee6585e0f6301ed490c59922d532f936611bc39098e -SHA512 (libfido2-1.5.0.tar.gz) = 240e2368e43846fddf5e98bbcc247468833565bcde4ec27976b88c814d787f1a477241a82b064818aa0eb0a98ff46a65d80b8243f4d0bbd763270e42492354e2 +SHA512 (libfido2-1.6.0.tar.gz) = c473732a2f7ef54156097d315e44457d89056446ab3112a7c7a6fd99d5c2c8ae0ca2451ff9cd45be6c32de1ab335d6dfdb2b0c56b40cae9eb41391d18d83be4a +SHA512 (libfido2-1.6.0.tar.gz.sig) = b36bcfe1fbce8c11948214bdf701281b76d956752939afaa1f9596597bc9864430cf24bb7c9cc6aad4ed02e088dd4d53731f9d1235e6d2ba6a730981328477df