Patch for security bug #97651

Package-Manager: portage-2.0.51.19

5 files changed, 91 insertions, 2 deletions

diff --git a/www-apps/egroupware/ChangeLog b/www-apps/egroupware/ChangeLog
index d1b8d7f0a23a..6e9f5f9fbb0e 100644
--- a/www-apps/egroupware/ChangeLog
+++ b/www-apps/egroupware/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/egroupware
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v 1.20 2005/04/23 21:26:27 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v 1.21 2005/07/06 00:00:48 stuart Exp $
+
+*egroupware-1.0.0.007-r1 (06 Jul 2005)
+
+  06 Jul 2005; Stuart Herbert <stuart@gentoo.org>
+  +files/egroupware-1.0.0.007-xmlrpc.patch, +egroupware-1.0.0.007-r1.ebuild:
+  Patch for security bug #97651
 
   24 Apr 2005; Martin Holzer <mholzer@gentoo.org>
   egroupware-1.0.0.007.ebuild:
diff --git a/www-apps/egroupware/Manifest b/www-apps/egroupware/Manifest
index 2a8d801acf00..077a20607da0 100644
--- a/www-apps/egroupware/Manifest
+++ b/www-apps/egroupware/Manifest
@@ -1,5 +1,8 @@
-MD5 03f1e66b038ef806d34ef59b08196dbb ChangeLog 4458
+MD5 e6c35051e109b9b24ae9f06eacb4be93 ChangeLog 4657
+MD5 d0d4dee4820188ddcad73ce84a40a111 egroupware-1.0.0.007-r1.ebuild 1365
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 MD5 43abedf32fc95ad9f886a2d22991fe02 egroupware-1.0.0.007.ebuild 1262
+MD5 059eae124458c66f13e1ff62a93c0b69 files/egroupware-1.0.0.007-xmlrpc.patch 1088
+MD5 08a77bf0063609ec500ebbfb2135ef05 files/digest-egroupware-1.0.0.007-r1 77
 MD5 08a77bf0063609ec500ebbfb2135ef05 files/digest-egroupware-1.0.0.007 77
 MD5 5acfe8f4f634af8faac95b6411b410e5 files/postinstall-en.txt 397
diff --git a/www-apps/egroupware/egroupware-1.0.0.007-r1.ebuild b/www-apps/egroupware/egroupware-1.0.0.007-r1.ebuild
new file mode 100644
index 000000000000..cf9112d0db14
--- /dev/null
+++ b/www-apps/egroupware/egroupware-1.0.0.007-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/egroupware-1.0.0.007-r1.ebuild,v 1.1 2005/07/06 00:00:48 stuart Exp $
+
+inherit webapp eutils
+
+MY_P=eGroupWare-${PV}-2
+S=${WORKDIR}/${PN}
+
+DESCRIPTION="Web-based GroupWare suite. It contains many modules"
+HOMEPAGE="http://www.eGroupWare.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~sparc ~hppa"
+IUSE="ldap"
+
+RDEPEND="virtual/php
+	|| ( >=dev-db/mysql-3.23 >=dev-db/postgresql-7.2 )
+	ldap? ( net-nds/openldap )
+	net-www/apache"
+
+pkg_setup () {
+	webapp_pkg_setup
+	einfo "Please make sure that your PHP is compiled with LDAP (if using openldap), IMAP, and MySQL|PostgreSQL support"
+	einfo
+	einfo "Consider installing an MTA if you want to take advantage of eGW's mail capabilities."
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+#	epatch ${FILESDIR}/${PN}-1.0.0.007-xmlrpc.patch
+}
+
+src_install() {
+	webapp_src_preinst
+	cd ${S}
+	# remove CVS directories
+	find . -type d -name 'CVS' -print | xargs rm -rf
+	cp -r . ${D}/${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/fudforum
+	webapp_serverowned ${MY_HTDOCSDIR}/phpgwapi/images
+
+	# add post-installation instructions
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/egroupware/files/digest-egroupware-1.0.0.007-r1 b/www-apps/egroupware/files/digest-egroupware-1.0.0.007-r1
new file mode 100644
index 000000000000..e61134a24508
--- /dev/null
+++ b/www-apps/egroupware/files/digest-egroupware-1.0.0.007-r1
@@ -0,0 +1 @@
+MD5 3c9a3ab01cf36c45b394e3a3bf98a3ca eGroupWare-1.0.0.007-2.tar.bz2 11084469
diff --git a/www-apps/egroupware/files/egroupware-1.0.0.007-xmlrpc.patch b/www-apps/egroupware/files/egroupware-1.0.0.007-xmlrpc.patch
new file mode 100644
index 000000000000..a9b420d04ce5
--- /dev/null
+++ b/www-apps/egroupware/files/egroupware-1.0.0.007-xmlrpc.patch
@@ -0,0 +1,29 @@
+--- egroupware/phpgwapi/inc/xml_functions.inc.php.old	2005-07-04 22:35:39.000000000 +0200
++++ egroupware/phpgwapi/inc/xml_functions.inc.php	2004-03-07 10:55:43.000000000 +0100
+@@ -189,7 +189,7 @@
+ 				$GLOBALS['_xh'][$parser]['qt']=0;
+ 				break;
+ 			case 'NAME':
+-				$GLOBALS['_xh'][$parser]['st'] .= "'";
++				$GLOBALS['_xh'][$parser]['st'] .= '"';
+ 				$GLOBALS['_xh'][$parser]['ac'] = '';
+ 				break;
+ 			case 'FAULT':
+@@ -265,7 +265,7 @@
+ 				$GLOBALS['_xh'][$parser]['cm']--;
+ 				break;
+ 			case 'NAME':
+-				$GLOBALS['_xh'][$parser]['st'].= $GLOBALS['_xh'][$parser]['ac'] . "' => ";
++				$GLOBALS['_xh'][$parser]['st'].= $GLOBALS['_xh'][$parser]['ac'] . '" => ';
+ 				break;
+ 			case 'BOOLEAN':
+ 				// special case here: we translate boolean 1 or 0 into PHP
+@@ -293,7 +293,7 @@
+ 				}
+ 				elseif ($GLOBALS['_xh'][$parser]['qt']==2)
+ 				{
+-					$GLOBALS['_xh'][$parser]['st'].='base64_decode("'. $GLOBALS['_xh'][$parser]['ac'] . '")';
++					$GLOBALS['_xh'][$parser]['st'].="base64_decode('". $GLOBALS['_xh'][$parser]['ac'] . "')"; 
+ 				}
+ 				elseif ($name=='BOOLEAN')
+ 				{