since 6.6, jitterentropy-library is independed from rng-tools,
no any entropy source will lead to rng-tools service fail.
This commit is contained in:
parent
14c9b7d250
commit
939d7c564f
BIN
jitterentropy-library-2.2.0.tar.gz
Normal file
BIN
jitterentropy-library-2.2.0.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -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)
|
||||
|
||||
@ -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 <yangzhuangzhuang1@huawei.com> - 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 <zhangxingliang3@huawei.com> - 6.10-1
|
||||
- update to 6.10
|
||||
|
||||
|
||||
BIN
v6.10.tar.gz
BIN
v6.10.tar.gz
Binary file not shown.
BIN
v6.5.tar.gz
Normal file
BIN
v6.5.tar.gz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user