From 1fec1b1ff1e3129b1afe582442ca5161d8ccfa16 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 12 Apr 2018 23:13:12 +0200 Subject: [PATCH] Rebased to TomcatJSS 7.3.0 final --- sources | 2 +- tomcatjss.spec | 216 ++++++++++++++----------------------------------- 2 files changed, 62 insertions(+), 156 deletions(-) diff --git a/sources b/sources index 0d7c046..b977321 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tomcatjss-7.3.0.tar.gz) = 6394d725af4fed1ace96963b306c62b90252654558e2f0eace8a0a31018934994fcf25ef5cedf07dea9b355f4fb078498db5e9e979dd9f1d6976fe91fafc680e +SHA512 (tomcatjss-7.3.0.tar.gz) = 68d9e36acb9ead97cfdb173126a66b300024d46516b874ea6c692d049c228661349bc5a55c56463a6bb3434f96829c9d88d84e1920e4ed6178ba369097445661 diff --git a/tomcatjss.spec b/tomcatjss.spec index 5a65b9e..9a79310 100644 --- a/tomcatjss.spec +++ b/tomcatjss.spec @@ -1,19 +1,39 @@ -Name: tomcatjss -Version: 7.3.0 -Release: 0.2%{?dist} -Summary: JSS Connector for Apache Tomcat, a JSSE module for Apache Tomcat that uses JSS -URL: http://pki.fedoraproject.org/ -License: LGPLv2+ -Group: System Environment/Libraries +################################################################################ +Name: tomcatjss +################################################################################ -BuildArch: noarch +Summary: JSS Connector for Apache Tomcat +URL: http://www.dogtagpki.org/wiki/TomcatJSS +License: LGPLv2+ +BuildArch: noarch -Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}/tomcatjss-%{version}.tar.gz +Version: 7.3.0 +Release: 1%{?dist} + +Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}/tomcatjss-%{version}.tar.gz + +################################################################################ +# Tomcat +################################################################################ + +%if 0%{?fedora} >= 27 || 0%{?rhel} > 7 +%global app_server tomcat-8.5 +%else +%if 0%{?fedora} +%global app_server tomcat-8.0 +%else +%global app_server tomcat-7.0 +%endif +%endif + +################################################################################ +# 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 -Conflicts: pki-base < 10.4.0 +Conflicts: pki-base < 10.6.0 BuildRequires: ant BuildRequires: apache-commons-lang BuildRequires: java-devel @@ -24,18 +44,19 @@ BuildRequires: jss >= 4.4.2-2 BuildRequires: jss >= 4.4.0-7 %endif %if 0%{?fedora} >= 27 || 0%{?rhel} > 7 -BuildRequires: tomcat >= 8.5.23 -%global app_server tomcat-8.5 +BuildRequires: tomcat >= 8.5.23 %else %if 0%{?fedora} -BuildRequires: tomcat >= 8.0.49 -%global app_server tomcat-8.0 +BuildRequires: tomcat >= 8.0.49 %else -BuildRequires: tomcat >= 7.0.68 -%global app_server tomcat-7.0 +BuildRequires: tomcat >= 7.0.68 %endif %endif +################################################################################ +# Runtime Dependencies +################################################################################ + Requires: apache-commons-lang %if 0%{?fedora} >= 21 Requires: java-headless @@ -80,154 +101,39 @@ 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 +################################################################################ -%setup -q -chmod -c -x LICENSE README - -%build - -ant -f build.xml -Dversion=%{version} -Dsrc.dir=%{app_server} -Djnidir=%{_jnidir} dist +%autosetup -n tomcatjss-%{version} -p 1 +################################################################################ %install +################################################################################ -# Unpack the files we just built -cd dist/binary -unzip %{name}-%{version}.zip -d %{buildroot} - -# Install our files -cd %{buildroot}%{_javadir} -%if 0%{?rhel} || 0%{?fedora} < 21 -mv %{name}.jar %{name}-%{version}.jar -ln -s %{name}-%{version}.jar %{name}.jar -%endif +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 +################################################################################ + %defattr(-,root,root) -%doc README LICENSE +%doc README +%doc LICENSE %{_javadir}/* +################################################################################ %changelog +################################################################################ +* Thu Apr 12 2018 Dogtag PKI Team 7.3.0-1 +- Cleaned up spec file +- Rebased to TomcatJSS 7.3.0 final + * Thu Mar 15 2018 Dogtag PKI Team 7.3.0-0.2 -- Rebased to TomcatJSS 7.3.0 - -* Fri Feb 09 2018 Fedora Release Engineering - 7.2.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 7.2.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jun 12 2017 Matthew Harmsen 7.2.4-1 -- tomcatjss Pagure Issue #10 - Comply with ASF trademark rules (mharmsen) - -* Mon Jun 5 2017 Endi Sukma Dewata 7.2.3-1 -- tomcatjss Pagure Issue #9 - Problem parsing formatted cipher list (edewata) - -* Mon Mar 27 2017 Matthew Harmsen - 7.2.2-1 -- tomcatjss Pagure Issue #6 - Rebase tomcatjss to 7.2.x in Fedora 25+ (mharmsen) -- tomcatjss Pagure Issue #4 - Support for Event API (edewata) - -* Tue Mar 21 2017 Matthew Harmsen - 7.2.1-2 -- Bugzilla Bug #1434541 - tomcatjss 7.2.1 is incompatible with versions of - pki-base < 10.4.0 - -* Tue Mar 14 2017 Matthew Harmsen 7.2.1-1 -- Updated jss build and runtime dependencies -- Bumped version due to corrupted tarball - -* Mon Mar 13 2017 Matthew Harmsen 7.2.0-2 -- Changed build so that it did not package and depend upon the specfile being - included inside the tarball - -* Sun Mar 12 2017 Matthew Harmsen 7.2.0-1 -- tomcatjss Pagure Issue #6 - Rebase tomcatjss to 7.2.x in Fedora 25+ (mharmsen) -- Bugzilla Bug #1394416 - Rebase tomcatjss to 7.2.x in RHEL 7.4 (mharmsen) - -* Sat Feb 11 2017 Fedora Release Engineering - 7.1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jul 5 2016 Christina Fu 7.1.4.1 -- Bugzilla Bug #1203407 missing ciphers (cfu) - -* Tue Jul 5 2016 Christina Fu 7.1.3.3 -- Bugzilla Bug #1203407 missing ciphers (cfu) - -* Fri Feb 05 2016 Fedora Release Engineering 7.1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jul 22 2015 Endi Sukma Dewata 7.1.3-1 -- Bugzilla Bug #1245786 - Build failure on F23 - -* Fri Jun 19 2015 Fedora Release Engineering - 7.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Mar 4 2015 Endi Sukma Dewata 7.1.2-1 -- Bugzilla Bug #1198450 - Support for Apache Tomcat 8 -- Bugzilla Bug #1214858 - Add nuxwdog support (alee) - -* Tue Sep 30 2014 Christina Fu 7.1.1-1 -- Bugzilla Bug #1058366 NullPointerException in tomcatjss searching - for attribute "clientauth" (cfu) -- Bugzilla Bug #871171 - Provide Apache Tomcat support for TLS v1.1 and - TLS v1.2 (cfu) -- Bumped revision to 7.1.1 - -* Sun Jun 08 2014 Fedora Release Engineering - 7.1.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 25 2014 Mikolaj Izdebski - 7.1.0-5 -- Move to java-headless -- Resolves: rhbz#1068567 - -* Tue Jan 07 2014 Michael Simacek - 7.1.0-5 -- Remove versioned symlink (rhbz#1022167) - -* Fri Aug 2 2013 Ville Skyttä - 7.1.0-4 -- Simplify installation of docs. - -* Thu Jun 13 2013 Matthew Harmsen 7.1.0-3 -- Updated tomcatjss to utilize tomcat-7.0.40. -- Updated JNIDIR to /usr/lib/java. - -* Fri Feb 15 2013 Fedora Release Engineering - 7.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Dec 19 2012 Christina Fu 7.1.0-1 -- Bugzila Bug #819554 tomcatjss: Please migrate from tomcat6 to tomcat7 - -* Thu Aug 2 2012 Matthew Harmsen 7.0.0-3 -- PKI TRAC Ticket #283 - Dogtag 10: Integrate Apache Tomcat 6 'tomcatjss.jar' - and Apache Tomcat 7 'tomcat7jss.jar' in Fedora 18 tomcatjss package - -* Thu Jul 26 2012 Matthew Harmsen 7.0.0-2 -- Fixed runtime 'Requires' cut/paste typos - -* Wed Jun 06 2012 Matthew Harmsen 7.0.0-1 -- Bugzilla Bug #819554 - tomcatjss: Please migrate from tomcat6 to tomcat7 - -* Thu Sep 22 2011 Matthew Harmsen 6.0.2-1 -- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen) -- Bugzilla Bug #699809 - Convert CS to use systemd (alee) - -* Mon Sep 12 2011 Matthew Harmsen 6.0.1-1 -- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . - -* Thu Jul 14 2011 Matthew Harmsen - 6.0.0-1 -- Bugzilla Bug #702716 - rhcs80 cannot do client auth with pkiconsole - (ok with 7.3) (jmagne) -- Require "jss >= 4.2.6-17" as a build and runtime requirement -- Bump version 2.1.1 --> 6.0.0 (to better coincide with tomcat6) - -* Fri Mar 25 2011 Matthew Harmsen - 2.1.1-1 -- Require "jss >= 4.2.6-15" as a build and runtime requirement -- Require "tomcat6 >= 6.0.30-6" as a build and runtime requirement - for Fedora 15 and later platforms - -* Wed Jan 12 2011 John Dennis - 2.1.0-1 -- bump version to 2.1.0 - Bug #588323 - Failed to enable cipher 0xc001 (svn rev 105) - Bug #634375 - Build tomcatjss against tomcat6 (svn rev 106) - Bug #655915 - Disable socket timeouts when socket is first created. (svn rev 107) - -* Tue Dec 14 2010 John Dennis -- Updated 'tomcatjss' to utilize 'tomcat6'. +- Rebased to TomcatJSS 7.3.0 beta