diff --git a/jitterentropy-library-2.2.0.tar.gz b/jitterentropy-library-2.2.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..905cd30f2bbbd07b58c99fa353aed76db63840fa Binary files /dev/null and b/jitterentropy-library-2.2.0.tar.gz differ diff --git a/jitterentropy-library-3f7b6cc.tar.gz b/jitterentropy-library-3f7b6cc.tar.gz deleted file mode 100644 index b93ef4733d81118e6ab2f1c03a20ee0fbfbf2114..0000000000000000000000000000000000000000 Binary files a/jitterentropy-library-3f7b6cc.tar.gz and /dev/null differ diff --git a/jitterentropy-remove-install.patch b/jitterentropy-remove-install.patch index f0dd90f640010dc2b8c1005ec1e6dd58175abadd..56dc36a7fe2350438298fd699263738baede7edd 100644 --- a/jitterentropy-remove-install.patch +++ b/jitterentropy-remove-install.patch @@ -1,8 +1,9 @@ -diff -up ./jitterentropy-library/Makefile.makefile ./jitterentropy-library/Makefile ---- ./jitterentropy-library/Makefile.makefile 2018-07-09 13:23:31.000000000 -0400 -+++ ./jitterentropy-library/Makefile 2018-07-16 11:36:25.543791453 -0400 -@@ -44,13 +44,10 @@ scan: $(OBJS) - scan-build --use-analyzer=/usr/bin/clang $(CC) -shared -Wl,-soname,lib$(NAME).so.$(LIBMAJOR) -o lib$(NAME).so.$(LIBVERSION) $(OBJS) $(LDFLAGS) +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 @@ -10,11 +11,12 @@ diff -up ./jitterentropy-library/Makefile.makefile ./jitterentropy-library/Makef - 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)/ -+ -+clean: -+ @- $(RM) $(NAME) - $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) +- 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 840483e78bb7a0010598ffc250cf667784cf64b4..18c72f4bf52d5f6eed8dd682d093b67b07c6031a 100644 --- a/rng-tools.spec +++ b/rng-tools.spec @@ -1,17 +1,16 @@ Name: rng-tools -Version: 6.10 +Version: 6.5 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: jitterentropy-library-3f7b6cc.tar.gz +Source2: jitterentropy-library-2.2.0.tar.gz Patch0: jitterentropy-remove-install.patch #Dependency -BuildRequires: libp11-devel jansson-devel BuildRequires: gcc make gettext systemd autoconf automake BuildRequires: libgcrypt-devel libsysfs-devel libcurl-devel libxml2-devel openssl-devel Requires: libgcrypt libsysfs openssl libxml2 libcurl @@ -28,7 +27,7 @@ and supplies entropy from them to the system kernel's /dev/random machinery. %build ./autogen.sh -%configure --without-rtlsdr +%configure %make_build %install @@ -60,6 +59,10 @@ install -D -t $RPM_BUILD_ROOT%{_unitdir} -m 0644 %{SOURCE1} %{_mandir}/man8/rngd.8.* %changelog +* Wed Sep 2 2020 yangzhuangzhuang - 6.5-1 +- since 6.6, jitterentropy-library is independed from rng-tools, + no any entropy source will lead to rng-tools service fail. + * Thu Jul 30 2020 zhangxingliang - 6.10-1 - update to 6.10 diff --git a/v6.10.tar.gz b/v6.10.tar.gz deleted file mode 100644 index 8bea411adb882cd3c3e83fe48bd6b15123eb1d63..0000000000000000000000000000000000000000 Binary files a/v6.10.tar.gz and /dev/null differ diff --git a/v6.5.tar.gz b/v6.5.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..3fca73728f0044fce6d4b4e04d0ccf113c876ef0 Binary files /dev/null and b/v6.5.tar.gz differ