rpms/trac/EL-5 trac-0.10.5-CVE-2008-5646.patch,NONE,1.1

[Jesse Keating]

Author: jkeating

Update of /cvs/pkgs/rpms/trac/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10874

Added Files:
	trac-0.10.5-CVE-2008-5646.patch 
Log Message:
Add the missing patch


trac-0.10.5-CVE-2008-5646.patch:
 formatter.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE trac-0.10.5-CVE-2008-5646.patch ---
diff -up trac-0.10.5/trac/wiki/formatter.py.jk trac-0.10.5/trac/wiki/formatter.py
--- trac-0.10.5/trac/wiki/formatter.py.jk	2010-04-22 11:06:24.823778294 -0700
+++ trac-0.10.5/trac/wiki/formatter.py	2010-04-22 11:10:07.545778570 -0700
@@ -216,9 +216,10 @@ class Formatter(object):
         #  * list
         r"(?P<list>^(?P<ldepth>\s+)(?:[-*]|\d+\.|[a-zA-Z]\.|[ivxIVX]{1,5}\.) )",
         # definition:: 
-        r"(?P<definition>^\s+((?:%s[^%s]*%s|%s.*?%s|[^%s%s:]|:[^:])+::)(?:\s+|$))"
+        r"(?P<definition>^\s+((?:%s[^%s]*%s|%s(?:%s{,2}[^%s])*?%s|[^%s%s:]|:[^:])+::)(?:\s+|$))"
         % (INLINE_TOKEN, INLINE_TOKEN, INLINE_TOKEN,
-           STARTBLOCK_TOKEN, ENDBLOCK_TOKEN, INLINE_TOKEN, STARTBLOCK[0]),
+           STARTBLOCK_TOKEN, ENDBLOCK[0], ENDBLOCK[0], ENDBLOCK_TOKEN,
+           INLINE_TOKEN, STARTBLOCK[0]),
         # (leading space)
         r"(?P<indent>^(?P<idepth>\s+)(?=\S))",
         # || table ||