Pullup ticket #3573 - requested by taca
lang/php53 security update

Revisions pulled up:
- lang/php53/Makefile                                           1.18
- lang/php53/Makefile.php                                       1.9-1.10
- lang/php53/distinfo                                           1.23-1.26
- lang/php53/patches/patch-Zend_zend__builtin__functions.c      1.1-1.2
- lang/php53/patches/patch-as                                   1.1

---
   Module Name:	pkgsrc
   Committed By:	jklos
   Date:		Thu Oct  6 05:34:00 UTC 2011

   Modified Files:
   	pkgsrc/lang/php53: distinfo
   Added Files:
   	pkgsrc/lang/php53/patches: patch-as

   Log Message:
   Atomic operations via gcc are not supported on many archs. Allow them only
     on amd64, powerpc, i386 and alpha.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Oct 20 12:38:24 UTC 2011

   Modified Files:
   	pkgsrc/lang/php53: Makefile.php distinfo

   Log Message:
   Re-add suhosin-patch to distinfo.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Oct 20 12:39:33 UTC 2011

   Modified Files:
   	pkgsrc/lang/php53: Makefile.php

   Log Message:
   Revert accidental commit with previous commit.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Oct 20 13:32:20 UTC 2011

   Modified Files:
   	pkgsrc/lang/php53: Makefile distinfo
   Added Files:
   	pkgsrc/lang/php53/patches: patch-Zend_zend__builtin__functions.c

   Log Message:
   Add fix for 2011-3379 from r317183 from PHP's repository.

   Bump PKGREVISION.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Oct 20 14:30:55 UTC 2011

   Modified Files:
   	pkgsrc/lang/php53: distinfo
   	pkgsrc/lang/php53/patches: patch-Zend_zend__builtin__functions.c

   Log Message:
   A small correction in comment text of the patch.


(sbd)

$NetBSD: patch-Zend_zend__builtin__functions.c,v 1.2.2.2 2011/10/22 07:01:25 sbd Exp $

* Fix for CVE-2011-3379 from r317183 from PHP's repository.

--- Zend/zend_builtin_functions.c.orig	2011-08-08 14:54:50.000000000 +0000
+++ Zend/zend_builtin_functions.c
@@ -816,13 +816,19 @@ static void is_a_impl(INTERNAL_FUNCTION_
 	int class_name_len;
 	zend_class_entry *instance_ce;
 	zend_class_entry **ce;
+	zend_bool allow_string = only_subclass;
 	zend_bool retval;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs", &obj, &class_name, &class_name_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs|b", &obj, &class_name, &class_name_len, &allow_string) == FAILURE) {
 		return;
 	}
-	
-	if (Z_TYPE_P(obj) == IS_STRING) {
+	/*
+	   allow_string - is_a default is no, is_subclass_of is yes. 
+	   if it's allowed, then the autoloader will be called if the class does not exist.
+	   default behaviour is different, as 'is_a' usage is normally to test mixed return values 
+	*/
+
+	if (allow_string && Z_TYPE_P(obj) == IS_STRING) {
 		zend_class_entry **the_ce;
 		if (zend_lookup_class(Z_STRVAL_P(obj), Z_STRLEN_P(obj), &the_ce TSRMLS_CC) == FAILURE) {
 			RETURN_FALSE;

$NetBSD: patch-as,v 1.1.2.2 2011/10/22 07:01:25 sbd Exp $

--- ext/standard/php_crypt_r.c.orig	2011-10-06 05:25:16.000000000 +0000
+++ ext/standard/php_crypt_r.c
@@ -94,7 +94,8 @@ void _crypt_extended_init_r(void)
 	if (!initialized) {
 #ifdef PHP_WIN32
 		InterlockedIncrement(&initialized);
-#elif (defined(__GNUC__) && !defined(__hpux) && (__GNUC__ > 4 || \
+#elif (defined(__GNUC__) && (defined(__amd64__) || defined(__alpha__) || \
+    defined(__i386__) || defined(__powerpc__)) && (__GNUC__ > 4 || \
     (__GNUC__ == 4 && (__GNUC_MINOR__ > 1 || (__GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ > 1)))))
 		__sync_fetch_and_add(&initialized, 1);
 #elif defined(HAVE_ATOMIC_H) /* Solaris 10 defines atomic API within */