diff --git a/.gitignore b/.gitignore index aca0859..e86cf58 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/jitterentropy-library-2.1.2.tar.gz -/jitterentropy-library-2.2.0.tar.gz +/jitterentropy-library-3.0.2.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 8019e1b..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# jitterentropy - -The jitterentropy package \ No newline at end of file diff --git a/jitterentropy-rh-makefile.patch b/jitterentropy-rh-makefile.patch index abd7197..e1dc5e2 100644 --- a/jitterentropy-rh-makefile.patch +++ b/jitterentropy-rh-makefile.patch @@ -1,32 +1,56 @@ -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 - +diff -up Makefile.orig Makefile +--- Makefile 2021-04-21 13:39:48.000000000 +0200 ++++ Makefile 2021-06-17 21:07:39.416998436 +0200 +@@ -3,7 +3,7 @@ CC ?= gcc -+INSTALL ?= install - CFLAGS +=-Wextra -Wall -pedantic -fPIC -O0 #Hardening - CFLAGS +=-fstack-protector-all -fwrapv --param ssp-buffer-size=4 -@@ -56,14 +57,13 @@ cppcheck: - cppcheck --force -q --enable=performance --enable=warning --enable=portability *.h *.c + CFLAGS ?= -fwrapv --param ssp-buffer-size=4 -fvisibility=hidden -fPIE -Wcast-align -Wmissing-field-initializers -Wshadow -Wswitch-enum +-CFLAGS +=-Wextra -Wall -pedantic -fPIC -O0 -fwrapv -Wconversion ++CFLAGS +=-Wp,-U_FORTIFY_SOURCE -Wextra -Wall -pedantic -fPIC -O0 -fwrapv -Wconversion + LDFLAGS +=-Wl,-z,relro,-z,now - install: + GCCVERSIONFORMAT := $(shell echo `$(CC) -dumpversion | sed 's/\./\n/g' | wc -l`) +@@ -27,7 +27,7 @@ LIBDIR := lib + # include target directory + INCDIR := include + +-INSTALL_STRIP ?= install -s ++INSTALL ?= install + + NAME := jitterentropy + LIBMAJOR=$(shell cat jitterentropy-base.c | grep define | grep MAJVERSION | awk '{print $$3}') +@@ -73,25 +73,25 @@ cppcheck: + install: install-man install-shared install-includes + + install-man: - install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3 - install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/ + $(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 + gzip -n -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 + + install-shared: - install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) -- install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ +- $(INSTALL_STRIP) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) ++ $(INSTALL) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ + $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) + ln -sf lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) + ln -sf lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so + + install-includes: - 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) -+ $(INSTALL) -m 0755 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)/ - $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) - ln -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) - ln -s lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so + + install-static: +- install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) +- install -m 0755 lib$(NAME).a $(DESTDIR)$(PREFIX)/$(LIBDIR)/ ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) ++ $(INSTALL) -m 0755 lib$(NAME).a $(DESTDIR)$(PREFIX)/$(LIBDIR)/ + + clean: + @- $(RM) $(NAME) diff --git a/jitterentropy.spec b/jitterentropy.spec index ed4eb31..bbe5e49 100644 --- a/jitterentropy.spec +++ b/jitterentropy.spec @@ -1,17 +1,18 @@ Name: jitterentropy -Version: 2.2.0 -Release: 5%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: Library implementing the jitter entropy source License: BSD or GPLv2 URL: https://github.com/smuellerDD/jitterentropy-library -Source0: %url/archive/%{name}-library-%{version}.tar.gz +Source0: %{url}/archive/v%{version}/%{name}-library-%{version}.tar.gz BuildRequires: gcc BuildRequires: make # Disable Upstream Makefiles debuginfo strip on install Patch0: jitterentropy-rh-makefile.patch + %description Library implementing the CPU jitter entropy source @@ -33,13 +34,10 @@ Development headers and libraries for jitterentropy mkdir -p %{buildroot}/usr/include/ %make_install PREFIX=/usr LIBDIR=%{_lib} -%ldconfig_scriptlets - %files %doc README.md %license COPYING COPYING.bsd COPYING.gplv2 -%{_libdir}/libjitterentropy.so.2* - +%{_libdir}/libjitterentropy.so.3* %files devel %{_includedir}/* @@ -47,6 +45,10 @@ mkdir -p %{buildroot}/usr/include/ %{_mandir}/man3/* %changelog +* Fri Jun 18 2021 Vladis Dronov - 3.0.2-1 +- Update to the upstream v3.0.2 (bz 1973157) +- Remove %ldconfig_scriptlets + * Fri Apr 16 2021 Mohan Boddu - 2.2.0-5 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 diff --git a/sources b/sources index 40603f3..2b0b765 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jitterentropy-library-2.2.0.tar.gz) = 4701a7e0a82ee583cbde5edfdacb737a5f588b42c61b16434b5a11bdfb1a108e7b9df8b8b38d9e92290e702b33f2ae8774580d6a71e6e8ac3af295ffc8ff5ff9 +SHA512 (jitterentropy-library-3.0.2.tar.gz) = 7fffae99ac89a64d1fbf0feb698702f704943b2839c65e2b226c973d1c69d185da29a7c8048e3f531c9f0b6dc5be3dc92564a8240d7d81ec03f22f30de3b4b0f