public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/jss] pqc: Rebase to JSS 5.0.0-alpha1
@ 2026-07-28 16:48 Endi S. Dewata
0 siblings, 0 replies; only message in thread
From: Endi S. Dewata @ 2026-07-28 16:48 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/jss
Branch : pqc
Commit : ef80dbd51c645585ad2255fd0455d252466858a1
Author : Endi S. Dewata <edewata@redhat.com>
Date : 2021-06-22T14:55:26-05:00
Stats : +30/-169 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/jss/c/ef80dbd51c645585ad2255fd0455d252466858a1?branch=pqc
Log:
Rebase to JSS 5.0.0-alpha1
---
diff --git a/.gitignore b/.gitignore
index 385bad6..78c09bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ jss-4.2.6.tar.gz
/jss-4.8.0.tar.gz
/jss-4.8.1.tar.gz
/jss-4.9.0-alpha1.tar.gz
+/jss-5.0.0-alpha1.tar.gz
diff --git a/jss.spec b/jss.spec
index e65db2b..79c7bb3 100644
--- a/jss.spec
+++ b/jss.spec
@@ -8,8 +8,8 @@ License: MPLv1.1 or GPLv2+ or 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: 4.9.0
-Release: 0.2.alpha1%{?_timestamp}%{?_commit_id}%{?dist}
+Version: 5.0.0
+Release: 0.1.alpha1%{?_timestamp}%{?_commit_id}%{?dist}
%global _phase -alpha1
# To generate the source tarball:
@@ -29,6 +29,14 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas
# Patch: jss-VERSION-RELEASE.patch
################################################################################
+# Java
+################################################################################
+
+%define java_devel java-11-openjdk-devel
+%define java_headless java-11-openjdk-headless
+%define java_home /usr/lib/jvm/jre-11-openjdk
+
+################################################################################
# Build Options
################################################################################
@@ -50,29 +58,21 @@ BuildRequires: gcc-c++
BuildRequires: nspr-devel >= 4.13.1
BuildRequires: nss-devel >= 3.44
BuildRequires: nss-tools >= 3.44
-BuildRequires: java-devel
+BuildRequires: %{java_devel}
BuildRequires: jpackage-utils
BuildRequires: slf4j
BuildRequires: glassfish-jaxb-api
-%if 0%{?rhel} && 0%{?rhel} <= 7
-# no slf4j-jdk14
-%else
BuildRequires: slf4j-jdk14
-%endif
BuildRequires: apache-commons-lang3
BuildRequires: junit
Requires: nss >= 3.44
-Requires: java-headless
+Requires: %{java_headless}
Requires: jpackage-utils
Requires: slf4j
Requires: glassfish-jaxb-api
-%if 0%{?rhel} && 0%{?rhel} <= 7
-# no slf4j-jdk14
-%else
Requires: slf4j-jdk14
-%endif
Requires: apache-commons-lang3
Conflicts: ldapjdk < 4.20
@@ -105,7 +105,7 @@ This package contains the API documentation for JSS.
%set_build_flags
-[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
+export JAVA_HOME=%{java_home}
# Enable compiler optimizations
export BUILD_OPT=1
@@ -117,44 +117,24 @@ export CFLAGS
# Check if we're in FIPS mode
modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENABLED=1
-# The Makefile is not thread-safe
-%cmake \
- -DJAVA_HOME=%{java_home} \
- -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
- -B %{_vpath_builddir}
-
-cd %{_vpath_builddir}
-%{__make} all
-%{__make} javadoc
-
-%if %{with test}
-ctest --output-on-failure
-%endif
+./build.sh \
+ %{?_verbose:-v} \
+ --work-dir=%{_vpath_builddir} \
+ --java-lib-dir=%{_jnidir} \
+ --jss-lib-dir=%{_libdir}/jss \
+ --version=%{version} \
+ %{!?with_test:--without-test} \
+ dist
################################################################################
%install
-# There is no install target so we'll do it by hand
+./build.sh \
+ %{?_verbose:-v} \
+ --work-dir=%{_vpath_builddir} \
+ --install-dir=%{buildroot} \
+ install
-# jars
-install -d -m 0755 $RPM_BUILD_ROOT%{_jnidir}
-install -m 644 %{_vpath_builddir}/jss4.jar ${RPM_BUILD_ROOT}%{_jnidir}/jss4.jar
-
-# We have to use the name libjss4.so because this is dynamically
-# loaded by the jar file.
-install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/jss
-install -m 0755 %{_vpath_builddir}/libjss4.so ${RPM_BUILD_ROOT}%{_libdir}/jss/
-pushd ${RPM_BUILD_ROOT}%{_libdir}/jss
- ln -fs %{_jnidir}/jss4.jar jss4.jar
-popd
-
-# javadoc
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -rp %{_vpath_builddir}/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -p jss.html $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-# No ldconfig is required since this library is loaded by Java itself.
################################################################################
%files
@@ -172,125 +152,5 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
################################################################################
%changelog
-* Wed May 26 2021 Dogtag PKI Team <pki-devel@redhat.com> - 4.9.0-0.2
-- Drop git dependency
-- Disable unit tests by default
-
-* Tue May 18 2021 Dogtag PKI Team <pki-devel@redhat.com> - 4.9.0-0.1
-- Rebase to JSS 4.9.0-alpha1
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan 14 2021 Dogtag PKI Team <pki-devel@redhat.com> - 4.8.1-1
-- Rebase to upstream stable JSS v4.8.1
-
-* Thu Nov 05 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.8.0-2
-- Add Conflicts on older PKI versions due to missing ACL3
-
-* Wed Oct 21 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.8.0-1
-- Rebase to upstream stable release JSS v4.8.0
-
-* Wed Oct 21 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.8.0-b1
-- Rebase to upstream beta release JSS v4.8.0-b1
-
-* Fri Sep 11 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.7.3-1
-- Rebase to upstream stable release JSS v4.7.3
-
-* Tue Aug 18 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.7.2-1
-- Rebase to upstream stable release JSS v4.7.2 ; fixes FTBFS
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.0-4
-- Second attempt - Rebuilt for
- https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 4.7.0-2
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Thu Jul 09 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.7.0-1
-- Rebase to upstream stable release JSS v4.7.0
-
-* Mon Jul 06 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.7.0-0.5
-- Fix build issues with new Crypto-Policies denying SHA-1 usage
-
-* Tue Jun 30 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.7.0-0.4
-- Rebase to latest upstream JSS v4.7.0-b4
-
-* Wed Jun 10 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.7.0-0.2
-- Rebase to latest upstream JSS 4.7.0
-- JSS Provided SSLEngine
-
-* Mon Apr 27 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.6.4-1
-- Rebase to JSS 4.6.4
-- Fixes memory leak present since v4.6.2
-
-* Thu Mar 5 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.6.3-1
-- Rebase to JSS 4.6.3
-- Fixes base64 encoding of CSRs
-
-* Wed Mar 04 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.6.2-4
-- Fix for PBE errors
-
-* Tue Jan 28 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.6.2-3
-- Rebuild with new NSS to fix rhbz#1794814
-
-* Tue Oct 29 2019 Dogtag PKI Team <pki-devel@redhat.com> - 4.6.2-2
-- Fix for rhbz#1766451
-
-* Tue Oct 15 2019 Dogtag PKI Team <pki-devel@redhat.com> - 4.6.2-1
-- Rebase to JSS 4.6.2
-- Fixes CVE-2019-14823
-
-* Thu Aug 08 2019 Dogtag PKI Team <pki-devel@redhat.com> - 4.6.1-2
-- Disable unnecessary tests to fix broken s390x
-
-* Thu Aug 08 2019 Dogtag PKI Team <pki-devel@redhat.com> - 4.6.1-1
-- Rebase to JSS 4.6.1
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon May 06 2019 Dogtag PKI Team <pki-devel@redhat.com> - 4.5.3-2
-- Add AIA OCSP certificate checking patch
-
-* Tue Mar 19 2019 Dogtag PKI Team <pki-devel@redhat.com> - 4.5.3-1
-- Rebase to JSS 4.5.3
-
-* Fri Feb 01 2019 Dogtag PKI Team <pki-devel@redhat.com> - 4.5.2-3
-- Include nuxwdog patch for netscape.security.util.Utils from PKI
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan 14 2019 Dogtag PKI Team <pki-devel@redhat.com> 4.5.2-1
-- Rebased to JSS 4.5.2
-
-* Thu Nov 29 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.1-1
-- Rebased to JSS 4.5.1
-- Red Hat Bugzilla #1582323 - DER encoding error for enumerated types with a value of zero
-- Red Hat Bugzilla #1534765 - javadoc for org.mozilla.jss.pkix.cms.SignedData.getSignerInfos() is incorrect
-
-* Fri Aug 10 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-1
-- Rebased to JSS 4.5.0
-
-* Tue Aug 07 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-0.6
-- Rebased to JSS 4.5.0-b1
-
-* Tue Aug 07 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-0.5
-- Red Hat Bugzilla #1612063 - Do not override system crypto policy (support TLS 1.3)
-
-* Fri Jul 20 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-0.4
-- Rebased to JSS 4.5.0-a4
-- Red Hat Bugzilla #1604462 - jss: FTBFS in Fedora rawhide
-
-* Thu Jul 05 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-0.3
-- Rebased to JSS 4.5.0-a3
-
-* Fri Jun 22 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-0.2
-- Rebased to JSS 4.5.0-a2
-
-* Fri Jun 15 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-0.1
-- Rebased to JSS 4.5.0-a1
+* Tue Jun 22 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.0.0-0.1
+- Rebase to JSS 5.0.0-alpha1
diff --git a/sources b/sources
index c706521..3d73504 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jss-4.9.0-alpha1.tar.gz) = 3ab83818cf0c283f74087fd9de033d618ebbb8214b23a118414832017abbe2d4ed1f0567ab00e9aaec31ec9a04030a8817cf580ec6aeaf8f03a6be4b98c9a327
+SHA512 (jss-5.0.0-alpha1.tar.gz) = 27c18c88cea85a62e9dd2b1c4bf7223629938fd1a47d5c0c9168eaa3ab79366961dd9c6a17cd2c37633b18b9287776ecb2b027090425d530cddb4d056b220e39
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-28 16:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-28 16:48 [rpms/jss] pqc: Rebase to JSS 5.0.0-alpha1 Endi S. Dewata
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox