diff --git a/.gitignore b/.gitignore index b180d3b..e86cf58 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/jitterentropy-library-3.0.2.git.d18d5863.tar.gz +/jitterentropy-library-3.0.2.tar.gz diff --git a/jitterentropy-rh-makefile.patch b/jitterentropy-rh-makefile.patch index 684385e..529dcc2 100644 --- a/jitterentropy-rh-makefile.patch +++ b/jitterentropy-rh-makefile.patch @@ -1,6 +1,6 @@ diff -up Makefile.orig Makefile ---- Makefile 2021-04-21 13:39:48.000000000 +0200 -+++ Makefile 2021-06-17 21:07:39.416998436 +0200 +--- Makefileg 2021-07-13 17:23:42.954652287 +0200 ++++ Makefile 2021-07-13 17:27:27.958549833 +0200 @@ -3,7 +3,7 @@ CC ?= gcc #Hardening @@ -10,15 +10,15 @@ diff -up Makefile.orig Makefile LDFLAGS +=-Wl,-z,relro,-z,now -lpthread GCCVERSIONFORMAT := $(shell echo `$(CC) -dumpversion | sed 's/\./\n/g' | wc -l`) -@@ -27,7 +27,7 @@ LIBDIR := lib - # include target directory +@@ -28,7 +28,7 @@ LIBDIR := lib INCDIR := include + SRCDIR := src -INSTALL_STRIP ?= install -s +INSTALL ?= install NAME := jitterentropy - LIBMAJOR=$(shell cat jitterentropy-base.c | grep define | grep MAJVERSION | awk '{print $$3}') + LIBMAJOR=$(shell cat $(SRCDIR)/jitterentropy-base.c | grep define | grep MAJVERSION | awk '{print $$3}') @@ -73,25 +73,25 @@ cppcheck: install: install-man install-shared install-includes diff --git a/jitterentropy.spec b/jitterentropy.spec index 94ae894..6c1e03b 100644 --- a/jitterentropy.spec +++ b/jitterentropy.spec @@ -1,6 +1,6 @@ Name: jitterentropy -Version: 3.0.2.git.d18d5863 -Release: 1%{?dist} +Version: 3.0.2 +Release: 2.git.409828cf%{?dist} Summary: Library implementing the jitter entropy source License: BSD or GPLv2 @@ -35,8 +35,8 @@ mkdir -p %{buildroot}/usr/include/ %make_install PREFIX=/usr LIBDIR=%{_lib} %files -%doc README.md -%license COPYING COPYING.bsd COPYING.gplv2 +%doc README.md CHANGES.md +%license LICENSE LICENSE.bsd LICENSE.gplv2 %{_libdir}/libjitterentropy.so.3* %files devel @@ -45,6 +45,13 @@ mkdir -p %{buildroot}/usr/include/ %{_mandir}/man3/* %changelog +* Tue Jul 13 2021 Vladis Dronov - 3.0.2-2.git.409828cf +- Update to the latest upstream commits upto 409828cf +- Add clock_gettime() software time source +- Add a code for choosing between software and hardware time sources + https://github.com/smuellerDD/jitterentropy-library/pull/57 + https://bugzilla.redhat.com/show_bug.cgi?id=1974132 + * Tue Jul 06 2021 Vladis Dronov - 3.0.2.git.d18d5863-1 - Update to the upstream v3.0.2 + tip of origin/master with fixes for an important issue: diff --git a/sources b/sources index 1e14f34..0290c62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jitterentropy-library-3.0.2.git.d18d5863.tar.gz) = dc349d7d44a8389a075a97c82b49c4515180a70dd1e360d536e0041dc205f0a1dc573c7d0eff1a0603db0bff596218aba9167a616cdb99e860f4df593262c8f9 +SHA512 (jitterentropy-library-3.0.2.tar.gz) = 57ad498048c728da79247d1f93d60b60d4c3a8967a45b6ac0d205457f9f93f1001c9a0359e91588084dd81889a700fcac162e179947f4d68266d59a033a61386