From a080f3868c767e714e21b2ceb05fe916ab0dcd00 Mon Sep 17 00:00:00 2001 From: Marco Fargetta Date: Sun, 16 Feb 2025 12:08:00 +0100 Subject: [PATCH] Rebase to PKI 11.6.0 Resolves: RHEL-70108, RHEL-75585, RHEL-75546, RHEL-74371, RHEL-63015 --- dogtag-pki.spec | 64 ++++++++++++++----------------------------------- sources | 2 +- 2 files changed, 19 insertions(+), 47 deletions(-) diff --git a/dogtag-pki.spec b/dogtag-pki.spec index f785038..1120dfc 100644 --- a/dogtag-pki.spec +++ b/dogtag-pki.spec @@ -14,13 +14,13 @@ Name: dogtag-pki # Downstream release number: # - development/stabilization (unsupported): 0. where n >= 1 # - GA/update (supported): where n >= 1 -%global release_number 0.3 +%global release_number 1 # Development phase: # - development (unsupported): alpha where n >= 1 # - stabilization (unsupported): beta where n >= 1 # - GA/update (supported): -%global phase alpha2 +#global phase %undefine timestamp %undefine commit_id @@ -234,9 +234,9 @@ BuildRequires: mvn(org.apache.tomcat:tomcat-jaspic-api) >= 9.0.62 BuildRequires: mvn(org.apache.tomcat:tomcat-util-scan) >= 9.0.62 BuildRequires: tomcat9-lib -BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0 -BuildRequires: mvn(org.dogtagpki.jss:jss-tomcat) >= 5.5.0 -BuildRequires: mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.5.0 +BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0 +BuildRequires: mvn(org.dogtagpki.jss:jss-tomcat) >= 5.6.0 +BuildRequires: mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.6.0 # Python build dependencies BuildRequires: python3 >= 3.6 @@ -578,8 +578,8 @@ Provides: bundled(resteasy-client) = 3.0.26 Provides: bundled(resteasy-jackson2-provider) = 3.0.26 %endif -Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0 -Requires: mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.5.0 +Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0 +Requires: mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.6.0 Requires: %{product_id}-base = %{version}-%{release} %description -n %{product_id}-java @@ -652,7 +652,7 @@ Provides: bundled(resteasy-servlet-initializer) = 3.0.26 %endif Requires: tomcat9 >= 1:9.0.62 -Requires: mvn(org.dogtagpki.jss:jss-tomcat) >= 5.5.0 +Requires: mvn(org.dogtagpki.jss:jss-tomcat) >= 5.6.0 Requires: systemd Requires(post): systemd-units @@ -1312,44 +1312,8 @@ popd %endif # Remove all symbol table and relocation information from the executable. -C_FLAGS="-s" -CXX_FLAGS="$CXX_FLAGS -g -fPIE -pie" - -%if 0%{?fedora} -# https://sourceware.org/annobin/annobin.html/Test-gaps.html -C_FLAGS="$C_FLAGS -fplugin=annobin" - -%ifarch x86_64 -# https://sourceware.org/annobin/annobin.html/Test-cf-protection.html -C_FLAGS="$C_FLAGS -fcf-protection=full" -%endif - -# https://sourceware.org/annobin/annobin.html/Test-optimization.html -C_FLAGS="$C_FLAGS -O2" -CXX_FLAGS="$CXX_FLAGS -O2" - -# https://sourceware.org/annobin/annobin.html/Test-glibcxx-assertions.html -C_FLAGS="$C_FLAGS -D_GLIBCXX_ASSERTIONS" -CXX_FLAGS="$CXX_FLAGS -D_GLIBCXX_ASSERTIONS" - -# https://sourceware.org/annobin/annobin.html/Test-lto.html -C_FLAGS="$C_FLAGS -fno-lto" - -# https://sourceware.org/annobin/annobin.html/Test-fortify.html -C_FLAGS="$C_FLAGS -D_FORTIFY_SOURCE=3" -CXX_FLAGS="$CXX_FLAGS -D_FORTIFY_SOURCE=3" - -# https://sourceware.org/annobin/annobin.html/Test-stack-clash.html -C_FLAGS="$C_FLAGS -fstack-clash-protection" -CXX_FLAGS="$CXX_FLAGS -fstack-clash-protection" - -%ifarch aarch64 -# https://sourceware.org/annobin/annobin.html/Test-dynamic-tags.html -C_FLAGS="$C_FLAGS -mbranch-protection=standard" -CXX_FLAGS="$CXX_FLAGS -mbranch-protection=standard" -%endif - -%endif +C_FLAGS="%{optflags}" +CXX_FLAGS="%{optflags}" pkgs=base\ %{?with_server:,server}\ @@ -2055,6 +2019,14 @@ fi ################################################################################ %changelog +* Sun Feb 16 2025 Red Hat PKI Team - 11.6.0-1 +- Rebase to PKI 11.6.0 +- Resolves: RHEL-70108 +- Resolves: RHEL-75585 +- Resolves: RHEL-75546 +- Resolves: RHEL-74371 +- Resolves: RHEL-63015 + * Wed Feb 5 2025 Joe Orton - 11.6.0-0.3.alpha2 - update to use tomcat9 Resolves: RHEL-78038 diff --git a/sources b/sources index fd2c8a6..d856fe2 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (pki-11.6.0-alpha2.tar.gz) = d617a4463cf3736c093ea4876ec74e7c8b116bbc9393bb7d197020f4c4bc2f3cb2c57251a24c8fdda36976f0633c736abebba4600572b0db55905b98e19dd58e +SHA512 (pki-11.6.0.tar.gz) = 70aa2ca8696ab583e90c0c2799703b66bfa582cafd6013277407abf9d36801b8eded99a75f71a752876264741372721d1129e1b6fc070f7eb7f0282c8714c954 SHA512 (jackson-annotations-2.16.1.jar) = b5f05c0aeb994c8f694cf080ffb1f8cbd3baff34f52479a618fef6c91b82c8a1cb09801ab24c898b9db698863ea7da615d8991c8741172d21d540345156a200a SHA512 (jackson-core-2.16.1.jar) = 3abac44446ae99aa89c4c7bb50e4a07eb297f4c8d76931e330da6830ffcd9ea94520a7dda1b8d9b00fce64e3838cc7ecf8e490eb478276155d8c286b80f5586c SHA512 (jackson-databind-2.16.1.jar) = adbdcfae96dcfc56669c811a6c8e99a711d372cd1950e39122fe785dfec043a62c92c4a8cf495589db10424ce10517607808cbd4d1ec184ce41c20bb96cc476c