Author: markt
Date: Thu Oct 23 14:45:39 2014
New Revision: 1633824
URL: http://svn.apache.org/r1633824
Log:
Update to Tomcat Native 1.1.32
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1633824&r1=1633823&r2=1633824&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Oct 23 14:45:39 2014
@@ -151,11 +151,9 @@ npn.jar=${npn.home}/npn-${npn.version}.j
npn.loc=http://repo1.maven.org/maven2/org/eclipse/jetty/npn/npn-api/${npn.version}/npn-api-${npn.version}.jar
# ----- Tomcat native library -----
-tomcat-native.version=1.1.31
+tomcat-native.version=1.1.32
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/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1633824&r1=1633823&r2=1633824&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Oct 23 14:45:39 2014
@@ -1847,7 +1847,7 @@
tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" />
<!-- tc native -->
<copy todir="${tomcat.dist}/bin">
- <fileset dir="${tomcat-native.home}/${tomcat-native.win.path}/bin">
+ <fileset dir="${tomcat-native.home}/bin">
<include name="*.dll"/>
<include name="**/*.dll"/>
</fileset>
@@ -2082,8 +2082,8 @@ Apache Tomcat ${version} native binaries
</target>
<target name="-installer-prep"
- description="Prepares file structure required to buidl installer"
- depends="dist-static">
+ description="Prepares file structure required to build installer"
+ unless="skip.installer" depends="dist-static">
<copy todir="${tomcat.dist}">
<fileset dir="res">
<include name="INSTALLLICENSE" />
@@ -2106,7 +2106,7 @@ Apache Tomcat ${version} native binaries
<target name="-installer-create-tempinstaller"
description="Creates the temporary installer"
- depends="-installer-prep">
+ unless="skip.installer" depends="-installer-prep">
<exec dir="${tomcat.dist}" executable="${nsis.exe}" osfamily="windows">
<arg value="/DUNINSTALLONLY" />
<arg value="/DNSISDIR=${nsis.home}" />
@@ -2123,8 +2123,8 @@ Apache Tomcat ${version} native binaries
</target>
<target name="-installer-create-uninstaller"
- description="Execute the temporary installer to create the uninstaller"
- depends="-installer-create-tempinstaller">
+ description="Execute the temporary installer to create the uninstaller"
+ unless="skip.installer" depends="-installer-create-tempinstaller">
<!-- Execute the temporary installer to create the uninstaller -->
<exec dir="${tomcat.dist}" executable="${tomcat.dist}/tempinstaller.exe"
osfamily="windows" />
@@ -2136,7 +2136,7 @@ Apache Tomcat ${version} native binaries
<target name="-installer-sign-uninstaller"
description="Sign the uninstaller executable"
- depends="-installer-create-uninstaller"
+ unless="skip.installer" depends="-installer-create-uninstaller"
if="${do.codesigning}">
<taskdef name="signcode"
classname="org.apache.tomcat.buildutil.SignCode"
@@ -2815,7 +2815,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}/${tomcat-native.win.path}/LICENSE"/>
+ <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
<param name="destdir" value="${tomcat-native.home}"/>
</antcall>
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1633824&r1=1633823&r2=1633824&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 23 14:45:39 2014
@@ -322,6 +322,11 @@
1631450 to pick up additional fixes since the 2.0.1 release including
Javadoc corrections to fix errors when compiling with Java 8. (markt)
</fix>
+ <update>
+ <bug>56596</bug>: Update to Tomcat Native Library version 1.1.32 to
+ pick up the Windows binaries that are based on OpenSSL 1.0.1j and APR
+ 1.5.1. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
