[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[UPDATE] php5

To: ports_(_at_)_openbsd_(_dot_)_org
Subject: [UPDATE] php5
From: Robert Nagy <robert_(_at_)_openbsd_(_dot_)_org>
Date: Sun, 19 Dec 2004 00:05:21 +0100
Hi folks. Here is the diff that updates php5 to 5.0.3.
Please test it and report the problems.
You may also note that this is a security fix. 
+WANTLIB fix

Thanks

Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/www/php5/Makefile.inc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.inc
--- Makefile.inc	2 Oct 2004 11:32:35 -0000	1.1.1.1
+++ Makefile.inc	18 Dec 2004 23:00:19 -0000
@@ -4,7 +4,7 @@
 # and has Apache that supports DSO's.
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
-V=		5.0.2	
+V=		5.0.3
 DISTNAME=	php-${V}
 CATEGORIES=	www lang
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/php5/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo	2 Oct 2004 11:32:35 -0000	1.1.1.1
+++ distinfo	18 Dec 2004 23:00:19 -0000
@@ -1,3 +1,3 @@
-MD5 (php-5.0.2.tar.gz) = 5467327e0cab6de76a90266933322b59
-RMD160 (php-5.0.2.tar.gz) = 71bd044e3de3946099da35dc680eae88ea709920
-SHA1 (php-5.0.2.tar.gz) = 63ac32e110958f2cb5b70cd8bd6760a31b7106dd
+MD5 (php-5.0.3.tar.gz) = bf89557056ce34d502e20e24071616c7
+RMD160 (php-5.0.3.tar.gz) = f002dc137af6cfd8c8f3a4bb6d4948fef6662694
+SHA1 (php-5.0.3.tar.gz) = bf1b5db0d3144caad3a74d8eefc3d15f9cb08bfd
Index: core/Makefile
===================================================================
RCS file: /cvs/ports/www/php5/core/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- core/Makefile	11 Dec 2004 13:29:22 -0000	1.5
+++ core/Makefile	18 Dec 2004 23:00:19 -0000
@@ -5,7 +5,7 @@
 
 COMMENT=	"server-side HTML-embedded scripting language"
 COMMENT-pear=	"base classes for common PHP tasks"
-PKGNAME=	php5-core-${V}p1
+PKGNAME=	php5-core-${V}
 FULLPKGNAME-pear= php5-pear-${V}
 
 CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
@@ -42,7 +42,7 @@
 PHPXS_SUBST+= -e 's,${i},${${i}},'
 .endfor
 
-WANTLIB=	c crypto des m ssl z
+WANTLIB=	c crypto des m ssl stdc++ z
 
 .if defined(PACKAGING) && !empty(SUBPACKAGE)
 PREFIX=		${CHROOT_DIR}
Index: core/pkg/PLIST-pear
===================================================================
RCS file: /cvs/ports/www/php5/core/pkg/PLIST-pear,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST-pear
--- core/pkg/PLIST-pear	2 Oct 2004 12:36:50 -0000	1.1.1.1
+++ core/pkg/PLIST-pear	18 Dec 2004 23:00:19 -0000
@@ -75,11 +75,21 @@
 pear/include/Zend/zend_stack.h
 pear/include/Zend/zend_static_allocator.h
 pear/include/Zend/zend_stream.h
+pear/include/Zend/zend_strtod.h
 pear/include/Zend/zend_ts_hash.h
 pear/include/Zend/zend_types.h
 pear/include/Zend/zend_variables.h
 pear/include/acconfig.h
 pear/include/ext/
+pear/include/ext/iconv/
+pear/include/ext/iconv/php_have_bsd_iconv.h
+pear/include/ext/iconv/php_have_glibc_iconv.h
+pear/include/ext/iconv/php_have_iconv.h
+pear/include/ext/iconv/php_have_libiconv.h
+pear/include/ext/iconv/php_iconv.h
+pear/include/ext/iconv/php_iconv_supports_errno.h
+pear/include/ext/iconv/php_php_iconv_h_path.h
+pear/include/ext/iconv/php_php_iconv_impl.h
 pear/include/ext/libxml/
 pear/include/ext/libxml/php_libxml.h
 pear/include/ext/mbstring/
@@ -163,6 +173,7 @@
 pear/include/ext/xml/expat/
 pear/include/ext/xml/expat_compat.h
 pear/include/ext/xml/php_xml.h
+pear/include/include/
 pear/include/main/
 pear/include/main/SAPI.h
 pear/include/main/build-defs.h
@@ -245,6 +256,7 @@
 pear/lib/PEAR/Dependency.php
 pear/lib/PEAR/Downloader.php
 pear/lib/PEAR/ErrorStack.php
+pear/lib/PEAR/Exception.php
 pear/lib/PEAR/Frontend/
 pear/lib/PEAR/Frontend/CLI.php
 pear/lib/PEAR/Installer.php
Index: patches/patch-php_ini-dist
===================================================================
RCS file: /cvs/ports/www/php5/patches/patch-php_ini-dist,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-php_ini-dist
--- patches/patch-php_ini-dist	2 Oct 2004 11:32:38 -0000	1.1.1.1
+++ patches/patch-php_ini-dist	18 Dec 2004 23:00:20 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-php_ini-dist,v 1.1.1.1 2004/10/02 11:32:38 robert Exp $
---- php.ini-dist.orig	Tue Aug 10 02:44:23 2004
-+++ php.ini-dist	Wed Aug 25 16:38:35 2004
+$OpenBSD$
+--- php.ini-dist.orig	Sun Nov 28 14:22:11 2004
++++ php.ini-dist	Sat Dec 18 19:30:46 2004
 @@ -430,10 +430,7 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
@@ -31,11 +31,10 @@
  
  ; Define the anonymous ftp password (your email address)
  ;from="john_(_at_)_doe_(_dot_)_com"
-@@ -523,76 +520,6 @@
- ; fgets() and file() will work regardless of the source of the file.
+@@ -524,74 +521,6 @@
  ; auto_detect_line_endings = Off
  
--
+ 
 -;;;;;;;;;;;;;;;;;;;;;;
 -; Dynamic Extensions ;
 -;;;;;;;;;;;;;;;;;;;;;;
@@ -73,7 +72,6 @@
 -;extension=php_filepro.dll
 -;extension=php_gd2.dll
 -;extension=php_gettext.dll
--;extension=php_iconv.dll
 -;extension=php_ifx.dll
 -;extension=php_iisfunc.dll
 -;extension=php_imap.dll
@@ -108,7 +106,7 @@
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
  ;;;;;;;;;;;;;;;;;;;
-@@ -604,13 +531,6 @@
+@@ -603,14 +532,6 @@
  define_syslog_variables  = Off
  
  [mail function]
@@ -119,13 +117,17 @@
 -; For Win32 only.
 -;sendmail_from = me_(_at_)_example_(_dot_)_com
 -
- ; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
+-; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
  ;sendmail_path =
  
-@@ -1195,3 +1115,54 @@
- ; Local Variables:
- ; tab-width: 4
- ; End:
+ ; Force the addition of the specified parameters to be passed as extra parameters
+@@ -1191,6 +1112,54 @@
+ ; instead of original one.
+ soap.wsdl_cache_ttl=86400
+ 
+-; Local Variables:
+-; tab-width: 4
+-; End:
 +
 +;;;;;;;;;;;;;;;;;;;;;;
 +; Dynamic Extensions ;
Index: patches/patch-php_ini-recommended
===================================================================
RCS file: /cvs/ports/www/php5/patches/patch-php_ini-recommended,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-php_ini-recommended
--- patches/patch-php_ini-recommended	2 Oct 2004 11:32:38 -0000	1.1.1.1
+++ patches/patch-php_ini-recommended	18 Dec 2004 23:00:20 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-php_ini-recommended,v 1.1.1.1 2004/10/02 11:32:38 robert Exp $
---- php.ini-recommended.orig	Wed Jun 23 10:18:42 2004
-+++ php.ini-recommended	Tue Jul 27 01:24:10 2004
-@@ -437,10 +437,7 @@
+$OpenBSD$
+--- php.ini-recommended.orig	Sun Nov 28 14:22:11 2004
++++ php.ini-recommended	Sat Dec 18 19:30:37 2004
+@@ -488,10 +488,7 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -13,7 +13,7 @@
  
  ; The root of the PHP pages, used only if nonempty.
  ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-@@ -454,7 +451,7 @@
+@@ -505,7 +502,7 @@
  user_dir =
  
  ; Directory in which the loadable extensions (modules) reside.
@@ -22,7 +22,7 @@
  
  ; Whether or not to enable the dl() function.  The dl() function does NOT work
  ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-@@ -512,7 +509,7 @@
+@@ -563,7 +560,7 @@
  ;;;;;;;;;;;;;;;;;;
  
  ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
@@ -31,11 +31,10 @@
  
  ; Define the anonymous ftp password (your email address)
  ;from="john_(_at_)_doe_(_dot_)_com"
-@@ -530,76 +527,6 @@
- ; fgets() and file() will work regardless of the source of the file.
+@@ -582,74 +579,6 @@
  ; auto_detect_line_endings = Off
  
--
+ 
 -;;;;;;;;;;;;;;;;;;;;;;
 -; Dynamic Extensions ;
 -;;;;;;;;;;;;;;;;;;;;;;
@@ -73,7 +72,6 @@
 -;extension=php_filepro.dll
 -;extension=php_gd2.dll
 -;extension=php_gettext.dll
--;extension=php_iconv.dll
 -;extension=php_ifx.dll
 -;extension=php_iisfunc.dll
 -;extension=php_imap.dll
@@ -108,7 +106,7 @@
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
  ;;;;;;;;;;;;;;;;;;;
-@@ -611,13 +538,6 @@
+@@ -661,13 +590,6 @@
  define_syslog_variables  = Off
  
  [mail function]
@@ -122,13 +120,14 @@
  ; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
  ;sendmail_path =
  
-@@ -1191,6 +1111,53 @@
+@@ -1249,6 +1171,54 @@
  ; instead of original one.
  soap.wsdl_cache_ttl=86400
  
 -; Local Variables:
 -; tab-width: 4
 -; End:
++
 +;;;;;;;;;;;;;;;;;;;;;;
 +; Dynamic Extensions ;
 +;;;;;;;;;;;;;;;;;;;;;;
@@ -138,7 +137,7 @@
 +;
 +;   extension=modulename.so
 +;
-+; Note that it should be the name of the module only; no directory information 
++; Note that it should be the name of the module only; no directory information
 +; needs to go here.  Specify the location of the extension with the
 +; extension_dir directive above.
 +
Prev by Date: Re: UPDATE: yafc (1.1)
Next by Date: Re: gimp2
Previous by thread: Re: gimp2
Next by thread: Re: [UPDATE] php5
Index(es):
- Date
- Thread
Visit your host, monkey.org