Added hotfix for security vulerability, addresses #153901

Package-Manager: portage-2.1.2_rc4-r1

8 files changed, 62 insertions, 36 deletions

diff --git a/net-zope/plone/ChangeLog b/net-zope/plone/ChangeLog
index abb60c71ab54..43334dfceb8e 100644
--- a/net-zope/plone/ChangeLog
+++ b/net-zope/plone/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-zope/plone
 # Copyright 2003-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/ChangeLog,v 1.40 2006/09/30 21:21:02 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/ChangeLog,v 1.41 2006/12/29 01:58:28 radek Exp $
+
+  29 Dec 2006; Radoslaw Stachowiak <radek@gentoo.org> plone-2.5.ebuild,
+  plone-2.5.1.ebuild:
+  Added hotfix for security vulerability, addresses #153901
 
 *plone-2.5.1 (30 Sep 2006)
 
diff --git a/net-zope/plone/Manifest b/net-zope/plone/Manifest
index e78c9d295150..9ba68ff669dd 100644
--- a/net-zope/plone/Manifest
+++ b/net-zope/plone/Manifest
@@ -11,14 +11,15 @@ DIST Plone-2.5.tar.gz 8597606 RMD160 f0d2b04e46f422cf1e492d194a92aaabffbc0bdd SH
 DIST PloneBase-2.0-final.tar.gz 660909 RMD160 b361c89341e7da14a562983b8d5a98028523bad7 SHA256 f864db1686a678f52b6c75a2b8c91ef660a0394238906ecafd6e1951d2d1d68d
 DIST PloneBase-2.0.4.tar.gz 704435 RMD160 27eb1c72976f2dbaad18b689c50ae1f7126bbcd3 SHA256 8d7241b0a014e60088cb1c5d5cc331825befb74c39e560bba1e7abc7435b2972
 DIST PloneBase-2.0.5.tar.gz 709483 RMD160 a243d5798765d1e69abcd161860ea1679b445a14 SHA1 9f9ab9b8e2dca2005cbbc6a3505cfab4f46e1818 SHA256 2d80d42fa804f5e8ecf03f35e41659ea6a3a703639dd854af112b1b2efc2639b
-EBUILD plone-1.0.5.ebuild 835 RMD160 b10a675205f7a779d3b9846f272a2d069352486a SHA1 bd33f5150e534c8031172ca4c65d01a05c7ca182 SHA256 8fc53417926fc75940b5503b00e0df052bd44c06c8283f3dc8955f8be22ef178
-MD5 09ce2150f95427912b9a722018b271b3 plone-1.0.5.ebuild 835
-RMD160 b10a675205f7a779d3b9846f272a2d069352486a plone-1.0.5.ebuild 835
-SHA256 8fc53417926fc75940b5503b00e0df052bd44c06c8283f3dc8955f8be22ef178 plone-1.0.5.ebuild 835
-EBUILD plone-1.0.6.ebuild 834 RMD160 017b7542729c254864e081012153ffa5263979e5 SHA1 c8ef15fb282d4797cc68149b00ae76965860703f SHA256 7b2111a6daf463ce24b3671cb9b2895b6b39fe6d8c4255b14606dadd1df1bf23
-MD5 af792bad58f734cab9812c788eca8066 plone-1.0.6.ebuild 834
-RMD160 017b7542729c254864e081012153ffa5263979e5 plone-1.0.6.ebuild 834
-SHA256 7b2111a6daf463ce24b3671cb9b2895b6b39fe6d8c4255b14606dadd1df1bf23 plone-1.0.6.ebuild 834
+DIST PloneHotFix20061031.tar.gz 1288 RMD160 0c40ed2bc74d0352768aebf1d34da117a5cd7619 SHA1 42f66af5ac64049144140962bd71a701da49cce6 SHA256 7483ef24740d3fb7061a0701e7565e1eda4e1219addf8305140d7303eb363481
+EBUILD plone-1.0.5.ebuild 834 RMD160 1522a4e1e802b64f2a19c5a0bc9ecb04bdedb570 SHA1 fc0672245e32aab6320d73ff1900d2bd2a2f3ea2 SHA256 5d99da6954b05b99cabf1eaf4736f8a2fc42eb6a9cf1a432fe50414b11b3225a
+MD5 2b7c445d16cea0037a7f08ae57bdd141 plone-1.0.5.ebuild 834
+RMD160 1522a4e1e802b64f2a19c5a0bc9ecb04bdedb570 plone-1.0.5.ebuild 834
+SHA256 5d99da6954b05b99cabf1eaf4736f8a2fc42eb6a9cf1a432fe50414b11b3225a plone-1.0.5.ebuild 834
+EBUILD plone-1.0.6.ebuild 833 RMD160 a4a0f002efcc191e44140233d910617029013193 SHA1 7f66bc26b4cbf994c7700066271b0e27fcce28ef SHA256 b0aa23fb39e157e59dd2a2239ec655a500ebc6a0236260bae18ea0dcb694cca7
+MD5 996bc9dee80bfdd518280bc8ff079ab4 plone-1.0.6.ebuild 833
+RMD160 a4a0f002efcc191e44140233d910617029013193 plone-1.0.6.ebuild 833
+SHA256 b0aa23fb39e157e59dd2a2239ec655a500ebc6a0236260bae18ea0dcb694cca7 plone-1.0.6.ebuild 833
 EBUILD plone-2.0.4.ebuild 994 RMD160 68235d3c91f89a794df73e3351f11887cd3f483b SHA1 42bc1beb9d383b511d46f310a2d6405007df0b1b SHA256 9619d2267f5df10d246612ba940fdc331ef24fe8d9845d9dc1982564279035b0
 MD5 f271ac1d80cc079f23e571839c4c9e41 plone-2.0.4.ebuild 994
 RMD160 68235d3c91f89a794df73e3351f11887cd3f483b plone-2.0.4.ebuild 994
@@ -47,18 +48,18 @@ EBUILD plone-2.1.4.ebuild 1912 RMD160 b07c8604060d879447ae89b59fb128ef82d73e66 S
 MD5 baf29b733198e990cae7e4f411b43dd8 plone-2.1.4.ebuild 1912
 RMD160 b07c8604060d879447ae89b59fb128ef82d73e66 plone-2.1.4.ebuild 1912
 SHA256 d17fce2bd36aefbd3c5bcdffe265de6f194fb296016a2a2b62cc1df357a442e6 plone-2.1.4.ebuild 1912
-EBUILD plone-2.5.1.ebuild 1600 RMD160 1f92726019206c1d106378fd4ce36792c049d098 SHA1 64270e4f8a04c925217e39db4f7c0dd522c314d9 SHA256 4a7bb15bfd7a77d4a25226b5a159313c0887dfe2269acfada36c820cc3054059
-MD5 8abadaa9ce647685510fafb62e56309e plone-2.5.1.ebuild 1600
-RMD160 1f92726019206c1d106378fd4ce36792c049d098 plone-2.5.1.ebuild 1600
-SHA256 4a7bb15bfd7a77d4a25226b5a159313c0887dfe2269acfada36c820cc3054059 plone-2.5.1.ebuild 1600
-EBUILD plone-2.5.ebuild 1667 RMD160 ed75b67598669e1831492c6035adc6708ee15ee9 SHA1 94fc25054ebbb5ea186dc65316225d3bfe59530a SHA256 4a6f79d1d5a8b731a1d7e168eab5b967126db45dbda752212f465be5879005e6
-MD5 cb56a0132a774a8f1107972583646350 plone-2.5.ebuild 1667
-RMD160 ed75b67598669e1831492c6035adc6708ee15ee9 plone-2.5.ebuild 1667
-SHA256 4a6f79d1d5a8b731a1d7e168eab5b967126db45dbda752212f465be5879005e6 plone-2.5.ebuild 1667
-MISC ChangeLog 6744 RMD160 aff70a3781d7b946528f9d41a4004366e1b48b2d SHA1 04c765d6c397334790c699e07ee9dc4b361f7459 SHA256 087579a7e8bf538a4e3014b0edf9a3d45d97f3b57da942707440ff310c6244f6
-MD5 ad85924a95ec2f0a423a7295762340b9 ChangeLog 6744
-RMD160 aff70a3781d7b946528f9d41a4004366e1b48b2d ChangeLog 6744
-SHA256 087579a7e8bf538a4e3014b0edf9a3d45d97f3b57da942707440ff310c6244f6 ChangeLog 6744
+EBUILD plone-2.5.1.ebuild 1847 RMD160 abf2cd8f91ca9337b538afa3362922dd4d3d32e0 SHA1 4b00627148ed69ce4f46ee63c6e9474478d5c6ba SHA256 771fb3194ceefd406110367390a3c6a5c59377e2b39649243365b87a4be5429b
+MD5 7e305c99ae9cc782bb55b6bf41e09221 plone-2.5.1.ebuild 1847
+RMD160 abf2cd8f91ca9337b538afa3362922dd4d3d32e0 plone-2.5.1.ebuild 1847
+SHA256 771fb3194ceefd406110367390a3c6a5c59377e2b39649243365b87a4be5429b plone-2.5.1.ebuild 1847
+EBUILD plone-2.5.ebuild 1837 RMD160 57180d67a8d753fe3e78c2ee245432346df7bead SHA1 ef132bf55652f4eaafcbe5daa5e806c680c7ceb6 SHA256 d069446c073ee3eef467512406671a3375c6d4d0b9ffaf80bf58041340840d4b
+MD5 ae775b427fa4b63fa1b641af210bd07d plone-2.5.ebuild 1837
+RMD160 57180d67a8d753fe3e78c2ee245432346df7bead plone-2.5.ebuild 1837
+SHA256 d069446c073ee3eef467512406671a3375c6d4d0b9ffaf80bf58041340840d4b plone-2.5.ebuild 1837
+MISC ChangeLog 6899 RMD160 83ae6410ed8298d4f463803cdc118e32fdf49a24 SHA1 394a992e86cabe68fc90690d5ce7b6c048454946 SHA256 141274788cc55cafa623053ccdac57350bca274580bd6fc7a6c8a4dca94e112d
+MD5 5bf30eff99bbce1b2369c920a858f861 ChangeLog 6899
+RMD160 83ae6410ed8298d4f463803cdc118e32fdf49a24 ChangeLog 6899
+SHA256 141274788cc55cafa623053ccdac57350bca274580bd6fc7a6c8a4dca94e112d ChangeLog 6899
 MISC metadata.xml 161 RMD160 5e136d45f811478292bd2ee1798a9b0229ffe468 SHA1 9755179a2dee0511818b1f6738ded28e335e1b9a SHA256 e69ac7205cbc2e42a297e20d8f08922003390a345bbf50ccf00d1158a1c97cc5
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 RMD160 5e136d45f811478292bd2ee1798a9b0229ffe468 metadata.xml 161
@@ -90,9 +91,9 @@ SHA256 e39bca568aa8ef6d5a3857c70cde03abc3afed512a14588668767095dea16402 files/di
 MD5 1fabc2709953b7868eba8d3545422ca1 files/digest-plone-2.1.4 238
 RMD160 e5276e57de93726edfacd810f7dd7ae9a728e4d1 files/digest-plone-2.1.4 238
 SHA256 5ac788c7f3e15ab746cd895e40a8347e19a11a8ea24e044584689473f57bb390 files/digest-plone-2.1.4 238
-MD5 b128870b91dd5ce642298c69bf94c456 files/digest-plone-2.5 232
-RMD160 74c6ec27bf80c5ddd79bdacd3f3151e5b043e1ac files/digest-plone-2.5 232
-SHA256 41a52b7d16646e339a7f29758144311f07dab8f63636be1c386230cb268c7387 files/digest-plone-2.5 232
-MD5 62b0289dc02c66d13edfb42300922e53 files/digest-plone-2.5.1 256
-RMD160 58206bbe251035ef6463a56d649985d6f05933dd files/digest-plone-2.5.1 256
-SHA256 23f33b97ccad1b2289cc837ec18c0dd3eed51ce392245e7ab5800d6e3ca9d285 files/digest-plone-2.5.1 256
+MD5 42341cf11258a8f37ee0ef7dd02f1278 files/digest-plone-2.5 485
+RMD160 f41570b42536e36835fba08255f175c6f8bb27e6 files/digest-plone-2.5 485
+SHA256 482e03ab7ebc0f5db4ebb4dab21d337798ecc6c87f263303a464f2259a2952b8 files/digest-plone-2.5 485
+MD5 4ab3a93921828fe01e101eaef6964914 files/digest-plone-2.5.1 509
+RMD160 fdaf46d9b0c7792f53badae966bffa1b29415d3a files/digest-plone-2.5.1 509
+SHA256 be4d4866749d479fb36699a82f631435c618a7d10d4fe44aed1e769491c52cb0 files/digest-plone-2.5.1 509
diff --git a/net-zope/plone/files/digest-plone-2.5 b/net-zope/plone/files/digest-plone-2.5
index 62d2f6666de0..0d625baf7f0c 100644
--- a/net-zope/plone/files/digest-plone-2.5
+++ b/net-zope/plone/files/digest-plone-2.5
@@ -1,3 +1,6 @@
 MD5 0a385a1a4afbf940bb4e094ce5dcb583 Plone-2.5.tar.gz 8597606
 RMD160 f0d2b04e46f422cf1e492d194a92aaabffbc0bdd Plone-2.5.tar.gz 8597606
 SHA256 0dfddc8e1a45624f6b90047103cac84690b35fdcf0058c1cfd15446290769a3f Plone-2.5.tar.gz 8597606
+MD5 bc2b48651750bfc9e901664695e0e44c PloneHotFix20061031.tar.gz 1288
+RMD160 0c40ed2bc74d0352768aebf1d34da117a5cd7619 PloneHotFix20061031.tar.gz 1288
+SHA256 7483ef24740d3fb7061a0701e7565e1eda4e1219addf8305140d7303eb363481 PloneHotFix20061031.tar.gz 1288
diff --git a/net-zope/plone/files/digest-plone-2.5.1 b/net-zope/plone/files/digest-plone-2.5.1
index 331927c5705b..f34563d5527e 100644
--- a/net-zope/plone/files/digest-plone-2.5.1
+++ b/net-zope/plone/files/digest-plone-2.5.1
@@ -1,3 +1,6 @@
 MD5 cb965ed5eb4f863b124c0151824a2b5a Plone-2.5.1-final.tar.gz 8393144
 RMD160 f7467d07878c8730da1fb6d7df61e1f082b34a51 Plone-2.5.1-final.tar.gz 8393144
 SHA256 66c46cd429a48ce44794aa1443f861eee95404958169ad8e2d1396d3116d5ab3 Plone-2.5.1-final.tar.gz 8393144
+MD5 bc2b48651750bfc9e901664695e0e44c PloneHotFix20061031.tar.gz 1288
+RMD160 0c40ed2bc74d0352768aebf1d34da117a5cd7619 PloneHotFix20061031.tar.gz 1288
+SHA256 7483ef24740d3fb7061a0701e7565e1eda4e1219addf8305140d7303eb363481 PloneHotFix20061031.tar.gz 1288
diff --git a/net-zope/plone/plone-1.0.5.ebuild b/net-zope/plone/plone-1.0.5.ebuild
index 670be188d59d..94cf6bb209fe 100644
--- a/net-zope/plone/plone-1.0.5.ebuild
+++ b/net-zope/plone/plone-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-1.0.5.ebuild,v 1.8 2006/01/27 02:41:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-1.0.5.ebuild,v 1.9 2006/12/29 01:58:28 radek Exp $
 
 inherit zproduct
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/plone/CMFPlone${PV}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="~ppc x86"
 
-RDEPEND="=net-zope/cmf-1.3*
+RDEPEND=">=net-zope/cmf-1.3
 	>=net-zope/formulator-1.2.0"
 
 S=${WORKDIR}/CMFPlone-${PV}
diff --git a/net-zope/plone/plone-1.0.6.ebuild b/net-zope/plone/plone-1.0.6.ebuild
index 97629487af69..0879609434a8 100644
--- a/net-zope/plone/plone-1.0.6.ebuild
+++ b/net-zope/plone/plone-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-1.0.6.ebuild,v 1.2 2006/01/27 02:41:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-1.0.6.ebuild,v 1.3 2006/12/29 01:58:28 radek Exp $
 
 inherit zproduct
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/plone/Plone-${PV}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="~ppc ~x86"
 
-RDEPEND="=net-zope/cmf-1.3*
+RDEPEND=">=net-zope/cmf-1.3
 	>=net-zope/formulator-1.2.0"
 
 S=${WORKDIR}/CMFPlone-${PV}
diff --git a/net-zope/plone/plone-2.5.1.ebuild b/net-zope/plone/plone-2.5.1.ebuild
index e9b9975ff923..eb6a9b21e095 100644
--- a/net-zope/plone/plone-2.5.1.ebuild
+++ b/net-zope/plone/plone-2.5.1.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.5.1.ebuild,v 1.1 2006/09/30 21:21:02 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.5.1.ebuild,v 1.2 2006/12/29 01:58:28 radek Exp $
 
 inherit zproduct
 
 MY_P="Plone-2.5.1"
 DESCRIPTION="A Zope Content Management System, based on Zope CMF."
 HOMEPAGE="http://plone.org"
-SRC_URI="mirror://sourceforge/plone/${MY_P}-final.tar.gz"
+HOTFIXES_URI="http://plone.org/products/plone-hotfix/releases/20061031/PloneHotFix20061031.tar.gz"
+SRC_URI="mirror://sourceforge/plone/${MY_P}-final.tar.gz
+	    $HOTFIXES_URI"
 
 LICENSE="GPL-2"
 SLOT="2.5"
@@ -62,8 +64,14 @@ ZPROD_LIST="
 	SecureMailHost
 	statusmessages
 	validation
+	PloneHotFix20061031
 	"
 
+src_compile() {
+	# hotfixes to be applied
+	cp -a "${WORKDIR}/PloneHotFix20061031/" "${WORKDIR}/${MY_P}/"
+}
+
 pkg_postinst() {
 	ewarn
 	ewarn "This plone version is a bundled version = contains all necessary zope products"
diff --git a/net-zope/plone/plone-2.5.ebuild b/net-zope/plone/plone-2.5.ebuild
index f4e00b93f809..0bd87d480110 100644
--- a/net-zope/plone/plone-2.5.ebuild
+++ b/net-zope/plone/plone-2.5.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.5.ebuild,v 1.1 2006/06/19 12:29:26 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.5.ebuild,v 1.2 2006/12/29 01:58:28 radek Exp $
 
 inherit zproduct
 
 MY_P="Plone-2.5"
 DESCRIPTION="A Zope Content Management System, based on Zope CMF."
 HOMEPAGE="http://plone.org"
-SRC_URI="mirror://sourceforge/plone/${MY_P}.tar.gz"
+HOTFIXES_URI="http://plone.org/products/plone-hotfix/releases/20061031/PloneHotFix20061031.tar.gz"
+SRC_URI="mirror://sourceforge/plone/${MY_P}.tar.gz
+	    $HOTFIXES_URI"
 
 LICENSE="GPL-2"
 SLOT="2.5"
@@ -62,14 +64,19 @@ ZPROD_LIST="
 	SecureMailHost
 	statusmessages
 	validation
+	PloneHotFix20061031
 	"
 
+src_compile() {
+	# hotfixes to be applied
+	cp -a "${WORKDIR}/PloneHotFix20061031/" "${WORKDIR}/${MY_P}/"
+}
+
 pkg_postinst() {
 	ewarn
 	ewarn "This plone version is a bundled version = contains all necessary zope products"
 	ewarn "You should carefully manage Your zope instance manually(!) with zprod-manager tool"
 	ewarn "If You have simple installation (just zope and plone) you should safely ;)"
 	ewarn "execute 'zprod-manager add' and then mark ${P} to be added"
-	ewarn "Consult http://bugs.gentoo.org/show_bug.cgi?id=105187 for more info"
 	ewarn
 }