RHEL 9.0.0 Alpha bootstrap

The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/tomcatjss#c0ec42d065888628c79de7a1124ca89b1777b192
2020-10-15 12:57:56 -07:00 · 2020-10-15 12:57:56 -07:00 · 01468800a3
commit 01468800a3
parent e2b6165253
6 changed files with 331 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,30 @@
+tomcatjss-1.2.0.tar.gz
+/tomcatjss-2.0.0.tar.gz
+/tomcatjss-2.1.1.tar.gz
+/tomcatjss-6.0.0.tar.gz
+/tomcatjss-6.0.1.tar.gz
+/tomcatjss-6.0.2.tar.gz
+/tomcatjss-7.0.0.tar.gz
+/tomcatjss-7.1.0.tar.gz
+/tomcatjss-7.1.1.tar.gz
+/tomcatjss-7.1.2.tar.gz
+/tomcatjss-7.1.3.tar.gz
+/tomcatjss-7.1.4.tar.gz
+/tomcatjss-7.2.0.tar.gz
+/tomcatjss-7.2.1.tar.gz
+/tomcatjss-7.2.2.tar.gz
+/tomcatjss-7.2.3.tar.gz
+/tomcatjss-7.2.4.tar.gz
+/tomcatjss-7.3.0.tar.gz
+/tomcatjss-7.3.1.tar.gz
+/tomcatjss-7.3.2.tar.gz
+/tomcatjss-7.3.3.tar.gz
+/tomcatjss-7.3.4.tar.gz
+/tomcatjss-7.3.5.tar.gz
+/tomcatjss-7.3.6.tar.gz
+/tomcatjss-7.3.7.tar.gz
+/tomcatjss-7.4.0.tar.gz
+/tomcatjss-7.4.1.tar.gz
+/tomcatjss-7.5.0-a1.tar.gz
+/tomcatjss-7.5.0-b2.tar.gz
+/tomcatjss-7.5.0.tar.gz
--- a/0001-Switch-to-JDK8-source-target-compatibility.patch
+++ b/0001-Switch-to-JDK8-source-target-compatibility.patch
@ -0,0 +1,35 @@
+From d9e8b91443a89a4493c3c96b979079c2d65c73cd Mon Sep 17 00:00:00 2001
+From: Alexander Scheel <ascheel@redhat.com>
+Date: Mon, 17 Aug 2020 19:15:39 -0400
+Subject: [PATCH] Switch to JDK8 source/target compatibility
+
+Signed-off-by: Alexander Scheel <ascheel@redhat.com>
+---
+ build.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 0610cd4..3c945a6 100644
+--- a/build.xml
+++ b/build.xml
+@@ -20,7 +20,7 @@
+ <project name="tomcatjss" default="main" basedir=".">
+   <!--
+      Give user a chance to override without editing this file
+-       (and without typing -D each time it compiles it) 
+       (and without typing -D each time it compiles it)
+    -->
+ 
+   <property file=".ant.properties"/>
+@@ -217,7 +217,7 @@
+         description="compile the source " >
+     <!-- Compile the java code from ${src} into ${build} -->
+     <mkdir dir="${build.classes}"/>
+-    <javac debug="on" destdir="${build.classes}">
+    <javac debug="on" destdir="${build.classes}" source="1.8" target="1.8">
+       <src path="src"/>
+       <src path="${src.dir}"/>
+       <classpath refid="classpath"/>
+-- 
+2.26.2
+
--- a/copr-build.sh
+++ b/copr-build.sh
@ -0,0 +1,9 @@
+#!/bin/sh
+
+REPO=$1
+
+if [ "$REPO" == "" ]; then
+    REPO="pki-10.6"
+fi
+
+fedpkg copr-build --nowait $REPO
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (tomcatjss-7.5.0.tar.gz) = a8954bc9a820ce429a4bcbfdf756e7c202318bb454ab74e44e39a6bdcdb3dd4dd4ab6916bc1693b5eb55356db6ce4a3358dbf4dcc08bc5a8bc13c1ff95c017f0
--- a/sources-update.sh
+++ b/sources-update.sh
@ -0,0 +1,7 @@
+#!/bin/sh
+
+SOURCE=$1
+TARGET=`basename $1`
+
+cp $SOURCE $TARGET
+sha512sum --tag $TARGET > sources
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@ -0,0 +1,249 @@
+################################################################################
+Name:             tomcatjss
+################################################################################
+
+Summary:          JSS Connector for Apache Tomcat
+URL:              http://www.dogtagpki.org/wiki/TomcatJSS
+License:          LGPLv2+
+BuildArch:        noarch
+
+Version:          7.5.0
+Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
+#global           _phase -a1
+
+# To generate the source tarball:
+# $ git clone https://github.com/dogtagpki/tomcatjss.git
+# $ cd tomcatjss
+# $ git archive \
+#     --format=tar.gz \
+#     --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
+
+# To create a patch for all changes since a version tag:
+# $ git format-patch \
+#     --stdout \
+#     <version tag> \
+#     > tomcatjss-VERSION-RELEASE.patch
+# Patch: tomcatjss-VERSION-RELEASE.patch
+Patch1: 0001-Switch-to-JDK8-source-target-compatibility.patch
+
+################################################################################
+# Build Dependencies
+################################################################################
+
+# jpackage-utils requires versioning to meet both build and runtime requirements
+# jss requires versioning to meet both build and runtime requirements
+# tomcat requires versioning to meet both build and runtime requirements
+
+# autosetup
+BuildRequires:    git
+
+# Java
+BuildRequires:    ant
+BuildRequires:    apache-commons-lang
+BuildRequires:    java-devel
+BuildRequires:    jpackage-utils >= 0:1.7.5-15
+
+# SLF4J
+BuildRequires:    slf4j
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# no slf4j-jdk14
+%else
+BuildRequires:    slf4j-jdk14
+%endif
+
+# JSS
+%if 0%{?rhel} && 0%{?rhel} <= 7
+BuildRequires:    jss >= 4.4.0-7
+%else
+BuildRequires:    jss >= 4.7.0
+%endif
+
+# Tomcat
+%if 0%{?rhel} && 0%{?rhel} <= 7
+BuildRequires:    tomcat >= 7.0.69
+%else
+%if 0%{?fedora} && 0%{?fedora} <= 27
+BuildRequires:    tomcat >= 8.0.49
+%else
+%if 0%{?fedora} && 0%{?fedora} <= 28
+BuildRequires:    tomcat >= 1:8.5.23
+%else
+%if 0%{?rhel}
+BuildRequires:    pki-servlet-engine >= 1:9.0.7
+%else
+BuildRequires:    tomcat >= 1:9.0.7
+%endif
+%endif
+%endif
+%endif
+
+################################################################################
+# Runtime Dependencies
+################################################################################
+
+# Java
+Requires:         apache-commons-lang
+%if 0%{?fedora} >= 21
+Requires:         java-headless
+%else
+Requires:         java
+%endif
+Requires:         jpackage-utils >= 0:1.7.5-15
+
+# SLF4J
+Requires:         slf4j
+%if 0%{?rhel}
+# no slf4j-jdk14
+%else
+Requires:         slf4j-jdk14
+%endif
+
+# JSS
+%if 0%{?rhel} && 0%{?rhel} <= 7
+Requires:         jss >= 4.4.0-7
+%else
+Requires:         jss >= 4.7.0
+%endif
+
+# Tomcat
+%if 0%{?rhel} && 0%{?rhel} <= 7
+Requires:         tomcat >= 7.0.69
+%else
+%if 0%{?fedora} && 0%{?fedora} <= 27
+Requires:         tomcat >= 8.0.49
+%else
+%if 0%{?fedora} && 0%{?fedora} <= 28
+Requires:         tomcat >= 1:8.5.23
+%else
+%if 0%{?rhel}
+Requires:         pki-servlet-engine >= 1:9.0.7
+%else
+Requires:         tomcat >= 1:9.0.7
+%endif
+%endif
+%endif
+%endif
+
+# PKI
+Conflicts:        pki-base < 10.6.5
+
+
+%if 0%{?rhel}
+# For EPEL, override the '_sharedstatedir' macro on RHEL
+%define           _sharedstatedir    /var/lib
+%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).
+
+################################################################################
+%prep
+################################################################################
+
+%autosetup -n tomcatjss-%{version}%{?_phase} -p 1 -S git
+
+################################################################################
+%install
+################################################################################
+
+# get Tomcat <major>.<minor> version number
+tomcat_version=`/usr/sbin/tomcat version | sed -n 's/Server number: *\([0-9]\+\.[0-9]\+\).*/\1/p'`
+
+if [ $tomcat_version == "9.0" ]; then
+    app_server=tomcat-8.5
+else
+    app_server=tomcat-$tomcat_version
+fi
+
+ant -f build.xml \
+    -Dversion=%{version} \
+    -Dsrc.dir=$app_server \
+    -Djnidir=%{_jnidir} \
+    -Dinstall.doc.dir=%{buildroot}%{_docdir}/%{name} \
+    -Dinstall.jar.dir=%{buildroot}%{_javadir} \
+    install
+
+################################################################################
+%files
+################################################################################
+
+%license LICENSE
+
+%defattr(-,root,root)
+%doc README
+%doc LICENSE
+%{_javadir}/*
+
+################################################################################
+%changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.5.0-0.6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 7.5.0-0.5
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Jun 10 2020 Dogtag PKI Team <pki-devel@redhat.com> - 7.5.0-0.4
+- Rebase to match latest upstream version v7.5.0-b2
+
+* Wed Jun 10 2020 Dogtag PKI Team <pki-devel@redhat.com> - 7.5.0-0.1
+- Rebase to match latest upstream version v7.5.0-a1
+- Make TomcatJSS use both SunJSSE and Mozilla-JSS
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Aug 08 2019 Dogtag PKI Team <pki-team@redhat.com> - 7.4.1-2
+- Bumping min requirement for jss to 4.6.0
+
+* Thu Aug 08 2019 Dogtag PKI Team <pki-team@redhat.com> - 7.4.1-1
+- Rebased to TomcatJSS 7.4.1
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon May 06 2019 Dogtag PKI Team <pki-team@redhat.com> - 7.4.0-1
+- Rebased to TomcatJSS 7.4.0
+
+* Mon May 06 2019 Dogtag PKI Team <pki-team@redhat.com> - 7.3.7-1
+- Rebased to Tomcatjss 7.3.7
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Oct 03 2018 Dogtag PKI Team <pki-team@redhat.com> 7.3.6-1
+- Rebased to TomcatJSS 7.3.6
+
+* Mon Aug 13 2018 Dogtag PKI Team <pki-team@redhat.com> 7.3.5-1
+- Rebased to TomcatJSS 7.3.5
+
+* Tue Aug 07 2018 Dogtag PKI Team <pki-devel@redhat.com> 7.3.4-1
+- Rebased to TomcatJSS 7.3.4
+
+* Tue Aug 07 2018 Dogtag PKI Team <pki-devel@redhat.com> 7.3.3-2
+- 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> 7.3.3-1
+- Rebased to TomcatJSS 7.3.3
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jul 05 2018 Dogtag PKI Team <pki-devel@redhat.com> 7.3.2-1
+- Rebased to TomcatJSS 7.3.2
+
+* Fri Jun 15 2018 Dogtag PKI Team <pki-devel@redhat.com> 7.3.1-1
+- Fixed Tomcat dependencies
+- Rebased to TomcatJSS 7.3.1
+
+* Thu Apr 12 2018 Dogtag PKI Team <pki-devel@redhat.com> 7.3.0-1
+- Cleaned up spec file
+- Rebased to TomcatJSS 7.3.0 final
+
+* Thu Mar 15 2018 Dogtag PKI Team <pki-devel@redhat.com> 7.3.0-0.2
+- Rebased to TomcatJSS 7.3.0 beta
				`@ -0,0 +1 @@`
				`SHA512 (tomcatjss-7.5.0.tar.gz) = a8954bc9a820ce429a4bcbfdf756e7c202318bb454ab74e44e39a6bdcdb3dd4dd4ab6916bc1693b5eb55356db6ce4a3358dbf4dcc08bc5a8bc13c1ff95c017f0`