.gitignore

@@ -1 +1 @@
-SOURCES/tomcatjss-7.7.1.tar.gz
+SOURCES/tomcatjss-8.4.0.tar.gz

.tomcatjss.metadata

@@ -1 +1 @@
-a57bb5294890c2ddb5e62eb1e9c316d5deb95794 SOURCES/tomcatjss-7.7.1.tar.gz
+fee889db533634c90dffeecff165cf615bd45b7f SOURCES/tomcatjss-8.4.0.tar.gz

SPECS/tomcatjss.spec

@@ -2,16 +2,32 @@
 Name:             tomcatjss
 ################################################################################
 
-Summary:          JSS Connector for Apache Tomcat
-URL:              http://www.dogtagpki.org/wiki/TomcatJSS
-License:          LGPLv2+
-BuildArch:        noarch
+%global           product_id idm-tomcatjss
 
-# 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:          7.7.1
-Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
-#global           _phase -alpha1
+# Upstream version number:
+%global           major_version 8
+%global           minor_version 4
+%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
+
+# Development phase:
+# - development (unsupported): alpha<n> where n >= 1
+# - stabilization (unsupported): beta<n> where n >= 1
+# - GA/update (supported): <none>
+#global           phase
+
+%undefine         timestamp
+%undefine         commit_id
+
+Summary:          JSS Connector for Apache Tomcat
+URL:              https://github.com/dogtagpki/tomcatjss
+License:          LGPLv2+
+Version:          %{major_version}.%{minor_version}.%{update_version}
+Release:          %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/tomcatjss.git
@@ -21,7 +37,7 @@ Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
 #     --prefix tomcatjss-VERSION/ \
 #     -o tomcatjss-VERSION.tar.gz \
 #     <version tag>
-Source:           https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_phase}/tomcatjss-%{version}%{?_phase}.tar.gz
+Source:           https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?phase:-}%{?phase}/tomcatjss-%{version}%{?phase:-}%{?phase}.tar.gz
 
 # To create a patch for all changes since a version tag:
 # $ git format-patch \
@@ -30,19 +46,15 @@ Source:           https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_
 #     > tomcatjss-VERSION-RELEASE.patch
 # Patch: tomcatjss-VERSION-RELEASE.patch
 
+BuildArch:        noarch
+
 ################################################################################
 # Java
 ################################################################################
 
-%if 0%{?fedora} && 0%{?fedora} <= 32 || 0%{?rhel} && 0%{?rhel} <= 8
-%define java_devel java-1.8.0-openjdk-devel
-%define java_headless java-1.8.0-openjdk-headless
-%define java_home /usr/lib/jvm/jre-1.8.0-openjdk
-%else
-%define java_devel java-11-openjdk-devel
-%define java_headless java-11-openjdk-headless
-%define java_home /usr/lib/jvm/jre-11-openjdk
-%endif
+%define java_devel java-17-openjdk-devel
+%define java_headless java-17-openjdk-headless
+%define java_home %{_jvmdir}/jre-17-openjdk
 
 ################################################################################
 # Build Dependencies
@@ -63,7 +75,7 @@ BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
 
 # JSS
-BuildRequires:    jss >= 4.9.0, jss < 5.0.0
+BuildRequires:    jss = 5.4
 
 # Tomcat
 %if 0%{?rhel} && ! 0%{?eln}
@@ -72,10 +84,18 @@ BuildRequires:    pki-servlet-engine >= 1:9.0.7
 BuildRequires:    tomcat >= 1:9.0.7
 %endif
 
+%description
+JSS Connector for Apache Tomcat, installed via the tomcatjss package,
+is a Java Secure Socket Extension (JSSE) module for Apache Tomcat that
+uses Java Security Services (JSS), a Java interface to Network Security
+Services (NSS).
+
 ################################################################################
-# Runtime Dependencies
+%package -n %{product_id}
 ################################################################################
 
+Summary:          JSS Connector for Apache Tomcat
+
 # Java
 Requires:         apache-commons-lang3
 Requires:         %{java_headless}
@@ -86,7 +106,7 @@ Requires:         slf4j
 Requires:         slf4j-jdk14
 
 # JSS
-Requires:         jss >= 4.9.0, jss < 5.0.0
+Requires:         jss = 5.4
 
 # Tomcat
 %if 0%{?rhel} && ! 0%{?eln}
@@ -95,6 +115,11 @@ Requires:         pki-servlet-engine >= 1:9.0.7
 Requires:         tomcat >= 1:9.0.7
 %endif
 
+Obsoletes:        tomcatjss < %{version}-%{release}
+Provides:         tomcatjss = %{version}-%{release}
+Provides:         tomcatjss = %{major_version}.%{minor_version}
+Provides:         %{product_id} = %{major_version}.%{minor_version}
+
 # PKI
 Conflicts:        pki-base < 10.10.0
 
@@ -104,7 +129,7 @@ Conflicts:        pki-base < 10.10.0
 %define           _sharedstatedir    /var/lib
 %endif
 
-%description
+%description -n %{product_id}
 JSS Connector for Apache Tomcat, installed via the tomcatjss package,
 is a Java Secure Socket Extension (JSSE) module for Apache Tomcat that
 uses Java Security Services (JSS), a Java interface to Network Security
@@ -114,26 +139,38 @@ Services (NSS).
 %prep
 ################################################################################
 
-%autosetup -n tomcatjss-%{version}%{?_phase} -p 1
+%autosetup -n tomcatjss-%{version}%{?phase:-}%{?phase} -p 1
+
+################################################################################
+%build
+################################################################################
+
+export JAVA_HOME=%{java_home}
+
+./build.sh \
+    %{?_verbose:-v} \
+    --name=%{product_id} \
+    --work-dir=%{_vpath_builddir} \
+    --version=%{version} \
+    --jni-dir=%{_jnidir} \
+    dist
 
 ################################################################################
 %install
 ################################################################################
 
-# get Tomcat <major>.<minor> version number
-tomcat_version=`/usr/sbin/tomcat version | sed -n 's/Server number: *\([0-9]\+\.[0-9]\+\).*/\1/p'`
-app_server=tomcat-$tomcat_version
-
-ant -f build.xml \
-    -Dversion=%{version} \
-    -Dsrc.dir=$app_server \
-    -Djnidir=%{_jnidir} \
-    -Dinstall.doc.dir=%{buildroot}%{_docdir}/%{name} \
-    -Dinstall.jar.dir=%{buildroot}%{_javadir} \
+./build.sh \
+    %{?_verbose:-v} \
+    --name=%{product_id} \
+    --work-dir=%{_vpath_builddir} \
+    --version=%{version} \
+    --java-dir=%{_javadir} \
+    --doc-dir=%{_docdir} \
+    --install-dir=%{buildroot} \
     install
 
 ################################################################################
-%files
+%files -n %{product_id}
 ################################################################################
 
 %license LICENSE
@@ -145,68 +182,31 @@ ant -f build.xml \
 
 ################################################################################
 %changelog
-* Mon Nov 15 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 7.7.1-1
-- Rebase to TomcatJSS 7.7.1
+* Wed May 31 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.4.0-1
+- Rebase to Tomcat JSS 8.4.0
 
-* Mon Jul 26 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 7.7.0-1
-- Rebase to TomcatJSS 7.7.0
+* Fri Feb 10 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.3.0-1
+- Rebase to Tomcat JSS 8.3.0
 
-* Fri Jun 11 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 7.7.0-0.1
-- Rebase to TomcatJSS 7.7.0-alpha1
+* Wed Nov 30 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.3.0-0.2.beta1
+- Rebase to Tomcat JSS 8.3.0-beta1
 
-* Tue Nov 17 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 7.6.1-1
-- Rebase to TomcatJSS 7.6.1
+* Thu Jun 30 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.2.0-1
+- Rebase to Tomcat JSS 8.2.0
 
-* Wed Oct 28 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 7.6.0-2
-- Bump dependency to JSS 4.8.0
-- Remove unsupported platforms
+* Mon May 02 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.2.0-0.3.beta2
+- Rebase to Tomcat JSS 8.2.0-beta2
+- Rename packages to idm-tomcatjss
 
-* Tue Oct 20 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 7.6.0-1
-- Rebase to TomcatJSS 7.6.0
+* Mon Apr 18 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.2.0-0.2.beta1
+- Rebase to Tomcat JSS 8.2.0-beta1
 
-* Thu Jul 09 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 7.5.0-1
-- Rebase to TomcatJSS 7.5.0
+* Tue Oct 05 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.0.0-1
+- Rebase to Tomcat JSS 8.0.0
 
-* Thu Jun 25 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 7.5.0-0.2
-- Rebase to TomcatJSS 7.5.0-a2
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 8.0.0-0.2.alpha1
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Tue May 26 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 7.5.0-0.1
-- Rebase to TomcatJSS 7.5.0-a1
-
-* Thu Oct 31 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 7.4.1-2
-- Bump dependency to JSS 4.6.0
-
-* Wed Jun 12 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 7.4.1-1
-- Rebase to TomcatJSS 7.4.1
-
-* Wed Apr 24 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 7.4.0-1
-- Rebase to TomcatJSS 7.4.0
-
-* Fri Oct 05 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.6-1
-- Rebase to TomcatJSS 7.3.6
-
-* Mon Aug 13 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.5-1
-- Rebase to TomcatJSS 7.3.5
-
-* Tue Aug 07 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.4-1
-- Rebase to TomcatJSS 7.3.4
-
-* Tue Aug 07 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.3-2
-- Red Hat Bugzilla #1612063 - Do not override system crypto policy (support TLS 1.3)
-
-* Fri Jul 20 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.3-1
-- Rebase to TomcatJSS 7.3.3
-
-* Thu Jul 05 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.2-1
-- Rebase to TomcatJSS 7.3.2
-
-* Fri Jun 15 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.1-1
-- Fix Tomcat dependencies
-- Rebase to TomcatJSS 7.3.1
-
-* Thu Apr 12 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.0-1
-- Clean up spec file
-- Rebase to TomcatJSS 7.3.0 final
-
-* Thu Mar 15 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.0-0.2
-- Rebase to TomcatJSS 7.3.0 beta
+* Fri Jun 25 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.0.0-0.1
+- Rebase to Tomcat JSS 8.0.0-alpha1