9 changed files with 150 additions and 205 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
-SOURCES/jitterentropy-library-3.4.1.tar.gz
 SOURCES/rng-tools-6.16.tar.gz
--- a/.rng-tools.metadata
+++ b/.rng-tools.metadata
@ -0,0 +1 @@
+8487beef3dfc81bc0cef48b0e160996009ccbc4f SOURCES/rng-tools-6.16.tar.gz
--- a/SOURCES/1-je-rh-makefile.patch
+++ b/SOURCES/1-je-rh-makefile.patch
@ -1,56 +0,0 @@
-diff -up jitterentropy-library/Makefile jitterentropy-library/Makefile
--- jitterentropy-library/Makefile	2021-07-13 17:23:42.954652287 +0200
-+++ jitterentropy-library/Makefile	2021-07-13 17:27:27.958549833 +0200
-@@ -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
- 
- # Enable internal timer support
-@@ -28,7 +28,7 @@ LIBDIR := lib
- INCDIR := include
- SRCDIR := src
- 
-INSTALL_STRIP ?= install -s
-+INSTALL ?= install
- 
- NAME := jitterentropy
- LIBMAJOR=$(shell cat $(SRCDIR)/jitterentropy-base.c | grep define | grep MAJVERSION | awk '{print $$3}')
-@@ -73,25 +73,25 @@ cppcheck:
- install: install-man install-shared install-includes
- 
- install-man:
-	install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3
-	install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3
-+	$(INSTALL) -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/
- 	gzip -n -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
- 
- install-shared:
-	install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
-	$(INSTALL_STRIP) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
-+	$(INSTALL) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
- 	$(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
- 	ln -sf lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
- 	ln -sf lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so
- 
- install-includes:
-	install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR)
-	install -m 0644 jitterentropy.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
-	install -m 0644 jitterentropy-base-user.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR)
-+	$(INSTALL) -m 0644 jitterentropy.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
-+	$(INSTALL) -m 0644 jitterentropy-base-user.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
- 
- install-static:
-	install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
-	install -m 0755 lib$(NAME).a $(DESTDIR)$(PREFIX)/$(LIBDIR)/
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
-+	$(INSTALL) -m 0755 lib$(NAME).a $(DESTDIR)$(PREFIX)/$(LIBDIR)/
- 
- clean:
- 	@- $(RM) $(NAME)
--- a/SOURCES/1-rt-comment-out-have-aesni.patch
+++ b/SOURCES/1-rt-comment-out-have-aesni.patch
--- a/SOURCES/2-je-remove-install.patch
+++ b/SOURCES/2-je-remove-install.patch
@ -1,33 +0,0 @@
-diff -up jitterentropy-library/Makefile jitterentropy-library/Makefile
--- jitterentropy-library/Makefile	2021-07-13 17:23:42.954652287 +0200
-+++ jitterentropy-library/Makefile	2021-07-13 17:27:27.958549833 +0200
-@@ -70,29 +70,6 @@ scan: $(analyze_plists)
- cppcheck:
- 	cppcheck --force -q --enable=performance --enable=warning --enable=portability *.h *.c
- 
-install: install-man install-shared install-includes
-
-install-man:
-	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3
-	$(INSTALL) -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/
-	gzip -n -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
-
-install-shared:
-	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
-	$(INSTALL) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
-	$(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
-	ln -sf lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
-	ln -sf lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so
-
-install-includes:
-	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR)
-	$(INSTALL) -m 0644 jitterentropy.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
-	$(INSTALL) -m 0644 jitterentropy-base-user.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
-
-install-static:
-	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
-	$(INSTALL) -m 0755 lib$(NAME).a $(DESTDIR)$(PREFIX)/$(LIBDIR)/
-
- clean:
- 	@- $(RM) $(NAME)
- 	@- $(RM) $(OBJS)
--- a/SOURCES/2-rt-revert-build-randstat.patch
+++ b/SOURCES/2-rt-revert-build-randstat.patch
--- a/SOURCES/3-rt-use-jitter-static.patch
+++ b/SOURCES/3-rt-use-jitter-static.patch
@ -1,59 +0,0 @@
-diff -up Makefile.am Makefile.am
--- ./Makefile.am	2021-07-03 22:22:27.000000000 +0200
-+++ ./Makefile.am	2021-08-06 12:18:48.498612099 +0200
-@@ -1,7 +1,7 @@
- ##
- ## Toplevel Makefile.am for rng-tools
- ##
-SUBDIRS		= contrib tests
-+SUBDIRS		= contrib tests jitterentropy-library
- 
- sbin_PROGRAMS	 = rngd
- bin_PROGRAMS	 = rngtest
-@@ -23,44 +23,31 @@ if RNDR
- rngd_SOURCES	+= rngd_rndr.c
- endif
- 
-if JITTER
- rngd_SOURCES	+= rngd_jitter.c
-endif
-
-if RTLSDR
-rngd_SOURCES	+= rngd_rtlsdr.c
-endif
- 
- if QRYPT
- rngd_SOURCES	+= rngd_qrypt.c
- endif
- 
-rngd_LDADD	= librngd.a $(LIBS) $(librtlsdr_LIBS) ${libp11_LIBS} ${libcrypto_LIBS} ${jansson_LIBS} ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS} ${libcap_LIBS} $(PTHREAD_LIBS)
-+rngd_LDADD	= librngd.a $(LIBS) jitterentropy-library/libjitterentropy.a ${libcrypto_LIBS} ${jansson_LIBS} ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS} ${libcap_LIBS} $(PTHREAD_LIBS)
- 
- if DARN
- rngd_SOURCES	+= rngd_darn.c
- 
- # Build Power9-only code with Power9
- # compile flags in a separate library
- rngd_LDADD		+= libdarn_impl.a
- noinst_LIBRARIES	+= libdarn_impl.a
- libdarn_impl_a_SOURCES	= darn_impl.c
- libdarn_impl_a_CFLAGS	= -mcpu=power9 -mtune=power9
- endif
-
-if PKCS11
-rngd_SOURCES	+= rngd_pkcs11.c
-pkcs11_ENGINE = -DDEFAULT_PKCS11_ENGINE=\"$(PKCS11_ENGINE)\"
-endif
-
-rngd_CFLAGS	= ${pkcs11_CFLAGS} $(librtlsdr_CFLAGS) ${pkcs11_ENGINE} ${libp11_CFLAGS} ${libcrypto_CFLAGS} ${libxml2_CFLAGS} ${openssl_CFLAGS} ${libcap_CFLAGS} $(PTHREAD_CFLAGS)
-+rngd_CFLAGS	= ${libcrypto_CFLAGS} ${libxml2_CFLAGS} ${openssl_CFLAGS} ${libcap_CFLAGS} $(PTHREAD_CFLAGS) -DHAVE_JITTER -I./jitterentropy-library/
- rngd_LDFLAGS	= $(PTHREAD_CFLAGS)
- 
- rngtest_SOURCES	= exits.h stats.h stats.c rngtest.c
- rngtest_LDADD	= librngd.a
- 
- librngd_a_SOURCES = fips.h fips.c
- 
-
- EXTRA_DIST	= autogen.sh
-
--- a/SOURCES/rngd.service
+++ b/SOURCES/rngd.service
@ -10,4 +10,4 @@ EnvironmentFile=/etc/sysconfig/rngd
 ExecStart=/usr/sbin/rngd -f $RNGD_ARGS

 [Install]
-WantedBy=sysinit.target
+WantedBy=multi-user.target
--- a/SPECS/rng-tools.spec
+++ b/SPECS/rng-tools.spec
@ -1,16 +1,23 @@
 %global _hardened_build 1

+# this is a correct if, bcond_with actually means without and vice versa
+%if 0%{?rhel} && 0%{?rhel} >= 9
+%bcond_with    pkcs11
+%bcond_with    rtlsdr
+%else
+%bcond_without pkcs11
+%bcond_without rtlsdr
+%endif
+
 Summary:        Random number generator related utilities
 Name:           rng-tools
 Version:        6.16
 Release:        1%{?dist}
-Group:          System Environment/Base
 License:        GPLv2+
 URL:            https://github.com/nhorman/rng-tools
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:        rngd.service
 Source2:        rngd.sysconfig
-Source3:        jitterentropy-library-3.4.1.tar.gz

 BuildRequires: gcc make binutils
 BuildRequires: gettext
@ -18,9 +25,16 @@ BuildRequires: systemd systemd-rpm-macros
 BuildRequires: autoconf >= 2.57, automake >= 1.7
 BuildRequires: libgcrypt-devel libcurl-devel
 BuildRequires: libxml2-devel openssl-devel
+BuildRequires: jitterentropy-devel
 BuildRequires: jansson-devel
 BuildRequires: libcap-devel
+%if %{with rtlsdr}
+BuildRequires: rtl-sdr-devel
+%endif
+%if %{with pkcs11}
+BuildRequires: libp11-devel
 Suggests: opensc
+%endif

 Requires(post): systemd
 Requires(preun): systemd
@ -28,13 +42,10 @@ Requires(postun): systemd

 # This ensures that the selinux-policy package and all its dependencies
 # are not pulled into containers and other systems that do not use SELinux.
-Requires: (selinux-policy >= 3.14.3-98 if selinux-policy)
+Requires: (selinux-policy >= 34.1.31-2 if selinux-policy)

-Patch0: 1-je-rh-makefile.patch
-Patch1: 2-je-remove-install.patch
-Patch2: 3-rt-use-jitter-static.patch
-Patch3: 4-rt-comment-out-have-aesni.patch
-Patch4: 5-rt-revert-build-randstat.patch
+Patch0: 1-rt-comment-out-have-aesni.patch
+Patch1: 2-rt-revert-build-randstat.patch

 %description
 This is a random number generator daemon and its tools. It monitors
@ -42,12 +53,16 @@ a set of entropy sources present on a system (like /dev/hwrng, RDRAND,
 TPM, jitter) and supplies entropy from them to a kernel entropy pool.

 %prep
-%setup -q
-tar xf %{SOURCE3}
-mv jitterentropy-library-3.4.1 jitterentropy-library
-%autopatch -p0
+%autosetup -p0

 %build
+%if !%{with pkcs11}
+%define _without_pkcs11 --without-pkcs11
+%endif
+%if !%{with rtlsdr}
+%define _without_rtlsdr --without-rtlsdr
+%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
@ -57,7 +72,7 @@ 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}
 %make_build

 %install
@ -90,84 +105,162 @@ install -D %{SOURCE2} -m0644 %{buildroot}%{_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)
+- Update to the upstream v6.16 + tip of origin/master @ 0e560296 (bz 2174916)
 - 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
- Fix a stack corruption on s390x
+- Update to the upstream v6.15 + tip of origin/master @ cb8cc624 (bz 2156554)
 - Fix a number of issues found by covscan code scanner
 - Add a jitter init timeout for tests
 - Add a start condition for the FIPS mode (bz 2154804)

 * Tue Oct 04 2022 Vladis Dronov <vdronov@redhat.com> - 6.15-2
- Update rng-tools to v6.15 @ 6dcc9ec2 (bz 2124602)
- Update jitterentropy library to v3.4.1 @ 4544e113
+- Update to the upstream v6.15 + tip of origin/master @ 6dcc9ec2 (bz 2124605)
 - Do not require selinux-policy if it is not present

 * Sat Apr 16 2022 Vladis Dronov <vdronov@redhat.com> - 6.15-1
- Update rng-tools to v6.15 @ 172bf0e3 (bz 2075974)
- Update jitterentropy library to v3.4.0 @ 887c9871
+- Update to the upstream v6.15 @ 172bf0e3 (bz 2075977)
 - Allow rngd process to drop privileges with "-D user:group"
 - Fix an error building with jitterentropy-3.4.0
 - Add a requirement for selinux-policy of a certain version
 - Fix a build failure on ppc64
 - Small edits in test scripts

-* Mon Nov 22 2021 Vladis Dronov <vdronov@redhat.com> - 6.14-4.git.b2b7934e
- Update rng-tools to v6.14 @ b2b7934e (bz 2015570)
- Update jitterentropy library to v3.3.1 @ 887c9871
+* Tue Nov 23 2021 Vladis Dronov <vdronov@redhat.com> - 6.14-2.git.b2b7934e
+- Update to the upstream v6.14 @ b2b7934e (bz 2015566)
 - Add a config file for storing rngd options
- Fix a security issue found by a covscan in jitterentropy library

-* Thu Jul 22 2021 Vladis Dronov <vdronov@redhat.com> - 6.13-1.git.d207e0b6
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 6.13-6.git.d207e0b6
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Tue Jul 27 2021 Vladis Dronov <vdronov@redhat.com> - 6.13-5.git.d207e0b6
+- A version bump due to a necessary rebuild.
+
+* Thu Jul 22 2021 Vladis Dronov <vdronov@redhat.com> - 6.13-4.git.d207e0b6
 - Update to the upstream v6.13 + tip of origin/master + onecpu
-  branch + revert of 2ce93190
+  branch + revert of 2ce93190 (bz 1965318)
 - Rebuild rng-tools against the latest jitterentropy library
  3.0.2-2.git.409828cf with fixes for an important issue
- Fix a number of issues (bz 1974103, bz 1980421, bz 1859154)
+- Adjust Source0 to a more proper one

-* Mon Jul 05 2021 Vladis Dronov <vdronov@redhat.com> - 6.8-6
- Adjust rngd-wake-threshold.service and post section so udevadm is not
-  run in a container (bz 1975554)
+* Mon Jul 05 2021 Vladis Dronov <vdronov@redhat.com> - 6.13-3
+- Adjust rngd-wake-threshold.service and post section so udevadm
+  is not run in a container (bz 1965318)

-* Thu May 27 2021 Vladis Dronov <vdronov@redhat.com> - 6.8-5
- Fix /dev/hwrng permissions issue at boot time (bz 1955522)
+* Thu Jun 17 2021 Mohan Boddu <mboddu@redhat.com> - 6.13-2
+- Specbump for openssl 3.0
+  Related: rhbz#1971065

-* Mon May 24 2021 Vladis Dronov <vdronov@redhat.com> - 6.8-4
- There is no need to hardcode _sbindir anymore, also the old value is
-  incorrect
+* Wed Jun 16 2021 Vladis Dronov <vdronov@redhat.com> - 6.13-1
+- Update the sources to 6.13
+- Add important fixes from the upstream
+- Remove Provides: jitterentropy-rngd as it was retired in f29.
+
+* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.12-5
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065
+
+* Mon May 24 2021 Vladis Dronov <vdronov@redhat.com> - 6.12-4
+- Allow rngd to run as non-privledged user (bz 1965318)
 - Update the rngd.service file
- Fix a busyloop bug (bz 1956248)
- Fix /dev/hwrng permission issue (bz 1955522)
+- Add 3 small upstream patches fixing issues

-* Tue Feb 18 2020 Neil Horman <nhorman@redhat.com> - 6.8-3
- Fix coarse clock time on Azure (bz 180155)
+* Wed Apr 28 2021 Vladis Dronov <vdronov@redhat.com> - 6.12-3
+- There is no need to hardcode _sbindir anymore, also the old
+  value is incorrect (bz 1965318)

-* Mon Dec 02 2019 Neil Horman <nhorman@redhat.com> - 6.8-2
- Fix erroneous message due to bad errno check (bz 1776710)
- Enable addition of 0 value for fill-watermark (bz 1776710)
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.12-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021.
+  Related: rhbz#1947937

-* Fri Nov 15 2019 Neil Horman <nhorman@redhat.com> - 6.8-1
- Update to latest upstream (bz 1769916)
+* Fri Mar 12 2021 Vladis Dronov <vdronov@redhat.com> - 6.12-1
+- Update to 6.12
+- Drop libsysfs dependency since it is not used anymore
+- Remove jitterentropy-remove-install.patch since we depend on
+  a system jitterentropy library now
+- Remove rngd-shutdown.patch since it is the upstream commit 62fbff0a
+- Remove rngd-exit-code-for-list.patch since it is the upstream commit
+  fb46dc48
+- Remove pkcs11-path.patch since it is the upstream commit 1993eca9

-* Wed Oct 09 2019 Neil Horman <nhorman@redhat.com> 6.6-5
- Fix group typo in rngd.service (bz 1751810)
+* Tue Mar 02 2021 Vladis Dronov <vdronov@redhat.com> - 6.11-3
+- Replace outdated systemd-units

-* Fri Oct 04 2019 Neil Horman <nhorman@redhat.com> 6.6-4
- Revision bump to rebuild for new CI runs
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.11-2
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.

-* Mon Mar 25 2019 Neil Horman <nhorman@redhat.com> 6.2-3
- Allow rngd to run as non-privledged user (bz 1692435)
+* Fri Jan 29 2021 Dan Horák <dan[at]danny.cz> - 6.11-1
+- Update to 6.11

-* Mon Dec 17 2018 Neil Horman <nhorman@redhat.com> 6.2-2
- default to 1 thread on cpu 0 if getaffinty returns error (bz 1658855)
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.10-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

-* Thu May 17 2018 Neil Horman <nhorman@redhat.com> 6.2-1
+* Mon Nov 16 2020 Vladis Dronov <vdronov@redhat.com> - 6.10-7
+- Make rtl-sdr optional
+- For RHEL9 and above, do not build with rtl-sdr
+
+* Mon Oct 05 2020 Troy Dawson <tdawson@redhat.com> - 6.10-6
+- Make pkcs11 optional
+- For RHEL9 and above, do not build with pkcs11
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.10-5
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.10-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Mar 27 2020 Neil Horman <nhorman@redhat.com> - 6.10-3
+- Fix missing buildrequires
+
+* Fri Mar 27 2020 Neil Horman <nhorman@redhat.com> - 6.10-2
+- Fix missing buildrequires
+
+* Fri Mar 27 2020 Neil Horman <nhorman@redhat.com> - 6.10-1
+- Update to latest upstream
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jan 13 2020 Neil Horman <nhorman@redhat.com> - 6.9-2
+- Correct default pkcs11 path on 32 bit arch (bz 1788083)
+
+* Tue Dec 17 2019 Neil Horman <nhorman@redhat.com> - 6.9-1
+- update to latest upstream
+
+* Mon Aug 05 2019 Volker Froehlich <volker27@gmx.at> - 6.7-4
+- Remove explicit Requires for libraries
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 24 2019 Neil Horman <nhorman@redhat.com> -6.7-2
+- Fix race in shutdown leading to hang (bz 1690364)
+- bump version number
+
+* Thu Feb 14 2019 Neil Horman <nhorman@redhat.com> - 6.7-1
+- Update to latest upstream
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.3.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Oct 01 2018 Neil Horman <nhorman@redhat.com> - 6.3.1-2
+- Add Provides for jitterentropy-rngd (bz 1634788)
+
+* Mon Jul 16 2018 Neil Horman <nhorman@redhat.com> - 6.3.1-1
+- Update to latest upstream
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jul 06 2018 Neil Horman <nhorman@redhat.com> - 6.3-1
+- update to latest upstream (#1598608)
+
+* Thu May 10 2018 Neil Horman <nhorman@redhat.com>
 - Update to latest upstream
- Add CI self tests

 * Thu Feb 15 2018 Adam Williamson <awilliam@redhat.com> - 6.1-4
 - Drop all attempts to 'fix' #1490632, revert spec to same as 6.1-1
				`@ -0,0 +1 @@`
				`8487beef3dfc81bc0cef48b0e160996009ccbc4f SOURCES/rng-tools-6.16.tar.gz`