diff --git a/.gitignore b/.gitignore index b6d9ec8..f0aa81c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/pki-11.0.0.tar.gz +SOURCES/pki-11.0.1.tar.gz diff --git a/.pki-core.metadata b/.pki-core.metadata index 28ba387..62edf23 100644 --- a/.pki-core.metadata +++ b/.pki-core.metadata @@ -1 +1 @@ -03cef69c6bd54977770ecdd0f95e693a2e635601 SOURCES/pki-11.0.0.tar.gz +a406adf0433fffd986bb45e56760016709013e60 SOURCES/pki-11.0.1.tar.gz diff --git a/SOURCES/0001-Use-fstack-protector-strong-compiler-flag.patch b/SOURCES/0001-Use-fstack-protector-strong-compiler-flag.patch new file mode 100644 index 0000000..6c520f2 --- /dev/null +++ b/SOURCES/0001-Use-fstack-protector-strong-compiler-flag.patch @@ -0,0 +1,31 @@ +From 6ab64f1d0686817d17420a39284efdbe46b42f61 Mon Sep 17 00:00:00 2001 +From: Chris Kelley +Date: Thu, 2 Dec 2021 14:40:58 +0000 +Subject: [PATCH] Use -fstack-protector-strong compiler flag + +* Fixes gating issues with annobin + +Resolves: #1936636 +--- + cmake/Modules/DefineCompilerFlags.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/Modules/DefineCompilerFlags.cmake b/cmake/Modules/DefineCompilerFlags.cmake +index 10d30f1a9..413648d13 100644 +--- a/cmake/Modules/DefineCompilerFlags.cmake ++++ b/cmake/Modules/DefineCompilerFlags.cmake +@@ -22,9 +22,9 @@ if (UNIX AND NOT WIN32) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") + endif (WITH_FPIC) + +- check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR) ++ check_c_compiler_flag_ssp("-fstack-protector-strong" WITH_STACK_PROTECTOR) + if (WITH_STACK_PROTECTOR) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong") + endif (WITH_STACK_PROTECTOR) + + check_c_compiler_flag("-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE) +-- +2.33.1 + diff --git a/SPECS/pki-core.spec b/SPECS/pki-core.spec index 4ab1a51..06da6db 100644 --- a/SPECS/pki-core.spec +++ b/SPECS/pki-core.spec @@ -15,8 +15,8 @@ License: GPLv2 and LGPLv2 # For development (i.e. unsupported) releases, use x.y.z-0.n.. # For official (i.e. supported) releases, use x.y.z-r where r >=1. -Version: 11.0.0 -Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +Version: 11.0.1 +Release: 3%{?_timestamp}%{?_commit_id}%{?dist} #global _phase -alpha1 # To create a tarball from a version tag: @@ -26,6 +26,7 @@ Release: 1%{?_timestamp}%{?_commit_id}%{?dist} # -o pki-.tar.gz \ # Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{version}%{?_phase}.tar.gz +Patch1: 0001-Use-fstack-protector-strong-compiler-flag.patch # To create a patch for all changes since a version tag: # $ git format-patch \ @@ -64,7 +65,7 @@ ExcludeArch: i686 %define java_devel java-11-openjdk-devel %define java_headless java-11-openjdk-headless -%define java_home /usr/lib/jvm/jre-11-openjdk +%define java_home %{_jvmdir}/jre-11-openjdk ################################################################################ # RESTEasy @@ -1369,6 +1370,12 @@ fi ################################################################################ %changelog +* Thu Dec 02 2021 Red Hat PKI Team - 11.0.1-3 +- Change gcc compiler flags to fix annobin gating failures + +* Tue Nov 23 2021 Red Hat PKI Team - 11.0.1-2 +- Rebase to PKI 11.0.1 + * Tue Oct 05 2021 Red Hat PKI Team - 11.0.0-1 - Rebase to PKI 11.0.0