diff --git a/rng-tools.spec b/rng-tools.spec index 10ee2b2ac7feee6a7a7aca2b248846cf576c46ef..d14f748a85531fd5ebad3de9cee62f93cb156dd7 100644 --- a/rng-tools.spec +++ b/rng-tools.spec @@ -1,21 +1,17 @@ Name: rng-tools -Version: 6.16 -Release: 1 +Version: 6.14 +Release: 5 Summary: Random number generator daemon License: GPLv2+ URL: https://github.com/nhorman/rng-tools Source0: https://github.com/nhorman/rng-tools/archive/v%{version}.tar.gz Source1: rngd.service -Source2: rngd.sysconfig #Dependency BuildRequires: gcc make gettext systemd autoconf automake -BuildRequires: libgcrypt-devel libcurl-devel libxml2-devel openssl-devel libcap-devel +BuildRequires: libgcrypt-devel libcurl-devel libxml2-devel openssl-devel BuildRequires: jansson-devel jitterentropy-library-devel -#Provide the command: killall used by test cases. -BuildRequires: psmisc - Requires: libgcrypt libsysfs openssl libxml2 libcurl jitterentropy-library %{?systemd_requires} @@ -37,11 +33,8 @@ and supplies entropy from them to the system kernel's /dev/random machinery. %make_install install -D -t $RPM_BUILD_ROOT%{_unitdir} -m 0644 %{SOURCE1} -# install sysconfig file -install -D %{SOURCE2} -m0644 %{buildroot}%{_sysconfdir}/sysconfig/rngd %check -export RNGD_JITTER_TIMEOUT=10 #Enseur that the AES can be generated. %make_build check %pre @@ -63,13 +56,16 @@ export RNGD_JITTER_TIMEOUT=10 #Enseur that the AES can be generated. %{_bindir}/randstat %{_sbindir}/rngd %attr(0644,root,root) %{_unitdir}/rngd.service -%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/rngd %files help %{_mandir}/man1/rngtest.1.* %{_mandir}/man8/rngd.8.* %changelog +* Mon Nov 13 2023 zhangruifang - 6.14-5 +- revert version to 6.14-5 +- Large differences between versions 6.16 and 6.14 + * Wed Oct 18 2023 zhangruifang - 6.16-1 - update version to 6.16 - update the rngd.service file diff --git a/rngd.service b/rngd.service index 189b34c1acd1dfbb0eabdc1fc9466b3017f114b5..3d9dcb5c250246862546046c70faf387d888d270 100644 --- a/rngd.service +++ b/rngd.service @@ -1,11 +1,8 @@ [Unit] Description=Hardware RNG Entropy Gatherer Daemon -# The "-f" option is required for the systemd service rngd to work with Type=simple [Service] -Type=simple -EnvironmentFile=/etc/sysconfig/rngd -ExecStart=/usr/sbin/rngd -f $RNGD_ARGS +ExecStart=/sbin/rngd -f [Install] WantedBy=multi-user.target diff --git a/rngd.sysconfig b/rngd.sysconfig deleted file mode 100644 index cf18656c465fffb86ff98433831e1878be566117..0000000000000000000000000000000000000000 --- a/rngd.sysconfig +++ /dev/null @@ -1,3 +0,0 @@ -# Optional arguments passed to rngd. See rngd(8) and -# https://bugzilla.redhat.com/show_bug.cgi?id=1252175#c21 -RNGD_ARGS="-O jitter:timeout:10" diff --git a/v6.14.tar.gz b/v6.14.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1b30a34a8227713bd9fc0328532580d23c0b3f15 Binary files /dev/null and b/v6.14.tar.gz differ diff --git a/v6.16.tar.gz b/v6.16.tar.gz deleted file mode 100644 index b00338cbe4dff894dd2b2eb97a75e67ac05b5099..0000000000000000000000000000000000000000 Binary files a/v6.16.tar.gz and /dev/null differ