<pre style='margin:0'>
Blair Zajac (blair) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fc6a26da8ba84ed39605c6922c0e1c5307f520f6">https://github.com/macports/macports-ports/commit/fc6a26da8ba84ed39605c6922c0e1c5307f520f6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new fc6a26d tomcat6: upgrade to 6.0.53 to resolve security issues in current version.
</span>fc6a26d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fc6a26da8ba84ed39605c6922c0e1c5307f520f6
</span>Author: Blair Zajac <blair@macports.org>
AuthorDate: Sat Aug 26 18:50:32 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> tomcat6: upgrade to 6.0.53 to resolve security issues in current version.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/53246
</span>---
java/tomcat6/Portfile | 9 ++++-----
java/tomcat6/files/patch-build.xml.diff | 14 +++++++-------
2 files changed, 11 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/tomcat6/Portfile b/java/tomcat6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3d3e500..eeb87c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/tomcat6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/tomcat6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,7 @@
</span> PortSystem 1.0
name tomcat6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.0.35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.0.53
</span>
categories java www
maintainers blair openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +20,9 @@ homepage http://tomcat.apache.org/
</span> distname apache-tomcat-${version}-src
master_sites apache:tomcat/tomcat-6/v${version}/src/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 4d44a7e7610a83ebe930a781257a8b1d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 1a47ad41d52a27757cfeddf7fa1627688ed4027a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d292b210fe62aafec4a074e3a626766585367a3e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 7c6bd23abcaa1b91c0fd5061945d97e7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 307a5e5699904de924e8918527361d680d278bcd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0392a1d04554c91b8efc3c62becbda634de2031f0366925378047062a2098d30
</span>
patchfiles patch-bin-catalina.sh \
patch-build.xml.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/tomcat6/files/patch-build.xml.diff b/java/tomcat6/files/patch-build.xml.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 660bc577..282f76f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/tomcat6/files/patch-build.xml.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/tomcat6/files/patch-build.xml.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build.xml.orig 2010-06-29 07:33:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build.xml 2010-07-13 08:39:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,6 +140,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build.xml.orig 2017-08-26 18:47:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build.xml 2017-08-26 18:48:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -158,6 +158,7 @@
</span>
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@
</span> debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -531,6 +532,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -574,6 +575,7 @@
</span>
<!-- Build classes for examples webapp -->
<javac srcdir="webapps/examples/WEB-INF/classes"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@
</span> destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
source="${compile.source}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -542,6 +544,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -584,6 +586,7 @@
</span> </javac>
<javac srcdir="webapps/examples/jsp/plugin/applet"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,11 +24,11 @@
</span> destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet"
debug="${compile.debug}" deprecation="${compile.deprecation}"
source="${compile.source}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -801,6 +804,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1065,6 +1068,7 @@
</span> </move>
<mkdir dir="${tomcat-dbcp.home}/classes"/>
<javac destdir="${tomcat-dbcp.home}/classes"
+ fork="true" memoryinitialsize="256m" memorymaximumsize="512m"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- optimize="off"
</span> debug="${compile.debug}"
deprecation="${compile.deprecation}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ source="${compile.source}"
</span></pre><pre style='margin:0'>
</pre>