!22 Use the external jitterentropy library
Merge pull request !22 from 杨壮壮/openEuler-22.03-LTS-Next
This commit is contained in:
commit
8f771109a6
Binary file not shown.
@ -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)
|
|
||||||
@ -1,20 +1,17 @@
|
|||||||
Name: rng-tools
|
Name: rng-tools
|
||||||
Version: 6.14
|
Version: 6.14
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: Random number generator daemon
|
Summary: Random number generator daemon
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://github.com/nhorman/rng-tools
|
URL: https://github.com/nhorman/rng-tools
|
||||||
Source0: https://github.com/nhorman/rng-tools/archive/v%{version}.tar.gz
|
Source0: https://github.com/nhorman/rng-tools/archive/v%{version}.tar.gz
|
||||||
Source1: rngd.service
|
Source1: rngd.service
|
||||||
Source2: jitterentropy-library-2.2.0.tar.gz
|
|
||||||
|
|
||||||
Patch0: jitterentropy-remove-install.patch
|
|
||||||
|
|
||||||
#Dependency
|
#Dependency
|
||||||
BuildRequires: gcc make gettext systemd autoconf automake
|
BuildRequires: gcc make gettext systemd autoconf automake
|
||||||
BuildRequires: libgcrypt-devel libsysfs-devel libcurl-devel libxml2-devel openssl-devel
|
BuildRequires: libgcrypt-devel libcurl-devel libxml2-devel openssl-devel
|
||||||
BuildRequires: libp11-devel jansson-devel
|
BuildRequires: libp11-devel jansson-devel jitterentropy-library-devel
|
||||||
Requires: libgcrypt libsysfs openssl libxml2 libcurl
|
Requires: libgcrypt libsysfs openssl libxml2 libcurl jitterentropy-library openssl-pkcs11
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -24,7 +21,7 @@ and supplies entropy from them to the system kernel's /dev/random machinery.
|
|||||||
%package_help
|
%package_help
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{version} -a 2 -p1
|
%autosetup -n %{name}-%{version} -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
@ -61,6 +58,9 @@ install -D -t $RPM_BUILD_ROOT%{_unitdir} -m 0644 %{SOURCE1}
|
|||||||
%{_mandir}/man8/rngd.8.*
|
%{_mandir}/man8/rngd.8.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 27 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 6.14-2
|
||||||
|
- Use the external jitterentropy library
|
||||||
|
|
||||||
* Sat Nov 27 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 6.14-1
|
* Sat Nov 27 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 6.14-1
|
||||||
- update version to 6.14
|
- update version to 6.14
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user