From a67da5455e19f5cd3d4e1c34f123d05d0b5d86ac Mon Sep 17 00:00:00 2001
From: Vladis Dronov <vdronov@redhat.com>
Date: Sat, 26 Oct 2024 17:56:20 +0200
Subject: [PATCH] Update to the upstream v3.6.0

The upstream commit is 11829386.

Resolves: RHEL-64947

Signed-off-by: Vladis Dronov <vdronov@redhat.com>
---
 jitterentropy-rh-makefile.patch |  6 +++---
 jitterentropy.spec              | 20 ++++++++++++--------
 sources                         |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/jitterentropy-rh-makefile.patch b/jitterentropy-rh-makefile.patch
index f98ee29..28058ad 100644
--- a/jitterentropy-rh-makefile.patch
+++ b/jitterentropy-rh-makefile.patch
@@ -10,7 +10,7 @@ diff -up Makefile.orig Makefile
  LDFLAGS +=-Wl,-z,relro,-z,now -lpthread
  
  # Enable internal timer support
-@@ -28,7 +28,7 @@ LIBDIR := lib
+@@ -34,7 +34,7 @@ LIBDIR := lib
  INCDIR := include
  SRCDIR := src
  
@@ -18,8 +18,8 @@ diff -up Makefile.orig Makefile
 +INSTALL ?= install
  
  NAME := jitterentropy
- LIBMAJOR=$(shell cat $(SRCDIR)/jitterentropy-base.c | grep define | grep MAJVERSION | awk '{print $$3}')
-@@ -73,25 +73,25 @@ cppcheck:
+ LIBMAJOR=$(shell cat jitterentropy.h | egrep "define\s+JENT_MAJVERSION" | awk '{print $$3}')
+@@ -83,25 +83,25 @@ cppcheck:
  install: install-man install-shared install-includes
  
  install-man:
diff --git a/jitterentropy.spec b/jitterentropy.spec
index 7bf62c8..26aa522 100644
--- a/jitterentropy.spec
+++ b/jitterentropy.spec
@@ -1,11 +1,12 @@
-Name:	jitterentropy
-Version:	3.5.0
-Release:	1%{?dist}
-Summary:	Library implementing the jitter entropy source
+%global libjit_soversion 3
+Name:           jitterentropy
+Version:        3.6.0
+Release:        1%{?dist}
+Summary:        Library implementing the jitter entropy source
 
-License:	BSD-3-Clause OR GPL-2.0-only
-URL:		https://github.com/smuellerDD/jitterentropy-library
-Source0:	%{url}/archive/v%{version}/%{name}-library-%{version}.tar.gz
+License:        BSD-3-Clause OR GPL-2.0-only
+URL:            https://github.com/smuellerDD/jitterentropy-library
+Source0:        %{url}/archive/v%{version}/%{name}-library-%{version}.tar.gz
 
 BuildRequires: gcc
 BuildRequires: make
@@ -37,7 +38,7 @@ mkdir -p %{buildroot}/usr/include/
 %files
 %doc README.md CHANGES.md
 %license LICENSE LICENSE.bsd LICENSE.gplv2
-%{_libdir}/libjitterentropy.so.3*
+%{_libdir}/libjitterentropy.so.%{libjit_soversion}*
 
 %files devel
 %{_includedir}/*
@@ -45,6 +46,9 @@ mkdir -p %{buildroot}/usr/include/
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 25 2024 Vladis Dronov <vdronov@redhat.com> - 3.6.0-1
+- Update to the upstream v3.6.0 @ 11829386 (RHEL-64947)
+
 * Wed Feb 07 2024 Vladis Dronov <vdronov@redhat.com> - 3.5.0-1
 - Update to the upstream v3.5.0 @ b178ef6b (RHEL-30957)
 - Use proper SPDX license identifiers
diff --git a/sources b/sources
index bd42bb2..0523b33 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jitterentropy-library-3.5.0.tar.gz) = a2548840581b4a9da7b48728da5aee85ca22d9d6692fec1752ed72bac26e26538a278a5ff19ab27eaa35bff3c7b7d3f14464a88a48284ac30f90da8941583692
+SHA512 (jitterentropy-library-3.6.0.tar.gz) = d31801d5201f8a5435a8332064ef599d568d42168b708d8e5d72dfec9d80d3d814dcb8c9714d2738919662e8da851e25045cc237c92c9e473b97c3f6861f6929