Date: Sat, 25 Nov 2000 21:16:22 -0600 (CST) From: "Scot W. Hetzel" <hetzels@westbend.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/23104: www/apache13-fp upgrade (Maintainer) Message-ID: <200011260316.VAA71277@www.westbend.net>
next in thread | raw e-mail | index | archive | help
>Number: 23104 >Category: ports >Synopsis: Maintainer upgrade to Apache 1.3.14 for apache13-fp >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Nov 25 18:30:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Scot W. Hetzel >Release: FreeBSD 4.2-STABLE i386 >Organization: West Bend Internet >Environment: >Description: Upgrade apache13-fp port to use Apache 1.3.14 >How-To-Repeat: >Fix: Changed Files: Makefile distinfo patch-ag patch-al Removed Files: patch-ac patch-as Apply the attached patch to upgrade to Apache-1.3.14 diff -ruN apache13-fp.orig/Makefile apache13-fp/Makefile --- apache13-fp.orig/Makefile Fri Nov 24 17:47:19 2000 +++ apache13-fp/Makefile Sat Nov 25 11:04:38 2000 @@ -6,7 +6,7 @@ # PORTNAME= apache_fp -PORTVERSION= 1.3.12 +PORTVERSION= 1.3.14 CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/ \ ftp://ftp.microsoft.com/products/frontpage/ \ @@ -27,7 +27,7 @@ ftp://ftp.mtnranch.net/pub/apache/dist/ \ ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \ ftp://apache.nextpath.com/pub/apache/dist/ -DISTNAME= apache_1.3.12 +DISTNAME= apache_${PORTVERSION} DISTFILES= ${APACHE} ${FRONTPAGE} powerlogo.gif fplogo.gif MAINTAINER= hetzels@westbend.net diff -ruN apache13-fp.orig/distinfo apache13-fp/distinfo --- apache13-fp.orig/distinfo Sat Sep 2 10:23:49 2000 +++ apache13-fp/distinfo Sat Nov 25 11:05:06 2000 @@ -1,4 +1,4 @@ -MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2 +MD5 (apache_1.3.14.tar.gz) = 34803e3d83a0a9ed981b571657b33109 MD5 (fp40.bsdi.tar.z) = f469ea85b69d69f80f32c58fb0d273c4 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62 MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6 diff -ruN apache13-fp.orig/files/patch-ac apache13-fp/files/patch-ac --- apache13-fp.orig/files/patch-ac Sun Apr 30 13:51:48 2000 +++ apache13-fp/files/patch-ac Wed Dec 31 18:00:00 1969 @@ -1,11 +0,0 @@ ---- src/Configure.bak Sun Feb 6 04:27:19 2000 -+++ src/Configure Sun Mar 19 21:51:00 2000 -@@ -1043,7 +1043,7 @@ - LDFLAGS_SHLIB_EXPORT="" - SHLIB_SUFFIX_DEPTH=2 - ;; -- *-freebsd3*|*-freebsd4*) -+ *-freebsd[3-9]*) - LD_SHLIB="gcc" - CFLAGS_SHLIB="-fpic" - LDFLAGS_SHLIB="-shared" diff -ruN apache13-fp.orig/files/patch-ag apache13-fp/files/patch-ag --- apache13-fp.orig/files/patch-ag Wed Mar 1 00:25:07 2000 +++ apache13-fp/files/patch-ag Sat Nov 25 11:42:21 2000 @@ -1,5 +1,5 @@ ---- conf/httpd.conf-dist.orig Wed May 5 15:17:59 1999 -+++ conf/httpd.conf-dist Wed Oct 27 21:37:07 1999 +--- conf/httpd.conf-dist.orig Thu Sep 28 08:12:36 2000 ++++ conf/httpd.conf-dist Sat Nov 25 11:40:39 2000 @@ -97,6 +97,9 @@ #ResourceConfig conf/srm.conf #AccessConfig conf/access.conf @@ -21,7 +21,7 @@ # # BindAddress: You can support virtual hosts with this option. This directive # is used to tell the server which IP address to listen to. It can either -@@ -274,7 +281,7 @@ +@@ -278,7 +285,7 @@ # documents. By default, all requests are taken from this directory, but # symbolic links and aliases may be used to point to other locations. # @@ -30,7 +30,7 @@ # # Each directory to which Apache has access, can be configured with respect -@@ -315,7 +322,16 @@ +@@ -319,7 +326,16 @@ # override. Can also be "All", or any combination of "Options", "FileInfo", # "AuthConfig", and "Limit" # @@ -48,8 +48,8 @@ # # Controls who can get stuff from this server. -@@ -347,6 +363,15 @@ - # </Limit> +@@ -353,12 +369,36 @@ + # </LimitExcept> #</Directory> +### In Order for FrontPage to work in User and Virtual ### @@ -64,7 +64,29 @@ # # DirectoryIndex: Name of the file or files to use as a pre-written HTML # directory index. Separate multiple entries with spaces. -@@ -467,7 +492,7 @@ + # + <IfModule mod_dir.c> +- DirectoryIndex index.html ++ <IfModule mod_php3.c> ++ <IfModule mod_php4.c> ++ DirectoryIndex index.php index.php3 index.html ++ </IfModule> ++ <IfModule !mod_php4.c> ++ DirectoryIndex index.php3 index.html ++ </IfModule> ++ </IfModule> ++ <IfModule !mod_php3.c> ++ <IfModule mod_php4.c> ++ DirectoryIndex index.php index.html ++ </IfModule> ++ <IfModule !mod_php4.c> ++ DirectoryIndex index.html ++ </IfModule> ++ </IfModule> + </IfModule> + + # +@@ -477,7 +517,7 @@ # define per-<VirtualHost> access logfiles, transactions will be # logged therein and *not* in this file. # @@ -73,7 +95,7 @@ # # If you would like to have agent and referer logfiles, uncomment the -@@ -480,7 +505,7 @@ +@@ -490,7 +530,7 @@ # If you prefer a single logfile with access, agent, and referer information # (Combined Logfile Format) you can use the following directive. # @@ -82,10 +104,32 @@ # # Optionally add a line containing the server version and virtual host -@@ -852,3 +877,48 @@ - - #<VirtualHost _default_:*> - #</VirtualHost> +@@ -729,13 +769,17 @@ + # For example, the PHP 3.x 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 ++ <IfModule mod_php3.c> ++ AddType application/x-httpd-php3 .php3 ++ AddType application/x-httpd-php3-source .php3s ++ </IfModule> + # + # And for PHP 4.x, use: + # +- #AddType application/x-httpd-php .php +- #AddType application/x-httpd-php-source .phps ++ <IfModule mod_php4.c> ++ AddType application/x-httpd-php .php ++ AddType application/x-httpd-php-source .phps ++ </IfModule> + + AddType application/x-tar .tgz + +@@ -854,6 +898,51 @@ + # Deny from all + # Allow from .your_domain.com + #</Location> + +# This virtual Host allows access to the Apache & Frontpage Docs on port 8080 +<VirtualHost _default_:8080> @@ -131,3 +175,6 @@ + ServerName @@HOSTNAME@@ +</VirtualHost> + + + # + # Allow remote server configuration reports, with the URL of diff -ruN apache13-fp.orig/files/patch-al apache13-fp/files/patch-al --- apache13-fp.orig/files/patch-al Sun Jan 2 21:36:34 2000 +++ apache13-fp/files/patch-al Sat Nov 25 11:48:58 2000 @@ -1,5 +1,5 @@ ---- src/support/log_server_status.orig Fri Jun 4 10:54:19 1999 -+++ src/support/log_server_status Sat Nov 13 19:42:02 1999 +--- src/support/log_server_status.orig Fri Jun 4 19:54:19 1999 ++++ src/support/log_server_status Fri Sep 3 15:53:16 1999 @@ -67,10 +67,10 @@ # require 'sys/socket.ph'; @@ -13,16 +13,7 @@ sub tcp_connect { -@@ -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`; +@@ -100,7 +100,7 @@ chomp($date); ($day,$time)=split(/:/,$date); $res=&tcp_connect($server,$port); diff -ruN apache13-fp.orig/files/patch-as apache13-fp/files/patch-as --- apache13-fp.orig/files/patch-as Sun Sep 26 21:52:25 1999 +++ apache13-fp/files/patch-as Wed Dec 31 18:00:00 1969 @@ -1,11 +0,0 @@ ---- config.layout.orig Thu Jul 29 13:12:43 1999 -+++ config.layout Thu Aug 19 22:30:39 1999 -@@ -41,7 +41,7 @@ - sysconfdir: $prefix/etc+ - datadir: $prefix/share+ - iconsdir: $datadir/icons -- htdocsdir: $datadir/htdocs -+ htdocsdir: $datadir/data - cgidir: $datadir/cgi-bin - includedir: $prefix/include+ - localstatedir: $prefix/var+ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200011260316.VAA71277>