Author: markt
Date: Thu Aug 18 18:22:37 2011
New Revision: 1159346
URL: http://svn.apache.org/viewvc?rev=1159346&view=rev
Log:
Fix CVE-2011-2729. Update commons daemon to 1.0.7
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/build/build.properties.default
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1159346&r1=1159345&r2=1159346&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Aug 18 18:22:37 2011
@@ -70,8 +70,3 @@ PATCHES PROPOSED TO BACKPORT:
ep.setStatus(MsgContext.JK_STATUS_ERROR);
Can't it be done by CoyoteAdapter itself?
-1:
-
-* Fix CVE-2011-2729. Update commons daemon to 1.0.7
- http://people.apache.org/~markt/patches/2011-08-12-cve2011-2729-tc5.patch
- +1: markt, jfclere, kkolinko
- -1:
Modified: tomcat/tc5.5.x/trunk/build/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.properties.default?rev=1159346&r1=1159345&r2=1159346&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/build/build.properties.default (original)
+++ tomcat/tc5.5.x/trunk/build/build.properties.default Thu Aug 18 18:22:37 2011
@@ -94,16 +94,16 @@ commons-launcher.loc=${base-commons.loc}
# ----- Commons Daemon, version 1.0-Alpha or later -----
-commons-daemon.version=1.0.5
+commons-daemon.version=1.0.7
commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
commons-daemon.native.win.home=${commons-daemon.home}/windows
commons-daemon.native.win.mgr.exe=${commons-daemon.native.win.home}/prunmgr.exe
commons-daemon.native.src.tgz=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-native-src.tar.gz
commons-daemon.native.win.zip=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-bin-windows.zip
-commons-daemon.bin.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/commons-daemon-${commons-daemon.version}-bin.tar.gz
+commons-daemon.bin.loc=${base-commons.loc}/daemon/binaries/commons-daemon-${commons-daemon.version}-bin.tar.gz
commons-daemon.native.src.loc=${base-commons.loc}/daemon/source/commons-daemon-${commons-daemon.version}-native-src.tar.gz
-commons-daemon.native.win.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
+commons-daemon.native.win.loc=${base-commons.loc}/daemon/binaries/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
# ----- Commons Digester, version 1.4 or later -----
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1159346&r1=1159345&r2=1159346&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Thu Aug 18
18:22:37 2011
@@ -154,6 +154,9 @@
Clarify error messages in *.sh files to mention that if a script is
not found it might be because execute permission is needed. (kkolinko)
</update>
+ <update>
+ Fix CVE-2011-2729. Update commons daemon to 1.0.7. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
