Author: markt
Date: Tue Jul 8 09:10:37 2014
New Revision: 1608695
URL: http://svn.apache.org/r1608695
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56685
Update to Tomcat Native Library version 1.1.31 to pick up the Windows binaries
that are based on OpenSSL 1.0.1h.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1608428
Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1608695&r1=1608694&r2=1608695&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Tue Jul 8 09:10:37 2014
@@ -137,9 +137,11 @@ jdt.loc.1=http://archive.eclipse.org/ecl
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# ----- Tomcat native library -----
-tomcat-native.version=1.1.30
+tomcat-native.version=1.1.31
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
+# Required due to packaging error in 1.1.31 - remove once fixed
+tomcat-native.win.path=tomcat-native-${tomcat-native.version}-win32-bin
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1608695&r1=1608694&r2=1608695&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Tue Jul 8 09:10:37 2014
@@ -1795,7 +1795,7 @@
tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" />
<!-- tc native -->
<copy todir="${tomcat.dist}/bin">
- <fileset dir="${tomcat-native.home}/bin">
+ <fileset dir="${tomcat-native.home}/${tomcat-native.win.path}/bin">
<include name="*.dll"/>
<include name="**/*.dll"/>
</fileset>
@@ -2741,7 +2741,7 @@ Apache Tomcat ${version} native binaries
<antcall target="downloadzip-2">
<param name="sourcefile.1" value="${tomcat-native.win.1}"/>
<param name="sourcefile.2" value="${tomcat-native.win.2}"/>
- <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
+ <param name="destfile"
value="${tomcat-native.home}/${tomcat-native.win.path}/LICENSE"/>
<param name="destdir" value="${tomcat-native.home}"/>
</antcall>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1608695&r1=1608694&r2=1608695&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jul 8 09:10:37 2014
@@ -254,9 +254,13 @@
Update optional Checkstyle library to 5.7. (kkolinko)
</update>
<fix>
- <bug>56685</bug>: Add quotes necessary for <code>daemon.sh</code> to
+ <bug>56685</bug>: Add quotes necessary for <code>daemon.sh</code> to
work correctly on Solaris. Based on a suggesiton by lfuka. (markt)
</fix>
+ <update>
+ <bug>56596</bug> Update to Tomcat Native Library version 1.1.31 to pick
+ up the Windows binaries that are based on OpenSSL 1.0.1h. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
