diff --git a/.gitignore b/.gitignore index dffe94a..343c4d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/tomcatjss-7.5.0.tar.gz +SOURCES/tomcatjss-7.6.1.tar.gz diff --git a/.tomcatjss.metadata b/.tomcatjss.metadata index c1fffc7..ab0952c 100644 --- a/.tomcatjss.metadata +++ b/.tomcatjss.metadata @@ -1 +1 @@ -c74c6e4ca0a0ba0d2252dce896d5b0f88bf8ba6d SOURCES/tomcatjss-7.5.0.tar.gz +5bd1aecee0fb11d59b064c305a373d97f8574ace SOURCES/tomcatjss-7.6.1.tar.gz diff --git a/SPECS/tomcatjss.spec b/SPECS/tomcatjss.spec index 8916b99..eb6ac81 100644 --- a/SPECS/tomcatjss.spec +++ b/SPECS/tomcatjss.spec @@ -7,7 +7,7 @@ URL: http://www.dogtagpki.org/wiki/TomcatJSS License: LGPLv2+ BuildArch: noarch -Version: 7.5.0 +Version: 7.6.1 Release: 1%{?_timestamp}%{?_commit_id}%{?dist} #global _phase -a1 @@ -41,50 +41,30 @@ BuildRequires: git # Java BuildRequires: ant -BuildRequires: apache-commons-lang +BuildRequires: apache-commons-lang3 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 +BuildRequires: jss >= 4.8.0 # 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 +Requires: apache-commons-lang3 %if 0%{?fedora} >= 21 Requires: java-headless %else @@ -94,40 +74,20 @@ 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 +Requires: jss >= 4.8.0 # 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 +Conflicts: pki-base < 10.10.0 %if 0%{?rhel} @@ -141,10 +101,6 @@ 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). -NOTE: The 'tomcatjss' package conflicts with the 'tomcat-native' package - because it uses an underlying NSS security model rather than the - OpenSSL security model, so these two packages may not co-exist. - ################################################################################ %prep ################################################################################ @@ -185,49 +141,59 @@ ant -f build.xml \ ################################################################################ %changelog +* Tue Nov 17 2020 Red Hat PKI Team 7.6.1-1 +- Rebase to TomcatJSS 7.6.1 + +* Wed Oct 28 2020 Red Hat PKI Team 7.6.0-2 +- Bump dependency to JSS 4.8.0 +- Remove unsupported platforms + +* Tue Oct 20 2020 Red Hat PKI Team 7.6.0-1 +- Rebase to TomcatJSS 7.6.0 + * Thu Jul 09 2020 Red Hat PKI Team 7.5.0-1 -- Rebased to TomcatJSS 7.5.0 +- Rebase to TomcatJSS 7.5.0 * Thu Jun 25 2020 Red Hat PKI Team 7.5.0-0.2 -- Rebased to TomcatJSS 7.5.0-a2 +- Rebase to TomcatJSS 7.5.0-a2 * Tue May 26 2020 Red Hat PKI Team 7.5.0-0.1 -- Rebased to TomcatJSS 7.5.0-a1 +- Rebase to TomcatJSS 7.5.0-a1 * Thu Oct 31 2019 Red Hat PKI Team 7.4.1-2 -- Bumping min requirement for jss to 4.6.0 +- Bump dependency to JSS 4.6.0 * Wed Jun 12 2019 Red Hat PKI Team 7.4.1-1 -- Rebased to TomcatJSS 7.4.1 +- Rebase to TomcatJSS 7.4.1 * Wed Apr 24 2019 Red Hat PKI Team 7.4.0-1 -- Rebased to TomcatJSS 7.4.0 +- Rebase to TomcatJSS 7.4.0 * Fri Oct 05 2018 Red Hat PKI Team 7.3.6-1 -- Rebased to TomcatJSS 7.3.6 +- Rebase to TomcatJSS 7.3.6 * Mon Aug 13 2018 Red Hat PKI Team 7.3.5-1 -- Rebased to TomcatJSS 7.3.5 +- Rebase to TomcatJSS 7.3.5 * Tue Aug 07 2018 Red Hat PKI Team 7.3.4-1 -- Rebased to TomcatJSS 7.3.4 +- Rebase to TomcatJSS 7.3.4 * Tue Aug 07 2018 Red Hat PKI Team 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 7.3.3-1 -- Rebased to TomcatJSS 7.3.3 +- Rebase to TomcatJSS 7.3.3 * Thu Jul 05 2018 Red Hat PKI Team 7.3.2-1 -- Rebased to TomcatJSS 7.3.2 +- Rebase to TomcatJSS 7.3.2 * Fri Jun 15 2018 Red Hat PKI Team 7.3.1-1 -- Fixed Tomcat dependencies -- Rebased to TomcatJSS 7.3.1 +- Fix Tomcat dependencies +- Rebase to TomcatJSS 7.3.1 * Thu Apr 12 2018 Red Hat PKI Team 7.3.0-1 -- Cleaned up spec file -- Rebased to TomcatJSS 7.3.0 final +- Clean up spec file +- Rebase to TomcatJSS 7.3.0 final * Thu Mar 15 2018 Red Hat PKI Team 7.3.0-0.2 -- Rebased to TomcatJSS 7.3.0 beta +- Rebase to TomcatJSS 7.3.0 beta