diff --git a/.gitignore b/.gitignore index 5cf0508..81278af 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ tomcatjss-1.2.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 diff --git a/copr-build.sh b/copr-build.sh new file mode 100755 index 0000000..156c705 --- /dev/null +++ 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 diff --git a/sources b/sources index a8025a3..9ce1fc2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tomcatjss-7.3.3.tar.gz) = 516eb95eef8e278e6629070172d1e04d57c6b832232fe8b7f13f031798eac174ab61cfcb43ddaa555d6309d0cc6ea5052084a6d591b13602916dc2df8b9526ad +SHA512 (tomcatjss-7.3.4.tar.gz) = 3ac55ea1c517f3df17364cfb07bb1b8a31378671c5aa778fb04eda2d9ff97327df981cfc2c491dd519fcdc3eea9c966061ae006f84cdf36e4d6c90c71e6bd3ce diff --git a/sources-update.sh b/sources-update.sh new file mode 100755 index 0000000..96129ca --- /dev/null +++ b/sources-update.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +SOURCE=$1 +TARGET=`basename $1` + +cp $SOURCE $TARGET +sha512sum --tag $TARGET > sources diff --git a/tomcatjss.spec b/tomcatjss.spec index 581bb3b..e42e85d 100644 --- a/tomcatjss.spec +++ b/tomcatjss.spec @@ -7,7 +7,7 @@ URL: http://www.dogtagpki.org/wiki/TomcatJSS License: LGPLv2+ BuildArch: noarch -Version: 7.3.3 +Version: 7.3.4 Release: 1%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 @@ -29,20 +29,6 @@ Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_ # Patch: tomcatjss-VERSION-RELEASE.patch ################################################################################ -# Tomcat -################################################################################ - -%if 0%{?rhel} && 0%{?rhel} <= 7 -%global app_server tomcat-7.0 -%else -%if 0%{?fedora} && 0%{?fedora} <= 27 -%global app_server tomcat-8.0 -%else -%global app_server tomcat-8.5 -%endif -%endif - -################################################################################ # Build Dependencies ################################################################################ @@ -71,7 +57,7 @@ BuildRequires: slf4j-jdk14 %if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: jss >= 4.4.0-7 %else -BuildRequires: jss >= 4.5.0-0.4 +BuildRequires: jss >= 4.5.0-0.6 %endif # Tomcat @@ -114,7 +100,7 @@ Requires: slf4j-jdk14 %if 0%{?rhel} && 0%{?rhel} <= 7 Requires: jss >= 4.4.0-7 %else -Requires: jss >= 4.5.0-0.4 +Requires: jss >= 4.5.0-0.6 %endif # Tomcat @@ -123,7 +109,6 @@ Requires: tomcat >= 7.0.69 %else %if 0%{?fedora} && 0%{?fedora} <= 27 Requires: tomcat >= 8.0.49 -Conflicts: tomcat >= 1:8.5 %else %if 0%{?fedora} && 0%{?fedora} <= 28 Requires: tomcat >= 1:8.5.23 @@ -140,7 +125,7 @@ Requires: tomcat >= 1:9.0.7 Conflicts: tomcat-native # PKI -Conflicts: pki-base < 10.6.3 +Conflicts: pki-base < 10.6.5 %if 0%{?rhel} @@ -168,9 +153,18 @@ NOTE: The 'tomcatjss' package conflicts with the 'tomcat-native' package %install ################################################################################ +# get Tomcat . 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} \ + -Dsrc.dir=$app_server \ -Djnidir=%{_jnidir} \ -Dinstall.doc.dir=%{buildroot}%{_docdir}/%{name} \ -Dinstall.jar.dir=%{buildroot}%{_javadir} \ @@ -187,6 +181,12 @@ ant -f build.xml \ ################################################################################ %changelog +* Tue Aug 7 2018 Dogtag PKI Team 7.3.4-1 +- Rebased to TomcatJSS 7.3.4 + +* Tue Aug 7 2018 Dogtag PKI Team 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 7.3.3-1 - Rebased to TomcatJSS 7.3.3