From e4f793f49cea0bf71e42c43d15d776f348eb70ba Mon Sep 17 00:00:00 2001
From: Vladis Dronov <vdronov@redhat.com>
Date: Thu, 16 Sep 2021 19:58:35 +0200
Subject: [PATCH] Update to the latest upstream v3.3.0

- Update to the upstream v3.3.0 commit 418c1e6
- Add small fixes which have missed the v3.3.0 release
  https://github.com/smuellerDD/jitterentropy-library/pull/71

Signed-off-by: Vladis Dronov <vdronov@redhat.com>
---
 .gitignore                         |  2 +-
 jitterentropy-execution-flow.patch | 31 ++++++++++++++++++++++++++++++
 jitterentropy-rh-makefile.patch    |  2 +-
 jitterentropy.spec                 | 15 +++++++++++----
 sources                            |  2 +-
 5 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 jitterentropy-execution-flow.patch

diff --git a/.gitignore b/.gitignore
index e86cf58..a654154 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/jitterentropy-library-3.0.2.tar.gz
+/jitterentropy-library-3.3.0.tar.gz
diff --git a/jitterentropy-execution-flow.patch b/jitterentropy-execution-flow.patch
new file mode 100644
index 0000000..8b73837
--- /dev/null
+++ b/jitterentropy-execution-flow.patch
@@ -0,0 +1,31 @@
+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-rh-makefile.patch b/jitterentropy-rh-makefile.patch
index 529dcc2..66482a2 100644
--- a/jitterentropy-rh-makefile.patch
+++ b/jitterentropy-rh-makefile.patch
@@ -1,5 +1,5 @@
 diff -up Makefile.orig Makefile
---- Makefileg	2021-07-13 17:23:42.954652287 +0200
+--- Makefile	2021-07-13 17:23:42.954652287 +0200
 +++ Makefile	2021-07-13 17:27:27.958549833 +0200
 @@ -3,7 +3,7 @@
  CC ?= gcc
diff --git a/jitterentropy.spec b/jitterentropy.spec
index 7510c92..cd4ce69 100644
--- a/jitterentropy.spec
+++ b/jitterentropy.spec
@@ -1,6 +1,6 @@
 Name:	jitterentropy
-Version:	3.0.2
-Release:	3.git.409828cf%{?dist}
+Version:	3.3.0
+Release:	1%{?dist}
 Summary:	Library implementing the jitter entropy source
 
 License:	BSD or GPLv2
@@ -10,8 +10,10 @@ 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
-Patch0: jitterentropy-rh-makefile.patch
+Patch1: jitterentropy-rh-makefile.patch
 
 %description
 Library implementing the CPU jitter entropy source
@@ -24,7 +26,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 Development headers and libraries for jitterentropy
 
 %prep
-%autosetup -n %{name}-library-%{version}
+%autosetup -p0 -n %{name}-library-%{version}
 
 %build
 %set_build_flags
@@ -45,6 +47,11 @@ mkdir -p %{buildroot}/usr/include/
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 16 2021 Vladis Dronov <vdronov@redhat.com> - 3.3.0-1
+- Update to the upstream v3.3.0
+- Add small fixes which have missed the v3.3.0 release
+  https://github.com/smuellerDD/jitterentropy-library/pull/71
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-3.git.409828cf
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index 0290c62..70bc83c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jitterentropy-library-3.0.2.tar.gz) = 57ad498048c728da79247d1f93d60b60d4c3a8967a45b6ac0d205457f9f93f1001c9a0359e91588084dd81889a700fcac162e179947f4d68266d59a033a61386
+SHA512 (jitterentropy-library-3.3.0.tar.gz) = 1c7956fbacf8accb401f4ff3cc5674f384ef33a5f907c181ea358f2ca9e7c6b46ad1465743100fc0157c47a970c383e84029688bfa0a844e1e10675c1355993c