pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Update php4 to 4.3.8.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8d0ab42d9c8b
branches:  trunk
changeset: 477992:8d0ab42d9c8b
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Wed Jul 14 08:03:16 2004 +0000

description:
Update php4 to 4.3.8.

This is security fix release, fixing several important security
issues. From the ChangeLog:

* Fixed strip_tags() to correctly handle '\0' characters.
* Improved stability during startup when memory_limit is used.
* Replace alloca() with emalloc() for better stack protection.
* Added missing safe_mode checks inside ftok and itpc.
* Fixed bug #28963 Fixed address allocation routine in IMAP extension.
* Fixed bug #28632 Prevent open_basedir bypass via MySQL's LOAD DATA LOCAL.

Note: package update also includes extra patches from PHP CVS not
present in stock PHP 4.3.8 release - compilation fix for
mssql extension and Zend engine memory-use-after-free fix.

diffstat:

 databases/php4-mssql/Makefile         |   4 +++-
 databases/php4-mssql/distinfo         |   5 +++++
 databases/php4-mssql/patches/patch-aa |  29 +++++++++++++++++++++++++++++
 databases/php4-mysql/distinfo         |   6 +++---
 doc/CHANGES                           |   3 ++-
 mail/php4-imap/distinfo               |   6 +++---
 www/php4/Makefile.common              |   4 ++--
 www/php4/Makefile.php                 |   6 +++---
 www/php4/distinfo                     |   6 +++---
 9 files changed, 53 insertions(+), 16 deletions(-)

diffs (145 lines):

diff -r 6b719eeaa21c -r 8d0ab42d9c8b databases/php4-mssql/Makefile
--- a/databases/php4-mssql/Makefile     Wed Jul 14 07:06:05 2004 +0000
+++ b/databases/php4-mssql/Makefile     Wed Jul 14 08:03:16 2004 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2004/04/25 01:12:49 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/07/14 08:03:16 jdolecek Exp $
 
 MODNAME=               mssql
 CATEGORIES+=           databases
 COMMENT=               PHP4 extension for MS SQL databases
 
+DISTINFO_FILE=         ${.CURDIR}/distinfo
+
 .include "../../www/php4/Makefile.module"
 
 USE_BUILDLINK3=                yes
diff -r 6b719eeaa21c -r 8d0ab42d9c8b databases/php4-mssql/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/php4-mssql/distinfo     Wed Jul 14 08:03:16 2004 +0000
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2004/07/14 08:04:37 jdolecek Exp $
+
+SHA1 (php-4.3.8.tar.bz2) = 95da913b932859239f544a7b2f38c9257aa3d735
+Size (php-4.3.8.tar.bz2) = 3963437 bytes
+SHA1 (patch-aa) = 20ae463b1bfcef2fc97f3ac6f3b3b314f6080334
diff -r 6b719eeaa21c -r 8d0ab42d9c8b databases/php4-mssql/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/php4-mssql/patches/patch-aa     Wed Jul 14 08:03:16 2004 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.1 2004/07/14 08:03:16 jdolecek Exp $
+
+===================================================================
+RCS file: /repository/php-src/ext/mssql/php_mssql.h,v
+retrieving revision 1.23.4.10
+retrieving revision 1.23.4.11
+diff -p --unified=3 -r1.23.4.10 -r1.23.4.11
+--- php_mssql.h        2004/04/20 23:37:26     1.23.4.10
++++ php_mssql.h        2004/06/04 01:02:21     1.23.4.11
+@@ -17,7 +17,7 @@
+  */
+
+
+-/* $Id: patch-aa,v 1.1 2004/07/14 08:03:16 jdolecek Exp $ */
++/* $Id: patch-aa,v 1.1 2004/07/14 08:03:16 jdolecek Exp $ */
+
+ #ifndef PHP_MSSQL_H
+ #define PHP_MSSQL_H
+@@ -37,9 +37,7 @@
+ #include "sqldb.h"
+
+ #if HAVE_FREETDS
+-#ifndef SHORT
+-typedef short SHORT;
+-#endif
++typedef short TDS_SHORT;
+ #define SQLTEXT SYBTEXT
+ #define SQLCHAR SYBCHAR
+ #define SQLVARCHAR SYBVARCHAR
diff -r 6b719eeaa21c -r 8d0ab42d9c8b databases/php4-mysql/distinfo
--- a/databases/php4-mysql/distinfo     Wed Jul 14 07:06:05 2004 +0000
+++ b/databases/php4-mysql/distinfo     Wed Jul 14 08:03:16 2004 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2004/07/06 19:52:01 jdolecek Exp $
+$NetBSD: distinfo,v 1.11 2004/07/14 08:03:16 jdolecek Exp $
 
-SHA1 (php-4.3.7.tar.bz2) = f6171d71282b2e50333d1e96859fe907da068c34
-Size (php-4.3.7.tar.bz2) = 3963734 bytes
+SHA1 (php-4.3.8.tar.bz2) = 95da913b932859239f544a7b2f38c9257aa3d735
+Size (php-4.3.8.tar.bz2) = 3963437 bytes
 SHA1 (patch-aa) = 8f7027758c3fe1d59187e7777ee46e73d126738a
diff -r 6b719eeaa21c -r 8d0ab42d9c8b doc/CHANGES
--- a/doc/CHANGES       Wed Jul 14 07:06:05 2004 +0000
+++ b/doc/CHANGES       Wed Jul 14 08:03:16 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6548 2004/07/14 01:14:23 xtraeme Exp $
+$NetBSD: CHANGES,v 1.6549 2004/07/14 08:03:16 jdolecek Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -3383,3 +3383,4 @@
        Updated mathomatic to 11.3 [minskim 2004-07-13]
        Updated jabberd2 to 2.0s3 [xtraeme 2004-07-14]
        Added nrg2iso-0.2 [xtraeme 2004-07-14]
+       Updated php4 to 4.3.8 [jdolecek 2004-07-14]
diff -r 6b719eeaa21c -r 8d0ab42d9c8b mail/php4-imap/distinfo
--- a/mail/php4-imap/distinfo   Wed Jul 14 07:06:05 2004 +0000
+++ b/mail/php4-imap/distinfo   Wed Jul 14 08:03:16 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2004/07/06 19:52:01 jdolecek Exp $
+$NetBSD: distinfo,v 1.12 2004/07/14 08:03:16 jdolecek Exp $
 
-SHA1 (php-4.3.7.tar.bz2) = f6171d71282b2e50333d1e96859fe907da068c34
-Size (php-4.3.7.tar.bz2) = 3963734 bytes
+SHA1 (php-4.3.8.tar.bz2) = 95da913b932859239f544a7b2f38c9257aa3d735
+Size (php-4.3.8.tar.bz2) = 3963437 bytes
 SHA1 (patch-aa) = 73333018762ba63adf026ff91ccb6d6edd461f42
 SHA1 (patch-ab) = 594c9ebf5e7979e049399d7ba9dcb00614bfc95e
diff -r 6b719eeaa21c -r 8d0ab42d9c8b www/php4/Makefile.common
--- a/www/php4/Makefile.common  Wed Jul 14 07:06:05 2004 +0000
+++ b/www/php4/Makefile.common  Wed Jul 14 08:03:16 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2004/07/13 12:34:33 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.43 2004/07/14 08:03:16 jdolecek Exp $
 
 DISTNAME?=             php-${PHP_DIST_VERS}
 CATEGORIES+=           www php4
@@ -15,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.7
+PHP_DIST_VERS=         4.3.8
 PHP_BASE_VERS=         ${PHP_DIST_VERS}
 
 DISTFILES?=            ${PHP_DISTFILE}
diff -r 6b719eeaa21c -r 8d0ab42d9c8b www/php4/Makefile.php
--- a/www/php4/Makefile.php     Wed Jul 14 07:06:05 2004 +0000
+++ b/www/php4/Makefile.php     Wed Jul 14 08:03:16 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.php,v 1.14 2004/07/13 12:34:33 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.15 2004/07/14 08:03:16 jdolecek Exp $
 
 .include "../../www/php4/Makefile.common"
 
-# revision of the core PHP interepreter
-PKGREVISION=           1
+# revision of the core PHP interepreter package
+PKGREVISION=           # empty
 
 DISTINFO_FILE=         ${.CURDIR}/../../www/php4/distinfo
 PATCHDIR=                      ${.CURDIR}/../../www/php4/patches
diff -r 6b719eeaa21c -r 8d0ab42d9c8b www/php4/distinfo
--- a/www/php4/distinfo Wed Jul 14 07:06:05 2004 +0000
+++ b/www/php4/distinfo Wed Jul 14 08:03:16 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.30 2004/07/13 12:22:29 jdolecek Exp $
+$NetBSD: distinfo,v 1.31 2004/07/14 08:03:16 jdolecek Exp $
 
-SHA1 (php-4.3.7.tar.bz2) = f6171d71282b2e50333d1e96859fe907da068c34
-Size (php-4.3.7.tar.bz2) = 3963734 bytes
+SHA1 (php-4.3.8.tar.bz2) = 95da913b932859239f544a7b2f38c9257aa3d735
+Size (php-4.3.8.tar.bz2) = 3963437 bytes
 SHA1 (patch-aa) = feb064407950d0fc732b7240e65cac84420d2407
 SHA1 (patch-ab) = cc7785755774377d4eb2d3d4816cea61234da167
 SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4



Home | Main Index | Thread Index | Old Index