Rebase to PKI 11.0.3

Resolves: #2033109, #2013141, #2029838
This commit is contained in:
Chris Kelley 2022-01-19 15:56:42 +00:00
parent 02538ddcd0
commit aacd9c5a47
4 changed files with 12 additions and 38 deletions

1
.gitignore vendored
View File

@ -85,3 +85,4 @@
/pki-11.0.0-beta1.tar.gz
/pki-11.0.0.tar.gz
/pki-11.0.1.tar.gz
/pki-11.0.3.tar.gz

View File

@ -1,31 +0,0 @@
From 6ab64f1d0686817d17420a39284efdbe46b42f61 Mon Sep 17 00:00:00 2001
From: Chris Kelley <ckelley@redhat.com>
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

View File

@ -15,8 +15,8 @@ License: GPLv2 and LGPLv2
# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
# For official (i.e. supported) releases, use x.y.z-r where r >=1.
Version: 11.0.1
Release: 3%{?_timestamp}%{?_commit_id}%{?dist}
Version: 11.0.3
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
#global _phase -alpha1
# To create a tarball from a version tag:
@ -26,7 +26,6 @@ Release: 3%{?_timestamp}%{?_commit_id}%{?dist}
# -o pki-<version>.tar.gz \
# <version tag>
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 \
@ -1370,6 +1369,11 @@ fi
################################################################################
%changelog
* Wed Jan 19 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.0.3-1
- Bug #2033109 Invalid certificates with creation of subCA (pkispawn single step)[rhel-9.0.0]
- Bug #2013141 kra-key-retrieve failed to accept xml input format to generate .p12 key through cli
- Bug #2029838 SHA1withRSA being listed in signing certificates while approving certificate via Agent page in browser
* Thu Dec 02 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.0.1-3
- Change gcc compiler flags to fix annobin gating failures
@ -1391,9 +1395,6 @@ fi
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Tue May 18 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 10.11.0-0.1
- Rebase to PKI 10.11.0-alpha1
* Thu Jul 1 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.0.0-0.3
- Drop sudo dependency
@ -1402,3 +1403,6 @@ fi
* Fri Jun 25 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.0.0-0.1
- Rebase to PKI 11.0.0-alpha1
* Tue May 18 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 10.11.0-0.1
- Rebase to PKI 10.11.0-alpha1

View File

@ -1 +1 @@
SHA512 (pki-11.0.1.tar.gz) = 8e630a1af0d201a29b287ef54fd4e31a5374361192e24b0b7ce38a63c3efdd2d1cdba90c9f38c961b93228cf59456dc664d1a1f24f5f6496e304cd8cd100fd92
SHA512 (pki-11.0.3.tar.gz) = 20eb3e8c977df499140cda8f2238595fc89e8f0516147726712b1068b9ef915d074bcf9419dbf1fd2a60b8a706cc4fde8e53a4a3c6b9ca62b888a23acd5af170