TEST: php-4.1.0RC3 / OpenBSD Port
| From: | Anil Madhavapeddy | Date: | Sat, 24 Nov 2001 19:49:25 +0000 |
| Subject: | TEST: php-4.1.0RC3 / OpenBSD Port | ||
| Groups: | php.qa | ||
| Request: | Send a blank email to php-qa+get-4033@lists.php.net to get a copy of this message | ||
This is the final RC of PHP-4.1.0. Please test on OpenBSD
to see if you can spot any release critical bugs before it
ships.
Patch is against openbsd-current
As usual, non-i386 platforms and wierd extensions are
most needed.
TODO:
1) Add an "xsl" FLAVOR before release, to work with
Sablotron. Note that the "sablot" extension no longer
exists as of PHP-4.1.x
2) Are there any other FLAVORs that other people need?
Let me know soon.
Anil
? patch-php-4.1.0RC3 Index: Makefile =================================================================== RCS file: /cvs/ports/www/php4/Makefile,v retrieving revision 1.59 diff -u -r1.59 Makefile --- Makefile 19 Nov 2001 01:50:34 -0000 1.59 +++ Makefile 24 Nov 2001 19:43:50 -0000 @@ -10,19 +10,20 @@ # and has Apache that supports DSO's. ONLY_FOR_ARCHS= i386 m68k sparc -V= 4.0.6 +V= 4.1.0RC3 DISTNAME= php-${V} -PKGNAME= php4-${V}p1 -FULLPKGNAME-pear= php4-pear-${V}p1 +PKGNAME= php4-${V} +FULLPKGNAME-pear= php4-pear-${V} CATEGORIES= www lang -NEED_VERSION= 1.489 +NEED_VERSION= 1.499 MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org> HOMEPAGE= http://www.php.net/ -MASTER_SITES= http://www.php.net:8000/distributions/ \ +MASTER_SITES= http://www.php.net/~zeev/ \ + http://www.php.net:8000/distributions/ \ http://se.php.net/distributions/ \ http://no.php.net/distributions/ \ http://uk.php.net/distributions/ @@ -205,7 +206,7 @@ ${PREFIX}/lib/libphp4.so ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/php4 ${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/share/doc/php4 - ${INSTALL_DATA} ${WRKSRC}/php.ini-optimized ${PREFIX}/share/doc/php4 + ${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/share/doc/php4 @sed 's,y0y0y0,${TRUEPREFIX},' \ <${FILESDIR}/php4-enable >${PREFIX}/sbin/php4-enable @chown ${BINOWN}:${BINGRP} ${PREFIX}/sbin/php4-enable Index: distinfo =================================================================== RCS file: /cvs/ports/www/php4/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 19 Nov 2001 01:50:34 -0000 1.1 +++ distinfo 24 Nov 2001 19:43:50 -0000 @@ -1,3 +1,3 @@ -MD5 (php-4.0.6.tar.gz) = 5f698521cf2b392cf9bfa87fc1a0fe90 -RMD160 (php-4.0.6.tar.gz) = e455b9a4d1de74cb30f657668a535a2d27b81925 -SHA1 (php-4.0.6.tar.gz) = 6544eb1085b916541af914a11074e9bb8a037a03 +MD5 (php-4.1.0RC3.tar.gz) = b1e100a2ae3c0e4978fccf7af817b65e +RMD160 (php-4.1.0RC3.tar.gz) = 03eb626b53531a5c3ac6e358da1088750d4fa4a9 +SHA1 (php-4.1.0RC3.tar.gz) = 22b97cabf0132398ed9ead2d44b755523b7d7741 Index: patches/patch-Zend_zend_alloc_c =================================================================== RCS file: patches/patch-Zend_zend_alloc_c diff -N patches/patch-Zend_zend_alloc_c --- patches/patch-Zend_zend_alloc_c 11 Aug 2001 00:16:56 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-Zend_zend_alloc_c,v 1.1 2001/08/11 00:16:56 avsm Exp $ ---- Zend/zend_alloc.c.orig Tue Jun 19 18:04:53 2001 -+++ Zend/zend_alloc.c Sat Aug 11 00:07:15 2001 -@@ -446,6 +446,9 @@ ZEND_API void shutdown_memory_manager(in - for (i=1; i<MAX_CACHED_MEMORY; i++) { - for (j=0; j<AG(cache_count)[i]; j++) { - ptr = (zend_mem_header *) AG(cache)[i][j]; -+#if MEMORY_LIMIT -+ AG(allocated_memory) -= REAL_SIZE(ptr->size); -+#endif - REMOVE_POINTER_FROM_LIST(ptr); - free(ptr); - } Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/www/php4/patches/patch-configure,v retrieving revision 1.7 diff -u -r1.7 patch-configure --- patches/patch-configure 19 Nov 2001 01:50:34 -0000 1.7 +++ patches/patch-configure 24 Nov 2001 19:43:50 -0000 @@ -1,188 +1,12 @@ -$OpenBSD: patch-configure,v 1.7 2001/11/19 01:50:34 brad Exp $ ---- configure.orig Thu Jun 21 02:28:57 2001 -+++ configure Sun Nov 18 17:12:35 2001 -@@ -6577,6 +6577,7 @@ for ac_func in asctime_r \ - chroot \ - ctime_r \ - cuserid \ -+crypt \ - flock \ - gai_strerror \ - gcvt \ -@@ -8517,10 +8518,6 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - esac - - cat >> confdefs.h <<\EOF --#define HAVE_LIBCRYPT 1 --EOF -- -- cat >> confdefs.h <<\EOF - #define HAVE_CRYPT 1 - EOF - -@@ -22424,8 +22421,37 @@ EOF - fi - done - -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=-I$IMAP_INC_DIR -+ cat > conftest.$ac_ext <<EOF -+#line 22431 "configure" -+#include "confdefs.h" -+ -+ #include "imap4r1.h" -+ #if defined(IMAPSSLPORT) -+ this_is_true -+ #endif -+ -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "this_is_true" >/dev/null 2>&1; then -+ rm -rf conftest* -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_IMAP2001 1 -+EOF -+ -+ -+else -+ rm -rf conftest* -+ -+fi -+rm -f conftest* -+ -+ CPPFLAGS=$old_CPPFLAGS -+ - echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 --echo "configure:22429: checking for pam_start in -lpam" >&5 -+echo "configure:22458: checking for pam_start in -lpam" >&5 - ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -22471,7 +22497,54 @@ else - echo "$ac_t""no" 1>&6 - fi - -- -+ echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -+echo "configure:22505: checking for crypt in -lcrypt" >&5 -+ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lcrypt $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 22513 "configure" -+#include "confdefs.h" -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char crypt(); -+ -+int main() { -+crypt() -+; return 0; } -+EOF -+if { (eval echo configure:22524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_lib=HAVE_LIB`echo crypt | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+ cat >> confdefs.h <<EOF -+#define $ac_tr_lib 1 -+EOF -+ -+ LIBS="-lcrypt $LIBS" -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ - - if test -z "$IMAP_DIR" || echo "$IMAP_DIR" | grep '^/' >/dev/null ; then - IMAP_DIR="$IMAP_DIR" -@@ -22585,53 +22658,21 @@ fi +$OpenBSD$ +--- configure.orig Sat Nov 24 19:10:35 2001 ++++ configure Sat Nov 24 19:10:44 2001 +@@ -24893,22 +24893,22 @@ EOF fi -- DLIBS="-l$IMAP_LIB $DLIBS" -+ DLIBS="$DLIBS -l$IMAP_LIB" - - -- -- --echo $ac_n "checking for Kerberos support in IMAP""... $ac_c" 1>&6 --echo "configure:22595: checking for Kerberos support in IMAP" >&5 --# Check whether --with-kerberos or --without-kerberos was given. -+ # Check whether --with-kerberos or --without-kerberos was given. - if test "${with_kerberos+set}" = set; then - withval="$with_kerberos" -- PHP_KERBEROS=$withval -+ -+ PHP_KERBEROS=$withval -+ - else -- PHP_KERBEROS=no --fi -- -- --case "$PHP_KERBEROS" in --shared,*) -- ext_output="yes, shared" -- ext_shared=yes -- PHP_KERBEROS=`echo "$PHP_KERBEROS"|sed 's/^shared,//'` -- ;; --shared) -- ext_output="yes, shared" -- ext_shared=yes -- PHP_KERBEROS=yes -- ;; --no) -- ext_output="no" -- ext_shared=no -- ;; --*) -- ext_output="yes" -- ext_shared=no -- ;; --esac -- --if test "$php_always_shared" = "yes"; then -- ext_output="yes, shared" -- ext_shared=yes -- test "$PHP_KERBEROS" = "no" && PHP_KERBEROS=yes -+ -+ PHP_KERBEROS=no -+ - fi - --echo "$ac_t""$ext_output" 1>&6 -- -- -- - - if test "$PHP_KERBEROS" = "yes"; then - test -d /usr/kerberos && PHP_KERBEROS=/usr/kerberos -@@ -22676,22 +22717,22 @@ EOF - fi - - -- case "gssapi_krb5" in -+ case "gssapi" in +- case gssapi_krb5 in ++ case gssapi in c|c_r|pthread*) ;; *) @@ -193,8 +17,8 @@ else -- case "gssapi_krb5" in -+ case "gssapi" in +- case gssapi_krb5 in ++ case gssapi in c|c_r|pthread*) ;; *) @@ -204,12 +28,12 @@ ;; -@@ -22730,22 +22771,22 @@ EOF +@@ -24947,22 +24947,22 @@ EOF esac -- case "k5crypto" in -+ case "asn1" in +- case k5crypto in ++ case asn1 in c|c_r|pthread*) ;; *) @@ -220,8 +44,8 @@ else -- case "k5crypto" in -+ case "asn1" in +- case k5crypto in ++ case asn1 in c|c_r|pthread*) ;; *) @@ -231,12 +55,12 @@ ;; -@@ -22757,22 +22798,22 @@ EOF +@@ -24974,22 +24974,22 @@ EOF esac -- case "com_err" in -+ case "com_err_pic" in +- case com_err in ++ case com_err_pic in c|c_r|pthread*) ;; *) @@ -247,8 +71,8 @@ else -- case "com_err" in -+ case "com_err_pic" in +- case com_err in ++ case com_err_pic in c|c_r|pthread*) ;; *) @@ -258,157 +82,12 @@ ;; -@@ -22783,59 +22824,49 @@ EOF - ;; - esac - -- fi -- -- -+ else -+ cat > conftest.$ac_ext <<EOF -+#line 22833 "configure" -+#include "confdefs.h" -+#include <$IMAP_INC_DIR/linkage.h> -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "auth_gss" >/dev/null 2>&1; then -+ rm -rf conftest* - -+ { echo "configure: error: This c-client library is build with Kerberos support. - --echo $ac_n "checking for SSL support in IMAP""... $ac_c" 1>&6 --echo "configure:22793: checking for SSL support in IMAP" >&5 --# Check whether --with-imap-ssl or --without-imap-ssl was given. --if test "${with_imap_ssl+set}" = set; then -- withval="$with_imap_ssl" -- PHP_IMAP_SSL=$withval --else -- PHP_IMAP_SSL=no -+ Add --with-kerberos<=DIR> to your configure line. Check config.log for details." 1>&2; exit 1; } -+ - fi -+rm -f conftest* - -+ fi - --case "$PHP_IMAP_SSL" in --shared,*) -- ext_output="yes, shared" -- ext_shared=yes -- PHP_IMAP_SSL=`echo "$PHP_IMAP_SSL"|sed 's/^shared,//'` -- ;; --shared) -- ext_output="yes, shared" -- ext_shared=yes -- PHP_IMAP_SSL=yes -- ;; --no) -- ext_output="no" -- ext_shared=no -- ;; --*) -- ext_output="yes" -- ext_shared=no -- ;; --esac - --if test "$php_always_shared" = "yes"; then -- ext_output="yes, shared" -- ext_shared=yes -- test "$PHP_IMAP_SSL" = "no" && PHP_IMAP_SSL=yes -+ -+ # Check whether --with-imap-ssl or --without-imap-ssl was given. -+if test "${with_imap_ssl+set}" = set; then -+ withval="$with_imap_ssl" -+ -+ PHP_IMAP_SSL=$withval -+ -+else -+ -+ PHP_IMAP_SSL=no -+ - fi - --echo "$ac_t""$ext_output" 1>&6 -- -- -- - - if test "$PHP_IMAP_SSL" = "yes"; then - PHP_IMAP_SSL=/usr - fi - - if test "$PHP_IMAP_SSL" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_IMAP_SSL 1 -+EOF -+ - - if test "$PHP_IMAP_SSL/lib" != "/usr/lib"; then - -@@ -22870,22 +22901,23 @@ echo "$ac_t""$ext_output" 1>&6 - fi - - -- DLIBS="-lcrypto $DLIBS" -+ DLIBS="$DLIBS -lssl" - - -- DLIBS="-lssl $DLIBS" -- -+ DLIBS="$DLIBS -lcrypto" - -+ else +@@ -25134,7 +25134,7 @@ EOF old_LIBS=$LIBS -- LIBS="$LIBS -lc-client" -+ LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB" + LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB" if test $PHP_KERBEROS != "no"; then -- LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" +- LIBS="$LIBS -L$PHP_KERBEROS/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" + LIBS="$LIBS -L$PHP_KERBEROS/lib -lgssapi -lkrb5 -lasn1 -lcom_err_pic" fi -+ + if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 22889 "configure" -+#line 22924 "configure" - #include "confdefs.h" - - void mm_log(void){} -@@ -22903,27 +22935,24 @@ else - void mm_exists(void){} - void mm_searched(void){} - void mm_expunged(void){} -- char ssl_onceonlyinit(); -+ char mail_open(); - int main() { -- ssl_onceonlyinit(); -+ mail_open(0,"",0); - return 0; - } - - EOF --if { (eval echo configure:22914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:22949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then -- -- cat >> confdefs.h <<\EOF --#define HAVE_IMAP_SSL 1 --EOF -- -- -+ : - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - -- { echo "configure: error: This c-client library does not support SSL. Recompile or remove --with-imap-ssl from configure line." 1>&2; exit 1; } -+ { echo "configure: error: This c-client library is build with SSL support. -+ -+ Add --with-imap-ssl<=DIR> to your configure line. Check config.log for details." 1>&2; exit 1; } - - fi - rm -fr conftest* Index: patches/patch-configure_in =================================================================== RCS file: patches/patch-configure_in diff -N patches/patch-configure_in --- patches/patch-configure_in 4 Oct 2001 21:27:44 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-configure_in,v 1.3 2001/10/04 21:27:44 avsm Exp $ ---- configure.in.orig Thu Oct 4 21:36:32 2001 -+++ configure.in Thu Oct 4 21:37:23 2001 -@@ -363,6 +363,7 @@ AC_FUNC_VPRINTF - AC_CHECK_FUNCS( - asctime_r \ - chroot \ -+crypt \ - ctime_r \ - cuserid \ - flock \ -@@ -622,9 +623,8 @@ fi - - AC_CHECK_LIB(crypt, crypt, [ - PHP_ADD_LIBRARY(crypt) -- AC_DEFINE(HAVE_LIBCRYPT,1,[ ]) - AC_DEFINE(HAVE_CRYPT,1,[ ]) --], []) -+]) - - divert(5) - Index: patches/patch-ext_imap_config_m4 =================================================================== RCS file: /cvs/ports/www/php4/patches/patch-ext_imap_config_m4,v retrieving revision 1.2 diff -u -r1.2 patch-ext_imap_config_m4 --- patches/patch-ext_imap_config_m4 19 Nov 2001 01:50:34 -0000 1.2 +++ patches/patch-ext_imap_config_m4 24 Nov 2001 19:43:50 -0000 @@ -1,22 +1,7 @@ -$OpenBSD: patch-ext_imap_config_m4,v 1.2 2001/11/19 01:50:34 brad Exp $ ---- ext/imap/config.m4.orig Mon May 21 20:38:46 2001 -+++ ext/imap/config.m4 Sun Nov 18 17:12:56 2001 -@@ -22,8 +22,12 @@ AC_DEFUN(IMAP_LIB_CHK,[ - ]) - - AC_DEFUN(PHP_IMAP_KRB_CHK, [ -- PHP_ARG_WITH(kerberos,for Kerberos support in IMAP, -- [ --with-kerberos[=DIR] IMAP: Include Kerberos support.]) -+ AC_ARG_WITH(kerberos, -+ [ --with-kerberos[=DIR] IMAP: Include Kerberos support. DIR is the Kerberos install dir.],[ -+ PHP_KERBEROS=$withval -+ ],[ -+ PHP_KERBEROS=no -+ ]) - - if test "$PHP_KERBEROS" = "yes"; then - test -d /usr/kerberos && PHP_KERBEROS=/usr/kerberos -@@ -32,31 +36,44 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [ +$OpenBSD$ +--- ext/imap/config.m4.orig Tue Aug 7 16:18:04 2001 ++++ ext/imap/config.m4 Sat Nov 24 19:10:23 2001 +@@ -36,10 +36,10 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [ if test "$PHP_KERBEROS" != "no"; then AC_DEFINE(HAVE_IMAP_KRB,1,[ ]) PHP_ADD_LIBPATH($PHP_KERBEROS/lib, IMAP_SHARED_LIBADD) @@ -27,110 +12,15 @@ - PHP_ADD_LIBRARY(com_err, 1, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(asn1, 1, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(com_err_pic, 1, IMAP_SHARED_LIBADD) -+ else -+ AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [ -+ AC_MSG_ERROR(This c-client library is build with Kerberos support. -+ -+ Add --with-kerberos<=DIR> to your configure line. Check config.log for details.) -+ ]) - fi -+ - ]) - - AC_DEFUN(PHP_IMAP_SSL_CHK, [ -- PHP_ARG_WITH(imap-ssl,for SSL support in IMAP, -- [ --with-imap-ssl[=DIR] IMAP: Include SSL support.]) -+ AC_ARG_WITH(imap-ssl, -+ [ --with-imap-ssl[=DIR] IMAP: Include SSL support. DIR is the OpenSSL install dir.],[ -+ PHP_IMAP_SSL=$withval -+ ],[ -+ PHP_IMAP_SSL=no -+ ]) - - if test "$PHP_IMAP_SSL" = "yes"; then - PHP_IMAP_SSL=/usr - fi - - if test "$PHP_IMAP_SSL" != "no"; then -+ AC_DEFINE(HAVE_IMAP_SSL,1,[ ]) - PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD) -- PHP_ADD_LIBRARY_DEFER(crypto) -- PHP_ADD_LIBRARY_DEFER(ssl) -- -+ PHP_ADD_LIBRARY_DEFER(ssl,, IMAP_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_DEFER(crypto,, IMAP_SHARED_LIBADD) -+ else + else + AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [ + AC_MSG_ERROR(This c-client library is build with Kerberos support. +@@ -71,7 +71,7 @@ AC_DEFUN(PHP_IMAP_SSL_CHK, [ old_LIBS=$LIBS -- LIBS="$LIBS -lc-client" -+ LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB" + LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB" if test $PHP_KERBEROS != "no"; then -- LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" +- LIBS="$LIBS -L$PHP_KERBEROS/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" + LIBS="$LIBS -L$PHP_KERBEROS/lib -lgssapi -lkrb5 -lasn1 -lcom_err_pic" fi -+ - AC_TRY_RUN([ - void mm_log(void){} - void mm_dlog(void){} -@@ -73,15 +90,15 @@ AC_DEFUN(PHP_IMAP_SSL_CHK, [ - void mm_exists(void){} - void mm_searched(void){} - void mm_expunged(void){} -- char ssl_onceonlyinit(); -+ char mail_open(); - int main() { -- ssl_onceonlyinit(); -+ mail_open(0,"",0); - return 0; - } -- ],[ -- AC_DEFINE(HAVE_IMAP_SSL,1,[ ]) -- ], [ -- AC_MSG_ERROR(This c-client library does not support SSL. Recompile or remove --with-imap-ssl from configure line.) -+ ],,[ -+ AC_MSG_ERROR(This c-client library is build with SSL support. -+ -+ Add --with-imap-ssl<=DIR> to your configure line. Check config.log for details.) - ]) - LIBS=$old_LIBS - fi -@@ -108,8 +125,21 @@ if test "$PHP_IMAP" != "no"; then - fi - done -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=-I$IMAP_INC_DIR -+ AC_EGREP_CPP(this_is_true, [ -+ #include "imap4r1.h" -+ #if defined(IMAPSSLPORT) -+ this_is_true -+ #endif -+ ],[ -+ AC_DEFINE(HAVE_IMAP2001, 1, [ ]) -+ ],[ ]) -+ CPPFLAGS=$old_CPPFLAGS -+ - AC_CHECK_LIB(pam, pam_start) -- -+ AC_CHECK_LIB(crypt, crypt) -+ - PHP_EXPAND_PATH($IMAP_DIR, IMAP_DIR) - - if test -z "$IMAP_DIR"; then -@@ -122,7 +152,7 @@ if test "$PHP_IMAP" != "no"; then - ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 - fi - -- for lib in imap c-client4 c-client; do -+ for lib in c-client4 c-client imap; do - IMAP_LIB=$lib - IMAP_LIB_CHK(lib) - IMAP_LIB_CHK(c-client) -@@ -134,7 +164,7 @@ if test "$PHP_IMAP" != "no"; then - - PHP_ADD_INCLUDE($IMAP_INC_DIR) - PHP_ADD_LIBPATH($IMAP_LIBDIR, IMAP_SHARED_LIBADD) -- PHP_ADD_LIBRARY_DEFER($IMAP_LIB) -+ PHP_ADD_LIBRARY_DEFER($IMAP_LIB,, IMAP_SHARED_LIBADD) - PHP_IMAP_KRB_CHK - PHP_IMAP_SSL_CHK - fi + AC_TRY_RUN([ Index: patches/patch-php_ini-dist =================================================================== RCS file: /cvs/ports/www/php4/patches/patch-php_ini-dist,v retrieving revision 1.2 diff -u -r1.2 patch-php_ini-dist --- patches/patch-php_ini-dist 4 Oct 2001 21:53:04 -0000 1.2 +++ patches/patch-php_ini-dist 24 Nov 2001 19:43:50 -0000 @@ -1,10 +1,7 @@ -$OpenBSD: patch-php_ini-dist,v 1.2 2001/10/04 21:53:04 avsm Exp $ -URL fopen off by default - this is one of those things that people hardly -ever use, and can turn local exploits into remote ones. - ---- php.ini-dist.orig Fri Jun 1 03:20:49 2001 -+++ php.ini-dist Thu Oct 4 22:39:04 2001 -@@ -349,7 +349,7 @@ upload_max_filesize = 2M +$OpenBSD$ +--- php.ini-dist.orig Sat Nov 24 19:37:08 2001 ++++ php.ini-dist Sat Nov 24 19:38:00 2001 +@@ -383,7 +383,7 @@ upload_max_filesize = 2M ;;;;;;;;;;;;;;;;;; ; Whether to allow the treatment of URLs (like http:// or ftp://) as files. Index: patches/patch-php_ini-optimized =================================================================== RCS file: patches/patch-php_ini-optimized diff -N patches/patch-php_ini-optimized --- patches/patch-php_ini-optimized 5 Oct 2001 07:17:34 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-php_ini-optimized,v 1.2 2001/10/05 07:17:34 avsm Exp $ ---- php.ini-optimized.orig Thu Oct 4 22:37:46 2001 -+++ php.ini-optimized Thu Oct 4 22:38:32 2001 -@@ -249,7 +249,7 @@ upload_max_filesize = 2M ; Maximum - ;;;;;;;;;;;;;;;;;; - ; Fopen wrappers ; - ;;;;;;;;;;;;;;;;;; --allow_url_fopen = On ; Whether to allow the treatment of URLs (like http:// or ftp://) as files -+allow_url_fopen = Off ; Whether to allow the treatment of URLs (like http:// or ftp://) as files - ;from="john@doe.com" ; Define the anonymous ftp password (your email address) - - Index: patches/patch-php_ini-recommended =================================================================== RCS file: patches/patch-php_ini-recommended diff -N patches/patch-php_ini-recommended --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-php_ini-recommended 24 Nov 2001 19:43:50 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- php.ini-recommended.orig Sat Nov 24 19:38:07 2001 ++++ php.ini-recommended Sat Nov 24 19:38:13 2001 +@@ -396,7 +396,7 @@ upload_max_filesize = 2M + ;;;;;;;;;;;;;;;;;; + + ; Whether to allow the treatment of URLs (like http:// or ftp://) as files. +-allow_url_fopen = On ++allow_url_fopen = Off + + ; Define the anonymous ftp password (your email address) + ;from="john@doe.com" Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/php4/pkg/PLIST,v retrieving revision 1.4 diff -u -r1.4 PLIST --- pkg/PLIST 12 Jun 2001 15:07:29 -0000 1.4 +++ pkg/PLIST 24 Nov 2001 19:43:50 -0000 @@ -1,7 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.4 2001/06/12 15:07:29 avsm Exp $ +@comment $OpenBSD$ @pkgcfl php3-* +bin/php-config lib/libphp4.so sbin/php4-enable share/doc/php4/php.ini-dist -share/doc/php4/php.ini-optimized +share/doc/php4/php.ini-recommended @dirrm share/doc/php4 Index: pkg/PLIST-pear =================================================================== RCS file: /cvs/ports/www/php4/pkg/PLIST-pear,v retrieving revision 1.3 diff -u -r1.3 PLIST-pear --- pkg/PLIST-pear 5 Jul 2001 22:55:40 -0000 1.3 +++ pkg/PLIST-pear 24 Nov 2001 19:43:51 -0000 @@ -1,8 +1,5 @@ -@comment $OpenBSD: PLIST-pear,v 1.3 2001/07/05 22:55:40 avsm Exp $ -bin/pear -bin/php-config -bin/phpextdist -bin/phpize +@comment $OpenBSD$ +@pkgcfl php3-* include/php/TSRM/TSRM.h include/php/TSRM/acconfig.h include/php/TSRM/readdir.h @@ -84,7 +81,6 @@ include/php/ext/standard/php_mail.h include/php/ext/standard/php_math.h include/php/ext/standard/php_metaphone.h -include/php/ext/standard/php_output.h include/php/ext/standard/php_parsedate.h include/php/ext/standard/php_rand.h include/php/ext/standard/php_smart_str.h @@ -92,6 +88,7 @@ include/php/ext/standard/php_standard.h include/php/ext/standard/php_string.h include/php/ext/standard/php_var.h +include/php/ext/standard/php_versioning.h include/php/ext/standard/quot_print.h include/php/ext/standard/reg.h include/php/ext/standard/scanf.h @@ -100,17 +97,6 @@ include/php/ext/standard/url.h include/php/ext/standard/url_scanner.h include/php/ext/standard/url_scanner_ex.h -include/php/ext/xml/expat/xmlparse/expat_hashtable.h -include/php/ext/xml/expat/xmlparse/xmlparse.h -include/php/ext/xml/expat/xmltok/asciitab.h -include/php/ext/xml/expat/xmltok/iasciitab.h -include/php/ext/xml/expat/xmltok/latin1tab.h -include/php/ext/xml/expat/xmltok/nametab.h -include/php/ext/xml/expat/xmltok/utf8tab.h -include/php/ext/xml/expat/xmltok/xmldef.h -include/php/ext/xml/expat/xmltok/xmlrole.h -include/php/ext/xml/expat/xmltok/xmltok.h -include/php/ext/xml/expat/xmltok/xmltok_impl.h include/php/ext/xml/php_xml.h include/php/main/SAPI.h include/php/main/build-defs.h @@ -129,6 +115,7 @@ include/php/main/php_main.h include/php/main/php_network.h include/php/main/php_open_temporary_file.h +include/php/main/php_output.h include/php/main/php_reentrancy.h include/php/main/php_regex.h include/php/main/php_streams.h @@ -147,6 +134,7 @@ include/php/regex/regex2.h include/php/regex/regex_extra.h include/php/regex/utils.h +lib/php/Archive/Tar.php lib/php/Benchmark/Iterate.php lib/php/Benchmark/Timer.php lib/php/Cache.php @@ -156,6 +144,7 @@ lib/php/Cache/Container/file.php lib/php/Cache/Container/phplib.php lib/php/Cache/Container/shm.php +lib/php/Cache/DB.php lib/php/Cache/Error.php lib/php/Cache/Function.php lib/php/Cache/Graphics.php @@ -166,6 +155,7 @@ lib/php/Crypt/HCEMD5.php lib/php/DB.php lib/php/DB/common.php +lib/php/DB/fbsql.php lib/php/DB/ibase.php lib/php/DB/ifx.php lib/php/DB/msql.php @@ -185,6 +175,7 @@ lib/php/HTML/Form.php lib/php/HTML/IT.php lib/php/HTML/ITX.php +lib/php/HTML/IT_Error.php lib/php/HTML/Page.php lib/php/HTML/Processor.php lib/php/HTML/Select.php @@ -193,14 +184,15 @@ lib/php/HTTP/Compress.php lib/php/Image/Remote.php lib/php/Log.php +lib/php/Log/Observer.php lib/php/Log/composite.php lib/php/Log/file.php lib/php/Log/mcal.php -lib/php/Log/observer.php lib/php/Log/sql.php lib/php/Log/syslog.php lib/php/Mail.php lib/php/Mail/RFC822.php +lib/php/Mail/mime.php lib/php/Mail/sendmail.php lib/php/Mail/smtp.php lib/php/Math/Fraction.php @@ -212,14 +204,16 @@ lib/php/Numbers/Roman.php lib/php/PEAR.php lib/php/PEAR/Common.php +lib/php/PEAR/Config.php lib/php/PEAR/Installer.php lib/php/PEAR/Packager.php +lib/php/PEAR/Registry.php +lib/php/PEAR/Remote.php lib/php/PEAR/Uploader.php lib/php/Payment/Verisign.php lib/php/Schedule/At.php +lib/php/System.php lib/php/XML/Parser.php -lib/php/XML/RPC.php -lib/php/XML/RPC/Server.php lib/php/build/acinclude.m4 lib/php/build/dynlib.m4 lib/php/build/dynlib.mk @@ -234,7 +228,6 @@ lib/php/build/rules_pear.mk lib/php/build/shtool @dirrm lib/php/build -@dirrm lib/php/XML/RPC @dirrm lib/php/XML @dirrm lib/php/Schedule @dirrm lib/php/Payment @@ -255,10 +248,13 @@ @dirrm lib/php/Cache/Container @dirrm lib/php/Cache @dirrm lib/php/Benchmark +@dirrm lib/php/Archive @dirrm lib/php @dirrm include/php/regex @dirrm include/php/main +@exec mkdir -p %D/include/php/ext/xml/expat/xmltok @dirrm include/php/ext/xml/expat/xmltok +@exec mkdir -p %D/include/php/ext/xml/expat/xmlparse @dirrm include/php/ext/xml/expat/xmlparse @dirrm include/php/ext/xml/expat @dirrm include/php/ext/xml Index: pkg/SECURITY =================================================================== RCS file: pkg/SECURITY diff -N pkg/SECURITY --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/SECURITY 24 Nov 2001 19:43:51 -0000 @@ -0,0 +1,16 @@ +A couple of minor changes have been made to PHP's +default installation to make it more secure. + +1) Temporary files have greater randomness in their names. + +2) URL fopen is OFF by default, as this functionality is + easily exploitable for many common PHP scripts out there. + Turning it off by default does not affect 99% of users, + and turns remote exploits into local ones. + +The source has not otherwise been audited. If you do so, +please contact the maintainer(s) below. + +-- +Anil Madhavapeddy, <avsm@openbsd.org> +$OpenBSD$
? patch-php-4.1.0RC3 Index: Makefile =================================================================== RCS file: /cvs/ports/www/php4/Makefile,v retrieving revision 1.59 diff -u -r1.59 Makefile --- Makefile 19 Nov 2001 01:50:34 -0000 1.59 +++ Makefile 24 Nov 2001 19:43:50 -0000 @@ -10,19 +10,20 @@ # and has Apache that supports DSO's. ONLY_FOR_ARCHS= i386 m68k sparc -V= 4.0.6 +V= 4.1.0RC3 DISTNAME= php-${V} -PKGNAME= php4-${V}p1 -FULLPKGNAME-pear= php4-pear-${V}p1 +PKGNAME= php4-${V} +FULLPKGNAME-pear= php4-pear-${V} CATEGORIES= www lang -NEED_VERSION= 1.489 +NEED_VERSION= 1.499 MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org> HOMEPAGE= http://www.php.net/ -MASTER_SITES= http://www.php.net:8000/distributions/ \ +MASTER_SITES= http://www.php.net/~zeev/ \ + http://www.php.net:8000/distributions/ \ http://se.php.net/distributions/ \ http://no.php.net/distributions/ \ http://uk.php.net/distributions/ @@ -205,7 +206,7 @@ ${PREFIX}/lib/libphp4.so ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/php4 ${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/share/doc/php4 - ${INSTALL_DATA} ${WRKSRC}/php.ini-optimized ${PREFIX}/share/doc/php4 + ${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/share/doc/php4 @sed 's,y0y0y0,${TRUEPREFIX},' \ <${FILESDIR}/php4-enable >${PREFIX}/sbin/php4-enable @chown ${BINOWN}:${BINGRP} ${PREFIX}/sbin/php4-enable Index: distinfo =================================================================== RCS file: /cvs/ports/www/php4/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 19 Nov 2001 01:50:34 -0000 1.1 +++ distinfo 24 Nov 2001 19:43:50 -0000 @@ -1,3 +1,3 @@ -MD5 (php-4.0.6.tar.gz) = 5f698521cf2b392cf9bfa87fc1a0fe90 -RMD160 (php-4.0.6.tar.gz) = e455b9a4d1de74cb30f657668a535a2d27b81925 -SHA1 (php-4.0.6.tar.gz) = 6544eb1085b916541af914a11074e9bb8a037a03 +MD5 (php-4.1.0RC3.tar.gz) = b1e100a2ae3c0e4978fccf7af817b65e +RMD160 (php-4.1.0RC3.tar.gz) = 03eb626b53531a5c3ac6e358da1088750d4fa4a9 +SHA1 (php-4.1.0RC3.tar.gz) = 22b97cabf0132398ed9ead2d44b755523b7d7741 Index: patches/patch-Zend_zend_alloc_c =================================================================== RCS file: patches/patch-Zend_zend_alloc_c diff -N patches/patch-Zend_zend_alloc_c --- patches/patch-Zend_zend_alloc_c 11 Aug 2001 00:16:56 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-Zend_zend_alloc_c,v 1.1 2001/08/11 00:16:56 avsm Exp $ ---- Zend/zend_alloc.c.orig Tue Jun 19 18:04:53 2001 -+++ Zend/zend_alloc.c Sat Aug 11 00:07:15 2001 -@@ -446,6 +446,9 @@ ZEND_API void shutdown_memory_manager(in - for (i=1; i<MAX_CACHED_MEMORY; i++) { - for (j=0; j<AG(cache_count)[i]; j++) { - ptr = (zend_mem_header *) AG(cache)[i][j]; -+#if MEMORY_LIMIT -+ AG(allocated_memory) -= REAL_SIZE(ptr->size); -+#endif - REMOVE_POINTER_FROM_LIST(ptr); - free(ptr); - } Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/www/php4/patches/patch-configure,v retrieving revision 1.7 diff -u -r1.7 patch-configure --- patches/patch-configure 19 Nov 2001 01:50:34 -0000 1.7 +++ patches/patch-configure 24 Nov 2001 19:43:50 -0000 @@ -1,188 +1,12 @@ -$OpenBSD: patch-configure,v 1.7 2001/11/19 01:50:34 brad Exp $ ---- configure.orig Thu Jun 21 02:28:57 2001 -+++ configure Sun Nov 18 17:12:35 2001 -@@ -6577,6 +6577,7 @@ for ac_func in asctime_r \ - chroot \ - ctime_r \ - cuserid \ -+crypt \ - flock \ - gai_strerror \ - gcvt \ -@@ -8517,10 +8518,6 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - esac - - cat >> confdefs.h <<\EOF --#define HAVE_LIBCRYPT 1 --EOF -- -- cat >> confdefs.h <<\EOF - #define HAVE_CRYPT 1 - EOF - -@@ -22424,8 +22421,37 @@ EOF - fi - done - -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=-I$IMAP_INC_DIR -+ cat > conftest.$ac_ext <<EOF -+#line 22431 "configure" -+#include "confdefs.h" -+ -+ #include "imap4r1.h" -+ #if defined(IMAPSSLPORT) -+ this_is_true -+ #endif -+ -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "this_is_true" >/dev/null 2>&1; then -+ rm -rf conftest* -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_IMAP2001 1 -+EOF -+ -+ -+else -+ rm -rf conftest* -+ -+fi -+rm -f conftest* -+ -+ CPPFLAGS=$old_CPPFLAGS -+ - echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 --echo "configure:22429: checking for pam_start in -lpam" >&5 -+echo "configure:22458: checking for pam_start in -lpam" >&5 - ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -22471,7 +22497,54 @@ else - echo "$ac_t""no" 1>&6 - fi - -- -+ echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -+echo "configure:22505: checking for crypt in -lcrypt" >&5 -+ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lcrypt $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 22513 "configure" -+#include "confdefs.h" -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char crypt(); -+ -+int main() { -+crypt() -+; return 0; } -+EOF -+if { (eval echo configure:22524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_lib=HAVE_LIB`echo crypt | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+ cat >> confdefs.h <<EOF -+#define $ac_tr_lib 1 -+EOF -+ -+ LIBS="-lcrypt $LIBS" -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ - - if test -z "$IMAP_DIR" || echo "$IMAP_DIR" | grep '^/' >/dev/null ; then - IMAP_DIR="$IMAP_DIR" -@@ -22585,53 +22658,21 @@ fi +$OpenBSD$ +--- configure.orig Sat Nov 24 19:10:35 2001 ++++ configure Sat Nov 24 19:10:44 2001 +@@ -24893,22 +24893,22 @@ EOF fi -- DLIBS="-l$IMAP_LIB $DLIBS" -+ DLIBS="$DLIBS -l$IMAP_LIB" - - -- -- --echo $ac_n "checking for Kerberos support in IMAP""... $ac_c" 1>&6 --echo "configure:22595: checking for Kerberos support in IMAP" >&5 --# Check whether --with-kerberos or --without-kerberos was given. -+ # Check whether --with-kerberos or --without-kerberos was given. - if test "${with_kerberos+set}" = set; then - withval="$with_kerberos" -- PHP_KERBEROS=$withval -+ -+ PHP_KERBEROS=$withval -+ - else -- PHP_KERBEROS=no --fi -- -- --case "$PHP_KERBEROS" in --shared,*) -- ext_output="yes, shared" -- ext_shared=yes -- PHP_KERBEROS=`echo "$PHP_KERBEROS"|sed 's/^shared,//'` -- ;; --shared) -- ext_output="yes, shared" -- ext_shared=yes -- PHP_KERBEROS=yes -- ;; --no) -- ext_output="no" -- ext_shared=no -- ;; --*) -- ext_output="yes" -- ext_shared=no -- ;; --esac -- --if test "$php_always_shared" = "yes"; then -- ext_output="yes, shared" -- ext_shared=yes -- test "$PHP_KERBEROS" = "no" && PHP_KERBEROS=yes -+ -+ PHP_KERBEROS=no -+ - fi - --echo "$ac_t""$ext_output" 1>&6 -- -- -- - - if test "$PHP_KERBEROS" = "yes"; then - test -d /usr/kerberos && PHP_KERBEROS=/usr/kerberos -@@ -22676,22 +22717,22 @@ EOF - fi - - -- case "gssapi_krb5" in -+ case "gssapi" in +- case gssapi_krb5 in ++ case gssapi in c|c_r|pthread*) ;; *) @@ -193,8 +17,8 @@ else -- case "gssapi_krb5" in -+ case "gssapi" in +- case gssapi_krb5 in ++ case gssapi in c|c_r|pthread*) ;; *) @@ -204,12 +28,12 @@ ;; -@@ -22730,22 +22771,22 @@ EOF +@@ -24947,22 +24947,22 @@ EOF esac -- case "k5crypto" in -+ case "asn1" in +- case k5crypto in ++ case asn1 in c|c_r|pthread*) ;; *) @@ -220,8 +44,8 @@ else -- case "k5crypto" in -+ case "asn1" in +- case k5crypto in ++ case asn1 in c|c_r|pthread*) ;; *) @@ -231,12 +55,12 @@ ;; -@@ -22757,22 +22798,22 @@ EOF +@@ -24974,22 +24974,22 @@ EOF esac -- case "com_err" in -+ case "com_err_pic" in +- case com_err in ++ case com_err_pic in c|c_r|pthread*) ;; *) @@ -247,8 +71,8 @@ else -- case "com_err" in -+ case "com_err_pic" in +- case com_err in ++ case com_err_pic in c|c_r|pthread*) ;; *) @@ -258,157 +82,12 @@ ;; -@@ -22783,59 +22824,49 @@ EOF - ;; - esac - -- fi -- -- -+ else -+ cat > conftest.$ac_ext <<EOF -+#line 22833 "configure" -+#include "confdefs.h" -+#include <$IMAP_INC_DIR/linkage.h> -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "auth_gss" >/dev/null 2>&1; then -+ rm -rf conftest* - -+ { echo "configure: error: This c-client library is build with Kerberos support. - --echo $ac_n "checking for SSL support in IMAP""... $ac_c" 1>&6 --echo "configure:22793: checking for SSL support in IMAP" >&5 --# Check whether --with-imap-ssl or --without-imap-ssl was given. --if test "${with_imap_ssl+set}" = set; then -- withval="$with_imap_ssl" -- PHP_IMAP_SSL=$withval --else -- PHP_IMAP_SSL=no -+ Add --with-kerberos<=DIR> to your configure line. Check config.log for details." 1>&2; exit 1; } -+ - fi -+rm -f conftest* - -+ fi - --case "$PHP_IMAP_SSL" in --shared,*) -- ext_output="yes, shared" -- ext_shared=yes -- PHP_IMAP_SSL=`echo "$PHP_IMAP_SSL"|sed 's/^shared,//'` -- ;; --shared) -- ext_output="yes, shared" -- ext_shared=yes -- PHP_IMAP_SSL=yes -- ;; --no) -- ext_output="no" -- ext_shared=no -- ;; --*) -- ext_output="yes" -- ext_shared=no -- ;; --esac - --if test "$php_always_shared" = "yes"; then -- ext_output="yes, shared" -- ext_shared=yes -- test "$PHP_IMAP_SSL" = "no" && PHP_IMAP_SSL=yes -+ -+ # Check whether --with-imap-ssl or --without-imap-ssl was given. -+if test "${with_imap_ssl+set}" = set; then -+ withval="$with_imap_ssl" -+ -+ PHP_IMAP_SSL=$withval -+ -+else -+ -+ PHP_IMAP_SSL=no -+ - fi - --echo "$ac_t""$ext_output" 1>&6 -- -- -- - - if test "$PHP_IMAP_SSL" = "yes"; then - PHP_IMAP_SSL=/usr - fi - - if test "$PHP_IMAP_SSL" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_IMAP_SSL 1 -+EOF -+ - - if test "$PHP_IMAP_SSL/lib" != "/usr/lib"; then - -@@ -22870,22 +22901,23 @@ echo "$ac_t""$ext_output" 1>&6 - fi - - -- DLIBS="-lcrypto $DLIBS" -+ DLIBS="$DLIBS -lssl" - - -- DLIBS="-lssl $DLIBS" -- -+ DLIBS="$DLIBS -lcrypto" - -+ else +@@ -25134,7 +25134,7 @@ EOF old_LIBS=$LIBS -- LIBS="$LIBS -lc-client" -+ LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB" + LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB" if test $PHP_KERBEROS != "no"; then -- LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" +- LIBS="$LIBS -L$PHP_KERBEROS/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" + LIBS="$LIBS -L$PHP_KERBEROS/lib -lgssapi -lkrb5 -lasn1 -lcom_err_pic" fi -+ + if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 22889 "configure" -+#line 22924 "configure" - #include "confdefs.h" - - void mm_log(void){} -@@ -22903,27 +22935,24 @@ else - void mm_exists(void){} - void mm_searched(void){} - void mm_expunged(void){} -- char ssl_onceonlyinit(); -+ char mail_open(); - int main() { -- ssl_onceonlyinit(); -+ mail_open(0,"",0); - return 0; - } - - EOF --if { (eval echo configure:22914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:22949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then -- -- cat >> confdefs.h <<\EOF --#define HAVE_IMAP_SSL 1 --EOF -- -- -+ : - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - -- { echo "configure: error: This c-client library does not support SSL. Recompile or remove --with-imap-ssl from configure line." 1>&2; exit 1; } -+ { echo "configure: error: This c-client library is build with SSL support. -+ -+ Add --with-imap-ssl<=DIR> to your configure line. Check config.log for details." 1>&2; exit 1; } - - fi - rm -fr conftest* Index: patches/patch-configure_in =================================================================== RCS file: patches/patch-configure_in diff -N patches/patch-configure_in --- patches/patch-configure_in 4 Oct 2001 21:27:44 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-configure_in,v 1.3 2001/10/04 21:27:44 avsm Exp $ ---- configure.in.orig Thu Oct 4 21:36:32 2001 -+++ configure.in Thu Oct 4 21:37:23 2001 -@@ -363,6 +363,7 @@ AC_FUNC_VPRINTF - AC_CHECK_FUNCS( - asctime_r \ - chroot \ -+crypt \ - ctime_r \ - cuserid \ - flock \ -@@ -622,9 +623,8 @@ fi - - AC_CHECK_LIB(crypt, crypt, [ - PHP_ADD_LIBRARY(crypt) -- AC_DEFINE(HAVE_LIBCRYPT,1,[ ]) - AC_DEFINE(HAVE_CRYPT,1,[ ]) --], []) -+]) - - divert(5) - Index: patches/patch-ext_imap_config_m4 =================================================================== RCS file: /cvs/ports/www/php4/patches/patch-ext_imap_config_m4,v retrieving revision 1.2 diff -u -r1.2 patch-ext_imap_config_m4 --- patches/patch-ext_imap_config_m4 19 Nov 2001 01:50:34 -0000 1.2 +++ patches/patch-ext_imap_config_m4 24 Nov 2001 19:43:50 -0000 @@ -1,22 +1,7 @@ -$OpenBSD: patch-ext_imap_config_m4,v 1.2 2001/11/19 01:50:34 brad Exp $ ---- ext/imap/config.m4.orig Mon May 21 20:38:46 2001 -+++ ext/imap/config.m4 Sun Nov 18 17:12:56 2001 -@@ -22,8 +22,12 @@ AC_DEFUN(IMAP_LIB_CHK,[ - ]) - - AC_DEFUN(PHP_IMAP_KRB_CHK, [ -- PHP_ARG_WITH(kerberos,for Kerberos support in IMAP, -- [ --with-kerberos[=DIR] IMAP: Include Kerberos support.]) -+ AC_ARG_WITH(kerberos, -+ [ --with-kerberos[=DIR] IMAP: Include Kerberos support. DIR is the Kerberos install dir.],[ -+ PHP_KERBEROS=$withval -+ ],[ -+ PHP_KERBEROS=no -+ ]) - - if test "$PHP_KERBEROS" = "yes"; then - test -d /usr/kerberos && PHP_KERBEROS=/usr/kerberos -@@ -32,31 +36,44 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [ +$OpenBSD$ +--- ext/imap/config.m4.orig Tue Aug 7 16:18:04 2001 ++++ ext/imap/config.m4 Sat Nov 24 19:10:23 2001 +@@ -36,10 +36,10 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [ if test "$PHP_KERBEROS" != "no"; then AC_DEFINE(HAVE_IMAP_KRB,1,[ ]) PHP_ADD_LIBPATH($PHP_KERBEROS/lib, IMAP_SHARED_LIBADD) @@ -27,110 +12,15 @@ - PHP_ADD_LIBRARY(com_err, 1, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(asn1, 1, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(com_err_pic, 1, IMAP_SHARED_LIBADD) -+ else -+ AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [ -+ AC_MSG_ERROR(This c-client library is build with Kerberos support. -+ -+ Add --with-kerberos<=DIR> to your configure line. Check config.log for details.) -+ ]) - fi -+ - ]) - - AC_DEFUN(PHP_IMAP_SSL_CHK, [ -- PHP_ARG_WITH(imap-ssl,for SSL support in IMAP, -- [ --with-imap-ssl[=DIR] IMAP: Include SSL support.]) -+ AC_ARG_WITH(imap-ssl, -+ [ --with-imap-ssl[=DIR] IMAP: Include SSL support. DIR is the OpenSSL install dir.],[ -+ PHP_IMAP_SSL=$withval -+ ],[ -+ PHP_IMAP_SSL=no -+ ]) - - if test "$PHP_IMAP_SSL" = "yes"; then - PHP_IMAP_SSL=/usr - fi - - if test "$PHP_IMAP_SSL" != "no"; then -+ AC_DEFINE(HAVE_IMAP_SSL,1,[ ]) - PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD) -- PHP_ADD_LIBRARY_DEFER(crypto) -- PHP_ADD_LIBRARY_DEFER(ssl) -- -+ PHP_ADD_LIBRARY_DEFER(ssl,, IMAP_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_DEFER(crypto,, IMAP_SHARED_LIBADD) -+ else + else + AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [ + AC_MSG_ERROR(This c-client library is build with Kerberos support. +@@ -71,7 +71,7 @@ AC_DEFUN(PHP_IMAP_SSL_CHK, [ old_LIBS=$LIBS -- LIBS="$LIBS -lc-client" -+ LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB" + LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB" if test $PHP_KERBEROS != "no"; then -- LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" +- LIBS="$LIBS -L$PHP_KERBEROS/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" + LIBS="$LIBS -L$PHP_KERBEROS/lib -lgssapi -lkrb5 -lasn1 -lcom_err_pic" fi -+ - AC_TRY_RUN([ - void mm_log(void){} - void mm_dlog(void){} -@@ -73,15 +90,15 @@ AC_DEFUN(PHP_IMAP_SSL_CHK, [ - void mm_exists(void){} - void mm_searched(void){} - void mm_expunged(void){} -- char ssl_onceonlyinit(); -+ char mail_open(); - int main() { -- ssl_onceonlyinit(); -+ mail_open(0,"",0); - return 0; - } -- ],[ -- AC_DEFINE(HAVE_IMAP_SSL,1,[ ]) -- ], [ -- AC_MSG_ERROR(This c-client library does not support SSL. Recompile or remove --with-imap-ssl from configure line.) -+ ],,[ -+ AC_MSG_ERROR(This c-client library is build with SSL support. -+ -+ Add --with-imap-ssl<=DIR> to your configure line. Check config.log for details.) - ]) - LIBS=$old_LIBS - fi -@@ -108,8 +125,21 @@ if test "$PHP_IMAP" != "no"; then - fi - done -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=-I$IMAP_INC_DIR -+ AC_EGREP_CPP(this_is_true, [ -+ #include "imap4r1.h" -+ #if defined(IMAPSSLPORT) -+ this_is_true -+ #endif -+ ],[ -+ AC_DEFINE(HAVE_IMAP2001, 1, [ ]) -+ ],[ ]) -+ CPPFLAGS=$old_CPPFLAGS -+ - AC_CHECK_LIB(pam, pam_start) -- -+ AC_CHECK_LIB(crypt, crypt) -+ - PHP_EXPAND_PATH($IMAP_DIR, IMAP_DIR) - - if test -z "$IMAP_DIR"; then -@@ -122,7 +152,7 @@ if test "$PHP_IMAP" != "no"; then - ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 - fi - -- for lib in imap c-client4 c-client; do -+ for lib in c-client4 c-client imap; do - IMAP_LIB=$lib - IMAP_LIB_CHK(lib) - IMAP_LIB_CHK(c-client) -@@ -134,7 +164,7 @@ if test "$PHP_IMAP" != "no"; then - - PHP_ADD_INCLUDE($IMAP_INC_DIR) - PHP_ADD_LIBPATH($IMAP_LIBDIR, IMAP_SHARED_LIBADD) -- PHP_ADD_LIBRARY_DEFER($IMAP_LIB) -+ PHP_ADD_LIBRARY_DEFER($IMAP_LIB,, IMAP_SHARED_LIBADD) - PHP_IMAP_KRB_CHK - PHP_IMAP_SSL_CHK - fi + AC_TRY_RUN([ Index: patches/patch-php_ini-dist =================================================================== RCS file: /cvs/ports/www/php4/patches/patch-php_ini-dist,v retrieving revision 1.2 diff -u -r1.2 patch-php_ini-dist --- patches/patch-php_ini-dist 4 Oct 2001 21:53:04 -0000 1.2 +++ patches/patch-php_ini-dist 24 Nov 2001 19:43:50 -0000 @@ -1,10 +1,7 @@ -$OpenBSD: patch-php_ini-dist,v 1.2 2001/10/04 21:53:04 avsm Exp $ -URL fopen off by default - this is one of those things that people hardly -ever use, and can turn local exploits into remote ones. - ---- php.ini-dist.orig Fri Jun 1 03:20:49 2001 -+++ php.ini-dist Thu Oct 4 22:39:04 2001 -@@ -349,7 +349,7 @@ upload_max_filesize = 2M +$OpenBSD$ +--- php.ini-dist.orig Sat Nov 24 19:37:08 2001 ++++ php.ini-dist Sat Nov 24 19:38:00 2001 +@@ -383,7 +383,7 @@ upload_max_filesize = 2M ;;;;;;;;;;;;;;;;;; ; Whether to allow the treatment of URLs (like http:// or ftp://) as files. Index: patches/patch-php_ini-optimized =================================================================== RCS file: patches/patch-php_ini-optimized diff -N patches/patch-php_ini-optimized --- patches/patch-php_ini-optimized 5 Oct 2001 07:17:34 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-php_ini-optimized,v 1.2 2001/10/05 07:17:34 avsm Exp $ ---- php.ini-optimized.orig Thu Oct 4 22:37:46 2001 -+++ php.ini-optimized Thu Oct 4 22:38:32 2001 -@@ -249,7 +249,7 @@ upload_max_filesize = 2M ; Maximum - ;;;;;;;;;;;;;;;;;; - ; Fopen wrappers ; - ;;;;;;;;;;;;;;;;;; --allow_url_fopen = On ; Whether to allow the treatment of URLs (like http:// or ftp://) as files -+allow_url_fopen = Off ; Whether to allow the treatment of URLs (like http:// or ftp://) as files - ;from="john@doe.com" ; Define the anonymous ftp password (your email address) - - Index: patches/patch-php_ini-recommended =================================================================== RCS file: patches/patch-php_ini-recommended diff -N patches/patch-php_ini-recommended --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-php_ini-recommended 24 Nov 2001 19:43:50 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- php.ini-recommended.orig Sat Nov 24 19:38:07 2001 ++++ php.ini-recommended Sat Nov 24 19:38:13 2001 +@@ -396,7 +396,7 @@ upload_max_filesize = 2M + ;;;;;;;;;;;;;;;;;; + + ; Whether to allow the treatment of URLs (like http:// or ftp://) as files. +-allow_url_fopen = On ++allow_url_fopen = Off + + ; Define the anonymous ftp password (your email address) + ;from="john@doe.com" Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/php4/pkg/PLIST,v retrieving revision 1.4 diff -u -r1.4 PLIST --- pkg/PLIST 12 Jun 2001 15:07:29 -0000 1.4 +++ pkg/PLIST 24 Nov 2001 19:43:50 -0000 @@ -1,7 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.4 2001/06/12 15:07:29 avsm Exp $ +@comment $OpenBSD$ @pkgcfl php3-* +bin/php-config lib/libphp4.so sbin/php4-enable share/doc/php4/php.ini-dist -share/doc/php4/php.ini-optimized +share/doc/php4/php.ini-recommended @dirrm share/doc/php4 Index: pkg/PLIST-pear =================================================================== RCS file: /cvs/ports/www/php4/pkg/PLIST-pear,v retrieving revision 1.3 diff -u -r1.3 PLIST-pear --- pkg/PLIST-pear 5 Jul 2001 22:55:40 -0000 1.3 +++ pkg/PLIST-pear 24 Nov 2001 19:43:51 -0000 @@ -1,8 +1,5 @@ -@comment $OpenBSD: PLIST-pear,v 1.3 2001/07/05 22:55:40 avsm Exp $ -bin/pear -bin/php-config -bin/phpextdist -bin/phpize +@comment $OpenBSD$ +@pkgcfl php3-* include/php/TSRM/TSRM.h include/php/TSRM/acconfig.h include/php/TSRM/readdir.h @@ -84,7 +81,6 @@ include/php/ext/standard/php_mail.h include/php/ext/standard/php_math.h include/php/ext/standard/php_metaphone.h -include/php/ext/standard/php_output.h include/php/ext/standard/php_parsedate.h include/php/ext/standard/php_rand.h include/php/ext/standard/php_smart_str.h @@ -92,6 +88,7 @@ include/php/ext/standard/php_standard.h include/php/ext/standard/php_string.h include/php/ext/standard/php_var.h +include/php/ext/standard/php_versioning.h include/php/ext/standard/quot_print.h include/php/ext/standard/reg.h include/php/ext/standard/scanf.h @@ -100,17 +97,6 @@ include/php/ext/standard/url.h include/php/ext/standard/url_scanner.h include/php/ext/standard/url_scanner_ex.h -include/php/ext/xml/expat/xmlparse/expat_hashtable.h -include/php/ext/xml/expat/xmlparse/xmlparse.h -include/php/ext/xml/expat/xmltok/asciitab.h -include/php/ext/xml/expat/xmltok/iasciitab.h -include/php/ext/xml/expat/xmltok/latin1tab.h -include/php/ext/xml/expat/xmltok/nametab.h -include/php/ext/xml/expat/xmltok/utf8tab.h -include/php/ext/xml/expat/xmltok/xmldef.h -include/php/ext/xml/expat/xmltok/xmlrole.h -include/php/ext/xml/expat/xmltok/xmltok.h -include/php/ext/xml/expat/xmltok/xmltok_impl.h include/php/ext/xml/php_xml.h include/php/main/SAPI.h include/php/main/build-defs.h @@ -129,6 +115,7 @@ include/php/main/php_main.h include/php/main/php_network.h include/php/main/php_open_temporary_file.h +include/php/main/php_output.h include/php/main/php_reentrancy.h include/php/main/php_regex.h include/php/main/php_streams.h @@ -147,6 +134,7 @@ include/php/regex/regex2.h include/php/regex/regex_extra.h include/php/regex/utils.h +lib/php/Archive/Tar.php lib/php/Benchmark/Iterate.php lib/php/Benchmark/Timer.php lib/php/Cache.php @@ -156,6 +144,7 @@ lib/php/Cache/Container/file.php lib/php/Cache/Container/phplib.php lib/php/Cache/Container/shm.php +lib/php/Cache/DB.php lib/php/Cache/Error.php lib/php/Cache/Function.php lib/php/Cache/Graphics.php @@ -166,6 +155,7 @@ lib/php/Crypt/HCEMD5.php lib/php/DB.php lib/php/DB/common.php +lib/php/DB/fbsql.php lib/php/DB/ibase.php lib/php/DB/ifx.php lib/php/DB/msql.php @@ -185,6 +175,7 @@ lib/php/HTML/Form.php lib/php/HTML/IT.php lib/php/HTML/ITX.php +lib/php/HTML/IT_Error.php lib/php/HTML/Page.php lib/php/HTML/Processor.php lib/php/HTML/Select.php @@ -193,14 +184,15 @@ lib/php/HTTP/Compress.php lib/php/Image/Remote.php lib/php/Log.php +lib/php/Log/Observer.php lib/php/Log/composite.php lib/php/Log/file.php lib/php/Log/mcal.php -lib/php/Log/observer.php lib/php/Log/sql.php lib/php/Log/syslog.php lib/php/Mail.php lib/php/Mail/RFC822.php +lib/php/Mail/mime.php lib/php/Mail/sendmail.php lib/php/Mail/smtp.php lib/php/Math/Fraction.php @@ -212,14 +204,16 @@ lib/php/Numbers/Roman.php lib/php/PEAR.php lib/php/PEAR/Common.php +lib/php/PEAR/Config.php lib/php/PEAR/Installer.php lib/php/PEAR/Packager.php +lib/php/PEAR/Registry.php +lib/php/PEAR/Remote.php lib/php/PEAR/Uploader.php lib/php/Payment/Verisign.php lib/php/Schedule/At.php +lib/php/System.php lib/php/XML/Parser.php -lib/php/XML/RPC.php -lib/php/XML/RPC/Server.php lib/php/build/acinclude.m4 lib/php/build/dynlib.m4 lib/php/build/dynlib.mk @@ -234,7 +228,6 @@ lib/php/build/rules_pear.mk lib/php/build/shtool @dirrm lib/php/build -@dirrm lib/php/XML/RPC @dirrm lib/php/XML @dirrm lib/php/Schedule @dirrm lib/php/Payment @@ -255,10 +248,13 @@ @dirrm lib/php/Cache/Container @dirrm lib/php/Cache @dirrm lib/php/Benchmark +@dirrm lib/php/Archive @dirrm lib/php @dirrm include/php/regex @dirrm include/php/main +@exec mkdir -p %D/include/php/ext/xml/expat/xmltok @dirrm include/php/ext/xml/expat/xmltok +@exec mkdir -p %D/include/php/ext/xml/expat/xmlparse @dirrm include/php/ext/xml/expat/xmlparse @dirrm include/php/ext/xml/expat @dirrm include/php/ext/xml Index: pkg/SECURITY =================================================================== RCS file: pkg/SECURITY diff -N pkg/SECURITY --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/SECURITY 24 Nov 2001 19:43:51 -0000 @@ -0,0 +1,16 @@ +A couple of minor changes have been made to PHP's +default installation to make it more secure. + +1) Temporary files have greater randomness in their names. + +2) URL fopen is OFF by default, as this functionality is + easily exploitable for many common PHP scripts out there. + Turning it off by default does not affect 99% of users, + and turns remote exploits into local ones. + +The source has not otherwise been audited. If you do so, +please contact the maintainer(s) below. + +-- +Anil Madhavapeddy, <avsm@openbsd.org> +$OpenBSD$