Update php53 to 5.3.27 (PHP 5.3.27).

11-Jul-2013

Core:

* Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC).
* Fixed bug #64960 (Segfault in gc_zval_possible_root).
* Fixed bug #64934 (Apache2 TS crash with get_browser()).
* Fixed bug #63186 (compile failure on netbsd).

DateTime:

* Fixed bug #53437 (Crash when using unserialized DatePeriod instance).

PDO_firebird:

* Fixed bug #64037 (Firebird return wrong value for numeric field).
* Fixed bug #62024 (Cannot insert second row with null using parametrized
  query).

PDO_pgsql:

* Fixed bug #64949 (Buffer overflow in _pdo_pgsql_error).

pgsql:

* Fixed bug #64609 (pg_convert enum type support).

SPL:

* Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits
  systems).

XML:

* Fixed bug #65236 (heap corruption in xml parser).

18 files changed, 75 insertions, 89 deletions

diff --git a/lang/php53/Makefile.common b/lang/php53/Makefile.common
index 81a9f1ad3c7..48f7b532177 100644
--- a/lang/php53/Makefile.common
+++ b/lang/php53/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2013/06/07 13:53:52 taca Exp $
+# $NetBSD: Makefile.common,v 1.27 2013/07/12 00:07:04 taca Exp $
 # used by lang/php53/Makefile.php
 # used by lang/php/ext.mk
 # used by meta-pkgs/php53-extensions/Makefile
@@ -38,7 +38,7 @@ EXTRACT_SUFX?=		.tar.bz2
 MAINTAINER?=		pkgsrc-users@NetBSD.org
 HOMEPAGE?=		http://www.php.net/
 
-PHP_BASE_VERS=		5.3.26
+PHP_BASE_VERS=		5.3.27
 
 PHP_EXTENSION_DIR=	lib/php/20090630
 PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
diff --git a/lang/php53/Makefile.php b/lang/php53/Makefile.php
index b014f560f73..5a7e4836b7a 100644
--- a/lang/php53/Makefile.php
+++ b/lang/php53/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.34 2013/06/09 22:23:24 taca Exp $
+# $NetBSD: Makefile.php,v 1.35 2013/07/12 00:07:04 taca Exp $
 # used by lang/php53/Makefile
 # used by www/ap-php/Makefile
 
@@ -58,7 +58,7 @@ PKG_SUGGESTED_OPTIONS+=	inet6 ssl
 
 .if !empty(PKG_OPTIONS:Msuhosin)
 SUHOSIN_PHPVER=		5.3.25
-.  if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != "5.3.26"
+.  if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != "5.3.27"
 PKG_FAIL_REASON+=	"The suhosin patch is currently not available for"
 PKG_FAIL_REASON+=	"this version of PHP.  You may have to wait until"
 PKG_FAIL_REASON+=	"an updated patch is released or temporarily"
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index fe64f8cc81e..98ccfab9d05 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,23 +1,23 @@
-$NetBSD: distinfo,v 1.65 2013/06/09 22:23:24 taca Exp $
+$NetBSD: distinfo,v 1.66 2013/07/12 00:07:04 taca Exp $
 
-SHA1 (php-5.3.26.tar.bz2) = d2f97da600b640d618a8790dab22b519aa87b056
-RMD160 (php-5.3.26.tar.bz2) = a902aef59683dc7b051c81111b2995f8d5ebad93
-Size (php-5.3.26.tar.bz2) = 11430170 bytes
+SHA1 (php-5.3.27.tar.bz2) = 4f95682940ebe1bc1a93812d593460625a2aae64
+RMD160 (php-5.3.27.tar.bz2) = c2887004859f32b25229ffe52d86270c8de194b7
+Size (php-5.3.27.tar.bz2) = 11432791 bytes
 SHA1 (suhosin-patch-5.3.25-0.9.10.patch.bz2) = ce5883b05daf91e8a44fffbfa4d3989ac3311dd1
 RMD160 (suhosin-patch-5.3.25-0.9.10.patch.bz2) = 6c4d0cfe070802481121be465b66d3cefe44da83
 Size (suhosin-patch-5.3.25-0.9.10.patch.bz2) = 32447 bytes
-SHA1 (patch-aa) = b0dc6cd0b2103d5858280202506b33322a98496e
-SHA1 (patch-ab) = 7e9aab00e1d5f18e320ef5e513c0ff6833a5b69a
-SHA1 (patch-ac) = b6eb40116f3770464120b6ea9061624609b9564e
-SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881
-SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56
-SHA1 (patch-af) = 1618b23fd6d090ce5aa929208416028724278bfc
-SHA1 (patch-ag) = 37225805be13ec76d8ac17833da8115e99b78745
-SHA1 (patch-ah) = b20c29c64b3099f77855a5ec28960dc1c4f65c83
-SHA1 (patch-ai) = d4766893a2c47a4e4a744248dda265b0a9a66a1f
-SHA1 (patch-aj) = 8698b3caa6299843c7483473b0cb18ceffa3dada
-SHA1 (patch-al) = fbbee5502e0cd1c47c6e7c15e0d54746414ec32e
-SHA1 (patch-ext_standard_basic__functions.c) = 18596d281017760293189d87d19de9c5c772232d
-SHA1 (patch-main_streams_cast.c) = c169ccb73dc660e40eff9f9e168374f35eedadad
-SHA1 (patch-php__mssql.c) = b46c688ff2d8da33ca2f9beb0eb9182b6edf7e23
-SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 6453d0cea05c0f86dcabc95a656532a0ed084aed
+SHA1 (patch-aa) = fd930d0d9b1c60e8c7c514cfb6864b61ce4d158d
+SHA1 (patch-ab) = 5e8f0b91426656cb7f9272d17586ce40ab0fb547
+SHA1 (patch-ac) = e8a7218d74f2f4093acca2160693c9a245e4cfc7
+SHA1 (patch-ad) = 6b42868f41335ddfa5a8c1e982819166b05e4ad2
+SHA1 (patch-ae) = 3a354cb5c1253eb375041d8ee8549c2f663e6c74
+SHA1 (patch-af) = 4f5aac4c52ce576f4489cb1f06fdb672745a8fdb
+SHA1 (patch-ag) = 84af84bc1144ac8a1fce931edcedd4a3ad0f2fda
+SHA1 (patch-ah) = 697156508da2d837a1ea1a41f036eab4fb87e94b
+SHA1 (patch-ai) = 9659f73eef1b4fcca9b844bdaa785ac6d5e582a1
+SHA1 (patch-aj) = 181658ae523bd60f67750566711fc078b49191b7
+SHA1 (patch-al) = fe534d7d50a529e3c7d0ffed76afdb70bb55a521
+SHA1 (patch-ext_standard_basic__functions.c) = 017fd25e646af4d7eb2a0bd13b3c8da34eaee8c5
+SHA1 (patch-main_streams_cast.c) = d68b69c9418a8780b1610b8755487771f7c46a5a
+SHA1 (patch-php__mssql.c) = 524c4e5d7ede0e503049bf1febec58e0c4a29aa4
+SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 86137a37e74badf99c46d1ba7ca5d85f42bedfce
diff --git a/lang/php53/patches/patch-aa b/lang/php53/patches/patch-aa
index 15d836eaf41..018f5040fa2 100644
--- a/lang/php53/patches/patch-aa
+++ b/lang/php53/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2011/03/19 07:01:19 taca Exp $
+$NetBSD: patch-aa,v 1.3 2013/07/12 00:07:04 taca Exp $
 
---- acinclude.m4.orig	2011-02-15 08:28:22.000000000 +0000
+--- acinclude.m4.orig	2013-07-10 17:43:08.000000000 +0000
 +++ acinclude.m4
 @@ -2341,7 +2341,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
    if test "$found_openssl" = "no"; then
diff --git a/lang/php53/patches/patch-ab b/lang/php53/patches/patch-ab
index cc32ea6f8d6..c5144492721 100644
--- a/lang/php53/patches/patch-ab
+++ b/lang/php53/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2013/04/12 16:59:51 taca Exp $
+$NetBSD: patch-ab,v 1.7 2013/07/12 00:07:04 taca Exp $
 
---- configure.orig	2013-04-10 07:50:37.000000000 +0000
+--- configure.orig	2013-07-11 17:08:25.000000000 +0000
 +++ configure
 @@ -14121,7 +14121,7 @@ EOF
    PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH"
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.6 2013/04/12 16:59:51 taca Exp $
      
    if test "$PHP_SAPI" != "default"; then
  { echo "configure: error: 
-@@ -23462,7 +23462,7 @@ fi
+@@ -23465,7 +23465,7 @@ fi
      if test "$found_openssl" = "no"; then
    
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.6 2013/04/12 16:59:51 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -25453,7 +25453,7 @@ echo "configure:25433: checking bundled 
+@@ -25456,7 +25456,7 @@ echo "configure:25433: checking bundled 
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
      
    
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.6 2013/04/12 16:59:51 taca Exp $
        
    
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -36315,7 +36315,7 @@ fi
+@@ -36318,7 +36318,7 @@ fi
      if test "$found_openssl" = "no"; then
    
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.6 2013/04/12 16:59:51 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -50360,7 +50360,7 @@ fi
+@@ -50659,7 +50659,7 @@ fi
      if test "$found_openssl" = "no"; then
    
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -47,7 +47,7 @@ $NetBSD: patch-ab,v 1.6 2013/04/12 16:59:51 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -84478,7 +84478,7 @@ fi
+@@ -84777,7 +84777,7 @@ fi
      if test "$found_openssl" = "no"; then
    
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -56,7 +56,7 @@ $NetBSD: patch-ab,v 1.6 2013/04/12 16:59:51 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -107641,12 +107641,7 @@ old_CC=$CC
+@@ -107940,12 +107940,7 @@ old_CC=$CC
  if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
    CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
    INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
diff --git a/lang/php53/patches/patch-ac b/lang/php53/patches/patch-ac
index aaabf371c1d..b833d9697c7 100644
--- a/lang/php53/patches/patch-ac
+++ b/lang/php53/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.5 2013/02/17 13:10:13 taca Exp $
+$NetBSD: patch-ac,v 1.6 2013/07/12 00:07:04 taca Exp $
 
---- ext/gd/config.m4.orig	2011-05-12 08:19:37.000000000 +0000
+--- ext/gd/config.m4.orig	2013-07-10 17:43:08.000000000 +0000
 +++ ext/gd/config.m4
 @@ -45,18 +45,7 @@ dnl Checks for the configure options
  dnl
diff --git a/lang/php53/patches/patch-ad b/lang/php53/patches/patch-ad
index dbfacb5c872..323760f1370 100644
--- a/lang/php53/patches/patch-ad
+++ b/lang/php53/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+$NetBSD: patch-ad,v 1.2 2013/07/12 00:07:04 taca Exp $
 
---- ext/imap/config.m4.orig	2010-02-07 13:06:54.000000000 +0000
+--- ext/imap/config.m4.orig	2013-07-10 17:43:08.000000000 +0000
 +++ ext/imap/config.m4
 @@ -48,6 +48,14 @@ AC_DEFUN([PHP_IMAP_TEST_BUILD], [
    ])
diff --git a/lang/php53/patches/patch-ae b/lang/php53/patches/patch-ae
index 214dad63013..c77a1bc4617 100644
--- a/lang/php53/patches/patch-ae
+++ b/lang/php53/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+$NetBSD: patch-ae,v 1.2 2013/07/12 00:07:04 taca Exp $
 
---- ext/pdo/config.m4.orig	2008-07-25 13:46:24.000000000 +0000
+--- ext/pdo/config.m4.orig	2013-07-10 17:43:08.000000000 +0000
 +++ ext/pdo/config.m4
 @@ -37,20 +37,6 @@ if test "$PHP_PDO" != "no"; then
  
diff --git a/lang/php53/patches/patch-af b/lang/php53/patches/patch-af
index c06b90d9d76..3604f01af24 100644
--- a/lang/php53/patches/patch-af
+++ b/lang/php53/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.3 2011/06/22 09:54:35 taca Exp $
+$NetBSD: patch-af,v 1.4 2013/07/12 00:07:04 taca Exp $
 
---- ext/phar/Makefile.frag.orig	2011-02-25 09:32:17.000000000 +0000
+--- ext/phar/Makefile.frag.orig	2013-07-10 17:43:08.000000000 +0000
 +++ ext/phar/Makefile.frag
 @@ -18,7 +18,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
  	else \
diff --git a/lang/php53/patches/patch-ag b/lang/php53/patches/patch-ag
index 9e853fae4d6..f5d728272bf 100644
--- a/lang/php53/patches/patch-ag
+++ b/lang/php53/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2012/08/17 15:32:31 taca Exp $
+$NetBSD: patch-ag,v 1.3 2013/07/12 00:07:04 taca Exp $
 
 Use proper shbang line.
 
---- ext/phar/phar/phar.php.orig	2008-08-01 13:42:56.000000000 +0000
+--- ext/phar/phar/phar.php.orig	2013-07-10 17:43:08.000000000 +0000
 +++ ext/phar/phar/phar.php
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/php
diff --git a/lang/php53/patches/patch-ah b/lang/php53/patches/patch-ah
index a9d8d147324..bbc7edbf350 100644
--- a/lang/php53/patches/patch-ah
+++ b/lang/php53/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+$NetBSD: patch-ah,v 1.2 2013/07/12 00:07:04 taca Exp $
 
---- php.ini-development.orig	2009-11-05 13:29:34.000000000 +0000
+--- php.ini-development.orig	2013-07-10 17:43:08.000000000 +0000
 +++ php.ini-development
-@@ -781,7 +781,7 @@ default_mimetype = "text/html"
+@@ -793,7 +793,7 @@ default_mimetype = "text/html"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -802,8 +802,8 @@ doc_root =
+@@ -814,8 +814,8 @@ doc_root =
  ; http://php.net/user-dir
  user_dir =
  
@@ -22,7 +22,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
  ; extension_dir = "./"
  ; On windows:
  ; extension_dir = "ext"
-@@ -872,7 +872,7 @@ file_uploads = On
+@@ -884,7 +884,7 @@ file_uploads = On
  ; Temporary directory for HTTP uploaded files (will use system default if not
  ; specified).
  ; http://php.net/upload-tmp-dir
diff --git a/lang/php53/patches/patch-ai b/lang/php53/patches/patch-ai
index 5a9ad425d40..79fc4ad1589 100644
--- a/lang/php53/patches/patch-ai
+++ b/lang/php53/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+$NetBSD: patch-ai,v 1.2 2013/07/12 00:07:04 taca Exp $
 
---- php.ini-production.orig	2009-11-05 13:29:34.000000000 +0000
+--- php.ini-production.orig	2013-07-10 17:43:08.000000000 +0000
 +++ php.ini-production
-@@ -781,7 +781,7 @@ default_mimetype = "text/html"
+@@ -793,7 +793,7 @@ default_mimetype = "text/html"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -11,7 +11,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -802,8 +802,8 @@ doc_root =
+@@ -814,8 +814,8 @@ doc_root =
  ; http://php.net/user-dir
  user_dir =
  
@@ -22,7 +22,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
  ; extension_dir = "./"
  ; On windows:
  ; extension_dir = "ext"
-@@ -872,7 +872,7 @@ file_uploads = On
+@@ -884,7 +884,7 @@ file_uploads = On
  ; Temporary directory for HTTP uploaded files (will use system default if not
  ; specified).
  ; http://php.net/upload-tmp-dir
diff --git a/lang/php53/patches/patch-aj b/lang/php53/patches/patch-aj
index a1064d09fe6..dc65b875e41 100644
--- a/lang/php53/patches/patch-aj
+++ b/lang/php53/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2012/07/20 12:28:18 taca Exp $
+$NetBSD: patch-aj,v 1.3 2013/07/12 00:07:04 taca Exp $
 
 Use proper shbang line.
 
---- run-tests.php.orig	2010-01-03 09:23:27.000000000 +0000
+--- run-tests.php.orig	2013-07-10 17:43:08.000000000 +0000
 +++ run-tests.php
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env php
diff --git a/lang/php53/patches/patch-al b/lang/php53/patches/patch-al
index e5b6a9df62f..93ed4366613 100644
--- a/lang/php53/patches/patch-al
+++ b/lang/php53/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.1 2010/05/28 15:31:04 joerg Exp $
+$NetBSD: patch-al,v 1.2 2013/07/12 00:07:04 taca Exp $
 
---- ext/pdo_mysql/config.m4.orig	2010-05-28 15:19:37.000000000 +0000
+--- ext/pdo_mysql/config.m4.orig	2013-07-10 17:43:08.000000000 +0000
 +++ ext/pdo_mysql/config.m4
 @@ -158,7 +158,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
    fi
diff --git a/lang/php53/patches/patch-ext_standard_basic__functions.c b/lang/php53/patches/patch-ext_standard_basic__functions.c
index 528ee8f92bd..e18429b1295 100644
--- a/lang/php53/patches/patch-ext_standard_basic__functions.c
+++ b/lang/php53/patches/patch-ext_standard_basic__functions.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-ext_standard_basic__functions.c,v 1.1 2012/06/03 21:23:11 abs Exp $
+$NetBSD: patch-ext_standard_basic__functions.c,v 1.2 2013/07/12 00:07:04 taca Exp $
 
 Work around VAX FP lack of INF
 
---- ext/standard/basic_functions.c.orig	2012-05-08 09:22:27.000000000 +0000
+--- ext/standard/basic_functions.c.orig	2013-07-10 17:43:08.000000000 +0000
 +++ ext/standard/basic_functions.c
 @@ -3525,7 +3525,7 @@ PHPAPI double php_get_nan(void) /* {{{ *
  
diff --git a/lang/php53/patches/patch-main_streams_cast.c b/lang/php53/patches/patch-main_streams_cast.c
index f62d5f05729..bb5ea30c2d2 100644
--- a/lang/php53/patches/patch-main_streams_cast.c
+++ b/lang/php53/patches/patch-main_streams_cast.c
@@ -1,29 +1,15 @@
-$NetBSD: patch-main_streams_cast.c,v 1.1 2012/02/02 15:44:09 taca Exp $
+$NetBSD: patch-main_streams_cast.c,v 1.2 2013/07/12 00:07:04 taca Exp $
 
-Fix build problem of newer NetBSD.
+* For NetBSD 6.0+, __NetBSD_Version__ should includes 600000000.
 
---- main/streams/cast.c.orig	2012-01-01 13:15:04.000000000 +0000
+--- main/streams/cast.c.orig	2013-07-10 17:43:08.000000000 +0000
 +++ main/streams/cast.c
-@@ -34,7 +34,7 @@
- typedef struct {
- 	int (*reader)(void *, char *, int);
- 	int (*writer)(void *, const char *, int);
--	fpos_t (*seeker)(void *, fpos_t, int);
-+	off_t (*seeker)(void *, off_t, int);
- 	int (*closer)(void *);
- } COOKIE_IO_FUNCTIONS_T;
- 
-@@ -68,11 +68,11 @@ static int stream_cookie_writer(void *co
- 	return php_stream_write((php_stream *)cookie, (char *)buffer, size);
- }
- 
--static fpos_t stream_cookie_seeker(void *cookie, off_t position, int whence)
-+static off_t stream_cookie_seeker(void *cookie, off_t position, int whence)
- {
- 	TSRMLS_FETCH();
- 
--	return (fpos_t)php_stream_seek((php_stream *)cookie, position, whence);
-+	return (off_t)php_stream_seek((php_stream *)cookie, position, whence);
- }
- 
- static int stream_cookie_closer(void *cookie)
+@@ -33,7 +33,7 @@
+ #if defined(HAVE_FUNOPEN) && !defined(HAVE_FOPENCOOKIE)
+ 
+ /* NetBSD 6.0+ uses off_t instead of fpos_t in funopen */
+-# if defined(__NetBSD__) && (__NetBSD_Version__ > 600000000)
++# if defined(__NetBSD__) && (__NetBSD_Version__ >= 600000000)
+ #  define PHP_FPOS_T off_t
+ # else
+ #  define PHP_FPOS_T fpos_t
diff --git a/lang/php53/patches/patch-php__mssql.c b/lang/php53/patches/patch-php__mssql.c
index 044bb8f8f68..aaceec8f9ed 100644
--- a/lang/php53/patches/patch-php__mssql.c
+++ b/lang/php53/patches/patch-php__mssql.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-php__mssql.c,v 1.1 2011/09/12 16:24:32 taca Exp $
+$NetBSD: patch-php__mssql.c,v 1.2 2013/07/12 00:07:04 taca Exp $
 
 Fix with newer freetds:
 
 * cast pointer => long => int, hoping values are ranges in int.
 * Don't pass unsigned char ** to spprintf().
 
---- ext/mssql/php_mssql.c.orig	2011-07-28 11:01:04.000000000 +0000
+--- ext/mssql/php_mssql.c.orig	2013-07-10 17:43:08.000000000 +0000
 +++ ext/mssql/php_mssql.c
 @@ -764,7 +764,7 @@ static void php_mssql_do_connect(INTERNA
  				dbfreelogin(mssql.login);
diff --git a/lang/php53/patches/patch-sapi_fpm_php-fpm.conf.in b/lang/php53/patches/patch-sapi_fpm_php-fpm.conf.in
index e28b10b3057..a07ffac01d3 100644
--- a/lang/php53/patches/patch-sapi_fpm_php-fpm.conf.in
+++ b/lang/php53/patches/patch-sapi_fpm_php-fpm.conf.in
@@ -1,9 +1,9 @@
-$NetBSD: patch-sapi_fpm_php-fpm.conf.in,v 1.1 2013/02/28 21:28:21 imil Exp $
+$NetBSD: patch-sapi_fpm_php-fpm.conf.in,v 1.2 2013/07/12 00:07:04 taca Exp $
 
 Uncomment the pid parameter so the pidfile is created and rc.d script
 can really start / stop php-fpm
 
---- sapi/fpm/php-fpm.conf.in.orig	2013-02-20 10:52:37.000000000 +0000
+--- sapi/fpm/php-fpm.conf.in.orig	2013-07-10 17:43:08.000000000 +0000
 +++ sapi/fpm/php-fpm.conf.in
 @@ -22,7 +22,7 @@
  ; Pid file