summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradrianp <adrianp>2008-08-17 18:29:33 +0000
committeradrianp <adrianp>2008-08-17 18:29:33 +0000
commit9d3eb91bd0869ba8032bf2c6a513e802e55fd892 (patch)
tree9edc9474360a5fe637f8af9df54c5effe9a8f725
parent7eb84f750f0cb74190e71bc9c43d1a45df1672d4 (diff)
downloadpkgsrc-9d3eb91bd0869ba8032bf2c6a513e802e55fd892.tar.gz
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.
-rw-r--r--www/php4/Makefile3
-rw-r--r--www/php4/Makefile.common4
-rw-r--r--www/php4/Makefile.php9
-rw-r--r--www/php4/distinfo8
4 files changed, 15 insertions, 9 deletions
diff --git a/www/php4/Makefile b/www/php4/Makefile
index 6765862db90..517a1e4810e 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -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 --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index c28f8d4ff53..0e1e7025e3c 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -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 @@ HOMEPAGE?= http://www.php.net/
# 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 --git a/www/php4/Makefile.php b/www/php4/Makefile.php
index fc26bb53944..64a4d80e002 100644
--- a/www/php4/Makefile.php
+++ b/www/php4/Makefile.php
@@ -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_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
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 --git a/www/php4/distinfo b/www/php4/distinfo
index 5fcec8cf0f3..f1275c1a9b3 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -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