Fix from upstream for #143639 by Chris Carlin.

(Portage version: 2.1.1_pre5-r2)

4 files changed, 73 insertions, 1 deletions

diff --git a/www-apps/horde/ChangeLog b/www-apps/horde/ChangeLog
index 4cde421c8ee3..3b960cf89911 100644
--- a/www-apps/horde/ChangeLog
+++ b/www-apps/horde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/horde
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde/ChangeLog,v 1.41 2006/08/05 19:46:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde/ChangeLog,v 1.42 2006/08/20 08:04:31 vapier Exp $
+
+*horde-3.1.2-r1 (20 Aug 2006)
+
+  20 Aug 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/horde-3.1.2-perms.patch, +horde-3.1.2-r1.ebuild:
+  Fix from upstream for #143639 by Chris Carlin.
 
 *horde-3.1.2 (05 Aug 2006)
 
diff --git a/www-apps/horde/files/digest-horde-3.1.2-r1 b/www-apps/horde/files/digest-horde-3.1.2-r1
new file mode 100644
index 000000000000..3b1d3a027292
--- /dev/null
+++ b/www-apps/horde/files/digest-horde-3.1.2-r1
@@ -0,0 +1,3 @@
+MD5 2c1f3e5759fa6bca07483d584151771f horde-3.1.2.tar.gz 5176353
+RMD160 f37d8d4d21d46c6fc4c7284a60c20c9f10f459aa horde-3.1.2.tar.gz 5176353
+SHA256 36a0df6ce8155502c524619c017e3cadb54654ac1bd685e099500ee58840be1c horde-3.1.2.tar.gz 5176353
diff --git a/www-apps/horde/files/horde-3.1.2-perms.patch b/www-apps/horde/files/horde-3.1.2-perms.patch
new file mode 100644
index 000000000000..6f1cd2768390
--- /dev/null
+++ b/www-apps/horde/files/horde-3.1.2-perms.patch
@@ -0,0 +1,23 @@
+fix from upstream
+
+http://bugs.gentoo.org/143639
+
+===================================================================
+RCS file: /horde/cvs/framework/Perms/Perms/datatree.php,v
+retrieving revision 1.6.2.11
+retrieving revision 1.6.2.12
+diff -p --unified=3 -r1.6.2.11 -r1.6.2.12
+--- lib/Horde/Perms/datatree.php	2006/05/04 13:26:16	1.6.2.11
++++ lib/Horde/Perms/datatree.php	2006/07/20 18:50:05	1.6.2.12
+@@ -137,7 +137,11 @@ class Perms_datatree extends Perms {
+      */
+     function &getPermissionById($cid)
+     {
+-        $object = $this->_datatree->getObjectById($cid, 'DataTreeObject_Permission');
++        if ($cid == DATATREE_ROOT) {
++            $object = &$this->newPermission(DATATREE_ROOT);
++        } else {
++            $object = &$this->_datatree->getObjectById($cid, 'DataTreeObject_Permission');
++        }
+         return $object;
+     }
diff --git a/www-apps/horde/horde-3.1.2-r1.ebuild b/www-apps/horde/horde-3.1.2-r1.ebuild
new file mode 100644
index 000000000000..e5f182a60d1e
--- /dev/null
+++ b/www-apps/horde/horde-3.1.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde/horde-3.1.2-r1.ebuild,v 1.1 2006/08/20 08:04:31 vapier Exp $
+
+HORDE_PHP_FEATURES="session xml"
+
+EHORDE_PATCHES="${FILESDIR}/${P}-perms.patch"
+
+inherit horde
+
+DESCRIPTION="Horde Application Framework"
+HOMEPAGE="http://www.horde.org/"
+
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
+IUSE="mysql"
+
+DEPEND=""
+RDEPEND="virtual/php
+	>=sys-devel/gettext-0.10.40
+	>=dev-libs/libxml2-2.4.21
+	>=www-apps/horde-pear-1.3
+	dev-php/PEAR-Log
+	dev-php/PEAR-Mail_Mime
+	mysql? ( dev-php/PEAR-DB )"
+
+src_unpack() {
+	horde_src_unpack
+	cd "${S}"
+	chmod 600 scripts/sql/create.*.sql #137510
+}
+
+pkg_postinst() {
+	horde_pkg_postinst
+	echo
+	einfo "Horde requires PHP to have:"
+	einfo "    ==> 'short_open_tag enabled = On'"
+	einfo "    ==> 'magic_quotes_runtime set = Off'"
+	einfo "    ==> 'file_uploads enabled = On'"
+	einfo "Please edit /etc/php/apache2-php4/php.ini"
+}