diff --git a/www/php4/Makefile b/www/php4/Makefile index 5e031014f69..9498554e3b1 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.59 2001/11/19 01:50:34 brad Exp $ +# $OpenBSD: Makefile,v 1.60 2001/12/18 01:40:48 avsm Exp $ MULTI_PACKAGES= -pear SUBPACKAGE?= @@ -10,19 +10,19 @@ COMMENT-pear= "collection of base classes for common PHP tasks" # and has Apache that supports DSO's. ONLY_FOR_ARCHS= i386 m68k sparc -V= 4.0.6 +V= 4.1.0 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.502 MAINTAINER= Anil Madhavapeddy HOMEPAGE= http://www.php.net/ -MASTER_SITES= http://www.php.net:8000/distributions/ \ +MASTER_SITES= http://www.php.net/distributions/ \ http://se.php.net/distributions/ \ http://no.php.net/distributions/ \ http://uk.php.net/distributions/ @@ -205,7 +205,7 @@ do-install: ${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 diff --git a/www/php4/distinfo b/www/php4/distinfo index f212dda8b73..fdf53f4348f 100644 --- a/www/php4/distinfo +++ b/www/php4/distinfo @@ -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.0.tar.gz) = 4c2bfcc3cfc0b5b49d855316d78a3afc +RMD160 (php-4.1.0.tar.gz) = a56b6cb7b210a87a32fb099be07d3241414a8ae9 +SHA1 (php-4.1.0.tar.gz) = d8ce2c3b1dd9551980340d20064a1e939ef49431 diff --git a/www/php4/patches/patch-Zend_zend_alloc_c b/www/php4/patches/patch-Zend_zend_alloc_c deleted file mode 100644 index 4d1a7aa588f..00000000000 --- a/www/php4/patches/patch-Zend_zend_alloc_c +++ /dev/null @@ -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; isize); -+#endif - REMOVE_POINTER_FROM_LIST(ptr); - free(ptr); - } diff --git a/www/php4/patches/patch-aclocal_m4 b/www/php4/patches/patch-aclocal_m4 new file mode 100644 index 00000000000..d314d0b6df9 --- /dev/null +++ b/www/php4/patches/patch-aclocal_m4 @@ -0,0 +1,86 @@ +$OpenBSD: patch-aclocal_m4,v 1.1 2001/12/18 01:40:48 avsm Exp $ +--- aclocal.m4.orig Mon Dec 17 18:41:24 2001 ++++ aclocal.m4 Mon Dec 17 18:42:41 2001 +@@ -2110,7 +2110,14 @@ old_postuninstall_cmds= + + if test -n "$RANLIB"; then + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ++ case "$host_os" in ++ openbsd*) ++ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" ++ ;; ++ *) ++ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ++ ;; ++ esac + fi + + # Allow CC to be a program name with arguments. +@@ -2513,7 +2520,9 @@ cygwin* | mingw* | pw32* ) + with_gnu_ld=no + fi + ;; +- ++openbsd*) ++ with_gnu_ld=no ++ ;; + esac + + ld_shlibs=yes +@@ -2917,10 +2926,24 @@ else + ;; + + openbsd*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='${wl}-R$libdir' ++ export_dynamic_flag_spec='${wl}-E' ++ else ++ case "$host_os" in ++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='-R$libdir' ++ ;; ++ *) ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='${wl}-R$libdir' ++ ;; ++ esac ++ fi + ;; + + os2*) +@@ -3394,9 +3417,25 @@ newsos6) + + openbsd*) + version_type=sunos +- if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- need_version=no ++ need_lib_prefix=no ++ need_version=no ++ sys_lib_search_path_spec="/usr/lib" ++ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib" ++ file_magic_cmd=/usr/bin/file ++ file_magic_test_file=`echo /usr/lib/libc.so.*` ++ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' ++ case "$host_os" in ++ openbsd2.[89] | openbsd2.[89].*) ++ shlibpath_overrides_runpath=no ++ ;; ++ *) ++ shlibpath_overrides_runpath=yes ++ ;; ++ esac ++ else ++ deplibs_check_method='file_magic OpenBSD.* shared library' ++ shlibpath_overrides_runpath=yes + fi + library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' diff --git a/www/php4/patches/patch-configure b/www/php4/patches/patch-configure index 87332ea82d2..f437d5c5840 100644 --- a/www/php4/patches/patch-configure +++ b/www/php4/patches/patch-configure @@ -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 <&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 <&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 <&6 -+fi -+ -+ - - if test -z "$IMAP_DIR" || echo "$IMAP_DIR" | grep '^/' >/dev/null ; then - IMAP_DIR="$IMAP_DIR" -@@ -22585,53 +22658,21 @@ fi +$OpenBSD: patch-configure,v 1.8 2001/12/18 01:40:48 avsm Exp $ +--- configure.orig Sat Dec 8 19:40:35 2001 ++++ configure Mon Dec 17 21:35:09 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 @@ $OpenBSD: patch-configure,v 1.7 2001/11/19 01:50:34 brad Exp $ else -- case "gssapi_krb5" in -+ case "gssapi" in +- case gssapi_krb5 in ++ case gssapi in c|c_r|pthread*) ;; *) @@ -204,12 +28,12 @@ $OpenBSD: patch-configure,v 1.7 2001/11/19 01:50:34 brad Exp $ ;; -@@ -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 @@ $OpenBSD: patch-configure,v 1.7 2001/11/19 01:50:34 brad Exp $ else -- case "k5crypto" in -+ case "asn1" in +- case k5crypto in ++ case asn1 in c|c_r|pthread*) ;; *) @@ -231,12 +55,12 @@ $OpenBSD: patch-configure,v 1.7 2001/11/19 01:50:34 brad Exp $ ;; -@@ -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 @@ $OpenBSD: patch-configure,v 1.7 2001/11/19 01:50:34 brad Exp $ 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,113 @@ $OpenBSD: patch-configure,v 1.7 2001/11/19 01:50:34 brad Exp $ ;; -@@ -22783,59 +22824,49 @@ EOF - ;; - esac - -- fi -- -- -+ else -+ cat > conftest.$ac_ext < -+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 <&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; } - + if test "$cross_compiling" = yes; then +@@ -57538,7 +57538,7 @@ unset with_pic + + case $php_build_target in + program|static) +- standard_libtool_flag='-prefer-non-pic -static' ++ standard_libtool_flag='-static' + if test "$lib_build_shared" != "yes"; then + enable_shared=no + fi +@@ -57547,7 +57547,7 @@ program|static) + ;; + shared) + enable_static=no +- standard_libtool_flag=-prefer-pic ++ standard_libtool_flag= + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version" + ;; + esac +@@ -60620,7 +60620,14 @@ old_postuninstall_cmds= + + if test -n "$RANLIB"; then + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ++ case "$host_os" in ++ openbsd*) ++ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" ++ ;; ++ *) ++ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ++ ;; ++ esac fi - rm -fr conftest* + + # Allow CC to be a program name with arguments. +@@ -61117,7 +61124,9 @@ cygwin* | mingw* | pw32* ) + with_gnu_ld=no + fi + ;; +- ++openbsd*) ++ with_gnu_ld=no ++ ;; + esac + + ld_shlibs=yes +@@ -61521,10 +61530,24 @@ else + ;; + + openbsd*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='${wl}-R$libdir' ++ export_dynamic_flag_spec='${wl}-E' ++ else ++ case "$host_os" in ++ openbsd01.* | openbsd2.0-7 | openbsd2.0-7.*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='-R$libdir' ++ ;; ++ *) ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='${wl}-R$libdir' ++ ;; ++ esac ++ fi + ;; + + os2*) +@@ -62001,9 +62024,25 @@ newsos6) + + openbsd*) + version_type=sunos +- if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- need_version=no ++ need_lib_prefix=no ++ need_version=no ++ sys_lib_search_path_spec="/usr/lib" ++ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib" ++ file_magic_cmd=/usr/bin/file ++ file_magic_test_file=`echo /usr/lib/libc.so.*` ++ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ deplibs_check_method='file_magic ELF 0-90-9*-bit LMSB shared object' ++ case "$host_os" in ++ openbsd2.89 | openbsd2.89.*) ++ shlibpath_overrides_runpath=no ++ ;; ++ *) ++ shlibpath_overrides_runpath=yes ++ ;; ++ esac ++ else ++ deplibs_check_method='file_magic OpenBSD.* shared library' ++ shlibpath_overrides_runpath=yes + fi + library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' diff --git a/www/php4/patches/patch-configure_in b/www/php4/patches/patch-configure_in index ade3714be70..833909f371e 100644 --- a/www/php4/patches/patch-configure_in +++ b/www/php4/patches/patch-configure_in @@ -1,22 +1,21 @@ -$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) +$OpenBSD: patch-configure_in,v 1.4 2001/12/18 01:40:48 avsm Exp $ +--- configure.in.orig Mon Dec 17 21:26:33 2001 ++++ configure.in Mon Dec 17 21:34:50 2001 +@@ -669,7 +669,7 @@ unset with_pic + case $php_build_target in + program|static) +- standard_libtool_flag='-prefer-non-pic -static' ++ standard_libtool_flag='-static' + if test "$lib_build_shared" != "yes"; then + enable_shared=no + fi +@@ -678,7 +678,7 @@ program|static) + ;; + shared) + enable_static=no +- standard_libtool_flag=-prefer-pic ++ standard_libtool_flag= + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version" + ;; + esac diff --git a/www/php4/patches/patch-ext_imap_config_m4 b/www/php4/patches/patch-ext_imap_config_m4 index c720c4db549..71f620268e8 100644 --- a/www/php4/patches/patch-ext_imap_config_m4 +++ b/www/php4/patches/patch-ext_imap_config_m4 @@ -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: patch-ext_imap_config_m4,v 1.3 2001/12/18 01:40:48 avsm Exp $ +--- 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 @@ $OpenBSD: patch-ext_imap_config_m4,v 1.2 2001/11/19 01:50:34 brad Exp $ - 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 diff --git a/www/php4/patches/patch-ltmain_sh b/www/php4/patches/patch-ltmain_sh new file mode 100644 index 00000000000..2bb922d70ac --- /dev/null +++ b/www/php4/patches/patch-ltmain_sh @@ -0,0 +1,89 @@ +$OpenBSD: patch-ltmain_sh,v 1.1 2001/12/18 01:40:48 avsm Exp $ +--- ltmain.sh.orig Sat Dec 8 19:40:14 2001 ++++ ltmain.sh Mon Dec 17 18:47:05 2001 +@@ -1031,12 +1031,34 @@ compiler." + # These systems don't actually have a C library (as such) + test "X$arg" = "X-lc" && continue + ;; ++ *-*-openbsd*) ++ # Do not include libc due to us having libc/libc_r. ++ continue ++ ;; ++ esac ++ elif test "$arg" = "-lc_r"; then ++ case "$host" in ++ *-*-openbsd*) ++ # Do not include libc_r directly, use -pthread flag. ++ continue ++ ;; + esac + fi + deplibs="$deplibs $arg" + continue + ;; + ++ -pthread) ++ case $host in ++ *-*-openbsd*) ++ deplibs="$deplibs $arg" ++ ;; ++ *) ++ continue ++ ;; ++ esac ++ ;; ++ + -module) + module=yes + continue +@@ -2401,6 +2423,9 @@ compiler." + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) + # these systems don't actually have a c library (as such)! + ;; ++ *-*-openbsd*) ++ # Do not include libc due to us having libc/libc_r. ++ ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework + deplibs="$deplibs -framework System" +@@ -4412,40 +4437,6 @@ relink_command=\"$relink_command\"" + # Exit here if they wanted silent mode. + test "$show" = ":" && exit 0 + +- echo "----------------------------------------------------------------------" +- echo "Libraries have been installed in:" +- for libdir in $libdirs; do +- echo " $libdir" +- done +- echo +- echo "If you ever happen to want to link against installed libraries" +- echo "in a given directory, LIBDIR, you must either use libtool, and" +- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" +- echo "flag during linking and do at least one of the following:" +- if test -n "$shlibpath_var"; then +- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" +- echo " during execution" +- fi +- if test -n "$runpath_var"; then +- echo " - add LIBDIR to the \`$runpath_var' environment variable" +- echo " during linking" +- fi +- if test -n "$hardcode_libdir_flag_spec"; then +- libdir=LIBDIR +- eval flag=\"$hardcode_libdir_flag_spec\" +- +- echo " - use the \`$flag' linker flag" +- fi +- if test -n "$admincmds"; then +- echo " - have your system administrator run these commands:$admincmds" +- fi +- if test -f /etc/ld.so.conf; then +- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" +- fi +- echo +- echo "See any operating system documentation about shared libraries for" +- echo "more information, such as the ld(1) and ld.so(8) manual pages." +- echo "----------------------------------------------------------------------" + exit 0 + ;; + diff --git a/www/php4/patches/patch-php_ini-dist b/www/php4/patches/patch-php_ini-dist index 0eff56654e3..80062e2ab57 100644 --- a/www/php4/patches/patch-php_ini-dist +++ b/www/php4/patches/patch-php_ini-dist @@ -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: patch-php_ini-dist,v 1.3 2001/12/18 01:40:48 avsm Exp $ +--- 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. diff --git a/www/php4/patches/patch-php_ini-optimized b/www/php4/patches/patch-php_ini-optimized deleted file mode 100644 index 5f657e0a832..00000000000 --- a/www/php4/patches/patch-php_ini-optimized +++ /dev/null @@ -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) - - diff --git a/www/php4/patches/patch-php_ini-recommended b/www/php4/patches/patch-php_ini-recommended new file mode 100644 index 00000000000..3e00556305b --- /dev/null +++ b/www/php4/patches/patch-php_ini-recommended @@ -0,0 +1,12 @@ +$OpenBSD: patch-php_ini-recommended,v 1.1 2001/12/18 01:40:48 avsm Exp $ +--- 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" diff --git a/www/php4/pkg/PLIST b/www/php4/pkg/PLIST index 55b5acf39ff..d3191696cfe 100644 --- a/www/php4/pkg/PLIST +++ b/www/php4/pkg/PLIST @@ -1,7 +1,264 @@ -@comment $OpenBSD: PLIST,v 1.4 2001/06/12 15:07:29 avsm Exp $ -@pkgcfl php3-* -lib/libphp4.so -sbin/php4-enable -share/doc/php4/php.ini-dist -share/doc/php4/php.ini-optimized -@dirrm share/doc/php4 +@comment $OpenBSD: PLIST,v 1.5 2001/12/18 01:40:48 avsm Exp $ +include/php/TSRM/TSRM.h +include/php/TSRM/acconfig.h +include/php/TSRM/readdir.h +include/php/TSRM/tsrm_config.h +include/php/TSRM/tsrm_config.w32.h +include/php/TSRM/tsrm_config_common.h +include/php/TSRM/tsrm_strtok_r.h +include/php/TSRM/tsrm_virtual_cwd.h +include/php/TSRM/tsrm_win32.h +include/php/Zend/FlexLexer.h +include/php/Zend/acconfig.h +include/php/Zend/zend.h +include/php/Zend/zend_API.h +include/php/Zend/zend_alloc.h +include/php/Zend/zend_builtin_functions.h +include/php/Zend/zend_compile.h +include/php/Zend/zend_config.h +include/php/Zend/zend_config.w32.h +include/php/Zend/zend_constants.h +include/php/Zend/zend_dynamic_array.h +include/php/Zend/zend_errors.h +include/php/Zend/zend_execute.h +include/php/Zend/zend_execute_locks.h +include/php/Zend/zend_extensions.h +include/php/Zend/zend_fast_cache.h +include/php/Zend/zend_globals.h +include/php/Zend/zend_globals_macros.h +include/php/Zend/zend_hash.h +include/php/Zend/zend_highlight.h +include/php/Zend/zend_indent.h +include/php/Zend/zend_ini.h +include/php/Zend/zend_ini_parser.h +include/php/Zend/zend_ini_scanner.h +include/php/Zend/zend_istdiostream.h +include/php/Zend/zend_language_parser.h +include/php/Zend/zend_language_scanner.h +include/php/Zend/zend_list.h +include/php/Zend/zend_llist.h +include/php/Zend/zend_modules.h +include/php/Zend/zend_operators.h +include/php/Zend/zend_ptr_stack.h +include/php/Zend/zend_stack.h +include/php/Zend/zend_static_allocator.h +include/php/Zend/zend_variables.h +include/php/acconfig.h +include/php/ext/standard/base64.h +include/php/ext/standard/basic_functions.h +include/php/ext/standard/credits.h +include/php/ext/standard/credits_ext.h +include/php/ext/standard/credits_sapi.h +include/php/ext/standard/cyr_convert.h +include/php/ext/standard/datetime.h +include/php/ext/standard/dl.h +include/php/ext/standard/dns.h +include/php/ext/standard/exec.h +include/php/ext/standard/file.h +include/php/ext/standard/flock_compat.h +include/php/ext/standard/fsock.h +include/php/ext/standard/head.h +include/php/ext/standard/html.h +include/php/ext/standard/info.h +include/php/ext/standard/md5.h +include/php/ext/standard/microtime.h +include/php/ext/standard/pack.h +include/php/ext/standard/pageinfo.h +include/php/ext/standard/php_array.h +include/php/ext/standard/php_assert.h +include/php/ext/standard/php_browscap.h +include/php/ext/standard/php_crypt.h +include/php/ext/standard/php_dir.h +include/php/ext/standard/php_ext_syslog.h +include/php/ext/standard/php_filestat.h +include/php/ext/standard/php_fopen_wrappers.h +include/php/ext/standard/php_image.h +include/php/ext/standard/php_incomplete_class.h +include/php/ext/standard/php_iptc.h +include/php/ext/standard/php_lcg.h +include/php/ext/standard/php_link.h +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_parsedate.h +include/php/ext/standard/php_rand.h +include/php/ext/standard/php_smart_str.h +include/php/ext/standard/php_smart_str_public.h +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 +include/php/ext/standard/type.h +include/php/ext/standard/uniqid.h +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/php_xml.h +include/php/main/SAPI.h +include/php/main/build-defs.h +include/php/main/config.w32.h +include/php/main/fopen_wrappers.h +include/php/main/internal_functions_registry.h +include/php/main/logos.h +include/php/main/php.h +include/php/main/php3_compat.h +include/php/main/php_compat.h +include/php/main/php_config.h +include/php/main/php_content_types.h +include/php/main/php_globals.h +include/php/main/php_ini.h +include/php/main/php_logos.h +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 +include/php/main/php_syslog.h +include/php/main/php_ticks.h +include/php/main/php_variables.h +include/php/main/php_version.h +include/php/main/rfc1867.h +include/php/main/safe_mode.h +include/php/main/snprintf.h +include/php/main/win95nt.h +include/php/php_version.h +include/php/regex/cclass.h +include/php/regex/cname.h +include/php/regex/regex.h +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 +lib/php/Cache/Container.php +lib/php/Cache/Container/db.php +lib/php/Cache/Container/dbx.php +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 +lib/php/Cache/Output.php +lib/php/Cache/OutputCompression.php +lib/php/Console/Getopt.php +lib/php/Crypt/CBC.php +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 +lib/php/DB/mssql.php +lib/php/DB/mysql.php +lib/php/DB/oci8.php +lib/php/DB/odbc.php +lib/php/DB/pgsql.php +lib/php/DB/storage.php +lib/php/DB/sybase.php +lib/php/Date/Calc.php +lib/php/Date/Human.php +lib/php/File/Find.php +lib/php/File/Passwd.php +lib/php/File/SearchReplace.php +lib/php/HTML/Common.php +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 +lib/php/HTML/Table.php +lib/php/HTTP.php +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/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 +lib/php/Math/Util.php +lib/php/Net/Curl.php +lib/php/Net/Dig.php +lib/php/Net/SMTP.php +lib/php/Net/Socket.php +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/build/acinclude.m4 +lib/php/build/dynlib.m4 +lib/php/build/dynlib.mk +lib/php/build/fastgen.sh +lib/php/build/library.mk +lib/php/build/ltlib.mk +lib/php/build/mkdep.awk +lib/php/build/pear.m4 +lib/php/build/program.mk +lib/php/build/rules.mk +lib/php/build/rules_common.mk +lib/php/build/rules_pear.mk +lib/php/build/shtool +@dirrm lib/php/build +@dirrm lib/php/XML +@dirrm lib/php/Schedule +@dirrm lib/php/Payment +@dirrm lib/php/PEAR +@dirrm lib/php/Numbers +@dirrm lib/php/Net +@dirrm lib/php/Math +@dirrm lib/php/Mail +@dirrm lib/php/Log +@dirrm lib/php/Image +@dirrm lib/php/HTTP +@dirrm lib/php/HTML +@dirrm lib/php/File +@dirrm lib/php/Date +@dirrm lib/php/DB +@dirrm lib/php/Crypt +@dirrm lib/php/Console +@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 +@dirrm include/php/ext/standard +@dirrm include/php/ext +@dirrm include/php/Zend +@dirrm include/php/TSRM +@dirrm include/php diff --git a/www/php4/pkg/PLIST-pear b/www/php4/pkg/PLIST-pear index 7b009e169a5..006f48ac50c 100644 --- a/www/php4/pkg/PLIST-pear +++ b/www/php4/pkg/PLIST-pear @@ -1,269 +1,7 @@ -@comment $OpenBSD: PLIST-pear,v 1.3 2001/07/05 22:55:40 avsm Exp $ -bin/pear -bin/php-config -bin/phpextdist -bin/phpize -include/php/TSRM/TSRM.h -include/php/TSRM/acconfig.h -include/php/TSRM/readdir.h -include/php/TSRM/tsrm_config.h -include/php/TSRM/tsrm_config.w32.h -include/php/TSRM/tsrm_config_common.h -include/php/TSRM/tsrm_strtok_r.h -include/php/TSRM/tsrm_virtual_cwd.h -include/php/TSRM/tsrm_win32.h -include/php/Zend/FlexLexer.h -include/php/Zend/acconfig.h -include/php/Zend/zend.h -include/php/Zend/zend_API.h -include/php/Zend/zend_alloc.h -include/php/Zend/zend_builtin_functions.h -include/php/Zend/zend_compile.h -include/php/Zend/zend_config.h -include/php/Zend/zend_config.w32.h -include/php/Zend/zend_constants.h -include/php/Zend/zend_dynamic_array.h -include/php/Zend/zend_errors.h -include/php/Zend/zend_execute.h -include/php/Zend/zend_execute_locks.h -include/php/Zend/zend_extensions.h -include/php/Zend/zend_fast_cache.h -include/php/Zend/zend_globals.h -include/php/Zend/zend_globals_macros.h -include/php/Zend/zend_hash.h -include/php/Zend/zend_highlight.h -include/php/Zend/zend_indent.h -include/php/Zend/zend_ini.h -include/php/Zend/zend_ini_parser.h -include/php/Zend/zend_ini_scanner.h -include/php/Zend/zend_istdiostream.h -include/php/Zend/zend_language_parser.h -include/php/Zend/zend_language_scanner.h -include/php/Zend/zend_list.h -include/php/Zend/zend_llist.h -include/php/Zend/zend_modules.h -include/php/Zend/zend_operators.h -include/php/Zend/zend_ptr_stack.h -include/php/Zend/zend_stack.h -include/php/Zend/zend_static_allocator.h -include/php/Zend/zend_variables.h -include/php/acconfig.h -include/php/ext/standard/base64.h -include/php/ext/standard/basic_functions.h -include/php/ext/standard/credits.h -include/php/ext/standard/credits_ext.h -include/php/ext/standard/credits_sapi.h -include/php/ext/standard/cyr_convert.h -include/php/ext/standard/datetime.h -include/php/ext/standard/dl.h -include/php/ext/standard/dns.h -include/php/ext/standard/exec.h -include/php/ext/standard/file.h -include/php/ext/standard/flock_compat.h -include/php/ext/standard/fsock.h -include/php/ext/standard/head.h -include/php/ext/standard/html.h -include/php/ext/standard/info.h -include/php/ext/standard/md5.h -include/php/ext/standard/microtime.h -include/php/ext/standard/pack.h -include/php/ext/standard/pageinfo.h -include/php/ext/standard/php_array.h -include/php/ext/standard/php_assert.h -include/php/ext/standard/php_browscap.h -include/php/ext/standard/php_crypt.h -include/php/ext/standard/php_dir.h -include/php/ext/standard/php_ext_syslog.h -include/php/ext/standard/php_filestat.h -include/php/ext/standard/php_fopen_wrappers.h -include/php/ext/standard/php_image.h -include/php/ext/standard/php_incomplete_class.h -include/php/ext/standard/php_iptc.h -include/php/ext/standard/php_lcg.h -include/php/ext/standard/php_link.h -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 -include/php/ext/standard/php_smart_str_public.h -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/quot_print.h -include/php/ext/standard/reg.h -include/php/ext/standard/scanf.h -include/php/ext/standard/type.h -include/php/ext/standard/uniqid.h -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 -include/php/main/config.w32.h -include/php/main/fopen_wrappers.h -include/php/main/internal_functions_registry.h -include/php/main/logos.h -include/php/main/php.h -include/php/main/php3_compat.h -include/php/main/php_compat.h -include/php/main/php_config.h -include/php/main/php_content_types.h -include/php/main/php_globals.h -include/php/main/php_ini.h -include/php/main/php_logos.h -include/php/main/php_main.h -include/php/main/php_network.h -include/php/main/php_open_temporary_file.h -include/php/main/php_reentrancy.h -include/php/main/php_regex.h -include/php/main/php_streams.h -include/php/main/php_syslog.h -include/php/main/php_ticks.h -include/php/main/php_variables.h -include/php/main/php_version.h -include/php/main/rfc1867.h -include/php/main/safe_mode.h -include/php/main/snprintf.h -include/php/main/win95nt.h -include/php/php_version.h -include/php/regex/cclass.h -include/php/regex/cname.h -include/php/regex/regex.h -include/php/regex/regex2.h -include/php/regex/regex_extra.h -include/php/regex/utils.h -lib/php/Benchmark/Iterate.php -lib/php/Benchmark/Timer.php -lib/php/Cache.php -lib/php/Cache/Container.php -lib/php/Cache/Container/db.php -lib/php/Cache/Container/dbx.php -lib/php/Cache/Container/file.php -lib/php/Cache/Container/phplib.php -lib/php/Cache/Container/shm.php -lib/php/Cache/Error.php -lib/php/Cache/Function.php -lib/php/Cache/Graphics.php -lib/php/Cache/Output.php -lib/php/Cache/OutputCompression.php -lib/php/Console/Getopt.php -lib/php/Crypt/CBC.php -lib/php/Crypt/HCEMD5.php -lib/php/DB.php -lib/php/DB/common.php -lib/php/DB/ibase.php -lib/php/DB/ifx.php -lib/php/DB/msql.php -lib/php/DB/mssql.php -lib/php/DB/mysql.php -lib/php/DB/oci8.php -lib/php/DB/odbc.php -lib/php/DB/pgsql.php -lib/php/DB/storage.php -lib/php/DB/sybase.php -lib/php/Date/Calc.php -lib/php/Date/Human.php -lib/php/File/Find.php -lib/php/File/Passwd.php -lib/php/File/SearchReplace.php -lib/php/HTML/Common.php -lib/php/HTML/Form.php -lib/php/HTML/IT.php -lib/php/HTML/ITX.php -lib/php/HTML/Page.php -lib/php/HTML/Processor.php -lib/php/HTML/Select.php -lib/php/HTML/Table.php -lib/php/HTTP.php -lib/php/HTTP/Compress.php -lib/php/Image/Remote.php -lib/php/Log.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/sendmail.php -lib/php/Mail/smtp.php -lib/php/Math/Fraction.php -lib/php/Math/Util.php -lib/php/Net/Curl.php -lib/php/Net/Dig.php -lib/php/Net/SMTP.php -lib/php/Net/Socket.php -lib/php/Numbers/Roman.php -lib/php/PEAR.php -lib/php/PEAR/Common.php -lib/php/PEAR/Installer.php -lib/php/PEAR/Packager.php -lib/php/PEAR/Uploader.php -lib/php/Payment/Verisign.php -lib/php/Schedule/At.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 -lib/php/build/fastgen.sh -lib/php/build/library.mk -lib/php/build/ltlib.mk -lib/php/build/mkdep.awk -lib/php/build/pear.m4 -lib/php/build/program.mk -lib/php/build/rules.mk -lib/php/build/rules_common.mk -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 -@dirrm lib/php/PEAR -@dirrm lib/php/Numbers -@dirrm lib/php/Net -@dirrm lib/php/Math -@dirrm lib/php/Mail -@dirrm lib/php/Log -@dirrm lib/php/Image -@dirrm lib/php/HTTP -@dirrm lib/php/HTML -@dirrm lib/php/File -@dirrm lib/php/Date -@dirrm lib/php/DB -@dirrm lib/php/Crypt -@dirrm lib/php/Console -@dirrm lib/php/Cache/Container -@dirrm lib/php/Cache -@dirrm lib/php/Benchmark -@dirrm lib/php -@dirrm include/php/regex -@dirrm include/php/main -@dirrm include/php/ext/xml/expat/xmltok -@dirrm include/php/ext/xml/expat/xmlparse -@dirrm include/php/ext/xml/expat -@dirrm include/php/ext/xml -@dirrm include/php/ext/standard -@dirrm include/php/ext -@dirrm include/php/Zend -@dirrm include/php/TSRM -@dirrm include/php +@comment $OpenBSD: PLIST-pear,v 1.4 2001/12/18 01:40:48 avsm Exp $ +@pkgcfl php3-* +lib/libphp4.so +sbin/php4-enable +share/doc/php4/php.ini-dist +share/doc/php4/php.ini-recommended +@dirrm share/doc/php4 diff --git a/www/php4/pkg/SECURITY b/www/php4/pkg/SECURITY new file mode 100644 index 00000000000..124c53b8b1d --- /dev/null +++ b/www/php4/pkg/SECURITY @@ -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, +$OpenBSD: SECURITY,v 1.1 2001/12/18 01:40:48 avsm Exp $