Rebase to JSS 5.8.0-0.1.beta2
Resolves: RHCS-99832
This commit is contained in:
parent
a3eac308e0
commit
2855546ec1
1
.gitignore
vendored
1
.gitignore
vendored
@ -57,3 +57,4 @@ jss-4.2.6.tar.gz
|
||||
/jss-5.5.0.tar.gz
|
||||
/jss-5.6.0-alpha1.tar.gz
|
||||
/jss-5.6.0.tar.gz
|
||||
/jss-5.8.0-beta2.tar.gz
|
||||
|
||||
63
jss.spec
63
jss.spec
@ -7,19 +7,19 @@ Name: jss
|
||||
|
||||
# Upstream version number:
|
||||
%global major_version 5
|
||||
%global minor_version 6
|
||||
%global minor_version 8
|
||||
%global update_version 0
|
||||
|
||||
# Downstream release number:
|
||||
# - development/stabilization (unsupported): 0.<n> where n >= 1
|
||||
# - GA/update (supported): <n> where n >= 1
|
||||
%global release_number 1
|
||||
%global release_number 0.2
|
||||
|
||||
# Development phase:
|
||||
# - development (unsupported): alpha<n> where n >= 1
|
||||
# - stabilization (unsupported): beta<n> where n >= 1
|
||||
# - GA/update (supported): <none>
|
||||
#global phase
|
||||
%global phase beta2
|
||||
|
||||
%undefine timestamp
|
||||
%undefine commit_id
|
||||
@ -56,9 +56,26 @@ ExcludeArch: i686
|
||||
# Java
|
||||
################################################################################
|
||||
|
||||
# use Java 17 on Fedora 39 or older and RHEL 9 or older
|
||||
# otherwise, use Java 21
|
||||
|
||||
# maven-local is a subpackage of javapackages-tools
|
||||
|
||||
%if 0%{?fedora} && 0%{?fedora} <= 39 || 0%{?rhel} && 0%{?rhel} <= 9
|
||||
|
||||
%define java_devel java-17-openjdk-devel
|
||||
%define java_headless java-17-openjdk-headless
|
||||
%define java_home %{_jvmdir}/jre-17-openjdk
|
||||
%define maven_local maven-local-openjdk17
|
||||
|
||||
%else
|
||||
|
||||
%define java_devel java-21-openjdk-devel
|
||||
%define java_headless java-21-openjdk-headless
|
||||
%define java_home %{_jvmdir}/jre-21-openjdk
|
||||
%define maven_local maven-local
|
||||
|
||||
%endif
|
||||
|
||||
################################################################################
|
||||
# Build Options
|
||||
@ -69,10 +86,10 @@ ExcludeArch: i686
|
||||
|
||||
%bcond_without javadoc
|
||||
|
||||
# By default the build will not execute unit tests unless --with tests
|
||||
# option is specified.
|
||||
# By default the tests package will be built and the tests will executed
|
||||
# unless --without tests option is specified.
|
||||
|
||||
%bcond_without tests
|
||||
%bcond_with tests
|
||||
|
||||
################################################################################
|
||||
# Build Dependencies
|
||||
@ -84,15 +101,14 @@ BuildRequires: zip
|
||||
BuildRequires: unzip
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: nss-devel >= 3.97
|
||||
BuildRequires: nss-tools >= 3.97
|
||||
BuildRequires: nss-devel >= 3.101
|
||||
BuildRequires: nss-tools >= 3.101
|
||||
|
||||
BuildRequires: %{java_devel}
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: %{maven_local}
|
||||
BuildRequires: mvn(org.apache.commons:commons-lang3)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-jdk14)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
|
||||
%description
|
||||
Java Security Services (JSS) is a java native interface which provides a bridge
|
||||
@ -105,7 +121,7 @@ This only works with gcj. Other JREs require that JCE providers be signed.
|
||||
|
||||
Summary: Java Security Services (JSS)
|
||||
|
||||
Requires: nss >= 3.97
|
||||
Requires: nss >= 3.101
|
||||
|
||||
Requires: %{java_headless}
|
||||
Requires: mvn(org.apache.commons:commons-lang3)
|
||||
@ -133,16 +149,14 @@ This only works with gcj. Other JREs require that JCE providers be signed.
|
||||
Summary: Java Security Services (JSS) Connector for Tomcat
|
||||
|
||||
# Tomcat
|
||||
BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) >= 9.0.62
|
||||
BuildRequires: mvn(org.apache.tomcat:tomcat-coyote) >= 9.0.62
|
||||
BuildRequires: mvn(org.apache.tomcat:tomcat-juli) >= 9.0.62
|
||||
BuildRequires: tomcat9-lib
|
||||
BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) >= 10.1.33
|
||||
BuildRequires: mvn(org.apache.tomcat:tomcat-coyote) >= 10.1.33
|
||||
BuildRequires: mvn(org.apache.tomcat:tomcat-juli) >= 10.1.33
|
||||
|
||||
Requires: %{product_id} = %{version}-%{release}
|
||||
Requires: mvn(org.apache.tomcat:tomcat-catalina) >= 9.0.62
|
||||
Requires: mvn(org.apache.tomcat:tomcat-coyote) >= 9.0.62
|
||||
Requires: mvn(org.apache.tomcat:tomcat-juli) >= 9.0.62
|
||||
Requires: tomcat9 >= 1:9.0.62
|
||||
Requires: mvn(org.apache.tomcat:tomcat-catalina) >= 10.1.33
|
||||
Requires: mvn(org.apache.tomcat:tomcat-coyote) >= 10.1.33
|
||||
Requires: mvn(org.apache.tomcat:tomcat-juli) >= 10.1.33
|
||||
|
||||
# Tomcat JSS has been replaced with JSS Connector for Tomcat.
|
||||
# This will remove installed Tomcat JSS packages.
|
||||
@ -230,11 +244,11 @@ This package provides test suite for JSS.
|
||||
|
||||
# specify Maven artifact locations
|
||||
%mvn_file org.dogtagpki.jss:jss-tomcat jss/jss-tomcat
|
||||
%mvn_file org.dogtagpki.jss:jss-tomcat-9.0 jss/jss-tomcat-9.0
|
||||
%mvn_file org.dogtagpki.jss:jss-tomcat-10.1 jss/jss-tomcat-10.1
|
||||
|
||||
# specify Maven artifact packages
|
||||
%mvn_package org.dogtagpki.jss:jss-tomcat jss-tomcat
|
||||
%mvn_package org.dogtagpki.jss:jss-tomcat-9.0 jss-tomcat
|
||||
%mvn_package org.dogtagpki.jss:jss-tomcat-10.1 jss-tomcat
|
||||
|
||||
################################################################################
|
||||
%build
|
||||
@ -296,7 +310,7 @@ touch %{_vpath_builddir}/.targets/finished_generate_javadocs
|
||||
--lib-dir=%{_libdir} \
|
||||
--sysconf-dir=%{_sysconfdir} \
|
||||
--share-dir=%{_datadir} \
|
||||
--cmake=%{__cmake} \
|
||||
--cmake="%{__cmake} -DENABLE_NSS_VERSION_PQC_DEF=ON" \
|
||||
--java-home=%{java_home} \
|
||||
--jni-dir=%{_jnidir} \
|
||||
--version=%{version} \
|
||||
@ -379,6 +393,11 @@ cp base/target/jss-tests.jar %{buildroot}%{_datadir}/jss/tests/lib
|
||||
|
||||
################################################################################
|
||||
%changelog
|
||||
* Fri Jul 18 2025 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.8.0-0.1.beta2
|
||||
- Rebase to JSS 5.8.0-beta2
|
||||
- Jira Ticket RHCS-98721 ACME server: RFC 8555 violation: Support ES256 #4638 [rhel-10]
|
||||
- Jira Ticket IDM-2360 build encountered: PQC alg defs to match with NSS V3.112
|
||||
|
||||
* Sat Feb 15 2025 Red Hat PKI Team <rhcs-maint@redhat.com>- 5.6.0-1
|
||||
- Rebase to JSS 5.6.0
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (jss-5.6.0.tar.gz) = 6d4aeea6cbf82972e2d5283a2f8d37b767731f668afd1b41333cad70f3e1e760048f0c750654d3de85c878bef6ab9e2258a2ead66c48045a7d5283d4d797cc2a
|
||||
SHA512 (jss-5.8.0-beta2.tar.gz) = 544ce14a9b729ca0dca1f9cbe818f167d45ecd6ebad0ff83f9e674656e309d1dd47e551abe23215d5cc350c4b66486ec35489cafc91966b64cd03188c4ed767e
|
||||
|
||||
Loading…
Reference in New Issue
Block a user