summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2004-10-11 19:48:33 +0000
committerAlex Dupre <ale@FreeBSD.org>2004-10-11 19:48:33 +0000
commit0a6d8fdafa99b3a2eb43ca56ea9fe190543add45 (patch)
treef02acd79bcd86a687fe284eeb7728e132e1d313b
parentUpdate to 4.3.9 release: (diff)
Update to 5.0.2 release:
- Fix compilation of thread-safe PHP after the PTHREAD_LIBS change - Include md5 and blowfish support on amd64 (fix headers) [1] - Add support for dom_import_simplexml function in php5-dom [2] - Fix vulnerability in RFC 1867 file upload processing [3] - Fix php_variables memory disclosure [3] PR: ports/71752 [1], ports/72003 [2], ports/72420 [3] Submitted by: Adam Gregoire <bsdunx@yahoo.com> [1], Vaidrius Petrauskas <acrozy@uosis.mif.vu.lt> [2], Dmitry A Grigorovich <odip@bionet.nsc.ru> [3] Approved by: portmgr (kris)
Notes
Notes: svn path=/head/; revision=118611
Diffstat
-rw-r--r--lang/php5/Makefile11
-rw-r--r--lang/php5/Makefile.ext3
-rw-r--r--lang/php5/distinfo4
-rw-r--r--lang/php5/files/patch-configure38
-rw-r--r--lang/php53/Makefile11
-rw-r--r--lang/php53/Makefile.ext3
-rw-r--r--lang/php53/distinfo4
-rw-r--r--lang/php53/files/patch-configure38
-rw-r--r--textproc/php5-pspell/Makefile2
9 files changed, 94 insertions, 20 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 200cb723b10a..c53f32b7a13b 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= php5
-PORTVERSION= 5.0.1
+PORTVERSION= 5.0.2
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \
@@ -111,12 +111,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)
@@ -172,6 +168,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/php5/Makefile.ext b/lang/php5/Makefile.ext
index 2dac9b267630..5cab0e1de822 100644
--- a/lang/php5/Makefile.ext
+++ b/lang/php5/Makefile.ext
@@ -69,6 +69,9 @@ CONFIGURE_ARGS+=--enable-dom \
--with-libxml-dir=${LOCALBASE}
USE_GNOME= libxml2
+
+USE_PHP= simplexml
+USE_PHP_BUILD= yes
.endif
.if ${PHP_MODNAME} == "exif"
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 52176fd735bb..72641fbb1bd2 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,2 +1,2 @@
-MD5 (php-5.0.1.tar.bz2) = b12042826ddba29fba3ae5a2eac3c391
-SIZE (php-5.0.1.tar.bz2) = 4569781
+MD5 (php-5.0.2.tar.bz2) = 579f82f3d6a61b669183b2ebce357a1e
+SIZE (php-5.0.2.tar.bz2) = 4577974
diff --git a/lang/php5/files/patch-configure b/lang/php5/files/patch-configure
new file mode 100644
index 000000000000..a56d0519cb51
--- /dev/null
+++ b/lang/php5/files/patch-configure
@@ -0,0 +1,38 @@
+--- configure.orig Mon Oct 11 15:51:58 2004
++++ configure Mon Oct 11 15:52:26 2004
+@@ -2649,7 +2649,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
+@@ -10613,7 +10613,7 @@
+ if test "$enable_maintainer_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
+@@ -10630,8 +10630,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*)
+@@ -88453,7 +88451,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
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 200cb723b10a..c53f32b7a13b 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= php5
-PORTVERSION= 5.0.1
+PORTVERSION= 5.0.2
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \
@@ -111,12 +111,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)
@@ -172,6 +168,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/php53/Makefile.ext b/lang/php53/Makefile.ext
index 2dac9b267630..5cab0e1de822 100644
--- a/lang/php53/Makefile.ext
+++ b/lang/php53/Makefile.ext
@@ -69,6 +69,9 @@ CONFIGURE_ARGS+=--enable-dom \
--with-libxml-dir=${LOCALBASE}
USE_GNOME= libxml2
+
+USE_PHP= simplexml
+USE_PHP_BUILD= yes
.endif
.if ${PHP_MODNAME} == "exif"
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index 52176fd735bb..72641fbb1bd2 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,2 +1,2 @@
-MD5 (php-5.0.1.tar.bz2) = b12042826ddba29fba3ae5a2eac3c391
-SIZE (php-5.0.1.tar.bz2) = 4569781
+MD5 (php-5.0.2.tar.bz2) = 579f82f3d6a61b669183b2ebce357a1e
+SIZE (php-5.0.2.tar.bz2) = 4577974
diff --git a/lang/php53/files/patch-configure b/lang/php53/files/patch-configure
new file mode 100644
index 000000000000..a56d0519cb51
--- /dev/null
+++ b/lang/php53/files/patch-configure
@@ -0,0 +1,38 @@
+--- configure.orig Mon Oct 11 15:51:58 2004
++++ configure Mon Oct 11 15:52:26 2004
+@@ -2649,7 +2649,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
+@@ -10613,7 +10613,7 @@
+ if test "$enable_maintainer_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
+@@ -10630,8 +10630,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*)
+@@ -88453,7 +88451,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
diff --git a/textproc/php5-pspell/Makefile b/textproc/php5-pspell/Makefile
index da12a965c6f5..c7098115ee1f 100644
--- a/textproc/php5-pspell/Makefile
+++ b/textproc/php5-pspell/Makefile
@@ -5,8 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 1
-
CATEGORIES= textproc
MASTERDIR= ${.CURDIR}/../../lang/php5
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-09 06:44:20 +0000