diff --git a/SOURCES/jitter-rdtsc.patch b/SOURCES/jitter-rdtsc.patch new file mode 100644 index 0000000..0725255 --- /dev/null +++ b/SOURCES/jitter-rdtsc.patch @@ -0,0 +1,29 @@ +diff -up ./jitterentropy-library/jitterentropy.h.rdtsc ./jitterentropy-library/jitterentropy.h +--- ./jitterentropy-library/jitterentropy.h.rdtsc 2018-09-06 15:01:40.000000000 -0400 ++++ ./jitterentropy-library/jitterentropy.h 2020-02-18 12:47:10.465684582 -0500 +@@ -44,8 +44,12 @@ + + #ifdef __KERNEL__ + #include "jitterentropy-base-kernel.h" ++#else /* __KERNEL__ */ ++#ifdef __x86_64__ ++#include "arch/jitterentropy-base-x86.h" + #else + #include "jitterentropy-base-user.h" ++#endif /* __x86_64__ */ + #endif /* __KERNEL__ */ + + /* The entropy pool */ +diff -up ./rngd_jitter.c.rdtsc ./rngd_jitter.c +--- ./rngd_jitter.c.rdtsc 2020-02-18 12:47:22.490646896 -0500 ++++ ./rngd_jitter.c 2020-02-18 12:46:40.650778022 -0500 +@@ -27,6 +27,9 @@ + #include + #include + #include ++#include ++#include ++#include + #include "rng-tools-config.h" + + #include diff --git a/SPECS/rng-tools.spec b/SPECS/rng-tools.spec index 192e3d4..c3292cf 100644 --- a/SPECS/rng-tools.spec +++ b/SPECS/rng-tools.spec @@ -4,7 +4,7 @@ Summary: Random number generator related utilities Name: rng-tools Version: 6.8 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Base License: GPLv2+ URL: https://github.com/nhorman/rng-tools @@ -18,6 +18,8 @@ Patch1: jitterentropy-build-static.patch Patch2: jitter-setjmp.patch Patch3: Fix-message-log-on-error-in-thread_entropy_task.patch Patch4: Add-reserved-option-value-to-not-change-write_wakeup.patch +Patch5: jitter-rdtsc.patch + # https://sourceforge.net/p/gkernel/patches/111/ BuildRequires: gettext @@ -45,6 +47,7 @@ mv jitterentropy-library-2.1.2 jitterentropy-library %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build ./autogen.sh @@ -82,7 +85,10 @@ getent passwd rngd >/dev/null || useradd -r -M -d %{_localstatedir}/lib/rngd -s %attr(0644,root,root) %{_unitdir}/rngd-wake-threshold.service %changelog -* Mon Dec 02 2019 Neil Horman - 6.8.2 +* Tue Feb 18 2020 Neil Horman - 6.8-3 +- Fix coarse clock time on Azure (bz 180155) + +* Mon Dec 02 2019 Neil Horman - 6.8-2 - Fix erroneous message due to bad errno check (bz 1776710) - Enable addition of 0 value for fill-watermark (bz 1776710)