!3 add jitterentropy support

Merge pull request !3 from syyhao/developer
This commit is contained in:
openeuler-ci-bot 2020-02-29 17:47:48 +08:00 committed by Gitee
commit 6fd25d75cf
3 changed files with 28 additions and 2 deletions

Binary file not shown.

View File

@ -0,0 +1,20 @@
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)
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)/
+
+clean:
+ @- $(RM) $(NAME)
$(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
- ln -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
clean:
@- $(RM) $(NAME)

View File

@ -1,11 +1,14 @@
Name: rng-tools Name: rng-tools
Version: 6.3.1 Version: 6.3.1
Release: 3 Release: 4
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-3f7b6cc.tar.gz
Patch0: jitterentropy-remove-install.patch
#Dependency #Dependency
BuildRequires: gcc make gettext systemd autoconf automake BuildRequires: gcc make gettext systemd autoconf automake
@ -20,7 +23,7 @@ and supplies entropy from them to the system kernel's /dev/random machinery.
%package_help %package_help
%prep %prep
%autosetup -n %{name}-%{version} %autosetup -n %{name}-%{version} -a 2 -p1
%build %build
./autogen.sh ./autogen.sh
@ -56,5 +59,8 @@ install -D -t $RPM_BUILD_ROOT%{_unitdir} -m 0644 %{SOURCE1}
%{_mandir}/man8/rngd.8.* %{_mandir}/man8/rngd.8.*
%changelog %changelog
* Fri Oct 11 2019 openEuler Buildteam <buildteam@openeuler.org> - 6.3.1-4
- add jitterentropy support
* Wed Feb 19 2020 wanjiankang <wanjiankang@huawei.com> - 6.3.1-3 * Wed Feb 19 2020 wanjiankang <wanjiankang@huawei.com> - 6.3.1-3
- Package init - Package init