Author: kkolinko
Date: Wed Feb 18 21:58:05 2015
New Revision: 1660738
URL: http://svn.apache.org/r1660738
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57344
Provide sha1 checksum files for Tomcat downloads.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1660738&r1=1660737&r2=1660738&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Feb 18 21:58:05 2015
@@ -28,12 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57344
- Provide sha1 checksum files for Tomcat downloads.
- https://issues.apache.org/bugzilla/attachment.cgi?id=32287
- +1: kkolinko, remm, markt, schultz
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57558
Add missing JARs in Ant task definition. Expand the pattern in
catalina-tasks.xml to include all jars in ${catalina.home}/lib.
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=1660738&r1=1660737&r2=1660738&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Feb 18 21:58:05 2015
@@ -738,14 +738,19 @@
</antcall>
</target>
- <!-- Helper target, used to create a md5 checksum file -->
+ <!-- Helper target, used to create checksum files -->
<!-- Requires 'file' as a parameter. -->
<target name="md5sum">
<fail unless="file" />
- <fail if="filename" />
- <fail if="value" />
+ <local name="filename" />
+ <local name="md5value" />
+ <local name="sha1value" />
+
<basename file="${file}" property="filename" />
- <checksum file="${file}" property="value" />
- <echo file="${file}.md5"
message="${value}${md5sum.binary-prefix}${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}" />
</target>
</project>
Modified: tomcat/tc6.0.x/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=1660738&r1=1660737&r2=1660738&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Wed Feb 18 21:58:05 2015
@@ -376,14 +376,19 @@
<get src="${sourcefile}" dest="${destfile}" />
</target>
- <!-- Helper target, used to create a md5 checksum file -->
+ <!-- Helper target, used to create checksum files -->
<!-- Requires 'file' as a parameter. -->
<target name="md5sum">
<fail unless="file" />
- <fail if="filename" />
- <fail if="value" />
+ <local name="filename" />
+ <local name="md5value" />
+ <local name="sha1value" />
+
<basename file="${file}" property="filename" />
- <checksum file="${file}" property="value" />
- <echo file="${file}.md5"
message="${value}${md5sum.binary-prefix}${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}" />
</target>
</project>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1660738&r1=1660737&r2=1660738&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Feb 18 21:58:05 2015
@@ -116,6 +116,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <add>
+ <bug>57344</bug>: Provide sha1 checksum files for Tomcat downloads.
+ (kkolinko)
+ </add>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 6.0.43 (markt)" rtext="released 2014-11-22">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
