Date: Sat, 27 Nov 1999 22:30:25 -0800 (PST) From: rod@zort.on.ca To: freebsd-gnats-submit@freebsd.org Subject: misc/15128: Php4 beta 3 Message-ID: <19991128063025.ECF4614A26@hub.freebsd.org>
index | next in thread | raw e-mail
>Number: 15128 >Category: misc >Synopsis: Php4 beta 3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Nov 27 22:40:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Rod Taylor >Release: >Organization: Zort >Environment: >Description: This installed and runs fine on a couple systems. Please note the lack of any patches anymore. beta3 fixes several bugs, most notably the define problem (where a define is relative to a define). >How-To-Repeat: >Fix: diff -ruN apache13-php4.old/Makefile apache13-php4/Makefile --- apache13-php4.old/Makefile Sun Sep 19 10:37:35 1999 +++ apache13-php4/Makefile Sun Nov 28 01:25:07 1999 @@ -11,7 +11,7 @@ CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/ \ http://www.rge.com/pub/infosystems/apache/dist/ \ - http://us.php.net/${PHP_DISTDIR}/ \ + http://www.php.net/${PHP_DISTDIR}/ \ http://www.modssl.org/source/ \ ftp://ftp.modssl.org/source/ \ http://www.apache.de/dist/ \ @@ -40,8 +40,8 @@ ftp://ftp.fu-berlin.de/unix/security/mod_ssl/ DISTFILES= apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP}.tar.gz -PATCH_SITES= http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/ -PATCHFILES= php4_snmp.c.diff +#PATCH_SITES= http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/ +#PATCHFILES= php4_snmp.c.diff MAINTAINER= dirk@FreeBSD.org @@ -52,7 +52,7 @@ PHP_DISTDIR= version4/downloads VERSION_APACHE= 1.3.9 -VERSION_PHP= 4.0b2 +VERSION_PHP= 4.0b3 NO_LATEST_LINK= yes USE_PERL5= yes diff -ruN apache13-php4.old/files/md5 apache13-php4/files/md5 --- apache13-php4.old/files/md5 Thu Nov 25 16:33:12 1999 +++ apache13-php4/files/md5 Sat Nov 27 19:43:59 1999 @@ -1,4 +1,2 @@ MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32 -MD5 (php-4.0b2.tar.gz) = 509c245c2ec36d227985dd550e94240c -MD5 (mod_ssl-2.4.9-1.3.9.tar.gz) = 8d8efb64a0d23291b319c9056180c900 -MD5 (php4_snmp.c.diff) = f20420b92b4d206f8ec40d2d1c7c5d55 +MD5 (php-4.0b3.tar.gz) = f794d1650923cecbce261ab57ed42d04 diff -ruN apache13-php4.old/patches/patch-aa apache13-php4/patches/patch-aa --- apache13-php4.old/patches/patch-aa Fri Aug 20 15:12:56 1999 +++ apache13-php4/patches/patch-aa Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- configure.orig Sat Aug 14 10:29:05 1999 -+++ configure Fri Aug 20 19:59:53 1999 -@@ -1084,7 +1084,7 @@ - ## UID/GID as production oriented as a web server in NIS anyway. - ## - conf_user="nobody" --conf_group="#-1" -+conf_group="nobody" - conf_port="80" - conf_serveradmin="you@your.address" - conf_servername="new.host.name" diff -ruN apache13-php4.old/patches/patch-ab apache13-php4/patches/patch-ab --- apache13-php4.old/patches/patch-ab Tue Apr 13 11:40:21 1999 +++ apache13-php4/patches/patch-ab Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- Makefile.tmpl.orig Tue Mar 16 01:38:46 1999 -+++ Makefile.tmpl Mon Apr 12 22:38:49 1999 -@@ -410,7 +410,7 @@ - # and initial config files while preserving existing ones. - install-config: - @echo "===> [config: Installing Apache configuration files]" -- -@for conf in httpd.conf access.conf srm.conf; do \ -+ -@for conf in httpd.conf; do \ - if [ .$$conf = .httpd.conf ]; then \ - target_conf="$(TARGET).conf"; \ - else \ diff -ruN apache13-php4.old/patches/patch-ag apache13-php4/patches/patch-ag --- apache13-php4.old/patches/patch-ag Wed Sep 1 09:59:58 1999 +++ apache13-php4/patches/patch-ag Wed Dec 31 19:00:00 1969 @@ -1,51 +0,0 @@ ---- conf/httpd.conf-dist.orig Wed May 5 22:17:59 1999 -+++ conf/httpd.conf-dist Fri Aug 20 20:38:20 1999 -@@ -94,8 +94,8 @@ - # these files altogether by using "/dev/null" (for Unix) or - # "nul" (for Win32) for the arguments to the directives. - # --#ResourceConfig conf/srm.conf --#AccessConfig conf/access.conf -+ResourceConfig /dev/null -+AccessConfig /dev/null - - # - # Timeout: The number of seconds before receives and sends time out. -@@ -351,7 +351,7 @@ - # DirectoryIndex: Name of the file or files to use as a pre-written HTML - # directory index. Separate multiple entries with spaces. - # --DirectoryIndex index.html -+DirectoryIndex index.html index.php3 index.php - - # - # AccessFileName: The name of the file to look for in each directory -@@ -467,7 +467,7 @@ - # define per-<VirtualHost> access logfiles, transactions will be - # logged therein and *not* in this file. - # --CustomLog logs/access_log common -+#CustomLog logs/access_log common - - # - # If you would like to have agent and referer logfiles, uncomment the -@@ -480,7 +480,7 @@ - # If you prefer a single logfile with access, agent, and referer information - # (Combined Logfile Format) you can use the following directive. - # --#CustomLog logs/access_log combined -+CustomLog logs/access_log combined - - # - # Optionally add a line containing the server version and virtual host -@@ -653,8 +657,8 @@ - # For example, the PHP3 module (not part of the Apache distribution - see - # http://www.php.net) will typically use: - # --#AddType application/x-httpd-php3 .php3 --#AddType application/x-httpd-php3-source .phps -+AddType application/x-httpd-php .phtml .php3 .php -+AddType application/x-httpd-php-source .phps .php3s - - AddType application/x-tar .tgz - diff -ruN apache13-php4.old/patches/patch-ak apache13-php4/patches/patch-ak --- apache13-php4.old/patches/patch-ak Fri Aug 20 15:12:57 1999 +++ apache13-php4/patches/patch-ak Wed Dec 31 19:00:00 1969 @@ -1,19 +0,0 @@ ---- src/support/apachectl.orig Fri Aug 20 18:48:24 1999 -+++ src/support/apachectl Fri Aug 20 18:49:37 1999 -@@ -39,6 +39,8 @@ - # -------------------- -------------------- - # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| - -+eval `limits -e -C daemon` >/dev/null 2>&1 -+ - ERROR=0 - ARGV="$@" - if [ "x$ARGV" = "x" ] ; then -@@ -82,6 +84,7 @@ - fi - if kill $PID ; then - echo "$0 $ARG: httpd stopped" -+ rm -f $PIDFILE - else - echo "$0 $ARG: httpd could not be stopped" - ERROR=4 diff -ruN apache13-php4.old/patches/patch-al apache13-php4/patches/patch-al --- apache13-php4.old/patches/patch-al Fri Aug 20 15:12:57 1999 +++ apache13-php4/patches/patch-al Wed Dec 31 19:00:00 1969 @@ -1,29 +0,0 @@ ---- src/support/log_server_status.orig Fri Jun 4 17:54:19 1999 -+++ src/support/log_server_status Fri Aug 20 18:50:00 1999 -@@ -67,7 +67,7 @@ - # - require 'sys/socket.ph'; - --$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312" -+$wherelog = "/var/log/httpd-status-"; - $server = "localhost"; # Name of server, could be "www.foo.com" - $port = "80"; # Port on server - $request = "/status/?auto"; # Request to send -@@ -93,14 +93,14 @@ - ### Main - - { -- $year=`date +%y`; -+ $year=`LC_TIME=C date +%y`; - chomp($year); - $year += ($year < 70) ? 2000 : 1900; -- $date = $year . `date +%m%d:%H%M%S`; -+ $date = $year . `LC_TIME=C date +%m%d:%H%M%S`; - chomp($date); - ($day,$time)=split(/:/,$date); - $res=&tcp_connect($server,$port); -- open(OUT,">>$wherelog$day"); -+ open(OUT,">>$wherelog$day.log"); - if ($res) { - print OUT "$time:-1:-1:-1:-1:$res\n"; - exit 1; diff -ruN apache13-php4.old/patches/patch-an apache13-php4/patches/patch-an --- apache13-php4.old/patches/patch-an Fri Aug 20 15:12:57 1999 +++ apache13-php4/patches/patch-an Wed Dec 31 19:00:00 1969 @@ -1,14 +0,0 @@ ---- src/os/unix/os.h.orig Tue May 4 04:57:14 1999 -+++ src/os/unix/os.h Fri Aug 20 19:45:47 1999 -@@ -61,7 +61,11 @@ - #include "ap_config.h" - - #ifndef PLATFORM -+#if defined(__FreeBSD__) -+#define PLATFORM "FreeBSD" -+#else - #define PLATFORM "Unix" -+#endif - #endif - - /* diff -ruN apache13-php4.old/patches/patch-aq apache13-php4/patches/patch-aq --- apache13-php4.old/patches/patch-aq Tue Aug 17 04:07:05 1999 +++ apache13-php4/patches/patch-aq Wed Dec 31 19:00:00 1969 @@ -1,36 +0,0 @@ ---- ../php/configure.orig Mon Aug 9 20:35:31 1999 -+++ ../php/configure Tue Aug 17 09:45:15 1999 -@@ -7954,32 +7954,13 @@ - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" - -- EXTRA_LIBS="$EXTRA_LIBS -L$ai_p" -- RAW_RPATHS="$RAW_RPATHS ${raw_runpath_switch}$ai_p" -- if test -n "$APXS" ; then -- RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'" -- else -- RPATHS="$RPATHS ${ld_runpath_switch}$ai_p" -- fi -+ EXTRA_LIBS="$EXTRA_LIBS $ai_p/libc-client4.a" - - fi -- -- -- - -- unique=`echo $ac_n "$IMAP_LIB$ac_c" | tr -c -d a-zA-Z0-9` -- cmd="echo $ac_n \"\$LIBRARY$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBRARY$unique=set" -- -- EXTRA_LIBS="$EXTRA_LIBS -l$IMAP_LIB" -- -- fi - - - -- -- - if test -z "$IMAP_INC_DIR" || echo "$IMAP_INC_DIR" | grep '^/' >/dev/null ; then - ai_p="$IMAP_INC_DIR" - else >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the messagehelp
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19991128063025.ECF4614A26>