ports/55192: www/horde2: fixing Apache segfaults.

[Thierry Thomas]

>Number:         55192
>Category:       ports
>Synopsis:       www/horde2: fixing Apache segfaults.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 02 14:50:16 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.8-STABLE FreeBSD 4.8-STABLE #0: Sat Aug 2 13:35:08 CEST 2003 thierry at graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386


	
>Description:
	There is a bug in Horde: the logger (PEAR::Log) is instanciated
	without a '&', and PHP does not handle this error, letting Apache
	childs segfaulting.

	It has been fixed in Horde's CVS.

>How-To-Repeat:
	Run Horde, and read the logs.

>Fix:
	Please apply the following patch.

	New file: files/patch-lib_Horde.php (from CVS).

--- horde2.diff begins here ---
diff -urN www/horde2.orig/Makefile www/horde2/Makefile
--- www/horde2.orig/Makefile	Thu Jun 12 19:07:53 2003
+++ www/horde2/Makefile	Sat Aug  2 21:00:38 2003
@@ -7,7 +7,7 @@
 
 PORTNAME=	horde
 PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 		ftp://ftp.au.horde.org/pub/horde/			\
diff -urN www/horde2.orig/files/patch-lib_Horde.php www/horde2/files/patch-lib_Horde.php
--- www/horde2.orig/files/patch-lib_Horde.php	Thu Jan  1 01:00:00 1970
+++ www/horde2/files/patch-lib_Horde.php	Sat Aug  2 21:14:43 2003
@@ -0,0 +1,22 @@
+--- lib/Horde.php.orig	Wed Apr 23 23:43:06 2003
++++ lib/Horde.php	Sat Aug  2 21:14:12 2003
+@@ -120,7 +120,7 @@
+  *
+  * @author  Chuck Hagenbuch <chuck at horde.org>
+  * @author  Jon Parise <jon at horde.org>
+- * @version $Revision: 1.118.2.42 $
++ * @version $Revision: 1.118.2.43 $
+  * @since   Horde 1.3
+  * @package horde
+  */
+@@ -184,8 +184,8 @@
+         }
+ 
+         include_once 'Log.php';
+-        $logger = Log::singleton($conf['log']['type'], $conf['log']['name'],
+-                                 $conf['log']['ident'], $conf['log']['params']);
++        $logger = &Log::singleton($conf['log']['type'], $conf['log']['name'],
++                                  $conf['log']['ident'], $conf['log']['params']);
+ 
+         if (!$logger) {
+             Horde::fatal(new PEAR_Error('An error has occurred. Furthermore, Horde encountered an error attempting to log this error. Please check your Horde logging configuration in horde/config/horde.php.'), __FILE__, __LINE__, false);
diff -urN www/horde2.orig/pkg-plist www/horde2/pkg-plist
--- www/horde2.orig/pkg-plist	Tue Apr 29 23:47:35 2003
+++ www/horde2/pkg-plist	Sat Aug  2 21:08:22 2003
@@ -111,6 +111,7 @@
 %%HORDEDIR%%/lib/Group.php
 %%HORDEDIR%%/lib/Help.php
 %%HORDEDIR%%/lib/Horde.php
+%%HORDEDIR%%/lib/Horde.php.orig
 %%HORDEDIR%%/lib/Identity.php
 %%HORDEDIR%%/lib/Image.php
 %%HORDEDIR%%/lib/Lang.php
--- horde2.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: