[pkgsrc/trunk]: pkgsrc/www/php4 Security Enhancements and Fixes in PHP 4.4.9:

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/697d20f21f1c
branches:  trunk
changeset: 545955:697d20f21f1c
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Sun Aug 17 18:29:33 2008 +0000

description:
Security Enhancements and Fixes in PHP 4.4.9:

    * Updated PCRE to version 7.7.
    * Fixed overflow in memnstr().
    * Fixed crash in imageloadfont when an invalid font is given.
    * Fixed open_basedir handling issue in the curl extension.
    * Fixed mbstring.func_overload set in .htaccess becomes global.

For a full list of changes in PHP 4.4.9, see the ChangeLog.
(http://www.php.net/ChangeLog-4.php#4.4.9)

This also adds ${PREFIX}/lib/php to the default include_path in php.ini
which makes integration with PEAR a little simpler.

diffstat:

 www/php4/Makefile        |  3 +--
 www/php4/Makefile.common |  4 ++--
 www/php4/Makefile.php    |  9 ++++++++-
 www/php4/distinfo        |  8 ++++----
 4 files changed, 15 insertions(+), 9 deletions(-)

diffs (69 lines):

diff -r ea520e60bff5 -r 697d20f21f1c www/php4/Makefile
--- a/www/php4/Makefile Sun Aug 17 18:24:19 2008 +0000
+++ b/www/php4/Makefile Sun Aug 17 18:29:33 2008 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.81 2008/01/18 05:09:52 tnn Exp $
+# $NetBSD: Makefile,v 1.82 2008/08/17 18:29:33 adrianp Exp $
 
 PKGNAME=               php-${PHP_BASE_VERS}
-PKGREVISION=           1
 CATEGORIES+=           lang
 COMMENT=               HTML-embedded scripting language
 
diff -r ea520e60bff5 -r 697d20f21f1c www/php4/Makefile.common
--- a/www/php4/Makefile.common  Sun Aug 17 18:24:19 2008 +0000
+++ b/www/php4/Makefile.common  Sun Aug 17 18:29:33 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.57 2008/01/04 10:07:53 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.58 2008/08/17 18:29:33 adrianp Exp $
 
 DISTNAME?=             php-${PHP_DIST_VERS}
 CATEGORIES+=           www php4
@@ -18,7 +18,7 @@
 # PHP_DIST_VERS                version number on the php distfile
 # PHP_BASE_VERS                pkgsrc-mangled version number (convert pl -> .)
 #
-PHP_DIST_VERS=         4.4.8
+PHP_DIST_VERS=         4.4.9
 PHP_BASE_VERS=         ${PHP_DIST_VERS}
 
 DISTFILES?=            ${PHP_DISTFILE}
diff -r ea520e60bff5 -r 697d20f21f1c www/php4/Makefile.php
--- a/www/php4/Makefile.php     Sun Aug 17 18:24:19 2008 +0000
+++ b/www/php4/Makefile.php     Sun Aug 17 18:29:33 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.39 2007/12/09 14:40:08 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.40 2008/08/17 18:29:33 adrianp Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -46,6 +46,13 @@
 PKG_SUPPORTED_OPTIONS+=        inet6 ssl
 PKG_SUGGESTED_OPTIONS+=        ssl
 
+SUBST_CLASSES+=                ini
+SUBST_STAGE.ini=       post-patch
+SUBST_FILES.ini=       php.ini-dist
+SUBST_FILES.ini+=      php.ini-recommended
+SUBST_SED.ini=         -e "s|\;include_path = \".:/php/includes\"|include_path = \".:${PREFIX}/lib/php\"|g"
+SUBST_MESSAGE.ini=     Fixing default ini files.
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Minet6)
diff -r ea520e60bff5 -r 697d20f21f1c www/php4/distinfo
--- a/www/php4/distinfo Sun Aug 17 18:24:19 2008 +0000
+++ b/www/php4/distinfo Sun Aug 17 18:29:33 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.67 2008/01/04 10:07:53 adrianp Exp $
+$NetBSD: distinfo,v 1.68 2008/08/17 18:29:33 adrianp Exp $
 
-SHA1 (php-4.4.8.tar.bz2) = fca6259fd3e8e3a7a37343e9a81651f5b6d4835c
-RMD160 (php-4.4.8.tar.bz2) = dedf4a1a853b19bd3fb91a6028a256facb2d3224
-Size (php-4.4.8.tar.bz2) = 4546525 bytes
+SHA1 (php-4.4.9.tar.bz2) = ab3d2205d756ddf93452b57bd6ce6a2014b1c374
+RMD160 (php-4.4.9.tar.bz2) = 0d77092efaccd8fe6efc16635be98c5d4ccfec66
+Size (php-4.4.9.tar.bz2) = 4545009 bytes
 SHA1 (patch-aa) = feb064407950d0fc732b7240e65cac84420d2407
 SHA1 (patch-ab) = 38a4bcd0d65b26c5d8e54e22b552f60831188469
 SHA1 (patch-ac) = 28288b1e79c14fb2b40eaefed0d6d2bff4775607