Pullup ticket #3362 - requested by taca

archivers/php-zip: security patch
graphics/php-exif: security patch
lang/php5: security patch
lang/php53: security patch

Revisions pulled up:
- archivers/php-zip/Makefile					1.12-1.13
- graphics/php-exif/Makefile					1.9-1.10
- lang/php5/Makefile						1.82-1.83
- lang/php5/Makefile.php					1.43-1.44
- lang/php5/distinfo						1.86-1.87
- lang/php5/patches/patch-ext_exif_exif.c			1.1
- lang/php5/patches/patch-ext_zip_lib_zip__name__locate.c	1.1
- lang/php5/patches/patch-ext_zip_php__zip.c			1.1
- lang/php53/Makefile						1.7
- lang/php53/Makefile.php					1.5
- lang/php53/distinfo						1.12
- lang/php53/patches/patch-ext_exif_exif.c			1.1
- lang/php53/patches/patch-ext_zip_lib_zip__name__locate.c	1.1
- lang/php53/patches/patch-ext_zip_php__zip.c			1.1
---
Module Name:	pkgsrc
Committed By:	shattered
Date:		Tue Feb 15 20:52:24 UTC 2011

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

Log Message:
Re-enable DL_AUTO_VARS -- makes PHP CLI work again with extensions that
are linked to pthread (like mysql.so).
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Mon Feb 21 16:21:17 UTC 2011

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

Log Message:
Re-enable suhosin patch as php53.
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Mon Feb 21 16:23:58 UTC 2011

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

Log Message:
Re-enable DL_AUTO_VARS as php5 package.
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Mon Feb 21 16:25:33 UTC 2011

Modified Files:
	pkgsrc/lang/php5: Makefile
Added Files:
	pkgsrc/lang/php5/patches: patch-ext_exif_exif.c
	    patch-ext_zip_lib_zip__name__locate.c patch-ext_zip_php__zip.c

Log Message:
Add patches to fix SA43328.

Bump PKGREVISION.
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Mon Feb 21 16:26:50 UTC 2011

Modified Files:
	pkgsrc/lang/php5: distinfo

Log Message:
Regen distinfo.
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Mon Feb 21 16:29:15 UTC 2011

Modified Files:
	pkgsrc/lang/php53: Makefile

Log Message:
Bump PKGREVISION for DL_AUTO_VARS.
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Mon Feb 21 16:30:44 UTC 2011

Modified Files:
	pkgsrc/archivers/php-zip: Makefile
	pkgsrc/graphics/php-exif: Makefile

Log Message:
Bump PKGREVISION reflects fix of SA43328.
---

Module Name:	pkgsrc
Committed By:	taca
Date:		Mon Feb 21 16:38:40 UTC 2011

Modified Files:
	pkgsrc/lang/php53: distinfo
Added Files:
	pkgsrc/lang/php53/patches: patch-ext_exif_exif.c
	    patch-ext_zip_lib_zip__name__locate.c patch-ext_zip_php__zip.c

Log Message:
Oops, it should be commit before CHANGE-2011 update.

Add Add patches to fix SA43328.
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Tue Feb 22 07:36:08 UTC 2011

Modified Files:
	pkgsrc/archivers/php-zip: Makefile
	pkgsrc/graphics/php-exif: Makefile

Log Message:
Add missing USE_PHP_EXT_PATCHES to apply patches really.

1 files changed, 6 insertions, 3 deletions

diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php
index 9e1e3606ed2..9ae26a6324b 100644
--- a/lang/php5/Makefile.php
+++ b/lang/php5/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.42 2010/07/24 22:23:15 tron Exp $
+# $NetBSD: Makefile.php,v 1.42.4.1 2011/02/23 19:12:53 tron Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -56,8 +56,8 @@ SUBST_MESSAGE.ini=	Fixing default ini files.
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Msuhosin)
-SUHOSIN_PHPVER=		5.2.14
-. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS}
+SUHOSIN_PHPVER=		5.2.16
+. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && (${SUHOSIN_PHPVER} != "5.2.16" || ${PHP_BASE_VERS} != "5.2.17")
 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"
@@ -93,3 +93,6 @@ CONFIGURE_ARGS+=	--without-openssl
 .if !empty(PKG_OPTIONS:Mmaintainer-zts)
 CONFIGURE_ARGS+=	--enable-maintainer-zts
 .endif
+
+DL_AUTO_VARS=		yes
+.include "../../mk/dlopen.buildlink3.mk"