From 4d66a69caadafe2fd69fa0760781d1af40f560c7 Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@hmswarspite.think-freely.org>
Date: Thu, 26 Sep 2019 11:26:11 -0400
Subject: [PATCH] Update to latest upstream

---
 .gitignore                                          |  1 +
 jitterentropy-nostrip.patch                         | 12 ------------
 ...l-macro.patch => jitterentropy-rh-makefile.patch | 13 +++++++------
 jitterentropy.spec                                  | 11 ++++++-----
 sources                                             |  2 +-
 5 files changed, 15 insertions(+), 24 deletions(-)
 delete mode 100644 jitterentropy-nostrip.patch
 rename jitterentropy-install-macro.patch => jitterentropy-rh-makefile.patch (75%)

diff --git a/.gitignore b/.gitignore
index 124a49e..aca0859 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jitterentropy-library-2.1.2.tar.gz
+/jitterentropy-library-2.2.0.tar.gz
diff --git a/jitterentropy-nostrip.patch b/jitterentropy-nostrip.patch
deleted file mode 100644
index 7bb694d..0000000
--- a/jitterentropy-nostrip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./Makefile.strip ./Makefile
---- ./Makefile.strip	2018-09-10 12:15:41.193220198 -0400
-+++ ./Makefile	2018-09-10 12:15:54.606161249 -0400
-@@ -51,7 +51,7 @@ install:
- 	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 -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
- 	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)
diff --git a/jitterentropy-install-macro.patch b/jitterentropy-rh-makefile.patch
similarity index 75%
rename from jitterentropy-install-macro.patch
rename to jitterentropy-rh-makefile.patch
index b49799c..abd7197 100644
--- a/jitterentropy-install-macro.patch
+++ b/jitterentropy-rh-makefile.patch
@@ -1,6 +1,6 @@
-diff -up ./Makefile.install ./Makefile
---- ./Makefile.install	2018-09-13 14:06:05.234120069 -0400
-+++ ./Makefile	2018-09-13 14:07:19.622835587 -0400
+diff -up ./Makefile.rh ./Makefile
+--- ./Makefile.rh	2019-09-26 11:18:26.536441290 -0400
++++ ./Makefile	2019-09-26 11:20:13.485118687 -0400
 @@ -1,6 +1,7 @@
  # Compile Noise Source as user space application
  
@@ -9,8 +9,8 @@ diff -up ./Makefile.install ./Makefile
  CFLAGS +=-Wextra -Wall -pedantic -fPIC -O0
  #Hardening
  CFLAGS +=-fstack-protector-all -fwrapv --param ssp-buffer-size=4
-@@ -47,13 +48,13 @@ scan:	$(OBJS)
- 	scan-build --use-analyzer=/usr/bin/clang $(CC) -shared -Wl,-soname,lib$(NAME).so.$(LIBMAJOR) -o lib$(NAME).so.$(LIBVERSION) $(OBJS) $(LDFLAGS)
+@@ -56,14 +57,13 @@ cppcheck:
+ 	cppcheck --force -q --enable=performance --enable=warning --enable=portability *.h *.c
  
  install:
 -	install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3
@@ -19,7 +19,8 @@ diff -up ./Makefile.install ./Makefile
 +	$(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 lib$(NAME).so.$(LIBVERSION) $(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)/
 +	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
diff --git a/jitterentropy.spec b/jitterentropy.spec
index 0c0dc02..e9fdbd4 100644
--- a/jitterentropy.spec
+++ b/jitterentropy.spec
@@ -1,6 +1,6 @@
 Name:	jitterentropy
-Version:	2.1.2
-Release:	5%{?dist}
+Version:	2.2.0
+Release:	1%{?dist}
 Summary:	Library implementing the jitter entropy source
 
 License:	BSD or GPLv2
@@ -10,9 +10,7 @@ Source0:	%url/archive/%{name}-library-%{version}.tar.gz
 BuildRequires: gcc
 
 # Disable Upstream Makefiles debuginfo strip on install
-Patch0: jitterentropy-nostrip.patch
-# Allow the Makefile to make use of an $(INSTALL) macro
-Patch1: jitterentropy-install-macro.patch
+Patch0: jitterentropy-rh-makefile.patch
 %description
 Library implementing the CPU jitter entropy source
 
@@ -48,6 +46,9 @@ mkdir -p %{buildroot}/usr/include/
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 26 2019 Neil Horman <nhorman@redhat.com> - 2.2.0-1
+- Update to latest upstream
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 98e8c9e..40603f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jitterentropy-library-2.1.2.tar.gz) = b1ba2fe22c6b7d5bca64bb1611f2da3f53f1979e515a16141ccf330e3ca27a6944f0e45f0db57f4e3963a30ea4b34920ce9173f9c4f3ea82b820dc739cbd95f4
+SHA512 (jitterentropy-library-2.2.0.tar.gz) = 4701a7e0a82ee583cbde5edfdacb737a5f588b42c61b16434b5a11bdfb1a108e7b9df8b8b38d9e92290e702b33f2ae8774580d6a71e6e8ac3af295ffc8ff5ff9