From b56f87d93bf187f2cdba0fba7e84f9f07b24e2eb Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Fri, 31 May 2024 17:06:39 +0000
Subject: [PATCH] Import from AlmaLinux stable repository

---
 .gitignore           |  2 +-
 .rng-tools.metadata  |  2 --
 SPECS/rng-tools.spec | 16 ++++++++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)
 delete mode 100644 .rng-tools.metadata

diff --git a/.gitignore b/.gitignore
index 99ee757..c9c1826 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 SOURCES/jitterentropy-library-3.4.1.tar.gz
-SOURCES/rng-tools-6.15.tar.gz
+SOURCES/rng-tools-6.16.tar.gz
diff --git a/.rng-tools.metadata b/.rng-tools.metadata
deleted file mode 100644
index 8cb7b90..0000000
--- a/.rng-tools.metadata
+++ /dev/null
@@ -1,2 +0,0 @@
-2e3475074ae0c75fc417da553eb70ec160334b18 SOURCES/jitterentropy-library-3.4.1.tar.gz
-f8720f7aaef3f5ca0d63cf7b88d0de802a358ae0 SOURCES/rng-tools-6.15.tar.gz
diff --git a/SPECS/rng-tools.spec b/SPECS/rng-tools.spec
index 0bfa277..14a02b7 100644
--- a/SPECS/rng-tools.spec
+++ b/SPECS/rng-tools.spec
@@ -2,8 +2,8 @@
 
 Summary:        Random number generator related utilities
 Name:           rng-tools
-Version:        6.15
-Release:        3%{?dist}
+Version:        6.16
+Release:        1%{?dist}
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            https://github.com/nhorman/rng-tools
@@ -20,6 +20,7 @@ BuildRequires: libgcrypt-devel libcurl-devel
 BuildRequires: libxml2-devel openssl-devel
 BuildRequires: jansson-devel
 BuildRequires: libcap-devel
+Suggests: opensc
 
 Requires(post): systemd
 Requires(preun): systemd
@@ -48,6 +49,12 @@ mv jitterentropy-library-3.4.1 jitterentropy-library
 
 %build
 ./autogen.sh
+# a dirty hack to force PIC for a PIC-aware assembly code for i686
+# /usr/lib/rpm/redhat/redhat-hardened-cc1 in Koji/Brew does not
+# force PIC for assembly sources as of now
+%ifarch i386 i686
+sed -i -e '/^#define RDRAND_RETRY_LIMIT\t10/a#define __PIC__ 1' rdrand_asm.S
+%endif
 # a dirty hack so libdarn_impl_a_CFLAGS overrides common CFLAGS
 sed -i -e 's/$(libdarn_impl_a_CFLAGS) $(CFLAGS)/$(CFLAGS) $(libdarn_impl_a_CFLAGS)/' Makefile.in
 %configure --without-pkcs11 --without-rtlsdr
@@ -82,6 +89,11 @@ install -D %{SOURCE2} -m0644 %{buildroot}%{_sysconfdir}/sysconfig/rngd
 %config(noreplace) %attr(0644,root,root)    %{_sysconfdir}/sysconfig/rngd
 
 %changelog
+* Thu Mar 02 2023 Vladis Dronov <vdronov@redhat.com> - 6.16-1
+- Update rng-tools to v6.16 @ 0e560296 (bz 2174908)
+- Get rid of text relocations in -fPIE build
+- Add a hint for opensc package (bz 1845854)
+
 * Tue Dec 27 2022 Vladis Dronov <vdronov@redhat.com> - 6.15-3
 - Update rng-tools to v6.15 @ cb8cc624 (bz 2141379)
 - Update jitterentropy library to v3.4.1 @ 7bf9f85d