From e98c68374cdc3a2565cbaaa66483a3a81bbaa82b Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Fri, 6 Jul 2018 15:34:21 -0400 Subject: [PATCH] Resolves: bz 1598608 --- .gitignore | 2 ++ jitterentropy-remove-install.patch | 15 +++++++++++++++ rng-tools.spec | 12 ++++++++++-- sources | 2 +- 4 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 jitterentropy-remove-install.patch diff --git a/.gitignore b/.gitignore index 7b6963b..dc3f5b2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ rng-tools-3.tar.gz /rng-tools-6.tar.gz /rng-tools-6.1.tar.gz /rng-tools-6.2.tar.gz +/rng-tools-6.3.tar.gz +/jitterentropy-library-d95c1a2.tar.gz diff --git a/jitterentropy-remove-install.patch b/jitterentropy-remove-install.patch new file mode 100644 index 0000000..abb2b36 --- /dev/null +++ b/jitterentropy-remove-install.patch @@ -0,0 +1,15 @@ +diff -up ./jitterentropy-library/Makefile.install ./jitterentropy-library/Makefile +--- ./jitterentropy-library/Makefile.install 2018-07-05 16:05:37.568626280 -0400 ++++ ./jitterentropy-library/Makefile 2018-07-05 16:07:18.293189096 -0400 +@@ -44,11 +44,6 @@ 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 -m 644 doc/$(NAME).3 $(PREFIX)/share/man/man3/ +- gzip -9 $(PREFIX)/share/man/man3/$(NAME).3 +- install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(PREFIX)/$(LIBDIR)/ +- $(RM) $(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) +- ln -s lib$(NAME).so.$(LIBVERSION) $(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) + + clean: + @- $(RM) $(NAME) diff --git a/rng-tools.spec b/rng-tools.spec index 68520dc..2a414f6 100644 --- a/rng-tools.spec +++ b/rng-tools.spec @@ -3,13 +3,16 @@ Summary: Random number generator related utilities Name: rng-tools -Version: 6.2 +Version: 6.3 Release: 1%{?dist} Group: System Environment/Base License: GPLv2+ URL: https://github.com/nhorman/rng-tools Source0: https://github.com/nhorman/rng-tools/archive/rng-tools-%{version}.tar.gz Source1: rngd.service +Source2: jitterentropy-library-d95c1a2.tar.gz + +Patch0: jitterentropy-remove-install.patch # https://sourceforge.net/p/gkernel/patches/111/ @@ -30,7 +33,9 @@ Requires: openssl libxml2 libcurl Hardware random number generation tools. %prep -%autosetup +%setup +tar xvf %{SOURCE2} +%patch0 -p1 %build ./autogen.sh @@ -63,6 +68,9 @@ install -Dt %{buildroot}%{_unitdir} -m0644 %{SOURCE1} %attr(0644,root,root) %{_unitdir}/rngd.service %changelog +* fri Jul 06 2018 Neil Horman - 6.3-1 +- update to latest upstream (#1598608) + * Thu May 10 2018 Neil Horman - Update to latest upstream diff --git a/sources b/sources index ebb660d..e72fc58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rng-tools-6.2.tar.gz) = ffd8be5b232f092f8bcfdb6281580ce9053ec8bb87ff6bcae76585c38e3e91b9e464a9544a33ecd9814a9f244a89bac973d15c9bd3560d1164559685c720d174 +SHA512 (jitterentropy-library-d95c1a2.tar.gz) = f7c64d7fe39f7f8382101b4556792261239f28f3d8eaa24e85e600de54c037bc174b3c7333ab000fe3b9ad7fdbdac624be14d3eb6c37c0c63d0bf98d0b444f65