From fd74f980326c9002e5ce3e5fbe29ec36298bd84f Mon Sep 17 00:00:00 2001
From: Vladislav Dronov <vdronov@redhat.com>
Date: Thu, 21 May 2026 23:31:26 +0200
Subject: [PATCH] Update to the upstream v6.17

Update to the upstream v6.17 @ e8da3cdc
Handle new radiacode entropy source
Build with the updated jitterentropy v3.7.0 library
Drop the older i686 force-PIC fix

Resolves: RHEL-176338

Signed-off-by: Vladislav Dronov <vdronov@redhat.com>
---
 gating.yaml    |  6 ------
 rng-tools.spec | 24 ++++++++++++++++--------
 rngd.sysconfig |  2 +-
 sources        |  2 +-
 4 files changed, 18 insertions(+), 16 deletions(-)
 delete mode 100644 gating.yaml

diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index 4ca9235..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/rng-tools.spec b/rng-tools.spec
index 8ba3dca..2b8a9b1 100644
--- a/rng-tools.spec
+++ b/rng-tools.spec
@@ -4,15 +4,17 @@
 %if 0%{?rhel} && 0%{?rhel} >= 9
 %bcond_with    pkcs11
 %bcond_with    rtlsdr
+%bcond_with    radiacode
 %else
 %bcond_without pkcs11
 %bcond_without rtlsdr
+%bcond_without radiacode
 %endif
 
 Summary:        Random number generator related utilities
 Name:           rng-tools
 Version:        6.17
-Release:        5%{?dist}
+Release:        10%{?dist}
 License:        GPL-2.0-or-later
 URL:            https://github.com/nhorman/rng-tools
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -35,6 +37,9 @@ BuildRequires: rtl-sdr-devel
 BuildRequires: libp11-devel
 Suggests: opensc
 %endif
+%if %{with radiacode}
+BuildRequires: libusb1-devel
+%endif
 
 Requires(post): systemd
 Requires(preun): systemd
@@ -62,17 +67,14 @@ TPM, jitter) and supplies entropy from them to a kernel entropy pool.
 %if !%{with rtlsdr}
 %define _without_rtlsdr --without-rtlsdr
 %endif
+%if !%{with radiacode}
+%define _without_radiacode --without-radiacode
+%endif
 
 ./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}
+%configure %{?_without_pkcs11} %{?_without_rtlsdr} %{?_without_radiacode}
 %make_build
 
 %install
@@ -104,6 +106,12 @@ install -D %{SOURCE2} -m0644 %{buildroot}%{_sysconfdir}/sysconfig/rngd
 %config(noreplace) %attr(0644,root,root)    %{_sysconfdir}/sysconfig/rngd
 
 %changelog
+* Wed May 20 2026 Vladislav Dronov <vdronov@redhat.com> - 6.17-10
+- Update to the upstream v6.17 @ e8da3cdc (RHEL-176338)
+- Handle new radiacode entropy source
+- Build with the updated jitterentropy v3.7.0 library
+- Drop the older i686 force-PIC fix
+
 * Thu Jun 26 2025 Vladis Dronov <vdronov@redhat.com> - 6.17-5
 - Disable jitter entropy source by default (RHEL-91113)
 
diff --git a/rngd.sysconfig b/rngd.sysconfig
index d640847..3fcd732 100644
--- a/rngd.sysconfig
+++ b/rngd.sysconfig
@@ -1,3 +1,3 @@
 # Optional arguments passed to rngd. See rngd(8) and
 # https://bugzilla.redhat.com/show_bug.cgi?id=1252175#c21
-RNGD_ARGS="--fill-watermark=0 -x pkcs11 -x nist -x qrypt -x namedpipe -x jitter -D daemon:daemon"
+RNGD_ARGS="--fill-watermark=0 -x pkcs11 -x nist -x qrypt -x namedpipe -x jitter -x radiacode -x rtlsdr -D daemon:daemon"
diff --git a/sources b/sources
index e1026ba..fdb30e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rng-tools-6.17.tar.gz) = 32d2d18b9ff13976f6af0011d89fe962fac41761e66eeb24a54f372c7068c8f665537aab6b396e432954d52101b56cd73ac27d27f6a59937d48fc549d9b71421
+SHA512 (rng-tools-6.17.tar.gz) = 529b1359174e1ef39dbbe4788b602daa6d84fd9998f96c19c66bf3b4cb7ec23381890cbde630541711d039936650c8bde1df2f05a4a64b4cc0d77731bed8bd04