From 4a2d70a8b71a5569962e75545b093e6d7f5e7b25 Mon Sep 17 00:00:00 2001 From: avsm Date: Sun, 6 Jun 2004 18:09:22 +0000 Subject: [PATCH] update to php4-4.3.7 --- www/php4/Makefile.inc | 4 ++-- www/php4/core/distinfo | 6 +++--- www/php4/core/pkg/PLIST-pear | 4 +++- www/php4/extensions/distinfo | 6 +++--- www/php4/patches/patch-configure_in | 10 +++++----- www/php4/patches/patch-ext_standard_exec_c | 8 ++++---- www/php4/patches/patch-php_ini-dist | 14 ++++++++------ www/php4/patches/patch-php_ini-recommended | 11 ++++++----- 8 files changed, 34 insertions(+), 29 deletions(-) diff --git a/www/php4/Makefile.inc b/www/php4/Makefile.inc index 0582da7c362..9af825a45db 100644 --- a/www/php4/Makefile.inc +++ b/www/php4/Makefile.inc @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.20 2004/04/17 11:26:59 avsm Exp $ +# $OpenBSD: Makefile.inc,v 1.21 2004/06/06 18:09:22 avsm Exp $ # This port currently only works with archs supporting dynamic loading # and has Apache that supports DSO's. NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} -V= 4.3.6 +V= 4.3.7 DISTNAME= php-${V} CATEGORIES= www lang diff --git a/www/php4/core/distinfo b/www/php4/core/distinfo index c6a91bf367f..072b8f0c3d4 100644 --- a/www/php4/core/distinfo +++ b/www/php4/core/distinfo @@ -1,3 +1,3 @@ -MD5 (php-4.3.6.tar.gz) = 4848331288d6eaffcec0323a852d1082 -RMD160 (php-4.3.6.tar.gz) = cb34a4877f4b5e7f4477d648c528fa689f10698d -SHA1 (php-4.3.6.tar.gz) = 7a6fbd062074eb1971bad88b3957d08c0de2f2c8 +MD5 (php-4.3.7.tar.gz) = 20abcab34809146cb0f766a47187a957 +RMD160 (php-4.3.7.tar.gz) = bd84a2f4ab466268972ec55cbe22ecf0d2d63a47 +SHA1 (php-4.3.7.tar.gz) = 8fbd33c1321ba4abbae2d1e865cfda0496a62686 diff --git a/www/php4/core/pkg/PLIST-pear b/www/php4/core/pkg/PLIST-pear index 273c013d3e7..d962f3db43e 100644 --- a/www/php4/core/pkg/PLIST-pear +++ b/www/php4/core/pkg/PLIST-pear @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-pear,v 1.6 2004/04/08 12:38:59 avsm Exp $ +@comment $OpenBSD: PLIST-pear,v 1.7 2004/06/06 18:09:22 avsm Exp $ pear/lib/.registry/archive_tar.reg pear/lib/.registry/console_getopt.reg pear/lib/.registry/pear.reg @@ -28,6 +28,7 @@ pear/lib/PEAR/Config.php pear/lib/PEAR/Dependency.php pear/lib/PEAR/Downloader.php pear/lib/PEAR/Builder.php +pear/lib/PEAR/ErrorStack.php pear/lib/PEAR/Frontend/CLI.php pear/lib/PEAR/Installer.php pear/lib/PEAR/Packager.php @@ -58,6 +59,7 @@ pear/lib/DB/sqlite.php pear/lib/DB/common.php pear/lib/DB.php pear/lib/HTTP.php +pear/lib/Mail/null.php pear/lib/Mail/sendmail.php pear/lib/Mail/smtp.php pear/lib/Mail/RFC822.php diff --git a/www/php4/extensions/distinfo b/www/php4/extensions/distinfo index c6a91bf367f..072b8f0c3d4 100644 --- a/www/php4/extensions/distinfo +++ b/www/php4/extensions/distinfo @@ -1,3 +1,3 @@ -MD5 (php-4.3.6.tar.gz) = 4848331288d6eaffcec0323a852d1082 -RMD160 (php-4.3.6.tar.gz) = cb34a4877f4b5e7f4477d648c528fa689f10698d -SHA1 (php-4.3.6.tar.gz) = 7a6fbd062074eb1971bad88b3957d08c0de2f2c8 +MD5 (php-4.3.7.tar.gz) = 20abcab34809146cb0f766a47187a957 +RMD160 (php-4.3.7.tar.gz) = bd84a2f4ab466268972ec55cbe22ecf0d2d63a47 +SHA1 (php-4.3.7.tar.gz) = 8fbd33c1321ba4abbae2d1e865cfda0496a62686 diff --git a/www/php4/patches/patch-configure_in b/www/php4/patches/patch-configure_in index bff51a7f15b..c42668b0b38 100644 --- a/www/php4/patches/patch-configure_in +++ b/www/php4/patches/patch-configure_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-configure_in,v 1.10 2004/02/29 00:08:08 avsm Exp $ ---- configure.in.orig 2004-02-16 15:34:16.000000000 +0000 -+++ configure.in 2004-02-28 17:54:33.000000000 +0000 +$OpenBSD: patch-configure_in,v 1.11 2004/06/06 18:09:22 avsm Exp $ +--- configure.in.orig 2004-06-02 14:25:44.000000000 +0100 ++++ configure.in 2004-06-06 19:11:28.000000000 +0100 @@ -31,9 +31,7 @@ AC_PREREQ(2.13) AC_INIT(README.CVS-RULES) @@ -12,7 +12,7 @@ $OpenBSD: patch-configure_in,v 1.10 2004/02/29 00:08:08 avsm Exp $ AC_CANONICAL_HOST AC_CONFIG_HEADER(main/php_config.h) -@@ -778,14 +776,14 @@ unset with_pic +@@ -813,14 +811,14 @@ unset with_pic case $php_build_target in program|static) @@ -29,7 +29,7 @@ $OpenBSD: patch-configure_in,v 1.10 2004/02/29 00:08:08 avsm Exp $ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module" ;; esac -@@ -967,7 +965,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd +@@ -1002,7 +1000,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd EXPANDED_DATADIR=$datadir EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` diff --git a/www/php4/patches/patch-ext_standard_exec_c b/www/php4/patches/patch-ext_standard_exec_c index 055bf1398d3..60f2e86838f 100644 --- a/www/php4/patches/patch-ext_standard_exec_c +++ b/www/php4/patches/patch-ext_standard_exec_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-ext_standard_exec_c,v 1.1 2004/04/17 10:33:50 avsm Exp $ ---- ext/standard/exec.c.orig 2003-11-19 09:34:36.000000000 -0600 -+++ ext/standard/exec.c 2004-04-14 19:40:37.000000000 -0500 -@@ -942,7 +942,7 @@ PHP_FUNCTION(proc_open) +$OpenBSD: patch-ext_standard_exec_c,v 1.2 2004/06/06 18:09:22 avsm Exp $ +--- ext/standard/exec.c.orig 2004-05-18 14:43:33.000000000 +0100 ++++ ext/standard/exec.c 2004-06-06 19:11:28.000000000 +0100 +@@ -952,7 +952,7 @@ PHP_FUNCTION(proc_open) close(descriptors[i].childend); } diff --git a/www/php4/patches/patch-php_ini-dist b/www/php4/patches/patch-php_ini-dist index 3b573fffff7..60851aa3997 100644 --- a/www/php4/patches/patch-php_ini-dist +++ b/www/php4/patches/patch-php_ini-dist @@ -1,6 +1,6 @@ -$OpenBSD: patch-php_ini-dist,v 1.12 2004/02/29 00:08:08 avsm Exp $ ---- php.ini-dist.orig 2004-02-10 00:03:43.000000000 +0000 -+++ php.ini-dist 2004-02-28 17:54:25.000000000 +0000 +$OpenBSD: patch-php_ini-dist,v 1.13 2004/06/06 18:09:22 avsm Exp $ +--- php.ini-dist.orig 2004-05-17 17:31:13.000000000 +0100 ++++ php.ini-dist 2004-06-06 19:18:37.000000000 +0100 @@ -408,10 +408,7 @@ default_mimetype = "text/html" ;;;;;;;;;;;;;;;;;;;;;;;;; @@ -109,19 +109,21 @@ $OpenBSD: patch-php_ini-dist,v 1.12 2004/02/29 00:08:08 avsm Exp $ ;;;;;;;;;;;;;;;;;;; ; Module Settings ; ;;;;;;;;;;;;;;;;;;; -@@ -592,11 +518,6 @@ default_socket_timeout = 60 +@@ -592,13 +518,6 @@ default_socket_timeout = 60 define_syslog_variables = Off [mail function] -; For Win32 only. -SMTP = localhost +-smtp_port = 25 - -; For Win32 only. -;sendmail_from = me@example.com - +- ; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). ;sendmail_path = -@@ -1115,3 +1036,57 @@ sockets.use_system_read = On + +@@ -1116,3 +1035,57 @@ sockets.use_system_read = On ; Local Variables: ; tab-width: 4 ; End: diff --git a/www/php4/patches/patch-php_ini-recommended b/www/php4/patches/patch-php_ini-recommended index d960f3ea5cd..2ad5605a196 100644 --- a/www/php4/patches/patch-php_ini-recommended +++ b/www/php4/patches/patch-php_ini-recommended @@ -1,6 +1,6 @@ -$OpenBSD: patch-php_ini-recommended,v 1.10 2004/02/29 00:08:08 avsm Exp $ ---- php.ini-recommended.orig 2004-02-10 00:03:43.000000000 +0000 -+++ php.ini-recommended 2004-02-28 17:54:25.000000000 +0000 +$OpenBSD: patch-php_ini-recommended,v 1.11 2004/06/06 18:09:22 avsm Exp $ +--- php.ini-recommended.orig 2004-05-17 17:31:14.000000000 +0100 ++++ php.ini-recommended 2004-06-06 19:19:00.000000000 +0100 @@ -423,11 +423,8 @@ default_mimetype = "text/html" ;;;;;;;;;;;;;;;;;;;;;;;;; @@ -110,19 +110,20 @@ $OpenBSD: patch-php_ini-recommended,v 1.10 2004/02/29 00:08:08 avsm Exp $ ;;;;;;;;;;;;;;;;;;; ; Module Settings ; ;;;;;;;;;;;;;;;;;;; -@@ -607,11 +533,6 @@ default_socket_timeout = 60 +@@ -607,12 +533,6 @@ default_socket_timeout = 60 define_syslog_variables = Off [mail function] -; For Win32 only. -SMTP = localhost +-smtp_port = 25 - -; For Win32 only. -;sendmail_from = me@example.com ; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). ;sendmail_path = -@@ -1110,6 +1031,56 @@ sockets.use_system_read = On +@@ -1111,6 +1031,56 @@ sockets.use_system_read = On ;exif.decode_jis_motorola = JIS ;exif.decode_jis_intel = JIS