From f9dca73ff638444820065b1b37238f7b7510e66c Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Wed, 28 Oct 2020 16:10:43 -0400 Subject: [PATCH 1/3] Rebase to stable JSS v4.8.0 release Signed-off-by: Alexander Scheel --- .gitignore | 1 + jss.spec | 22 ++++++---------------- sources | 2 +- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 349bfb5..9d82cb3 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ jss-4.2.6.tar.gz /jss-4.7.0.tar.gz /jss-4.7.2.tar.gz /jss-4.7.3.tar.gz +/jss-4.8.0.tar.gz diff --git a/jss.spec b/jss.spec index 401fe38..82b7757 100644 --- a/jss.spec +++ b/jss.spec @@ -6,7 +6,7 @@ Summary: Java Security Services (JSS) URL: http://www.dogtagpki.org/wiki/JSS License: MPLv1.1 or GPLv2+ or LGPLv2+ -Version: 4.7.3 +Version: 4.8.0 Release: 1%{?_timestamp}%{?_commit_id}%{?dist} #global _phase -a1 @@ -50,7 +50,7 @@ BuildRequires: glassfish-jaxb-api %else BuildRequires: slf4j-jdk14 %endif -BuildRequires: apache-commons-lang +BuildRequires: apache-commons-lang3 BuildRequires: junit @@ -64,7 +64,7 @@ Requires: glassfish-jaxb-api %else Requires: slf4j-jdk14 %endif -Requires: apache-commons-lang +Requires: apache-commons-lang3 Conflicts: ldapjdk < 4.20 Conflicts: idm-console-framework < 1.2 @@ -108,26 +108,13 @@ export CFLAGS # Check if we're in FIPS mode modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENABLED=1 -# RHEL's CMake doesn't support -B flag. -%if 0%{?rhel} -%{__mkdir_p} %{_vpath_builddir} -cd %{_vpath_builddir} -%endif - # The Makefile is not thread-safe %cmake \ -DJAVA_HOME=%{java_home} \ -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \ -%if 0%{?rhel} - .. -%else -B %{_vpath_builddir} -%endif -%if 0%{?fedora} cd %{_vpath_builddir} -%endif - %{__make} all %{__make} javadoc ctest --output-on-failure @@ -173,6 +160,9 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ################################################################################ %changelog +* Wed Oct 21 2020 Dogtag PKI Team - 4.8.0-1 +- Rebase to upstream stable release JSS v4.8.0 + * Fri Sep 11 2020 Dogtag PKI Team - 4.7.3-1 - Rebase to upstream stable release JSS v4.7.3 diff --git a/sources b/sources index 13d43e8..017d89b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jss-4.7.3.tar.gz) = 9358cf78d99e5e32a07dd457d6b0c916bdf9bf6959efe889f1cb91af75aa79fc419c2d057a40bfbe4e2a4924bffc1cafa04d917622cafe07062bcb633f330f98 +SHA512 (jss-4.8.0.tar.gz) = 322d12b69a2665a4ea2302a9a3ba8668c8dd6b56e6aaa17b48e11885ebcb9b38663242312207a0452c95bd84306bab4e968a8d0a1444dea003e4d19e43f6f425 From 07eb4ee5cc1b687d1e4992767f832cc73eabc225 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Thu, 5 Nov 2020 09:40:00 -0500 Subject: [PATCH 2/3] Add conflict on older PKI versions due to ACL3 Signed-off-by: Alexander Scheel --- jss.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jss.spec b/jss.spec index 82b7757..254ffb6 100644 --- a/jss.spec +++ b/jss.spec @@ -7,7 +7,7 @@ URL: http://www.dogtagpki.org/wiki/JSS License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: 4.8.0 -Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +Release: 2%{?_timestamp}%{?_commit_id}%{?dist} #global _phase -a1 # To generate the source tarball: @@ -69,7 +69,7 @@ Requires: apache-commons-lang3 Conflicts: ldapjdk < 4.20 Conflicts: idm-console-framework < 1.2 Conflicts: tomcatjss < 7.3.4 -Conflicts: pki-base < 10.6.5 +Conflicts: pki-base < 10.10.0 %description Java Security Services (JSS) is a java native interface which provides a bridge @@ -160,6 +160,9 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ################################################################################ %changelog +* Thu Nov 05 2020 Dogtag PKI Team - 4.8.0-2 +- Add Conflicts on older PKI versions due to missing ACL3 + * Wed Oct 21 2020 Dogtag PKI Team - 4.8.0-1 - Rebase to upstream stable release JSS v4.8.0 From 3adc43e46df4eb7eb9f10f4aef850bb2351792b3 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Thu, 14 Jan 2021 09:09:11 -0500 Subject: [PATCH 3/3] Rebase to latest stable JSS v4.8.1 Signed-off-by: Alexander Scheel --- .gitignore | 1 + jss.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9d82cb3..1ef681f 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ jss-4.2.6.tar.gz /jss-4.7.2.tar.gz /jss-4.7.3.tar.gz /jss-4.8.0.tar.gz +/jss-4.8.1.tar.gz diff --git a/jss.spec b/jss.spec index 254ffb6..214a8c2 100644 --- a/jss.spec +++ b/jss.spec @@ -6,8 +6,8 @@ Summary: Java Security Services (JSS) URL: http://www.dogtagpki.org/wiki/JSS License: MPLv1.1 or GPLv2+ or LGPLv2+ -Version: 4.8.0 -Release: 2%{?_timestamp}%{?_commit_id}%{?dist} +Version: 4.8.1 +Release: 1%{?_timestamp}%{?_commit_id}%{?dist} #global _phase -a1 # To generate the source tarball: @@ -33,7 +33,7 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas # autosetup BuildRequires: git BuildRequires: make -BuildRequires: cmake +BuildRequires: cmake >= 3.14 BuildRequires: zip BuildRequires: unzip @@ -68,7 +68,7 @@ Requires: apache-commons-lang3 Conflicts: ldapjdk < 4.20 Conflicts: idm-console-framework < 1.2 -Conflicts: tomcatjss < 7.3.4 +Conflicts: tomcatjss < 7.6.0 Conflicts: pki-base < 10.10.0 %description @@ -160,6 +160,9 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ################################################################################ %changelog +* Thu Jan 14 2021 Dogtag PKI Team - 4.8.1-1 +- Rebase to upstream stable JSS v4.8.1 + * Thu Nov 05 2020 Dogtag PKI Team - 4.8.0-2 - Add Conflicts on older PKI versions due to missing ACL3 diff --git a/sources b/sources index 017d89b..064f3c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jss-4.8.0.tar.gz) = 322d12b69a2665a4ea2302a9a3ba8668c8dd6b56e6aaa17b48e11885ebcb9b38663242312207a0452c95bd84306bab4e968a8d0a1444dea003e4d19e43f6f425 +SHA512 (jss-4.8.1.tar.gz) = d18ef995cba627de68077bbd8dc25640b6444c4674e29ec83a05296ac1f18289e1ada35229baafbf5c5e4f1ae712a46e48d9d6dcead935e0f4d3d72b5208cf40