From e5050e2c74bd90fb320c56c853baec3983123c2f Mon Sep 17 00:00:00 2001 From: ghen Date: Fri, 23 Feb 2007 11:56:25 +0000 Subject: Pullup ticket 2032 - requested by taca security update for php5 - pkgsrc/graphics/php-gd/Makefile 1.15 - pkgsrc/lang/php5/Makefile.common 1.23 - pkgsrc/lang/php5/Makefile.php 1.22 - pkgsrc/lang/php5/PLIST 1.14 - pkgsrc/lang/php5/distinfo 1.36 - pkgsrc/lang/php5/patches/patch-ac removed - pkgsrc/lang/php5/patches/patch-al 1.3 Module Name: pkgsrc Committed By: jdolecek Date: Tue Feb 20 20:46:20 UTC 2007 Modified Files: pkgsrc/graphics/php-gd: Makefile pkgsrc/lang/php5: Makefile.common Makefile.php PLIST distinfo Added Files: pkgsrc/lang/php5/patches: patch-al Removed Files: pkgsrc/lang/php5/patches: patch-ac Log Message: Update PHP5 to 5.2.1. Includes several important security fixes and large number of other fixes. Update for all users is strongly advised. --- graphics/php-gd/Makefile | 4 +++- lang/php5/Makefile.common | 4 ++-- lang/php5/Makefile.php | 12 ++++++------ lang/php5/PLIST | 18 ++++++++++++++---- lang/php5/distinfo | 10 +++++----- 5 files changed, 30 insertions(+), 18 deletions(-) diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile index 113c76c42df..416a309a7de 100644 --- a/graphics/php-gd/Makefile +++ b/graphics/php-gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/06/04 16:26:54 joerg Exp $ +# $NetBSD: Makefile,v 1.14.6.1 2007/02/23 11:56:25 ghen Exp $ MODNAME= gd CATEGORIES+= graphics @@ -18,6 +18,8 @@ CONFIGURE_ARGS+= --enable-${MODNAME}-native-ttf CONFIGURE_ARGS+= --enable-${MODNAME}-jis-conv CONFIGURE_ARGS+= --without-t1lib +USE_PHP_EXT_PATCHES= yes + .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/lang/php5/Makefile.common b/lang/php5/Makefile.common index 8901ea20fb2..1f490550353 100644 --- a/lang/php5/Makefile.common +++ b/lang/php5/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2006/11/07 16:46:51 tron Exp $ +# $NetBSD: Makefile.common,v 1.22.2.1 2007/02/23 11:56:25 ghen Exp $ .if !defined(DISTNAME) DISTNAME= php-${PHP_BASE_VERS} @@ -15,7 +15,7 @@ EXTRACT_SUFX?= .tar.bz2 MAINTAINER?= jdolecek@NetBSD.org HOMEPAGE?= http://www.php.net/ -PHP_BASE_VERS= 5.2.0 +PHP_BASE_VERS= 5.2.1 PHP_EXTENSION_DIR= lib/php/20040412 PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q} diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php index 14205e4ab65..ca8930660d6 100644 --- a/lang/php5/Makefile.php +++ b/lang/php5/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.21 2006/11/06 22:17:50 jdolecek Exp $ +# $NetBSD: Makefile.php,v 1.21.2.1 2007/02/23 11:56:25 ghen Exp $ # .include "../../lang/php5/Makefile.common" @@ -50,9 +50,9 @@ CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --disable-ipv6 .endif -.if !empty(PKG_OPTIONS:Mssl) -. include "../../security/openssl/buildlink3.mk" -CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} -.else +#.if !empty(PKG_OPTIONS:Mssl) +#. include "../../security/openssl/buildlink3.mk" +#CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} +#.else CONFIGURE_ARGS+= --without-openssl -.endif +#.endif diff --git a/lang/php5/PLIST b/lang/php5/PLIST index 07996e7ccd8..52eb29c5c56 100644 --- a/lang/php5/PLIST +++ b/lang/php5/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2006/08/19 14:47:44 taca Exp $ +@comment $NetBSD: PLIST,v 1.13.4.1 2007/02/23 11:56:25 ghen Exp $ bin/pear bin/peardev bin/pecl @@ -48,7 +48,6 @@ include/php/Zend/zend_language_parser.h include/php/Zend/zend_language_scanner.h include/php/Zend/zend_list.h include/php/Zend/zend_llist.h -include/php/Zend/zend_mm.h include/php/Zend/zend_modules.h include/php/Zend/zend_multibyte.h include/php/Zend/zend_multiply.h @@ -73,6 +72,7 @@ include/php/ext/date/lib/timelib.h include/php/ext/date/lib/timelib_config.h include/php/ext/date/lib/timelib_structs.h include/php/ext/date/php_date.h +include/php/ext/filter/php_filter.h include/php/ext/hash/php_hash.h include/php/ext/hash/php_hash_adler32.h include/php/ext/hash/php_hash_crc32.h @@ -86,20 +86,28 @@ include/php/ext/hash/php_hash_tiger.h include/php/ext/hash/php_hash_types.h include/php/ext/hash/php_hash_whirlpool.h include/php/ext/libxml/php_libxml.h -include/php/ext/pcre/pcrelib/internal.h include/php/ext/pcre/pcrelib/pcre.h include/php/ext/pcre/pcrelib/pcre_internal.h include/php/ext/pcre/pcrelib/pcre_scanner.h include/php/ext/pcre/pcrelib/pcre_stringpiece.h include/php/ext/pcre/pcrelib/pcrecpp.h -include/php/ext/pcre/pcrelib/pcreposix.h include/php/ext/pcre/pcrelib/pcrecpparg.h +include/php/ext/pcre/pcrelib/pcreposix.h include/php/ext/pcre/pcrelib/ucp.h include/php/ext/pcre/pcrelib/ucpinternal.h include/php/ext/pcre/php_pcre.h include/php/ext/session/mod_files.h include/php/ext/session/mod_user.h include/php/ext/session/php_session.h +include/php/ext/spl/php_spl.h +include/php/ext/spl/spl_array.h +include/php/ext/spl/spl_directory.h +include/php/ext/spl/spl_engine.h +include/php/ext/spl/spl_exceptions.h +include/php/ext/spl/spl_functions.h +include/php/ext/spl/spl_iterators.h +include/php/ext/spl/spl_observer.h +include/php/ext/spl/spl_sxe.h include/php/ext/standard/base64.h include/php/ext/standard/basic_functions.h include/php/ext/standard/crc32.h @@ -372,11 +380,13 @@ share/php/php.gif @dirrm include/php/main @dirrm include/php/ext/xml @dirrm include/php/ext/standard +@dirrm include/php/ext/spl @dirrm include/php/ext/session @dirrm include/php/ext/pcre/pcrelib @dirrm include/php/ext/pcre @dirrm include/php/ext/libxml @dirrm include/php/ext/hash +@dirrm include/php/ext/filter @dirrm include/php/ext/date/lib @dirrm include/php/ext/date @dirrm include/php/ext diff --git a/lang/php5/distinfo b/lang/php5/distinfo index 7e9ce5be8e4..7588e5e0580 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.35 2006/11/07 17:24:39 tron Exp $ +$NetBSD: distinfo,v 1.35.2.1 2007/02/23 11:56:25 ghen Exp $ -SHA1 (php-5.2.0/php-5.2.0.tar.bz2) = 6306829b1b252156ca3a936ec809aba89a71d9e1 -RMD160 (php-5.2.0/php-5.2.0.tar.bz2) = baabe854ac219935ed9f58d348ebf08fb84853de -Size (php-5.2.0/php-5.2.0.tar.bz2) = 6789838 bytes +SHA1 (php-5.2.1/php-5.2.1.tar.bz2) = 978ce7cde3d988d9aa672e32e46f815a8b25baa0 +RMD160 (php-5.2.1/php-5.2.1.tar.bz2) = f75078e0e43cb9c64e6d0a8d51a2ebd23cc9131d +Size (php-5.2.1/php-5.2.1.tar.bz2) = 7163383 bytes SHA1 (patch-aa) = 20bc3831e435182d014b11ae9f1f6c537a21af20 -SHA1 (patch-ac) = 95cf7bbbf1a9ce645195854f3b176dd56c94fe47 SHA1 (patch-ag) = 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e SHA1 (patch-ah) = c7cbd4b9ea0796ea3b7491c2cffb6ddddc518587 SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc SHA1 (patch-ak) = 0a6445b5cf390cb63de8474d75c6e8a4c058afab +SHA1 (patch-al) = 0ee37782cc0d3bf5ede1a583de0589c2c1316b50 -- cgit v1.2.3