rng-tools.spec

@@ -1,22 +1,16 @@
 Name:            rng-tools
-Version:         6.16
+Version:         6.14
-Release:         5
+Release:         4
 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:   libp11-devel jitterentropy-library-devel jansson-devel libcap-devel
+BuildRequires:   libp11-devel jitterentropy-library-devel jansson-devel
-
-#Provide the command: killall used by test cases.
-BuildRequires:   psmisc
-BuildRequires:   opensc
-
 Requires:        libgcrypt libsysfs openssl libxml2 libcurl jitterentropy-library openssl-pkcs11
 Requires:        opensc
 %{?systemd_requires}
@@ -39,16 +33,6 @@ 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
-%ifarch riscv64
-export RNGD_JITTER_TIMEOUT=30
-%else
-export RNGD_JITTER_TIMEOUT=10 #Enseur that the AES can be generated.
-%endif
-%make_build check
 
 %pre
 
@@ -68,30 +52,13 @@ export RNGD_JITTER_TIMEOUT=10 #Enseur that the AES can be generated.
 %{_bindir}/rngtest
 %{_bindir}/randstat
 %{_sbindir}/rngd
-%attr(0644,root,root)    %{_unitdir}/rngd.service
+%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 04 2024 wangyangdahai <wangyang22@iscas.ac.cn> - 6.16-5
-- riscv64: increase RNGD_JITTER_TIMEOUT
-
-* Mon Jun 3 2024 yangxiaodong <yangxiaodong@kylinos.cn> - 6.16-4
-- add buildrequires opensc to fix check error
-
-* Mon Apr 24 2023 zhangruifang <zhangruifang1@h-partners.com> - 6.16-3
-- Update the rngd.service file
-- Add the config file for rngd service
-
-* Fri Apr 21 2023 zhangruifang <zhangruifang1@h-partners.com> - 6.16-2
-- enable make check
-
-* Sat Jan 28 2023 fuanan <fuanan3@h-partners.com> - 6.16-1
-- update version to 6.16
-
 * Fri Sep 2 2022 panxiaohe <panxh.life@foxmail.com> - 6.14-4
 - fix changelog to make it in descending chronological order
 

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
+ExecStart=/sbin/rngd -f
-EnvironmentFile=/etc/sysconfig/rngd
-ExecStart=/usr/sbin/rngd -f $RNGD_ARGS
 
 [Install]
 WantedBy=multi-user.target

rngd.sysconfig

@@ -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"