diff --git a/jitterentropy-library-3f7b6cc.tar.gz b/jitterentropy-library-3f7b6cc.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b93ef4733d81118e6ab2f1c03a20ee0fbfbf2114 Binary files /dev/null and b/jitterentropy-library-3f7b6cc.tar.gz differ diff --git a/jitterentropy-remove-install.patch b/jitterentropy-remove-install.patch new file mode 100644 index 0000000000000000000000000000000000000000..f0dd90f640010dc2b8c1005ec1e6dd58175abadd --- /dev/null +++ b/jitterentropy-remove-install.patch @@ -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) diff --git a/rng-tools.spec b/rng-tools.spec index 8990111a3dd59373c000c99e04913fd8f38b0652..92ea776f2ff347dfda284bfcddc8d9450069c315 100644 --- a/rng-tools.spec +++ b/rng-tools.spec @@ -1,11 +1,14 @@ Name: rng-tools Version: 6.3.1 -Release: 3 +Release: 4 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 + +Patch0: jitterentropy-remove-install.patch #Dependency 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 %prep -%autosetup -n %{name}-%{version} +%autosetup -n %{name}-%{version} -a 2 -p1 %build ./autogen.sh @@ -56,5 +59,8 @@ install -D -t $RPM_BUILD_ROOT%{_unitdir} -m 0644 %{SOURCE1} %{_mandir}/man8/rngd.8.* %changelog +* Fri Oct 11 2019 openEuler Buildteam - 6.3.1-4 +- add jitterentropy support + * Wed Feb 19 2020 wanjiankang - 6.3.1-3 - Package init