From 47b5501390610407798f932c00629a7e16921946 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 15 2022 06:51:18 +0000
Subject: import jitterentropy-3.4.0-1.el9


---

diff --git a/.gitignore b/.gitignore
index 3327bd1..f5c5459 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/jitterentropy-library-3.3.1.tar.gz
+SOURCES/jitterentropy-library-3.4.0.tar.gz
diff --git a/.jitterentropy.metadata b/.jitterentropy.metadata
index fefba16..91e8b3a 100644
--- a/.jitterentropy.metadata
+++ b/.jitterentropy.metadata
@@ -1 +1 @@
-b48e54d56961e3db138dac4fd6ab3117e31f5db9 SOURCES/jitterentropy-library-3.3.1.tar.gz
+9b6ad5d20372878cc317a424135c575921d7aa61 SOURCES/jitterentropy-library-3.4.0.tar.gz
diff --git a/SOURCES/jitterentropy-fix-ec-check.patch b/SOURCES/jitterentropy-fix-ec-check.patch
deleted file mode 100644
index 3b2757d..0000000
--- a/SOURCES/jitterentropy-fix-ec-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up src/jitterentropy-noise.c.orig src/jitterentropy-noise.c
---- src/jitterentropy-noise.c	2021-11-23 15:42:47.809329173 +0100
-+++ src/jitterentropy-noise.c	2021-11-23 15:44:19.820499338 +0100
-@@ -188,7 +188,7 @@ static void jent_memaccess(struct rand_data *ec, uint64_t loop_cnt)
- 		uint32_t u[4];
- 		uint8_t b[sizeof(uint32_t) * 4];
- 	} prngState = { .u = {0x8e93eec0, 0xce65608a, 0xa8d46b46, 0xe83cef69} };
--	uint32_t addressMask = ec->memmask;
-+	uint32_t addressMask;
- 
- 	/* Ensure that macros cannot overflow jent_loop_shuffle() */
- 	BUILD_BUG_ON((MAX_ACC_LOOP_BIT + MIN_ACC_LOOP_BIT) > 63);
-@@ -197,6 +197,7 @@ static void jent_memaccess(struct rand_data *ec, uint64_t loop_cnt)
- 
- 	if (NULL == ec || NULL == ec->mem)
- 		return;
-+	addressMask = ec->memmask;
- 
- 	/*
- 	 * Mix the current data into prngState
diff --git a/SOURCES/jitterentropy-rh-makefile.patch b/SOURCES/jitterentropy-rh-makefile.patch
index 66482a2..f98ee29 100644
--- a/SOURCES/jitterentropy-rh-makefile.patch
+++ b/SOURCES/jitterentropy-rh-makefile.patch
@@ -1,15 +1,15 @@
 diff -up Makefile.orig Makefile
 --- Makefile	2021-07-13 17:23:42.954652287 +0200
 +++ Makefile	2021-07-13 17:27:27.958549833 +0200
-@@ -3,7 +3,7 @@
- CC ?= gcc
+@@ -4,7 +4,7 @@ CC ?= gcc
  #Hardening
+ ENABLE_STACK_PROTECTOR ?= 1
  CFLAGS ?= -fwrapv --param ssp-buffer-size=4 -fvisibility=hidden -fPIE -Wcast-align -Wmissing-field-initializers -Wshadow -Wswitch-enum
 -CFLAGS +=-Wextra -Wall -pedantic -fPIC -O0 -fwrapv -Wconversion
 +CFLAGS +=-Wp,-U_FORTIFY_SOURCE -Wextra -Wall -pedantic -fPIC -O0 -fwrapv -Wconversion
  LDFLAGS +=-Wl,-z,relro,-z,now -lpthread
  
- GCCVERSIONFORMAT := $(shell echo `$(CC) -dumpversion | sed 's/\./\n/g' | wc -l`)
+ # Enable internal timer support
 @@ -28,7 +28,7 @@ LIBDIR := lib
  INCDIR := include
  SRCDIR := src
diff --git a/SPECS/jitterentropy.spec b/SPECS/jitterentropy.spec
index a3f43ec..c0eb8ac 100644
--- a/SPECS/jitterentropy.spec
+++ b/SPECS/jitterentropy.spec
@@ -1,6 +1,6 @@
 Name:	jitterentropy
-Version:	3.3.1
-Release:	2%{?dist}
+Version:	3.4.0
+Release:	1%{?dist}
 Summary:	Library implementing the jitter entropy source
 
 License:	BSD or GPLv2
@@ -12,8 +12,6 @@ BuildRequires: make
 
 # Disable Upstream Makefiles debuginfo strip on install
 Patch0: jitterentropy-rh-makefile.patch
-# Fix ec check for NULL
-Patch1: jitterentropy-fix-ec-check.patch
 
 %description
 Library implementing the CPU jitter entropy source
@@ -47,6 +45,9 @@ mkdir -p %{buildroot}/usr/include/
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 26 2022 Vladis Dronov <vdronov@redhat.com> - 3.4.0-1
+- Update to the upstream v3.4.0 @ 2e5019cf (bz 2075978)
+
 * Tue Nov 23 2021 Vladis Dronov <vdronov@redhat.com> - 3.3.1-2
 - Update to the upstream v3.3.1 @ 887c9871 (bz 2015560)
 - Fix a security issue found by a covscan in jitterentropy library