Update to 4.3.9 release:

- Fix compilation of thread-safe PHP after the PTHREAD_LIBS change
- Include md5 and blowfish support on amd64 (fix headers) [1]
- Fix vulnerability in RFC 1867 file upload processing [2]
- Fix php_variables memory disclosure [2]
- GD LZW-GIF support is now enabled by default

PR:		ports/71752 [1], ports/72420 [2]
Submitted by:	Adam Gregoire <bsdunx@yahoo.com> [1],
		Dmitry A Grigorovich <odip@bionet.nsc.ru> [2]
Approved by:	portmgr (kris)

4 files changed, 46 insertions, 15 deletions

diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index 7e0e66039807..1e28534c5ad8 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	php4
-PORTVERSION=	4.3.8
-PORTREVISION?=	2
+PORTVERSION=	4.3.9
+PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
 		http://downloads.php.net/ilia/:rc \
@@ -106,12 +106,8 @@ SAPI_FILE=	bin/php
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500016
-WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS:S/-l//}
-WITH_PTHREAD_CFLAGS?=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	ac_cv_pthreads_lib=${WITH_PTHREAD_LIBS} \
-		ac_cv_pthreads_cflags=${WITH_PTHREAD_CFLAGS}
-.endif
+CONFIGURE_ENV=	ac_cv_pthreads_lib=${PTHREAD_LIBS} \
+		ac_cv_pthreads_cflags=${PTHREAD_CFLAGS}
 
 .if defined(WITH_APACHE)
 .if exists(${LOCALBASE}/include/apache2/httpd.h)
@@ -167,6 +163,7 @@ PHP_PORT=	${.CURDIR:S|^${_PORTSDIR}||:S|^/||}
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
+	@${REINPLACE_CMD} "s|<crypt.h>|<unistd.h>|g" ${WRKSRC}/configure
 
 .if ${PHP_SAPI} == "full"
 pre-configure:
diff --git a/lang/php4/Makefile.ext b/lang/php4/Makefile.ext
index 122a16451850..48ce6ff95626 100644
--- a/lang/php4/Makefile.ext
+++ b/lang/php4/Makefile.ext
@@ -111,8 +111,7 @@ CONFIGURE_ARGS+=--with-xpm-dir=${X11BASE}
 
 OPTIONS=	T1LIB "Include T1lib support" on \
 		TRUETYPE "Enable TrueType string function" on \
-		JIS "Enable JIS-mapped Japanese font support" off \
-		LZW "Enable LZW-compressed GIF write support" off
+		JIS "Enable JIS-mapped Japanese font support" off
 
 PHP_HEADER_DIRS=libgd
 .endif
@@ -429,9 +428,6 @@ CONFIGURE_ARGS+=--enable-gd-native-ttf
 .	if defined(WITH_JIS)
 CONFIGURE_ARGS+=--enable-gd-jis-conv
 .	endif
-.	if defined(WITH_LZW)
-CONFIGURE_ARGS+=--enable-gd-lzw-gif
-.	endif
 .endif
 
 .if ${PHP_MODNAME} == "imap"
diff --git a/lang/php4/distinfo b/lang/php4/distinfo
index c5d3874d602b..b7bea31f1c67 100644
--- a/lang/php4/distinfo
+++ b/lang/php4/distinfo
@@ -1,2 +1,2 @@
-MD5 (php-4.3.8.tar.bz2) = e8ab484fcb94cd2e0d7ecfd0762cfd33
-SIZE (php-4.3.8.tar.bz2) = 3963437
+MD5 (php-4.3.9.tar.bz2) = b799bbb330da60324d972641baab693c
+SIZE (php-4.3.9.tar.bz2) = 4001681
diff --git a/lang/php4/files/patch-configure b/lang/php4/files/patch-configure
new file mode 100644
index 000000000000..6482eeea108d
--- /dev/null
+++ b/lang/php4/files/patch-configure
@@ -0,0 +1,38 @@
+--- configure.orig	Mon Oct 11 15:56:07 2004
++++ configure	Mon Oct 11 15:56:28 2004
+@@ -2672,7 +2672,7 @@
+   save_LIBS=$LIBS
+   
+ if test -n "$ac_cv_pthreads_lib"; then
+-  LIBS="$LIBS -l$ac_cv_pthreads_lib"
++  LIBS="$LIBS $ac_cv_pthreads_lib"
+ fi
+ 
+ if test -n "$ac_cv_pthreads_cflags"; then
+@@ -8934,7 +8934,7 @@
+ if test "$enable_experimental_zts" = "yes"; then
+   
+ if test -n "$ac_cv_pthreads_lib"; then
+-  LIBS="$LIBS -l$ac_cv_pthreads_lib"
++  LIBS="$LIBS $ac_cv_pthreads_lib"
+ fi
+ 
+ if test -n "$ac_cv_pthreads_cflags"; then
+@@ -8951,8 +8951,6 @@
+   case $host_alias in
+   *solaris*)
+     PTHREAD_FLAGS="-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT";;
+-  *freebsd*)
+-    PTHREAD_FLAGS="-D_REENTRANT -D_THREAD_SAFE";;
+   *linux*)
+     PTHREAD_FLAGS=-D_REENTRANT;;
+   *aix*)
+@@ -89623,7 +89621,7 @@
+   save_LIBS=$LIBS
+   
+ if test -n "$ac_cv_pthreads_lib"; then
+-  LIBS="$LIBS -l$ac_cv_pthreads_lib"
++  LIBS="$LIBS $ac_cv_pthreads_lib"
+ fi
+ 
+ if test -n "$ac_cv_pthreads_cflags"; then