From 22a63482536f62c153206d0953ca4fdf56f0c616a6c3da077e05f1c0311f7d85 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 11 Jul 2018 16:34:22 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=123 --- tomcat.changes | 6 ++++++ tomcat.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/tomcat.changes b/tomcat.changes index 759132b..5803929 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 11 16:33:35 UTC 2018 - fstrba@suse.com + +- Do not build java/org/apache/tomcat/buildutil/SignCode.java, + since it uses APIs removed in jdk11. + ------------------------------------------------------------------- Wed Feb 16 16:38:14 UTC 2018 - malbu@suse.de diff --git a/tomcat.spec b/tomcat.spec index 71e710c..395120f 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -247,6 +247,7 @@ The ROOT and examples web applications for Apache Tomcat # remove pre-built binaries and windows files find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \ -name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t rm -f +rm -f java/org/apache/tomcat/buildutil/SignCode.java %patch0 %patch1 %patch2 From b1ddb8d89843d2f443ab7f5c31c7e3225894c666b035be52fc9517f78db88fe5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 16 Jul 2018 08:57:56 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=124 --- tomcat.changes | 41 ++++++++++++++++++----------------------- tomcat.spec | 1 - 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/tomcat.changes b/tomcat.changes index 5803929..c1313ef 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,14 +1,8 @@ -------------------------------------------------------------------- -Wed Jul 11 16:33:35 UTC 2018 - fstrba@suse.com - -- Do not build java/org/apache/tomcat/buildutil/SignCode.java, - since it uses APIs removed in jdk11. - ------------------------------------------------------------------- Wed Feb 16 16:38:14 UTC 2018 - malbu@suse.de -- Update to Tomcat 9.0.5. See changelog at - http://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.5_(markt) +- Update to Tomcat 9.0.5. See changelog at + http://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.5_(markt) ------------------------------------------------------------------- Wed Jan 17 09:34:14 UTC 2018 - fstrba@suse.com @@ -50,17 +44,17 @@ Fri Dec 1 21:46:18 UTC 2017 - malbu@suse.com ------------------------------------------------------------------- Thu Nov 23 13:50:29 UTC 2017 - rbrown@suse.com -- Replace references to /var/adm/fillup-templates with new +- Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) ------------------------------------------------------------------- Mon Oct 23 09:42:48 UTC 2017 - malbu@suse.com -- Build with JDK 8 to fix runtime errors when running with JDK 7 +- Build with JDK 8 to fix runtime errors when running with JDK 7 and 8 - Fix tomcat-digest classpath error (bsc#977410) - Fix packaged /etc/alternatives symlinks for api libs that caused - rpm -V to report link mismatch (bsc#1019016) + rpm -V to report link mismatch (bsc#1019016) ------------------------------------------------------------------- Mon Oct 23 06:07:05 UTC 2017 - ecsos@opensuse.org @@ -68,7 +62,7 @@ Mon Oct 23 06:07:05 UTC 2017 - ecsos@opensuse.org - update to 8.0.47 http://tomcat.apache.org/tomcat-8.0-doc/changelog.html * Fixed CVE: - - CVE-2017-12617 + - CVE-2017-12617 - rebase tomcat-8.0-sle.catalina.policy.patch ------------------------------------------------------------------- @@ -78,14 +72,14 @@ Tue Sep 19 09:07:39 UTC 2017 - fstrba@suse.com * tomcat-8.0.44-javadoc.patch - generate documentation with the same source level as class files - - fixes build with jdk9 + - fixes build with jdk9 ------------------------------------------------------------------- Fri Jun 9 05:44:53 UTC 2017 - ecsos@opensuse.org - Version update to 8.0.44: http://tomcat.apache.org/tomcat-8.0-doc/changelog.html - * Fixed CVE: + * Fixed CVE: - CVE-2017-5664 (bsc#1042910) ------------------------------------------------------------------- @@ -96,7 +90,8 @@ Fri May 19 09:22:56 UTC 2017 - dziolkowski@suse.com ------------------------------------------------------------------- Tue May 9 13:36:47 UTC 2017 - malbu@suse.com -- Version update to 8.0.43: * Another bugfix release, for full details see: +- Version update to 8.0.43: + * Another bugfix release, for full details see: http://tomcat.apache.org/tomcat-8.0-doc/changelog.html * Fixed CVEs: - CVE-2017-5647 (bnc#1033448) @@ -303,7 +298,7 @@ Mon Sep 8 08:23:28 UTC 2014 - dmacvicar@suse.de * Update to the Eclipse JDT Compiler 4.4 * Better error handling when the error occurs after the response has been committed - * Various improvements to the Mapper including fixing some + * Various improvements to the Mapper including fixing some concurrency bugs * See http://tomcat.apache.org/tomcat-7.0-doc/changelog.html @@ -388,7 +383,7 @@ Thu May 15 14:59:25 UTC 2014 - darin@darins.net Thu May 15 14:41:40 UTC 2014 - darin@darins.net - remove saxon build requirement for sles -- disable bytecode check for sles +- disable bytecode check for sles ------------------------------------------------------------------- Mon Apr 14 17:59:07 UTC 2014 - darin@darins.net @@ -433,7 +428,7 @@ Mon Sep 9 11:06:25 UTC 2013 - tchvatal@suse.com ------------------------------------------------------------------- Thu Sep 5 13:59:28 UTC 2013 - mvyskocil@suse.com -- drop a dependency on unecessary -tomcat5 packages +- drop a dependency on unecessary -tomcat5 packages - use commons-dbcp.jar for build - add missing commons-pool.jar to libdir @@ -447,14 +442,14 @@ Fri Aug 9 09:18:44 UTC 2013 - mvyskocil@suse.com Tue Aug 6 20:24:06 UTC 2013 - robert.munteanu@gmail.com - Add missing 'su root tomcat' line to logrotate. See also - https://bugzilla.redhat.com/show_bug.cgi?id=790334 + https://bugzilla.redhat.com/show_bug.cgi?id=790334 ------------------------------------------------------------------- Fri Jul 26 13:06:35 UTC 2013 - mvyskocil@suse.com - call chown --no-dereference in init script (bnc#822177#c7/prevents CVE-2013-1976) - + ------------------------------------------------------------------- Tue Jul 23 14:33:47 UTC 2013 - mvyskocil@suse.com @@ -506,7 +501,7 @@ Thu Dec 20 22:45:19 UTC 2012 - archie@dellroad.org ------------------------------------------------------------------- Tue Dec 18 09:34:29 UTC 2012 - mvyskocil@suse.com -- Require gpg-offline on 12.2+ +- Require gpg-offline on 12.2+ ------------------------------------------------------------------- Thu Nov 29 19:17:03 CET 2012 - sbrabec@suse.cz @@ -521,7 +516,7 @@ Mon Nov 26 13:01:44 UTC 2012 - mvyskocil@suse.com ------------------------------------------------------------------- Tue Sep 11 08:24:53 UTC 2012 - mvyskocil@suse.cz -- update to 7.0.30 (bugfix release) +- update to 7.0.30 (bugfix release) * SSI and CGI disabled by default - fix bnc#779538: change the working dir to $CATALINA_BASE - document the CATALINA_BASE and CATALINA_HOME in tomcat.conf better @@ -570,7 +565,7 @@ Tue Nov 1 12:36:57 UTC 2011 - mvyskocil@suse.cz ------------------------------------------------------------------- Mon Sep 19 10:21:29 UTC 2011 - wittemar@googlemail.com - + - update to version 7.0.21 ------------------------------------------------------------------- diff --git a/tomcat.spec b/tomcat.spec index 395120f..71e710c 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -247,7 +247,6 @@ The ROOT and examples web applications for Apache Tomcat # remove pre-built binaries and windows files find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \ -name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t rm -f -rm -f java/org/apache/tomcat/buildutil/SignCode.java %patch0 %patch1 %patch2