pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Update PHP to 4.3.4



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ce0f75215c58
branches:  trunk
changeset: 463366:ce0f75215c58
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sat Nov 08 06:58:10 2003 +0000

description:
Update PHP to 4.3.4

>From release announcemenet:

After a lengthy QA process, PHP 4.3.4 is finally out!
This is a medium size maintenance release, with a fair number of bug fixes.
All users are encouraged to upgrade to 4.3.4.

Bugfix release

PHP 4.3.4 contains, among others, following important fixes, additions
and improvements:
* Fixed disk_total_space() and disk_free_space() under FreeBSD.
* Fixed FastCGI support on Win32.
* Fixed FastCGI being unable to bind to a specific IP.
* Fixed several bugs in mail() implementation on win32.
* Fixed crashes in a number of functions.
* Fixed compile failure on MacOSX 10.3 Panther.
* Over 60 various bug fixes!

For full list of changes in PHP 4.3.4, see ChangeLog:
        http://www.php.net/ChangeLog-4.php#4.3.4

diffstat:

 databases/php4-ldap/distinfo   |   6 +++---
 doc/CHANGES                    |   3 ++-
 mail/php4-imap/distinfo        |   6 +++---
 math/php4-bcmath/distinfo      |   6 +++---
 net/php4-snmp/Makefile         |   4 ++--
 security/php4-openssl/Makefile |   9 ++++++++-
 textproc/php4-domxml/Makefile  |   4 ++--
 textproc/php4-wddx/Makefile    |   4 ++--
 textproc/php4-wddx/distinfo    |   6 +++---
 www/php4/Makefile              |   4 +---
 www/php4/Makefile.common       |   5 +++--
 www/php4/Makefile.php          |   4 +---
 www/php4/PLIST                 |  16 +---------------
 www/php4/buildlink2.mk         |   4 ++--
 www/php4/distinfo              |  10 +++++-----
 www/php4/patches/patch-ab      |  14 ++++++++------
 www/php4/patches/patch-aj      |  33 +++++++++++++++++----------------
 17 files changed, 66 insertions(+), 72 deletions(-)

diffs (truncated from 351 to 300 lines):

diff -r f1c546db55bc -r ce0f75215c58 databases/php4-ldap/distinfo
--- a/databases/php4-ldap/distinfo      Sat Nov 08 06:33:45 2003 +0000
+++ b/databases/php4-ldap/distinfo      Sat Nov 08 06:58:10 2003 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2003/09/03 03:45:58 jmc Exp $
+$NetBSD: distinfo,v 1.9 2003/11/08 06:58:10 jdolecek Exp $
 
-SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d
-Size (php-4.3.3.tar.gz) = 4565509 bytes
+SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3
+Size (php-4.3.4.tar.bz2) = 3774324 bytes
 SHA1 (patch-aa) = 5c8011a8222920c07fbac8d95491eef767047eb4
diff -r f1c546db55bc -r ce0f75215c58 doc/CHANGES
--- a/doc/CHANGES       Sat Nov 08 06:33:45 2003 +0000
+++ b/doc/CHANGES       Sat Nov 08 06:58:10 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3793 2003/11/08 06:33:45 xtraeme Exp $
+$NetBSD: CHANGES,v 1.3794 2003/11/08 06:58:10 jdolecek Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -4316,3 +4316,4 @@
        Updated speedtouch to 1.2-beta2nb2 [abs 2003-11-06]
        Updated wmweather to 2.4.2 [xtraeme 2003-11-08]
        Updated lftp to 2.6.8 [xtraeme 2003-11-08]
+       Updated php to 4.3.4 [jdolecek 2003-11-08]
diff -r f1c546db55bc -r ce0f75215c58 mail/php4-imap/distinfo
--- a/mail/php4-imap/distinfo   Sat Nov 08 06:33:45 2003 +0000
+++ b/mail/php4-imap/distinfo   Sat Nov 08 06:58:10 2003 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2003/08/31 19:55:48 jdolecek Exp $
+$NetBSD: distinfo,v 1.8 2003/11/08 06:58:10 jdolecek Exp $
 
-SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d
-Size (php-4.3.3.tar.gz) = 4565509 bytes
+SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3
+Size (php-4.3.4.tar.bz2) = 3774324 bytes
 SHA1 (patch-aa) = 88bdeff65b4a8c2abe46b969715702b31020bb28
 SHA1 (patch-ab) = fbdb1acceacf4f514c28d7ef5dba61bcc451f308
diff -r f1c546db55bc -r ce0f75215c58 math/php4-bcmath/distinfo
--- a/math/php4-bcmath/distinfo Sat Nov 08 06:33:45 2003 +0000
+++ b/math/php4-bcmath/distinfo Sat Nov 08 06:58:10 2003 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2003/09/03 03:44:36 jmc Exp $
+$NetBSD: distinfo,v 1.8 2003/11/08 06:58:10 jdolecek Exp $
 
-SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d
-Size (php-4.3.3.tar.gz) = 4565509 bytes
+SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3
+Size (php-4.3.4.tar.bz2) = 3774324 bytes
 SHA1 (patch-aa) = 87d0642aaa4083e36844fb61065ab44dd33be0e5
diff -r f1c546db55bc -r ce0f75215c58 net/php4-snmp/Makefile
--- a/net/php4-snmp/Makefile    Sat Nov 08 06:33:45 2003 +0000
+++ b/net/php4-snmp/Makefile    Sat Nov 08 06:58:10 2003 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/11/07 23:23:18 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2003/11/08 06:58:10 jdolecek Exp $
 
 MODNAME=               snmp
 CATEGORIES+=           net
-PKGREVISION=           1
+PKGREVISION=           # empty
 COMMENT=               PHP4 extension for SNMP
 
 USE_BUILDLINK2=                YES
diff -r f1c546db55bc -r ce0f75215c58 security/php4-openssl/Makefile
--- a/security/php4-openssl/Makefile    Sat Nov 08 06:33:45 2003 +0000
+++ b/security/php4-openssl/Makefile    Sat Nov 08 06:58:10 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/01 16:37:36 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2003/11/08 06:58:10 jdolecek Exp $
 
 MODNAME=               openssl
 CATEGORIES+=           security
@@ -11,5 +11,12 @@
 
 CONFIGURE_ARGS+=       --with-${MODNAME}=shared,${BUILDLINK_PREFIX.openssl}
 
+# the config test for -lssl fails to link in -lcrypto; just force it
+# to succeed
+CONFIGURE_ENV+=                ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes
+
+post-extract:
+       cd ${WRKSRC} && ln -s config0.m4 config.m4
+
 .include "../../security/openssl/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f1c546db55bc -r ce0f75215c58 textproc/php4-domxml/Makefile
--- a/textproc/php4-domxml/Makefile     Sat Nov 08 06:33:45 2003 +0000
+++ b/textproc/php4-domxml/Makefile     Sat Nov 08 06:58:10 2003 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/09/13 07:30:23 jdolecek Exp $
+# $NetBSD: Makefile,v 1.11 2003/11/08 06:58:10 jdolecek Exp $
 
 MODNAME=               domxml
 CATEGORIES+=           textproc
-PKGREVISION=           1
+PKGREVISION=           # empty
 COMMENT=               PHP4 extension for DOM support
 
 USE_BUILDLINK2=                YES
diff -r f1c546db55bc -r ce0f75215c58 textproc/php4-wddx/Makefile
--- a/textproc/php4-wddx/Makefile       Sat Nov 08 06:33:45 2003 +0000
+++ b/textproc/php4-wddx/Makefile       Sat Nov 08 06:58:10 2003 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/10/11 13:40:19 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/11/08 06:58:10 jdolecek Exp $
 
 MODNAME=               wddx
 CATEGORIES+=           textproc
-PKGREVISION=           1
+PKGREVISION=           # empty
 COMMENT=               PHP4 extension for WDDX support
 
 USE_BUILDLINK2=                YES
diff -r f1c546db55bc -r ce0f75215c58 textproc/php4-wddx/distinfo
--- a/textproc/php4-wddx/distinfo       Sat Nov 08 06:33:45 2003 +0000
+++ b/textproc/php4-wddx/distinfo       Sat Nov 08 06:58:10 2003 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2003/09/03 03:25:29 jmc Exp $
+$NetBSD: distinfo,v 1.8 2003/11/08 06:58:10 jdolecek Exp $
 
-SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d
-Size (php-4.3.3.tar.gz) = 4565509 bytes
+SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3
+Size (php-4.3.4.tar.bz2) = 3774324 bytes
 SHA1 (patch-ab) = 5c89db466aeeb6986eee3269c36df47cf2372da1
diff -r f1c546db55bc -r ce0f75215c58 www/php4/Makefile
--- a/www/php4/Makefile Sat Nov 08 06:33:45 2003 +0000
+++ b/www/php4/Makefile Sat Nov 08 06:58:10 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2003/08/31 19:56:05 jdolecek Exp $
+# $NetBSD: Makefile,v 1.35 2003/11/08 06:58:10 jdolecek Exp $
 
 PKGNAME=               php-${PHP_BASE_VERS}
 CATEGORIES+=           lang
@@ -14,8 +14,6 @@
 
 .include "Makefile.php"
 
-CONFIGURE_ARGS+=       --enable-cli
-
 CGIDIR=                        ${PREFIX}/libexec/cgi-bin
 EGDIR=                 ${PREFIX}/share/examples/php
 
diff -r f1c546db55bc -r ce0f75215c58 www/php4/Makefile.common
--- a/www/php4/Makefile.common  Sat Nov 08 06:33:45 2003 +0000
+++ b/www/php4/Makefile.common  Sat Nov 08 06:58:10 2003 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.common,v 1.31 2003/08/31 19:56:05 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.32 2003/11/08 06:58:10 jdolecek Exp $
 
 DISTNAME?=             php-${PHP_DIST_VERS}
 CATEGORIES+=           www php4
 MASTER_SITES?=         http://www.php.net/distributions/ \
                        http://php3.de/distributions/ \
                        ftp://ftp.php.net/pub/distributions/
+EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER?=           jlam%NetBSD.org@localhost
 HOMEPAGE?=             http://www.php.net/
@@ -14,7 +15,7 @@
 # PHP_DIST_VERS                version number on the php distfile
 # PHP_BASE_VERS                pkgsrc-mangled version number (convert pl -> .)
 #
-PHP_DIST_VERS=         4.3.3
+PHP_DIST_VERS=         4.3.4
 PHP_BASE_VERS=         ${PHP_DIST_VERS}
 
 DISTFILES?=            ${PHP_DISTFILE}
diff -r f1c546db55bc -r ce0f75215c58 www/php4/Makefile.php
--- a/www/php4/Makefile.php     Sat Nov 08 06:33:45 2003 +0000
+++ b/www/php4/Makefile.php     Sat Nov 08 06:58:10 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.9 2003/09/05 19:39:52 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.10 2003/11/08 06:58:10 jdolecek Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -8,8 +8,6 @@
 USE_LIBTOOL=           YES
 GNU_CONFIGURE=         YES
 
-CONFIGURE_ARGS+=       --disable-cli
-
 CONFIGURE_ARGS+=       --without-mysql
 CONFIGURE_ARGS+=       --without-iconv
 
diff -r f1c546db55bc -r ce0f75215c58 www/php4/PLIST
--- a/www/php4/PLIST    Sat Nov 08 06:33:45 2003 +0000
+++ b/www/php4/PLIST    Sat Nov 08 06:58:10 2003 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/09/01 15:41:45 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/11/08 06:58:10 jdolecek Exp $
 bin/pear
 bin/php
 bin/php-config
@@ -131,24 +131,10 @@
 include/php/ext/xml/expat/asciitab.h
 include/php/ext/xml/expat/xmltok_impl.h
 include/php/ext/xml/php_xml.h
-include/php/ext/mbstring/cp932_table.h
-include/php/ext/mbstring/unicode_table_ru.h
-include/php/ext/mbstring/unicode_table_kr.h
-include/php/ext/mbstring/unicode_table_ja.h
-include/php/ext/mbstring/unicode_table_cn.h
-include/php/ext/mbstring/unicode_table.h
 include/php/ext/mbstring/unicode_data.h
 include/php/ext/mbstring/php_unicode.h
 include/php/ext/mbstring/php_mbregex.h
 include/php/ext/mbstring/mbstring.h
-include/php/ext/mbstring/mbregex.h
-include/php/ext/mbstring/mbfilter_tw.h
-include/php/ext/mbstring/mbfilter_ru.h
-include/php/ext/mbstring/mbfilter_kr.h
-include/php/ext/mbstring/mbfilter_ja.h
-include/php/ext/mbstring/mbfilter_cn.h
-include/php/ext/mbstring/mbfilter.h
-include/php/ext/mbstring/unicode_table_tw.h
 include/php/ext/pgsql/php_pgsql.h
 include/php/main/SAPI.h
 include/php/main/spprintf.h
diff -r f1c546db55bc -r ce0f75215c58 www/php4/buildlink2.mk
--- a/www/php4/buildlink2.mk    Sat Nov 08 06:33:45 2003 +0000
+++ b/www/php4/buildlink2.mk    Sat Nov 08 06:58:10 2003 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/09/29 12:47:38 jdolecek Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/11/08 06:58:10 jdolecek Exp $
 
 .if !defined(PHP4_BUILDLINK2_MK)
 PHP4_BUILDLINK2_MK=    # defined
 
 BUILDLINK_PACKAGES+=           php4
-BUILDLINK_DEPENDS.php4?=       php>=4.3.3
+BUILDLINK_DEPENDS.php4?=       php>=4.3.4
 BUILDLINK_PKGSRCDIR.php4?=     ../../www/php4
 
 # This adds a build-dependency as php4 has no libraries.
diff -r f1c546db55bc -r ce0f75215c58 www/php4/distinfo
--- a/www/php4/distinfo Sat Nov 08 06:33:45 2003 +0000
+++ b/www/php4/distinfo Sat Nov 08 06:58:10 2003 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.22 2003/09/01 10:16:49 martti Exp $
+$NetBSD: distinfo,v 1.23 2003/11/08 06:58:10 jdolecek Exp $
 
-SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d
-Size (php-4.3.3.tar.gz) = 4565509 bytes
-SHA1 (patch-ab) = b69b9ad226469300a885390db6e45dc43d8ae0d1
+SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3
+Size (php-4.3.4.tar.bz2) = 3774324 bytes
+SHA1 (patch-ab) = a670f6f5dcc7a5624e89d9e39ae97a9e44747e42
 SHA1 (patch-ae) = 21fb3fc613121bcfb35f2735870d142612e238dd
 SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4
 SHA1 (patch-ah) = 0ac37bd35c4594cb58f1ea85ef811154b644a931
 SHA1 (patch-ai) = 7a73ba3b111c6c0437cb52c7044c367453f9c132
-SHA1 (patch-aj) = b517c66ad74d1f1394ce7dd8f9a9567811d30b00
+SHA1 (patch-aj) = 6b8dac60d1a513fc76cf97b63cca0e2a1d643f11
diff -r f1c546db55bc -r ce0f75215c58 www/php4/patches/patch-ab
--- a/www/php4/patches/patch-ab Sat Nov 08 06:33:45 2003 +0000
+++ b/www/php4/patches/patch-ab Sat Nov 08 06:58:10 2003 +0000
@@ -1,18 +1,20 @@
-$NetBSD: patch-ab,v 1.13 2003/09/01 10:17:38 cjep Exp $
---- scripts/phpize.in.orig     2003-08-30 22:28:44.000000000 +0200
-+++ scripts/phpize.in  2003-08-30 22:29:39.000000000 +0200
-@@ -54,10 +54,15 @@
+$NetBSD: patch-ab,v 1.14 2003/11/08 06:58:10 jdolecek Exp $
+
+--- scripts/phpize.in.orig     2003-08-27 19:57:32.000000000 +0200
++++ scripts/phpize.in  2003-11-07 21:44:48.000000000 +0100
+@@ -54,11 +54,15 @@
  
  touch install-sh mkinstalldirs missing
  
 -aclocal || exit 1
 -autoconf || exit 1
 -autoheader || exit 1
--libtoolize -f -c || exit 1
+-libtoolize=`$builddir/build/shtool path glibtoolize libtoolize`
+-$libtoolize -f -c || exit 1
 +if [ -z "$ACLOCAL" ]; then ACLOCAL=aclocal; fi
 +if [ -z "$AUTOCONF" ]; then AUTOCONF=autoconf; fi
 +if [ -z "$AUTOHEADER" ]; then AUTOHEADER=autoheader; fi
-+if [ -z "$LIBTOOLIZE" ]; then LIBTOOLIZE=libtoolize; fi
++if [ -z "$LIBTOOLIZE" ]; then LIBTOOLIZE=`$builddir/build/shtool path glibtoolize libtoolize`; fi
 +
 +$ACLOCAL || exit 1
 +$AUTOCONF || exit 1
diff -r f1c546db55bc -r ce0f75215c58 www/php4/patches/patch-aj
--- a/www/php4/patches/patch-aj Sat Nov 08 06:33:45 2003 +0000
+++ b/www/php4/patches/patch-aj Sat Nov 08 06:58:10 2003 +0000
@@ -1,19 +1,20 @@
-$NetBSD: patch-aj,v 1.5 2003/09/01 10:17:39 cjep Exp $
---- ext/gettext/gettext.c.orig 2003-08-30 21:56:34.000000000 +0200
-+++ ext/gettext/gettext.c      2003-08-30 21:57:13.000000000 +0200
-@@ -58,6 +58,11 @@
- };
- /* }}} */
+$NetBSD: patch-aj,v 1.6 2003/11/08 06:58:10 jdolecek Exp $
+
+--- ext/gettext/gettext.c.orig 2003-09-24 04:08:48.000000000 +0200



Home | Main Index | Thread Index | Old Index