diff options
author | olgeni <olgeni@FreeBSD.org> | 2001-03-08 12:35:10 +0000 |
---|---|---|
committer | olgeni <olgeni@FreeBSD.org> | 2001-03-08 12:35:10 +0000 |
commit | 2b9e9ae6dbff9f62f4a83b66b166c8f46189e14f (patch) | |
tree | 9ddc5c6820c65ea54699d2e5a5b27e74dd584e3b /www/apache13-fp/files | |
parent | 1e052d65b5e02c3e0730473f9e2ffd988492e03e (diff) | |
download | FreeBSD-ports-2b9e9ae6dbff9f62f4a83b66b166c8f46189e14f.zip FreeBSD-ports-2b9e9ae6dbff9f62f4a83b66b166c8f46189e14f.tar.gz |
Upgrade to Apache 1.3.19
Also, from the PR:
* Alpha FrontPage Ext (OSF1) install for FreeBSD/alpha.
* FreeBSD FrontPage Ext install (define WANT_FREEBSD_EXT)
PR: 25604
Submitted by: Scot W. Hetzel <hetzels@westbend.net>
Diffstat (limited to 'www/apache13-fp/files')
-rw-r--r-- | www/apache13-fp/files/change_server.alpha | 11 | ||||
-rw-r--r-- | www/apache13-fp/files/change_server.bsdi | 11 | ||||
-rw-r--r-- | www/apache13-fp/files/fp_install.alpha | 11 | ||||
-rw-r--r-- | www/apache13-fp/files/fp_install.bsdi | 11 | ||||
-rw-r--r-- | www/apache13-fp/files/patch-ag | 38 | ||||
-rw-r--r-- | www/apache13-fp/files/patch-fa | 13 | ||||
-rw-r--r-- | www/apache13-fp/files/patch-fb | 13 | ||||
-rw-r--r-- | www/apache13-fp/files/patch-lang.en | 2 |
8 files changed, 66 insertions, 44 deletions
diff --git a/www/apache13-fp/files/change_server.alpha b/www/apache13-fp/files/change_server.alpha new file mode 100644 index 0000000..e8ba077 --- /dev/null +++ b/www/apache13-fp/files/change_server.alpha @@ -0,0 +1,11 @@ +--- frontpage/version4.0/change_server.sh.orig Wed Mar 7 22:12:02 2001 ++++ frontpage/version4.0/change_server.sh Wed Mar 7 22:13:11 2001 +@@ -62,7 +62,7 @@ + SunOS*5.*i386*) machine="solarisx86" ;; + BSD/OS*) machine="bsdi" ;; + SCO_SV*) machine="sco5" ;; +- FreeBSD*) machine="freebsd" ;; ++ FreeBSD*) machine="alpha" ;; + UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;; + *) echo "ERROR: Unsupported platform! Uname is $system." + return 1 diff --git a/www/apache13-fp/files/change_server.bsdi b/www/apache13-fp/files/change_server.bsdi new file mode 100644 index 0000000..fb8c549 --- /dev/null +++ b/www/apache13-fp/files/change_server.bsdi @@ -0,0 +1,11 @@ +--- frontpage/version4.0/change_server.sh.bsdi Wed Mar 7 22:12:02 2001 ++++ frontpage/version4.0/change_server.sh Wed Mar 7 22:10:59 2001 +@@ -62,7 +62,7 @@ + SunOS*5.*i386*) machine="solarisx86" ;; + BSD/OS*) machine="bsdi" ;; + SCO_SV*) machine="sco5" ;; +- FreeBSD*) machine="freebsd" ;; ++ FreeBSD*) machine="bsdi" ;; + UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;; + *) echo "ERROR: Unsupported platform! Uname is $system." + return 1 diff --git a/www/apache13-fp/files/fp_install.alpha b/www/apache13-fp/files/fp_install.alpha new file mode 100644 index 0000000..16aa62b --- /dev/null +++ b/www/apache13-fp/files/fp_install.alpha @@ -0,0 +1,11 @@ +--- frontpage/version4.0/fp_install.sh.alpha Wed Mar 7 22:16:28 2001 ++++ frontpage/version4.0/fp_install.sh Wed Mar 7 22:22:07 2001 +@@ -70,7 +70,7 @@ + SunOS*5.*i386*) machine="solarisx86" ;; + BSD/OS*) machine="bsdi" ;; + SCO_SV*) machine="sco5" ;; +- FreeBSD*) machine="freebsd" ;; ++ FreeBSD*) machine="alpha" ;; + UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;; + *) echo "ERROR: Unsupported platform! Uname is $system." + return 1 diff --git a/www/apache13-fp/files/fp_install.bsdi b/www/apache13-fp/files/fp_install.bsdi new file mode 100644 index 0000000..6b7a79c --- /dev/null +++ b/www/apache13-fp/files/fp_install.bsdi @@ -0,0 +1,11 @@ +--- frontpage/version4.0/fp_install.sh.bsdi Wed Mar 7 22:16:28 2001 ++++ frontpage/version4.0/fp_install.sh Wed Mar 7 22:16:00 2001 +@@ -70,7 +70,7 @@ + SunOS*5.*i386*) machine="solarisx86" ;; + BSD/OS*) machine="bsdi" ;; + SCO_SV*) machine="sco5" ;; +- FreeBSD*) machine="freebsd" ;; ++ FreeBSD*) machine="bsdi" ;; + UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;; + *) echo "ERROR: Unsupported platform! Uname is $system." + return 1 diff --git a/www/apache13-fp/files/patch-ag b/www/apache13-fp/files/patch-ag index d2122e7..f79b03c 100644 --- a/www/apache13-fp/files/patch-ag +++ b/www/apache13-fp/files/patch-ag @@ -1,6 +1,6 @@ ---- 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 @@ +--- conf/httpd.conf-dist.orig Wed Feb 21 21:48:15 2001 ++++ conf/httpd.conf-dist Wed Mar 7 23:43:56 2001 +@@ -95,6 +95,9 @@ #ResourceConfig conf/srm.conf #AccessConfig conf/access.conf @@ -10,7 +10,7 @@ # # Timeout: The number of seconds before receives and sends time out. # -@@ -176,6 +179,10 @@ +@@ -174,6 +177,10 @@ #Listen 3000 #Listen 12.34.56.78:80 @@ -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 -@@ -278,7 +285,7 @@ +@@ -276,7 +283,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 -@@ -319,7 +326,16 @@ +@@ -317,7 +324,16 @@ # override. Can also be "All", or any combination of "Options", "FileInfo", # "AuthConfig", and "Limit" # @@ -48,7 +48,7 @@ # # Controls who can get stuff from this server. -@@ -353,12 +369,36 @@ +@@ -351,12 +367,36 @@ # </LimitExcept> #</Directory> @@ -86,7 +86,7 @@ </IfModule> # -@@ -477,7 +517,7 @@ +@@ -475,7 +515,7 @@ # define per-<VirtualHost> access logfiles, transactions will be # logged therein and *not* in this file. # @@ -95,7 +95,7 @@ # # If you would like to have agent and referer logfiles, uncomment the -@@ -490,7 +530,7 @@ +@@ -488,7 +528,7 @@ # If you prefer a single logfile with access, agent, and referer information # (Combined Logfile Format) you can use the following directive. # @@ -104,7 +104,7 @@ # # Optionally add a line containing the server version and virtual host -@@ -729,13 +769,17 @@ +@@ -728,13 +768,17 @@ # For example, the PHP 3.x module (not part of the Apache distribution - see # http://www.php.net) will typically use: # @@ -126,10 +126,10 @@ AddType application/x-tar .tgz -@@ -854,6 +898,51 @@ - # Deny from all - # Allow from .your_domain.com - #</Location> +@@ -944,3 +988,47 @@ + # ErrorLog logs/dummy-host.example.com-error_log + # CustomLog logs/dummy-host.example.com-access_log common + #</VirtualHost> + +# This virtual Host allows access to the Apache & Frontpage Docs on port 8080 +<VirtualHost _default_:8080> @@ -141,13 +141,13 @@ + + # + # This may also be "None", "All", or any combination of "Indexes", -+ # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews". ++ # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews". + # + # Note that "MultiViews" must be named *explicitly* --- "Options All" -+ # doesn't give it to you. ++ # doesn't give it to you. + # + Options Indexes FollowSymLinks -+ ++ + # + # This controls which options the .htaccess files in directories can + # override. Can also be "All", or any combination of "Options", "FileInfo", @@ -174,7 +174,3 @@ + ServerAdmin webmaster@@@HOSTNAME@@ + ServerName @@HOSTNAME@@ +</VirtualHost> -+ - - # - # Allow remote server configuration reports, with the URL of diff --git a/www/apache13-fp/files/patch-fa b/www/apache13-fp/files/patch-fa index 1dc8ca2..8879738 100644 --- a/www/apache13-fp/files/patch-fa +++ b/www/apache13-fp/files/patch-fa @@ -1,5 +1,5 @@ ---- frontpage/version4.0/change_server.sh.orig Tue May 2 15:41:43 2000 -+++ frontpage/version4.0/change_server.sh Thu Jul 6 21:45:52 2000 +--- frontpage/version4.0/change_server.sh.orig Mon Aug 14 11:51:36 2000 ++++ frontpage/version4.0/change_server.sh Wed Mar 7 22:12:02 2001 @@ -38,9 +38,12 @@ { VERSION="4.0" @@ -16,15 +16,6 @@ case "`echo 'x\c'`" in 'x\c') echo="echo -n" nnl= ;; #BSD -@@ -62,7 +65,7 @@ - SunOS*5.*i386*) machine="solarisx86" ;; - BSD/OS*) machine="bsdi" ;; - SCO_SV*) machine="sco5" ;; -- FreeBSD*) machine="freebsd" ;; -+ FreeBSD*) machine="bsdi" ;; - UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;; - *) echo "ERROR: Unsupported platform! Uname is $system." - return 1 @@ -217,8 +220,22 @@ clear diff --git a/www/apache13-fp/files/patch-fb b/www/apache13-fp/files/patch-fb index 29bea50..1c7e4c0 100644 --- a/www/apache13-fp/files/patch-fb +++ b/www/apache13-fp/files/patch-fb @@ -1,5 +1,5 @@ ---- frontpage/version4.0/fp_install.sh.orig Tue May 2 15:41:43 2000 -+++ frontpage/version4.0/fp_install.sh Thu Jul 6 21:46:15 2000 +--- frontpage/version4.0/fp_install.sh.orig Mon Aug 14 11:51:36 2000 ++++ frontpage/version4.0/fp_install.sh Wed Mar 7 22:16:28 2001 @@ -48,7 +48,8 @@ { VERSION="4.0" @@ -10,15 +10,6 @@ case "`echo 'x\c'`" in 'x\c') echo="echo -n" nnl= ;; #BSD -@@ -70,7 +71,7 @@ - SunOS*5.*i386*) machine="solarisx86" ;; - BSD/OS*) machine="bsdi" ;; - SCO_SV*) machine="sco5" ;; -- FreeBSD*) machine="freebsd" ;; -+ FreeBSD*) machine="bsdi" ;; - UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;; - *) echo "ERROR: Unsupported platform! Uname is $system." - return 1 @@ -129,7 +130,7 @@ checkuser() { diff --git a/www/apache13-fp/files/patch-lang.en b/www/apache13-fp/files/patch-lang.en index c251310..46053c2 100644 --- a/www/apache13-fp/files/patch-lang.en +++ b/www/apache13-fp/files/patch-lang.en @@ -11,7 +11,7 @@ +<p>The Microsoft FrontPage 2000 Extentions has been installed with this +Apache Server. Read the <A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/">Microsoft FrontPage 2000 documentation</A> carefully.<p> + -+<p>Information of the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org>FreeBSD</A> web site.<p> ++<p>Information of the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org">FreeBSD</A> web site.<p> + <p>You are free to use the image below on an Apache-powered web server. -Thanks for using Apache!</p> |