diff --git a/rng-tools.spec b/rng-tools.spec index cc6f5a6..10ee2b2 100644 --- a/rng-tools.spec +++ b/rng-tools.spec @@ -1,16 +1,21 @@ Name: rng-tools -Version: 6.14 -Release: 5 +Version: 6.16 +Release: 1 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 +BuildRequires: libgcrypt-devel libcurl-devel libxml2-devel openssl-devel libcap-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} @@ -32,9 +37,12 @@ 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 -%make_build check +export RNGD_JITTER_TIMEOUT=10 #Enseur that the AES can be generated. +%make_build check %pre @@ -55,12 +63,18 @@ install -D -t $RPM_BUILD_ROOT%{_unitdir} -m 0644 %{SOURCE1} %{_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 +* Wed Oct 18 2023 zhangruifang - 6.16-1 +- update version to 6.16 +- update the rngd.service file +- add the config file for rngd service + * Fri Mar 31 2023 fuanan - 6.14-5 - enable make check diff --git a/rngd.service b/rngd.service index 3d9dcb5..189b34c 100644 --- a/rngd.service +++ b/rngd.service @@ -1,8 +1,11 @@ [Unit] Description=Hardware RNG Entropy Gatherer Daemon +# The "-f" option is required for the systemd service rngd to work with Type=simple [Service] -ExecStart=/sbin/rngd -f +Type=simple +EnvironmentFile=/etc/sysconfig/rngd +ExecStart=/usr/sbin/rngd -f $RNGD_ARGS [Install] WantedBy=multi-user.target diff --git a/rngd.sysconfig b/rngd.sysconfig new file mode 100644 index 0000000..cf18656 --- /dev/null +++ b/rngd.sysconfig @@ -0,0 +1,3 @@ +# 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 deleted file mode 100644 index 1b30a34..0000000 Binary files a/v6.14.tar.gz and /dev/null differ diff --git a/v6.16.tar.gz b/v6.16.tar.gz new file mode 100644 index 0000000..b00338c Binary files /dev/null and b/v6.16.tar.gz differ