[Midnightbsd-cvs] mports: lang/php5: Minor cleanup to php 5 port: * Add mail header

[laffer1 at midnightbsd.org]

Log Message:
-----------
Minor cleanup to php 5 port:

 * Add mail header patch

Modified Files:
--------------
    mports/lang/php5:
        Makefile (r1.18 -> r1.19)
        distinfo (r1.8 -> r1.9)

Added Files:
-----------
    mports/lang/php5/files:
        patch-main_safe_mode.c (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/lang/php5/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -L lang/php5/Makefile -L lang/php5/Makefile -u -r1.18 -r1.19
--- lang/php5/Makefile
+++ lang/php5/Makefile
@@ -8,17 +8,15 @@
 
 PORTNAME=	php5
 PORTVERSION=	5.2.6
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES?=	lang devel www
-MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
-		http://downloads.php.net/ilia/:rc \
-		http://downloads.php.net/jani/:rc
-MASTER_SITE_SUBDIR=	distributions/:release
-DISTNAME=	php-${PORTVERSION:S/.r/RC/}
+MASTER_SITES=	${MASTER_SITE_PHP}
+MASTER_SITE_SUBDIR=	distributions
+DISTNAME=	php-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:release
 
 MAINTAINER?=	ports at MidnightBSD.org
-COMMENT?=	PHP Scripting Language (Apache Module and CLI)
+COMMENT?=	PHP Scripting Language
 LICENSE?=	php
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@@ -26,7 +24,6 @@
 USE_BZIP2=	yes
 .if !defined(PKGNAMESUFFIX)
 USE_AUTOTOOLS=	autoconf:262
-USE_GETOPT_LONG=yes
 
 CONFIGURE_ARGS=	--enable-versioning \
 		--enable-memory-limit \
@@ -46,6 +43,7 @@
 		APACHE "Build Apache module" off \
 		DEBUG "Enable debug" off \
 		SUHOSIN "Enable Suhosin protection system (not for jails)" on \
+		MAILHEAD "Enable mail header patch" off \
 		MULTIBYTE "Enable zend multibyte support" off \
 		IPV6 "Enable ipv6 support" on \
 		REDIRECT "Enable force-cgi-redirect support (CGI only)" off \
@@ -66,6 +64,11 @@
 PLIST_SUB+=	SUHOSIN="@comment "
 .endif
 
+.if defined(WITH_MAILHEAD)
+PATCHFILES+=	php-${PORTVERSION}-mail-header.patch:mail
+PATCH_SITES+=	http://choon.net/opensource/php/:mail
+.endif
+
 .if !defined(WITHOUT_CLI)
 PHP_SAPI+=	cli
 PLIST_SUB+=	CLI=""
@@ -151,7 +154,7 @@
 .if defined(WITH_APACHE)
 	${MKDIR} ${FAKE_DESTDIR}${LOCALBASE}/${APACHEETCDIR}
 	${CP} ${LOCALBASE}/${APACHEETCDIR}/httpd.conf ${FAKE_DESTDIR}${LOCALBASE}/${APACHEETCDIR}
-.endif	
+.endif
 
 post-build:
 	@${ECHO_CMD} "PHP_VER=5" > ${WRKDIR}/php.conf
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/lang/php5/distinfo,v
retrieving revision 1.8
retrieving revision 1.9
diff -L lang/php5/distinfo -L lang/php5/distinfo -u -r1.8 -r1.9
--- lang/php5/distinfo
+++ lang/php5/distinfo
@@ -4,3 +4,6 @@
 MD5 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = f2ec986341a314c271259dbe4d940858
 SHA256 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = dfdae803778e6ed6854ea3ad2948bbfedbfffc5a32dbc75a657b99092a9cc5e4
 SIZE (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = 22986
+MD5 (php-5.2.6-mail-header.patch) = eb26be2469a173a3476220342c5fcd58
+SHA256 (php-5.2.6-mail-header.patch) = 7e546c22a19386c4d93bebddfb64ace9447774f748070794c7c41419c5c474ac
+SIZE (php-5.2.6-mail-header.patch) = 3420
--- /dev/null
+++ lang/php5/files/patch-main_safe_mode.c
@@ -0,0 +1,17 @@
+--- main/safe_mode.c.orig	2008-09-04 15:52:19.000000000 +0200
++++ main/safe_mode.c	2008-09-04 15:52:35.000000000 +0200
+@@ -74,14 +74,6 @@
+ 		}
+ 	}
+ 
+-	/* 
+-	 * If given filepath is a URL, allow - safe mode stuff
+-	 * related to URL's is checked in individual functions
+-	 */
+-	wrapper = php_stream_locate_url_wrapper(filename, NULL, STREAM_LOCATE_WRAPPERS_ONLY TSRMLS_CC);
+-	if (wrapper != NULL)
+-		return 1;
+-		
+ 	/* First we see if the file is owned by the same user...
+ 	 * If that fails, passthrough and check directory...
+ 	 */