diff --git a/jitterentropy-library-2.2.0.tar.gz b/jitterentropy-library-2.2.0.tar.gz deleted file mode 100644 index 905cd30f2bbbd07b58c99fa353aed76db63840fa..0000000000000000000000000000000000000000 Binary files a/jitterentropy-library-2.2.0.tar.gz and /dev/null differ diff --git a/jitterentropy-remove-install.patch b/jitterentropy-remove-install.patch deleted file mode 100644 index 56dc36a7fe2350438298fd699263738baede7edd..0000000000000000000000000000000000000000 --- a/jitterentropy-remove-install.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/jitterentropy-library/Makefile b/jitterentropy-library/Makefile -index 4ff069b..503be5c 100644 ---- a/jitterentropy-library/Makefile -+++ b/jitterentropy-library/Makefile -@@ -56,17 +56,6 @@ cppcheck: - cppcheck --force -q --enable=performance --enable=warning --enable=portability *.h *.c - - install: -- install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3 -- install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/ -- gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 -- install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) -- install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ -- 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)/ -- $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) -- ln -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) -- ln -s lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so - - clean: - @- $(RM) $(NAME) diff --git a/rng-tools.spec b/rng-tools.spec index 3926f00ec43c13d42d548435b3810bc3b96e0dbc..0400ee45c548af3d824789892b0fc76692812356 100644 --- a/rng-tools.spec +++ b/rng-tools.spec @@ -1,20 +1,17 @@ Name: rng-tools Version: 6.14 -Release: 1 +Release: 2 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: jitterentropy-library-2.2.0.tar.gz - -Patch0: jitterentropy-remove-install.patch #Dependency BuildRequires: gcc make gettext systemd autoconf automake -BuildRequires: libgcrypt-devel libsysfs-devel libcurl-devel libxml2-devel openssl-devel -BuildRequires: libp11-devel jansson-devel -Requires: libgcrypt libsysfs openssl libxml2 libcurl +BuildRequires: libgcrypt-devel libcurl-devel libxml2-devel openssl-devel +BuildRequires: libp11-devel jansson-devel jitterentropy-library-devel +Requires: libgcrypt libsysfs openssl libxml2 libcurl jitterentropy-library openssl-pkcs11 %{?systemd_requires} %description @@ -24,7 +21,7 @@ and supplies entropy from them to the system kernel's /dev/random machinery. %package_help %prep -%autosetup -n %{name}-%{version} -a 2 -p1 +%autosetup -n %{name}-%{version} -p1 %build ./autogen.sh @@ -61,6 +58,9 @@ install -D -t $RPM_BUILD_ROOT%{_unitdir} -m 0644 %{SOURCE1} %{_mandir}/man8/rngd.8.* %changelog +* Mon Dec 27 2021 yangzhuangzhuang - 6.14-2 +- Use the external jitterentropy library + * Sat Nov 27 2021 yangzhuangzhuang - 6.14-1 - update version to 6.14