patched to fix XSS.

diff --git a/net-zope/zwiki/ChangeLog b/net-zope/zwiki/ChangeLog
index abc483da441aef05f543db82bf8c5705d6e1cb4e..750bfdfb1bf5a1b296560647e72ff6c2c2ca830f 100644 (file)
--- a/net-zope/zwiki/ChangeLog
+++ b/net-zope/zwiki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-zope/zwiki
 # Copyright 2003-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/ChangeLog,v 1.14 2004/12/18 22:22:27 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/ChangeLog,v 1.15 2004/12/20 15:57:52 radek Exp $
+
+*zwiki-0.36.2-r1 (20 Dec 2004)
+
+  20 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +zwiki-0.36.2-r1.ebuild:
+  Patched 0.36.2 version due to XSS vulnerability, bug #72315.
 
 *zwiki-0.36.2 (18 Dec 2004)
 

diff --git a/net-zope/zwiki/Manifest b/net-zope/zwiki/Manifest
index 869c1fb89987685889ad66cbe7c67dfa78f787d9..afab65f2eff127dc6f20ce477c8e1b4054bba1f6 100644 (file)
--- a/net-zope/zwiki/Manifest
+++ b/net-zope/zwiki/Manifest
@@ -1,8 +1,11 @@
 MD5 dbb7db1661836dc8358db475bf1fa601 zwiki-0.36.2.ebuild 486
 MD5 e2a502e499d28a3e6588daa6f08be5fe zwiki-0.22.0.ebuild 538
+MD5 078309c7f76897679b03f315e449e949 zwiki-0.36.2-r1.ebuild 585
 MD5 e85a7aea5b84f37d7df707165be1a191 zwiki-0.34.0.ebuild 483
-MD5 f44b748eca4ee02d1ab9c23bd78fe812 ChangeLog 1829
+MD5 9080c4c9a1c5a5a90aeca7259f0d6727 ChangeLog 2004
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 5d791e4f82204b1751573082d6a9e948 files/zwiki-0.36.2-r1_xss.patch 411
 MD5 d7ce8db3eeb8d6d5a8726ca5ac0b4e71 files/digest-zwiki-0.22.0 61
 MD5 f398443ae6d299e3b39e5b02f184f5cf files/digest-zwiki-0.34.0 61
 MD5 3077f48eea50c5e8420c3a72377845e2 files/digest-zwiki-0.36.2 61
+MD5 3077f48eea50c5e8420c3a72377845e2 files/digest-zwiki-0.36.2-r1 61

diff --git a/net-zope/zwiki/files/digest-zwiki-0.36.2-r1 b/net-zope/zwiki/files/digest-zwiki-0.36.2-r1
new file mode 100644 (file)
index 0000000..1f7e358
--- /dev/null
+++ b/net-zope/zwiki/files/digest-zwiki-0.36.2-r1
@@ -0,0 +1 @@
+MD5 2ef81f0e8c788ff9a78271f7a5315793 ZWiki-0.36.2.tgz 413970

diff --git a/net-zope/zwiki/files/zwiki-0.36.2-r1_xss.patch b/net-zope/zwiki/files/zwiki-0.36.2-r1_xss.patch
new file mode 100644 (file)
index 0000000..4c3caba
--- /dev/null
+++ b/net-zope/zwiki/files/zwiki-0.36.2-r1_xss.patch
@@ -0,0 +1,11 @@
+--- content/basic/standard_error_message.dtml.original        Fri Nov 26 09:17:22 2004
++++ content/basic/standard_error_message.dtml Fri Nov 26 09:17:55 2004
+@@ -29,7 +29,7 @@
+   <body>
+     <p>
+       I could not find any likely page matching 
+-      "<b><dtml-var "here.urlunquote(searchexpr)"></b>"
++      "<b><dtml-var "here.urlunquote(searchexpr)" html_quote></b>"
+     </p>
+     <p>
+       Click here to 

diff --git a/net-zope/zwiki/zwiki-0.36.2-r1.ebuild b/net-zope/zwiki/zwiki-0.36.2-r1.ebuild
new file mode 100644 (file)
index 0000000..bc8505a
--- /dev/null
+++ b/net-zope/zwiki/zwiki-0.36.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.36.2-r1.ebuild,v 1.1 2004/12/20 15:57:52 radek Exp $
+
+inherit zproduct eutils
+
+DESCRIPTION="A zope wiki-clone for easy-to-edit collaborative websites."
+HOMEPAGE="http://zwiki.org"
+SRC_URI="${HOMEPAGE}/releases/ZWiki-${PV}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+ZPROD_LIST="ZWiki"
+MYDOC="ChangeLog GPL.txt ${MYDOC}"
+
+IUSE=""
+
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}/${ZPROD_LIST}
+       epatch ${FILESDIR}/${PF}_xss.patch
+}