*Use newer data type name of PHP; support PHP 5.4.x, too.

4 files changed, 278 insertions, 1 deletions

diff --git a/print/php-pdflib/distinfo b/print/php-pdflib/distinfo
index ddc078cde64..75402322352 100644
--- a/print/php-pdflib/distinfo
+++ b/print/php-pdflib/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.4 2010/06/02 15:22:01 adam Exp $
+$NetBSD: distinfo,v 1.5 2012/06/16 02:59:00 taca Exp $
 
 SHA1 (php-pdflib/pdflib-2.1.8.tgz) = 5d0b01dc6fe81a39e7832a4c719983ebd06f6174
 RMD160 (php-pdflib/pdflib-2.1.8.tgz) = a74d2bba8985bd85fbd61589450c591665663906
 Size (php-pdflib/pdflib-2.1.8.tgz) = 55797 bytes
+SHA1 (patch-pdf.c) = f6a2eb401f5da024df69e6fab119c482d6c8946b
+SHA1 (patch-pdf4.c) = 031c90ac70e3b83a92ea5d7f05388542aad1f2e0
+SHA1 (patch-pdf7.c) = a8cbd01525aa2b4bcbaceb15e82beff1223ce383
diff --git a/print/php-pdflib/patches/patch-pdf.c b/print/php-pdflib/patches/patch-pdf.c
new file mode 100644
index 00000000000..e56dddf77d3
--- /dev/null
+++ b/print/php-pdflib/patches/patch-pdf.c
@@ -0,0 +1,156 @@
+$NetBSD: patch-pdf.c,v 1.1 2012/06/16 02:59:00 taca Exp $
+
+* Add support for PHP 5.4.x.
+
+--- pdf.c.orig	1970-01-01 09:13:24.000000000 +0000
++++ pdf.c
+@@ -1075,8 +1075,12 @@ PHP_FUNCTION(pdf_add_launchlink)
+ #endif /* VIRTUAL_DIR */
+ 
+ #ifdef PDFLIB_CHECK_OPEN_BASEDIR
+-    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
+-            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
++    if (php_check_open_basedir(vfilename TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++	|| (PG(safe_mode) &&
++            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++	) {
+         RETURN_FALSE;
+     }
+ #endif /* PDFLIB_CHECK_OPEN_BASEDIR */
+@@ -1291,8 +1295,12 @@ PHP_FUNCTION(pdf_add_pdflink)
+ #endif /* VIRTUAL_DIR */
+ 
+ #ifdef PDFLIB_CHECK_OPEN_BASEDIR
+-    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
+-            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
++    if (php_check_open_basedir(vfilename TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++	|| (PG(safe_mode) &&
++            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++	) {
+         RETURN_FALSE;
+     }
+ #endif /* PDFLIB_CHECK_OPEN_BASEDIR */
+@@ -1545,8 +1553,12 @@ PHP_FUNCTION(pdf_attach_file)
+ #endif /* VIRTUAL_DIR */
+ 
+ #ifdef PDFLIB_CHECK_OPEN_BASEDIR
+-    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
+-            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
++    if (php_check_open_basedir(vfilename TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++	|| (PG(safe_mode) &&
++            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++	) {
+         RETURN_FALSE;
+     }
+ #endif /* PDFLIB_CHECK_OPEN_BASEDIR */
+@@ -1609,8 +1621,12 @@ PHP_FUNCTION(pdf_begin_document)
+     vfilename = filename;
+ #endif /* VIRTUAL_DIR */
+ 
+-    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
+-            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
++    if (php_check_open_basedir(vfilename TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++	|| (PG(safe_mode) &&
++            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++	) {
+         RETURN_FALSE;
+     }
+ 
+@@ -4773,8 +4789,12 @@ PHP_FUNCTION(pdf_load_iccprofile)
+ #endif /* VIRTUAL_DIR */
+ 
+ #ifdef PDFLIB_CHECK_OPEN_BASEDIR
+-    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
+-            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
++    if (php_check_open_basedir(vfilename TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++	|| (PG(safe_mode) &&
++            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++	) {
+         RETURN_FALSE;
+     }
+ #endif /* PDFLIB_CHECK_OPEN_BASEDIR */
+@@ -4836,8 +4856,12 @@ PHP_FUNCTION(pdf_load_image)
+ #endif /* VIRTUAL_DIR */
+ 
+ #ifdef PDFLIB_CHECK_OPEN_BASEDIR
+-    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
+-            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
++    if (php_check_open_basedir(vfilename TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++	|| (PG(safe_mode) &&
++            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++	) {
+         RETURN_FALSE;
+     }
+ #endif /* PDFLIB_CHECK_OPEN_BASEDIR */
+@@ -5037,8 +5061,12 @@ PHP_FUNCTION(pdf_open_ccitt)
+ #endif /* VIRTUAL_DIR */
+ 
+ #ifdef PDFLIB_CHECK_OPEN_BASEDIR
+-    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
+-            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
++    if (php_check_open_basedir(vfilename TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++	|| (PG(safe_mode) &&
++            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++	) {
+         RETURN_FALSE;
+     }
+ #endif /* PDFLIB_CHECK_OPEN_BASEDIR */
+@@ -5102,8 +5130,12 @@ PHP_FUNCTION(pdf_open_file)
+     vfilename = filename;
+ #endif /* VIRTUAL_DIR */
+ 
+-    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
+-            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
++    if (php_check_open_basedir(vfilename TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++	|| (PG(safe_mode) &&
++            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++	) {
+         RETURN_FALSE;
+     }
+ 
+@@ -5222,8 +5254,12 @@ PHP_FUNCTION(pdf_open_image_file)
+ #endif /* VIRTUAL_DIR */
+ 
+ #ifdef PDFLIB_CHECK_OPEN_BASEDIR
+-    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
+-            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
++    if (php_check_open_basedir(vfilename TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++	|| (PG(safe_mode) &&
++            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++	) {
+         RETURN_FALSE;
+     }
+ #endif /* PDFLIB_CHECK_OPEN_BASEDIR */
+@@ -5287,8 +5323,12 @@ PHP_FUNCTION(pdf_open_pdi)
+ #endif /* VIRTUAL_DIR */
+ 
+ #ifdef PDFLIB_CHECK_OPEN_BASEDIR
+-    if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
+-            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
++    if (php_check_open_basedir(vfilename TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++	|| (PG(safe_mode) &&
++            !php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++	) {
+         RETURN_FALSE;
+     }
+ #endif /* PDFLIB_CHECK_OPEN_BASEDIR */
diff --git a/print/php-pdflib/patches/patch-pdf4.c b/print/php-pdflib/patches/patch-pdf4.c
new file mode 100644
index 00000000000..5d1f27bfb29
--- /dev/null
+++ b/print/php-pdflib/patches/patch-pdf4.c
@@ -0,0 +1,97 @@
+$NetBSD: patch-pdf4.c,v 1.1 2012/06/16 02:59:00 taca Exp $
+
+* Add support for PHP 5.4.x.
+
+--- pdf4.c.orig	1970-01-01 09:13:24.000000000 +0000
++++ pdf4.c
+@@ -1846,7 +1846,11 @@ static void _php_pdf_open_image(INTERNAL
+ 	image = Z_STRVAL_PP(arg2);
+ #endif  
+ 
+-	if (php_check_open_basedir(image TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(image, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
++	if (php_check_open_basedir(image TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++		|| (PG(safe_mode) && !php_checkuid(image, "rb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++		) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -1923,7 +1927,11 @@ PHP_FUNCTION(pdf_open_image_file)
+ 	image = Z_STRVAL_PP(arg3);
+ #endif  
+ 
+-	if (php_check_open_basedir(image TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(image, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
++	if (php_check_open_basedir(image TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++		|| (PG(safe_mode) && !php_checkuid(image, "rb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++		) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -2345,7 +2353,11 @@ PHP_FUNCTION(pdf_open_file)
+ 		convert_to_string_ex(arg2);
+ 		filename = Z_STRVAL_PP(arg2);
+ 
+-		if (php_check_open_basedir(filename TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(filename, "wb+", CHECKUID_CHECK_MODE_PARAM))) {
++		if (php_check_open_basedir(filename TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++			|| (PG(safe_mode) && !php_checkuid(filename, "wb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++			) {
+ 			RETURN_FALSE;
+ 		}
+ 		if (php_check_open_basedir(filename TSRMLS_CC)) {
+@@ -2564,7 +2576,11 @@ PHP_FUNCTION(pdf_open_ccitt)
+ 	image = Z_STRVAL_PP(arg2);
+ #endif  
+ 
+-	if (php_check_open_basedir(image TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(image, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
++	if (php_check_open_basedir(image TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++		|| (PG(safe_mode) && !php_checkuid(image, "rb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++		) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -2617,7 +2633,11 @@ PHP_FUNCTION(pdf_open_image)
+ 	image = Z_STRVAL_PP(arg4);
+ #endif  
+ 
+-	if (php_check_open_basedir(image TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(image, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
++	if (php_check_open_basedir(image TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++		|| (PG(safe_mode) && !php_checkuid(image, "rb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++		) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -2659,7 +2679,11 @@ PHP_FUNCTION(pdf_attach_file)
+ 	convert_to_string_ex(arg9);
+ 	convert_to_string_ex(arg10);
+ 
+-	if (php_check_open_basedir(Z_STRVAL_PP(arg6) TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(arg6), "rb+", CHECKUID_CHECK_MODE_PARAM))) {
++	if (php_check_open_basedir(Z_STRVAL_PP(arg6) TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++		|| (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(arg6), "rb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++		) {
+ 		RETURN_FALSE;
+ 	}
+ 
+@@ -2803,7 +2827,11 @@ PHP_FUNCTION(pdf_open_pdi)
+ 	file = Z_STRVAL_PP(arg2);
+ #endif  
+ 
+-	if (php_check_open_basedir(file TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(file, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
++	if (php_check_open_basedir(file TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++		|| (PG(safe_mode) && !php_checkuid(file, "rb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++		) {
+ 		RETURN_FALSE;
+ 	}
+ 
diff --git a/print/php-pdflib/patches/patch-pdf7.c b/print/php-pdflib/patches/patch-pdf7.c
new file mode 100644
index 00000000000..837872255e4
--- /dev/null
+++ b/print/php-pdflib/patches/patch-pdf7.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-pdf7.c,v 1.1 2012/06/16 02:59:00 taca Exp $
+
+* Add support for PHP 5.4.x.
+
+--- pdf7.c.orig	1970-01-01 09:13:24.000000000 +0000
++++ pdf7.c
+@@ -541,8 +541,12 @@ PHP_FUNCTION(pdf_open_pdi)
+ 
+ #ifdef PDFLIB_CHECK_OPEN_BASEDIR
+     if (vfilename && *vfilename) {
+-	if (php_check_open_basedir(vfilename TSRMLS_CC) || (PG(safe_mode) &&
+-		!php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
++	if (php_check_open_basedir(vfilename TSRMLS_CC)
++#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4
++	    || (PG(safe_mode) &&
++		!php_checkuid(vfilename, "rb+", CHECKUID_CHECK_MODE_PARAM))
++#endif
++	    ) {
+ 	    RETURN_FALSE;
+     }
+     }