diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2003-08-23 07:56:26 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2003-08-23 07:56:26 +0000 |
| commit | d59e6a74c7c709fbc4c8d007b4a5301373047eca (patch) | |
| tree | a45380feade9bc8d79eeb470144c6896613d27b2 /www/horde2 | |
| parent | o Upgrade to 1.2.3. (diff) | |
www/horde2: fixing Apache segfaults.
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.
Also removed the *.orig files from the pkg-plist and let them be
removed via post-patch.
PR: ports/55192
Submitted by: Thierry Thomas <thierry@pompo.net>
Notes
Notes:
svn path=/head/; revision=87544
Diffstat (limited to 'www/horde2')
| -rw-r--r-- | www/horde2/Makefile | 11 | ||||
| -rw-r--r-- | www/horde2/files/patch-lib_Horde.php | 22 | ||||
| -rw-r--r-- | www/horde2/pkg-plist | 6 |
3 files changed, 32 insertions, 7 deletions
diff --git a/www/horde2/Makefile b/www/horde2/Makefile index 11dc437dc038..438b930c1c97 100644 --- a/www/horde2/Makefile +++ b/www/horde2/Makefile @@ -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/ \ @@ -121,6 +121,15 @@ pre-install: fi .endif +post-patch: + @${RM} ${WRKSRC}/po/translation.php.orig + @${RM} ${WRKSRC}/lib/Horde.php.orig + @${RM} ${WRKSRC}/scripts/db/README.orig + @${RM} ${WRKSRC}/scripts/set_perms.sh.orig + @${RM} ${WRKSRC}/config/horde.php.dist.orig + @${RM} ${WRKSRC}/config/registry.php.dist.orig + @${RM} ${WRKSRC}/config/mime_drivers.php.dist.orig + do-install: @${MKDIR} ${HORDEDIR} .for REP in ${SUB_DIRS} diff --git a/www/horde2/files/patch-lib_Horde.php b/www/horde2/files/patch-lib_Horde.php new file mode 100644 index 000000000000..f19d1cad4b2a --- /dev/null +++ b/www/horde2/files/patch-lib_Horde.php @@ -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@horde.org> + * @author Jon Parise <jon@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 --git a/www/horde2/pkg-plist b/www/horde2/pkg-plist index 9d5265231a49..466b45710fec 100644 --- a/www/horde2/pkg-plist +++ b/www/horde2/pkg-plist @@ -1,14 +1,12 @@ %%HORDEDIR%%/config/.htaccess %%HORDEDIR%%/config/horde.php %%HORDEDIR%%/config/horde.php.dist -%%HORDEDIR%%/config/horde.php.dist.orig %%HORDEDIR%%/config/html.php %%HORDEDIR%%/config/html.php.dist %%HORDEDIR%%/config/lang.php %%HORDEDIR%%/config/lang.php.dist %%HORDEDIR%%/config/mime_drivers.php %%HORDEDIR%%/config/mime_drivers.php.dist -%%HORDEDIR%%/config/mime_drivers.php.dist.orig %%HORDEDIR%%/config/mime_mapping.php %%HORDEDIR%%/config/mime_mapping.php.dist %%HORDEDIR%%/config/motd.php @@ -17,7 +15,6 @@ %%HORDEDIR%%/config/prefs.php.dist %%HORDEDIR%%/config/registry.php %%HORDEDIR%%/config/registry.php.dist -%%HORDEDIR%%/config/registry.php.dist.orig %%HORDEDIR%%/css.php %%HORDEDIR%%/graphics/alerts/error.gif %%HORDEDIR%%/graphics/alerts/message.gif @@ -244,7 +241,6 @@ %%HORDEDIR%%/po/sl_SI.po %%HORDEDIR%%/po/sv_SE.po %%HORDEDIR%%/po/translation.php -%%HORDEDIR%%/po/translation.php.orig %%HORDEDIR%%/po/uk_UA.po %%HORDEDIR%%/po/xgettext.sh %%HORDEDIR%%/po/zh_CN.po @@ -254,7 +250,6 @@ %%HORDEDIR%%/scripts/.htaccess %%HORDEDIR%%/scripts/SCRIPTS %%HORDEDIR%%/scripts/db/README -%%HORDEDIR%%/scripts/db/README.orig %%HORDEDIR%%/scripts/db/auth.sql %%HORDEDIR%%/scripts/db/category.sql %%HORDEDIR%%/scripts/db/category_mysql.sql @@ -272,7 +267,6 @@ %%HORDEDIR%%/scripts/mime_mapping/convert.pl %%HORDEDIR%%/scripts/mime_mapping/mime.types %%HORDEDIR%%/scripts/set_perms.sh -%%HORDEDIR%%/scripts/set_perms.sh.orig %%HORDEDIR%%/status.php %%HORDEDIR%%/templates/.htaccess %%HORDEDIR%%/templates/categorytree/rowend.inc |