Added hotfix for security vulerability, addresses #153901

(Portage version: 2.1.2_rc4-r1)

7 files changed, 35 insertions, 10 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/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
 }