Author: kkolinko
Date: Sat Dec 13 21:44:19 2014
New Revision: 1645360
URL: http://svn.apache.org/r1645360
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57344
Provide sha1 checksum files for Tomcat downloads.
Exclude stray *.asc file from apache-tomcat-*-embed.tar.gz archive.
Merged r1645357 from tomcat/trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/build.xml
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 13 21:44:19 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357
Modified: tomcat/tc8.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/build.xml?rev=1645360&r1=1645359&r2=1645360&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/build.xml (original)
+++ tomcat/tc8.0.x/trunk/build.xml Sat Dec 13 21:44:19 2014
@@ -1282,14 +1282,14 @@
<zip destfile="${tomcat.embed}/${final.name}-embed.zip">
<fileset dir="${tomcat.embed}">
<include name="**" />
+ <exclude name="*.asc" />
<exclude name="*.md5" />
+ <exclude name="*.sha1" />
<exclude name="*.zip" />
<exclude name="*.tar.gz" />
</fileset>
</zip>
- <antcall target="md5sum">
- <param name="file" value="${tomcat.embed}/${final.name}-embed.zip" />
- </antcall>
+ <hashAndSign file="${tomcat.embed}/${final.name}-embed.zip" />
<fixcrlf srcdir="${tomcat.embed}" eol="lf"
encoding="ISO-8859-1" fixlast="false" >
@@ -1299,14 +1299,14 @@
tarfile="${tomcat.embed}/${final.name}-embed.tar.gz">
<tarfileset dir="${tomcat.embed}" prefix="${final.name}-embed">
<include name="**" />
+ <exclude name="*.asc" />
<exclude name="*.md5" />
+ <exclude name="*.sha1" />
<exclude name="*.zip" />
<exclude name="*.tar.gz" />
</tarfileset>
</tar>
- <antcall target="md5sum">
- <param name="file" value="${tomcat.embed}/${final.name}-embed.tar.gz" />
- </antcall>
+ <hashAndSign file="${tomcat.embed}/${final.name}-embed.tar.gz" />
</target>
@@ -1618,16 +1618,12 @@
<zipfileset file="${tomcat.manifests}/default.license"
fullpath="META-INF/LICENSE" />
</jar>
- <antcall target="md5sum">
- <param name="file" value="${tomcat-juli-extras.jar}" />
- </antcall>
+ <hashAndSign file="${tomcat-juli-extras.jar}" />
<jarIt jarfile="${tomcat-juli-adapters.jar}"
filesDir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/target/classes"
filesId="files.tomcat-extras-juli-adapters" />
- <antcall target="md5sum">
- <param name="file" value="${tomcat-juli-adapters.jar}" />
- </antcall>
+ <hashAndSign file="${tomcat-juli-adapters.jar}" />
<!-- Source JARs -->
<jar jarfile="${tomcat-juli-extras-src.jar}"
@@ -1701,9 +1697,7 @@
filesDir="${tomcat.classes}"
filesId="files.tomcat-extras-ws" />
- <antcall target="md5sum">
- <param name="file" value="${catalina-ws.jar}" />
- </antcall>
+ <hashAndSign file="${catalina-ws.jar}" />
<jarIt jarfile="${catalina-ws-src.jar}"
filesDir="java"
@@ -1719,9 +1713,7 @@
filesDir="${tomcat.classes}"
filesId="files.tomcat-extras-jmxremote" />
- <antcall target="md5sum">
- <param name="file" value="${catalina-jmx-remote.jar}" />
- </antcall>
+ <hashAndSign file="${catalina-jmx-remote.jar}" />
<jarIt jarfile="${catalina-jmx-remote-src.jar}"
filesDir="java"
@@ -2178,9 +2170,7 @@ Apache Tomcat ${version} native binaries
<arg value="tomcat.nsi" />
</exec>
<move file="${tomcat.dist}/tomcat-installer.exe"
tofile="${tomcat.release}/v${version}/bin/${final.name}.exe" />
- <antcall target="md5sum">
- <param name="file"
value="${tomcat.release}/v${version}/bin/${final.name}.exe" />
- </antcall>
+ <hashAndSign file="${tomcat.release}/v${version}/bin/${final.name}.exe" />
</target>
<target name="installer-sign" depends="-installer" if="${do.codesigning}" >
@@ -2196,12 +2186,11 @@ Apache Tomcat ${version} native binaries
<filename name="v${version}/bin/${final.name}.exe"/>
</fileset>
</signcode>
- <!-- .exe has changed so need to redo MD5 and OpenPGP signature -->
- <delete file="${tomcat.release}/v${version}/bin/${final.name}.exe.md5" />
+ <!-- .exe has changed so need to redo checksums and OpenPGP signature -->
<delete file="${tomcat.release}/v${version}/bin/${final.name}.exe.asc" />
- <antcall target="md5sum">
- <param name="file"
value="${tomcat.release}/v${version}/bin/${final.name}.exe" />
- </antcall>
+ <delete file="${tomcat.release}/v${version}/bin/${final.name}.exe.md5" />
+ <delete file="${tomcat.release}/v${version}/bin/${final.name}.exe.sha1" />
+ <hashAndSign file="${tomcat.release}/v${version}/bin/${final.name}.exe" />
</target>
<target name="release"
@@ -2238,8 +2227,9 @@ Apache Tomcat ${version} native binaries
<fileset dir="${tomcat.embed}">
<include name="*.zip"/>
<include name="*.tar.gz"/>
- <include name="*.md5"/>
<include name="*.asc"/>
+ <include name="*.md5"/>
+ <include name="*.sha1"/>
</fileset>
</copy>
@@ -2288,9 +2278,7 @@ Apache Tomcat ${version} native binaries
</zipfileset>
</zip>
- <antcall target="md5sum">
- <param name="file"
value="${tomcat.release}/v${version}/bin/${final.name}.zip" />
- </antcall>
+ <hashAndSign file="${tomcat.release}/v${version}/bin/${final.name}.zip" />
</target>
<!-- Packages the core windows zip distros -->
@@ -2321,9 +2309,7 @@ Apache Tomcat ${version} native binaries
</zipfileset>
</zip>
- <antcall target="md5sum">
- <param name="file"
value="${tomcat.release}/v${version}/bin/${final.name}-windows-x86.zip" />
- </antcall>
+ <hashAndSign
file="${tomcat.release}/v${version}/bin/${final.name}-windows-x86.zip" />
<!-- Windows x64 package -->
<zip
zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip">
@@ -2351,9 +2337,7 @@ Apache Tomcat ${version} native binaries
<include name="*.exe"/>
</zipfileset>
</zip>
- <antcall target="md5sum">
- <param name="file"
value="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip" />
- </antcall>
+ <hashAndSign
file="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip" />
<!-- Windows i64 package -->
<zip
zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-i64.zip">
@@ -2382,9 +2366,7 @@ Apache Tomcat ${version} native binaries
</zipfileset>
</zip>
- <antcall target="md5sum">
- <param name="file"
value="${tomcat.release}/v${version}/bin/${final.name}-windows-i64.zip" />
- </antcall>
+ <hashAndSign
file="${tomcat.release}/v${version}/bin/${final.name}-windows-i64.zip" />
</target>
@@ -2407,9 +2389,7 @@ Apache Tomcat ${version} native binaries
<zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer"
includes="RELEASE-NOTES" />
</zip>
- <antcall target="md5sum">
- <param name="file"
value="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip" />
- </antcall>
+ <hashAndSign
file="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip" />
</target>
<!-- Packages the core tar.gz distro -->
@@ -2477,9 +2457,7 @@ Apache Tomcat ${version} native binaries
</tarfileset>
</tar>
- <antcall target="md5sum">
- <param name="file"
value="${tomcat.release}/v${version}/bin/${final.name}.tar.gz" />
- </antcall>
+ <hashAndSign file="${tomcat.release}/v${version}/bin/${final.name}.tar.gz"
/>
</target>
<!-- Packages the deployer Tomcat distro in tar.gz format -->
@@ -2506,9 +2484,7 @@ Apache Tomcat ${version} native binaries
</tarfileset>
</tar>
- <antcall target="md5sum">
- <param name="file"
value="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz" />
- </antcall>
+ <hashAndSign
file="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz" />
</target>
<!-- Packages the documentation distro in tar.gz format -->
@@ -2530,9 +2506,7 @@ Apache Tomcat ${version} native binaries
</tarfileset>
</tar>
- <antcall target="md5sum">
- <param name="file"
value="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz" />
- </antcall>
+ <hashAndSign
file="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz" />
</target>
<!-- Packages the source code distribution in zip format -->
@@ -2548,9 +2522,7 @@ Apache Tomcat ${version} native binaries
<zipfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
</zip>
- <antcall target="md5sum">
- <param name="file"
value="${tomcat.release}/v${version}/src/${final-src.name}.zip" />
- </antcall>
+ <hashAndSign
file="${tomcat.release}/v${version}/src/${final-src.name}.zip" />
</target>
<!-- Packages the source code distribution in tar.gz format -->
@@ -2566,9 +2538,7 @@ Apache Tomcat ${version} native binaries
tarfile="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz">
<tarfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
</tar>
- <antcall target="md5sum">
- <param name="file"
value="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz" />
- </antcall>
+ <hashAndSign
file="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz" />
</target>
<!-- Packages the source code in JARs to match the binary JARs -->
@@ -3060,20 +3030,27 @@ Read the Building page on the Apache Tom
</sequential>
</macrodef>
- <!-- Helper target, used to create a md5 checksum file -->
+ <!-- Macro, used to create checksum and signature files -->
<!-- Requires 'file' as a parameter. -->
- <target name="md5sum">
- <fail unless="file" />
- <fail if="filename" />
- <fail if="value" />
- <basename file="${file}" property="filename" />
- <checksum file="${file}" property="value" />
- <echo file="${file}.md5"
message="${value}${md5sum.binary-prefix}${filename}" />
- <!-- Anything that requires an md5 hash, also needs a signature -->
- <antcall target="sign" >
- <param name="file" value="${file}" />
- </antcall>
- </target>
+ <macrodef name="hashAndSign">
+ <attribute name="file" />
+ <sequential>
+ <local name="filename" />
+ <local name="md5value" />
+ <local name="sha1value" />
+
+ <basename file="@{file}" property="filename" />
+ <checksum algorithm="MD5" file="@{file}" property="md5value" />
+ <checksum algorithm="SHA-1" file="@{file}" property="sha1value" />
+
+ <echo file="@{file}.md5"
message="${md5value}${md5sum.binary-prefix}${filename}" />
+ <echo file="@{file}.sha1"
message="${sha1value}${md5sum.binary-prefix}${filename}" />
+
+ <antcall target="sign" >
+ <param name="file" value="@{file}" />
+ </antcall>
+ </sequential>
+ </macrodef>
<!-- Helper target, used to create a detached ascii OpenPGP signature.
-->
<!-- Uses GPG with default key. Requires 'file' as a parameter. Only
-->
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1645360&r1=1645359&r2=1645360&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Sat Dec 13 21:44:19 2014
@@ -315,6 +315,11 @@
<bug>57285</bug>: Restore the manifest entry that marks the Windows
uninstaller application as requiring elevated privileges. (markt)
</fix>
+ <add>
+ <bug>57344</bug>: Provide sha1 checksum files for Tomcat downloads.
+ Correct filename patterns for apache-tomcat-*-embed.tar.gz archive
+ to exclude an *.asc file. (kkolinko)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
