diff --git a/.gitignore b/.gitignore index a654154..770a535 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/jitterentropy-library-3.3.0.tar.gz +/jitterentropy-library-3.3.1.tar.gz diff --git a/jitterentropy-execution-flow.patch b/jitterentropy-execution-flow.patch deleted file mode 100644 index 8b73837..0000000 --- a/jitterentropy-execution-flow.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up src/jitterentropy-base.c.orig src/jitterentropy-base.c -index 30109dc..1911241 100644 ---- src/jitterentropy-base.c -+++ src/jitterentropy-base.c -@@ -710,6 +710,8 @@ int jent_entropy_init_ex(unsigned int osr, unsigned int flags) - if (ret) - return ret; - -+ ret = ENOTIME; -+ - /* Test without internal timer unless caller does not want it */ - if (!(flags & JENT_FORCE_INTERNAL_TIMER)) - ret = jent_time_entropy_init(osr, -diff -up src/jitterentropy-timer.c.orig src/jitterentropy-timer.c -index 72b17ce..42c5214 100644 ---- src/jitterentropy-timer.c -+++ src/jitterentropy-timer.c -@@ -202,8 +202,8 @@ int jent_notime_enable(struct rand_data *ec, unsigned int flags) - if (jent_force_internal_timer || (flags & JENT_FORCE_INTERNAL_TIMER)) { - /* Self test not run yet */ - if (!jent_force_internal_timer && -- jent_time_entropy_init(flags | JENT_FORCE_INTERNAL_TIMER, -- ec->osr)) -+ jent_time_entropy_init(ec->osr, -+ flags | JENT_FORCE_INTERNAL_TIMER)) - return EHEALTH; - - ec->enable_notime = 1; --- -2.26.3 - diff --git a/jitterentropy.spec b/jitterentropy.spec index cd4ce69..16844e4 100644 --- a/jitterentropy.spec +++ b/jitterentropy.spec @@ -1,5 +1,5 @@ Name: jitterentropy -Version: 3.3.0 +Version: 3.3.1 Release: 1%{?dist} Summary: Library implementing the jitter entropy source @@ -10,10 +10,8 @@ Source0: %{url}/archive/v%{version}/%{name}-library-%{version}.tar.gz BuildRequires: gcc BuildRequires: make -# Add small fixes which have missed the v3.3.0 release -Patch0: jitterentropy-execution-flow.patch # Disable Upstream Makefiles debuginfo strip on install -Patch1: jitterentropy-rh-makefile.patch +Patch0: jitterentropy-rh-makefile.patch %description Library implementing the CPU jitter entropy source @@ -47,6 +45,9 @@ mkdir -p %{buildroot}/usr/include/ %{_mandir}/man3/* %changelog +* Tue Nov 16 2021 Vladis Dronov - 3.3.1-1 +- Update to the upstream v3.3.1 + * Thu Sep 16 2021 Vladis Dronov - 3.3.0-1 - Update to the upstream v3.3.0 - Add small fixes which have missed the v3.3.0 release diff --git a/sources b/sources index 70bc83c..c37973d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jitterentropy-library-3.3.0.tar.gz) = 1c7956fbacf8accb401f4ff3cc5674f384ef33a5f907c181ea358f2ca9e7c6b46ad1465743100fc0157c47a970c383e84029688bfa0a844e1e10675c1355993c +SHA512 (jitterentropy-library-3.3.1.tar.gz) = 7dc17c377cf90d38057bbc135e00730a3f84bc66aeed83eca1ad1b0e1c2fb89c5346ec20bdf25d3ce27f1d21893d44e52c08e96175554c18dfa1934a8d4fd9f7