From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 31 00:50:17 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F40A737B401 for ; Thu, 31 Jul 2003 00:50:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7325F43FAF for ; Thu, 31 Jul 2003 00:50:15 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h6V7oFUp092821 for ; Thu, 31 Jul 2003 00:50:15 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h6V7oFbb092820; Thu, 31 Jul 2003 00:50:15 -0700 (PDT) Resent-Date: Thu, 31 Jul 2003 00:50:15 -0700 (PDT) Resent-Message-Id: <200307310750.h6V7oFbb092820@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alex Dupre Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DC3AB37B401; Thu, 31 Jul 2003 00:47:44 -0700 (PDT) Received: from relay.gufi.org (civetta.gufi.org [212.110.23.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7128643F75; Thu, 31 Jul 2003 00:47:43 -0700 (PDT) (envelope-from alex@vaio.alexdupre.com) Received: from vaio.alexdupre.com (host245-49.pool8288.interbusiness.it [82.88.49.245]) by relay.gufi.org (Postfix) with ESMTP id 5A52620F50; Thu, 31 Jul 2003 09:47:41 +0200 (CEST) Received: from vaio.alexdupre.com (localhost [127.0.0.1]) by vaio.alexdupre.com (8.12.9/8.12.9) with ESMTP id h6V7leeK068552; Thu, 31 Jul 2003 09:47:40 +0200 (CEST) (envelope-from alex@vaio.alexdupre.com) Received: (from alex@localhost) by vaio.alexdupre.com (8.12.9/8.12.9/Submit) id h6V7leCa068551; Thu, 31 Jul 2003 09:47:40 +0200 (CEST) Message-Id: <200307310747.h6V7leCa068551@vaio.alexdupre.com> Date: Thu, 31 Jul 2003 09:47:40 +0200 (CEST) From: Alex Dupre To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: nork@FreeBSD.org Subject: ports/55100: [Maintainer Update] Port: lang/php4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Alex Dupre List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jul 2003 07:50:17 -0000 >Number: 55100 >Category: ports >Synopsis: [Maintainer Update] Port: lang/php4 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jul 31 00:50:14 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Alex Dupre >Release: FreeBSD 4.8-ALEXDUPRE i386 >Organization: >Environment: System: FreeBSD 4.8-ALEXDUPRE i386 >Description: Update to 4.3.3RC2. Include slightly modified patches from PRs 54283 and 54726. >How-To-Repeat: >Fix: --- php4.diff begins here --- diff -ruN php4.orig/Makefile php4/Makefile --- php4.orig/Makefile Thu Jul 31 01:29:56 2003 +++ php4/Makefile Thu Jul 31 09:42:29 2003 @@ -20,8 +20,8 @@ # PORTNAME= php4 -PORTVERSION= 4.3.3.r1 -PORTREVISION= 1 +PORTVERSION= 4.3.3.r2 +PORTREVISION= 0 CATEGORIES?= lang devel www MASTER_SITES= http://www.php.net/distributions/ \ http://it.php.net/distributions/ \ @@ -98,6 +98,7 @@ CONFLICTS= php4-4* php4-cli-4* php4-cgi-4* .endif .endif +CONFLICTS+= php5-5* php5-cli-5* mod_php5-5* php5-cgi-5* .if defined(WITHOUT_APACHE) CONFIGURE_ARGS+=--enable-discard-path @@ -411,13 +412,11 @@ .if defined(WITH_MYSQL) .if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.10) LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -.else -.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14) +.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14) LIB_DEPENDS+= mysqlclient.14:${PORTSDIR}/databases/mysql41-client .else LIB_DEPENDS+= mysqlclient.12:${PORTSDIR}/databases/mysql40-client .endif -.endif CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} .endif @@ -434,8 +433,14 @@ .if defined(WITH_OPENLDAP) .if exists(${LOCALBASE}/lib/libldap.so.1) LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12 -.else +.elif exists(${LOCALBASE}/lib/libldap.la) +.if exists(${LOCALBASE}/bin/ldapwhoami) LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21 +.else +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20 +.endif +.else +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap22 .endif CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} .endif diff -ruN php4.orig/distinfo php4/distinfo --- php4.orig/distinfo Thu Jul 31 01:29:56 2003 +++ php4/distinfo Thu Jul 31 08:58:31 2003 @@ -1 +1 @@ -MD5 (php-4.3.3RC1.tar.bz2) = 2b3b4866bedd073d505c554c551fef92 +MD5 (php-4.3.3RC2.tar.bz2) = bc8cda0bd523c653d0900a460117c2af diff -ruN php4.orig/files/patch-configure php4/files/patch-configure --- php4.orig/files/patch-configure Thu Jul 31 01:29:56 2003 +++ php4/files/patch-configure Thu Jul 31 08:57:24 2003 @@ -1,6 +1,6 @@ ---- configure.orig Thu Jun 19 00:06:29 2003 -+++ configure Sat Jun 28 16:45:44 2003 -@@ -597,6 +597,8 @@ +--- configure.orig Thu Jul 31 00:51:41 2003 ++++ configure Thu Jul 31 08:56:35 2003 +@@ -616,6 +616,8 @@ ac_help="$ac_help --enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support." ac_help="$ac_help @@ -9,7 +9,7 @@ --with-gettext[=DIR] Include GNU gettext support." ac_help="$ac_help --with-gmp Include GNU MP support" -@@ -28224,6 +28226,31 @@ +@@ -29141,6 +29143,31 @@ @@ -41,7 +41,7 @@ -@@ -28248,7 +28275,7 @@ +@@ -29293,7 +29320,7 @@ libgd/gd_io_file.c libgd/gd_ss.c libgd/gd_io_ss.c libgd/gd_png.c libgd/gd_jpeg.c \ libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c libgd/gdfontmb.c libgd/gdfontl.c \ libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c libgd/gdkanji.c \ @@ -50,7 +50,7 @@ libgd/xbm.c" for ac_func in fabsf floorf -@@ -28323,6 +28350,11 @@ +@@ -29368,6 +29395,11 @@ fi @@ -62,7 +62,7 @@ if test "$PHP_JPEG_DIR" != "no"; then for i in /usr /usr/local $PHP_JPEG_DIR; do -@@ -29724,6 +29756,9 @@ +@@ -31077,6 +31109,9 @@ cat >> confdefs.h <<\EOF #define HAVE_GD_BUNDLED 1 @@ -72,7 +72,7 @@ EOF cat >> confdefs.h <<\EOF -@@ -29774,6 +29809,14 @@ +@@ -31127,6 +31162,14 @@ GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208" fi @@ -87,10 +87,10 @@ else if test "$PHP_GD" != "no"; then -@@ -32275,6 +32318,60 @@ - - save_old_LDFLAGS=$LDFLAGS - LDFLAGS=" -L$GD_LIB $GD_SHARED_LIBADD $LDFLAGS" +@@ -35474,6 +35517,137 @@ + esac + done + + echo $ac_n "checking for gdImageGifAnimBegin in -lgd""... $ac_c" 1>&6 +echo "configure:32250: checking for gdImageGifAnimBegin in -lgd" >&5 +ac_lib_var=`echo gd'_'gdImageGifAnimBegin | sed 'y%./+-%__p_%'` @@ -126,32 +126,109 @@ +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 -+ ++ + LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared + cat >> confdefs.h <<\EOF +#define HAVE_GD_GIF_ANIM 1 +EOF + -+ ++ +else + echo "$ac_t""no" 1>&6 + + LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared + unset ac_cv_func_gd -+ -+ ++ ++ +fi + -+ ++ + save_old_LDFLAGS=$LDFLAGS -+ LDFLAGS=" -L$GD_LIB $GD_SHARED_LIBADD $LDFLAGS" ++ ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " ++ ++ save_ext_shared=$ext_shared ++ ext_shared=yes ++ ++ for ac_i in $ac_stuff; do ++ case $ac_i in ++ -l*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -l$ac_ii" ++ else ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" ++ ;; ++ esac ++ ++ ++ fi ++ ;; ++ esac ++ ++ ++ ;; ++ -L*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/lib"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii ++ else ++ ++ ep_dir="`echo $ac_ii|sed 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$ld_runpath_switch$ai_p -L$ai_p $LDFLAGS" ++ else ++ ++ ++ ++ unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi ++ ++ ++ fi ++ ++ fi ++ ++ ;; ++ esac ++ done ++ echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6 - echo "configure:32280: checking for gdCacheCreate in -lgd" >&5 + echo "configure:35479: checking for gdCacheCreate in -lgd" >&5 ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'` -@@ -54325,8 +54422,8 @@ +@@ -58977,8 +59151,8 @@ echo $ac_n "checking Oracle version""... $ac_c" 1>&6 - echo "configure:54328: checking Oracle version" >&5 + echo "configure:58980: checking Oracle version" >&5 - if test -s "$ORACLE_DIR/orainst/unix.rgs"; then - ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/ */:/g' | cut -d: -f 6 | cut -c 2-4` + if test -s "$ORACLE_DIR/ocommon/install/partial.prd"; then @@ -159,7 +236,7 @@ test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3 elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then ORACLE_VERSION=9.0 -@@ -56589,6 +56686,102 @@ +@@ -60270,6 +60444,102 @@ if test "$ext_shared" = "yes"; then @@ -262,7 +339,7 @@ ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD" if test -n "$ORACLE_DIR/lib"; then -@@ -71130,29 +71323,6 @@ +@@ -76670,29 +76940,6 @@ else @@ -292,7 +369,7 @@ case ct in c|c_r|pthread*) ;; *) -@@ -71176,52 +71346,7 @@ +@@ -76716,52 +76963,7 @@ @@ -346,7 +423,7 @@ save_old_LDFLAGS=$LDFLAGS -@@ -71291,37 +71416,6 @@ +@@ -76907,38 +77109,6 @@ @@ -354,6 +431,7 @@ - echo "$ac_t""no" 1>&6 - - LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared - unset ac_cv_func_tcl - - @@ -384,7 +462,7 @@ fi -@@ -84252,10 +84346,7 @@ +@@ -90711,10 +90881,7 @@ CXXFLAGS="$CXXFLAGS $standard_libtool_flag" all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)' diff -ruN php4.orig/files/patch-main::main.c php4/files/patch-main::main.c --- php4.orig/files/patch-main::main.c Thu Jul 31 01:29:56 2003 +++ php4/files/patch-main::main.c Thu Jan 1 01:00:00 1970 @@ -1,139 +0,0 @@ ---- main/main.c.orig Sun Jun 22 11:16:39 2003 -+++ main/main.c Sun Jun 22 11:17:00 2003 - -@@ -134,7 +134,6 @@ static int short_track_vars_names_length - - #define NUM_TRACK_VARS (sizeof(short_track_vars_names_length)/sizeof(int)) - -- - #define SAFE_FILENAME(f) ((f)?(f):"-") - - /* {{{ PHP_INI_MH -@@ -1362,7 +1361,7 @@ static void php_autoglobal_merge(HashTab - static int php_hash_environment(TSRMLS_D) - { - char *p; -- unsigned char _gpc_flags[3] = {0, 0, 0}; -+ int _gpc_flags[5] = {0, 0, 0, 0, 0}; - zend_bool have_variables_order; - zval *dummy_track_vars_array = NULL; - zend_bool initialized_dummy_track_vars_array=0; -@@ -1409,42 +1408,48 @@ static int php_hash_environment(TSRMLS_D - case 'P': - if (!_gpc_flags[0] && !SG(headers_sent) && SG(request_info).request_method && !strcmp(SG(request_info).request_method, "POST")) { - sapi_module.treat_data(PARSE_POST, NULL, NULL TSRMLS_CC); /* POST Data */ -- _gpc_flags[0]=1; -+ _gpc_flags[0]=TRACK_VARS_POST + 1; - } - break; - case 'c': - case 'C': - if (!_gpc_flags[1]) { - sapi_module.treat_data(PARSE_COOKIE, NULL, NULL TSRMLS_CC); /* Cookie Data */ -- _gpc_flags[1]=1; -+ _gpc_flags[1]=TRACK_VARS_COOKIE + 1; - } - break; - case 'g': - case 'G': - if (!_gpc_flags[2]) { - sapi_module.treat_data(PARSE_GET, NULL, NULL TSRMLS_CC); /* GET Data */ -- _gpc_flags[2]=1; -+ _gpc_flags[2]=TRACK_VARS_GET + 1; - } - break; - case 'e': - case 'E': -- if (have_variables_order) { -- ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]); -- array_init(PG(http_globals)[TRACK_VARS_ENV]); -- INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]); -- php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC); -- } else { -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported 'e' element (environment) used in gpc_order - use variables_order instead"); -+ if (!_gpc_flags[3]) { -+ if (have_variables_order) { -+ ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]); -+ array_init(PG(http_globals)[TRACK_VARS_ENV]); -+ INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]); -+ php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC); -+ } else { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported 'e' element (environment) used in gpc_order - use variables_order instead"); -+ } -+ _gpc_flags[3]=TRACK_VARS_ENV + 1; - } - break; - case 's': - case 'S': -- php_register_server_variables(TSRMLS_C); -+ if (!_gpc_flags[4]) { -+ php_register_server_variables(TSRMLS_C); -+ _gpc_flags[4]=TRACK_VARS_SERVER + 1; -+ } - break; - } - } - -- if (!have_variables_order) { -+ if (!have_variables_order && !PG(http_globals)[TRACK_VARS_SERVER]) { - php_register_server_variables(TSRMLS_C); - } - -@@ -1453,6 +1458,14 @@ static int php_hash_environment(TSRMLS_D - php_build_argv(SG(request_info).query_string TSRMLS_CC); - } - -+ if (PG(register_globals)) { -+ for (i = 0; i < 5; i++) { -+ if (PG(http_globals)[i]) { -+ php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[i]) TSRMLS_CC); -+ } -+ } -+ } -+ - for (i=0; irefcount+1, 0); -- } -- zend_hash_move_forward_ex(Z_ARRVAL_P(form_variables), &pos); -+ for (i = 0; i < 3; i++) { -+ if (_gpc_flags[i]) { -+ php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[(_gpc_flags[i] - 1)]) TSRMLS_CC); - } - } -+ - zend_hash_update(&EG(symbol_table), "_REQUEST", sizeof("_REQUEST"), &form_variables, sizeof(zval *), NULL); - } diff -ruN php4.orig/pkg-plist php4/pkg-plist --- php4.orig/pkg-plist Thu Jul 31 01:29:56 2003 +++ php4/pkg-plist Thu Jul 31 09:15:01 2003 @@ -142,6 +142,7 @@ include/php/ext/xml/expat/asciitab.h include/php/ext/xml/expat/expat.h include/php/ext/xml/expat/iasciitab.h +include/php/ext/xml/expat/internal.h include/php/ext/xml/expat/latin1tab.h include/php/ext/xml/expat/nametab.h include/php/ext/xml/expat/utf8tab.h diff -ruN php4.orig/scripts/configure.php php4/scripts/configure.php --- php4.orig/scripts/configure.php Thu Jul 31 01:29:56 2003 +++ php4/scripts/configure.php Thu Jul 31 09:27:13 2003 @@ -16,7 +16,7 @@ export $i done fi - /usr/bin/dialog --title "configuration options" --clear --checklist "\n\ + /usr/bin/dialog --title "PHP configuration options" --clear --checklist "\n\ Please select desired options:" -1 -1 16 \ BCMATH "bc style precision math functions" ${WITH_BCMATH:-OFF} \ BZIP2 "bzip2 library support" ${WITH_BZIP2:-OFF} \ --- php4.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: