diff options
Diffstat (limited to 'www/apache21/files')
| -rw-r--r-- | www/apache21/files/apache.sh | 20 | ||||
| -rw-r--r-- | www/apache21/files/patch-Makefile.in | 54 | ||||
| -rw-r--r-- | www/apache21/files/patch-config.layout | 28 | ||||
| -rw-r--r-- | www/apache21/files/patch-configure | 32 | ||||
| -rw-r--r-- | www/apache21/files/patch-docs:conf:httpd-std.conf | 164 | ||||
| -rw-r--r-- | www/apache21/files/patch-docs:conf:ssl-std.conf | 96 | ||||
| -rw-r--r-- | www/apache21/files/patch-support:apachectl.in | 23 | ||||
| -rw-r--r-- | www/apache21/files/patch-support:apxs.in | 47 | ||||
| -rw-r--r-- | www/apache21/files/patch-support:log_server_status.in | 24 |
9 files changed, 0 insertions, 488 deletions
diff --git a/www/apache21/files/apache.sh b/www/apache21/files/apache.sh deleted file mode 100644 index ca4321814e5a..000000000000 --- a/www/apache21/files/apache.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 1 -fi - -case "$1" in -start) - [ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache' - ;; -stop) - [ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache' - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - ;; -esac - -exit 0 diff --git a/www/apache21/files/patch-Makefile.in b/www/apache21/files/patch-Makefile.in deleted file mode 100644 index a9d597aaa827..000000000000 --- a/www/apache21/files/patch-Makefile.in +++ /dev/null @@ -1,54 +0,0 @@ ---- Makefile.in.orig Mon Oct 22 21:46:29 2001 -+++ Makefile.in Tue Jan 22 19:02:30 2002 -@@ -32,7 +32,7 @@ - @test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir) - @cd $(top_srcdir)/docs/conf; \ - for i in mime.types magic; do \ -- $(INSTALL_DATA) $$i $(sysconfdir); \ -+ test -f $(sysconfdir)/$$i || $(INSTALL_DATA) $$i $(sysconfdir); \ - done; \ - for i in *-std* ssl.conf; do \ - [ -f $$i ] || continue; \ -@@ -51,7 +51,7 @@ - < $$i; \ - for j in $(DSO_MODULES) "^EOL^"; do \ - if test $$j != "^EOL^"; then \ -- echo "LoadModule $${j}_module modules/mod_$${j}.so"; \ -+ echo "LoadModule $${j}_module ${libexecdir:S|^${prefix}/||}/mod_$${j}.so"; \ - fi; \ - done; \ - sed -e '1,/@@LoadModule@@/d' \ -@@ -93,11 +93,14 @@ - - install-htdocs: - @echo Installing HTML documents -- @test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir) -- @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir)) -- @test -d $(prefix)/manual || $(MKINSTALLDIRS) $(prefix)/manual -- @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(prefix)/manual) -- @(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;) -+ @test -d $(htdocsdir).default || $(MKINSTALLDIRS) $(htdocsdir).default -+ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir).default) -+ @test -e $(htdocsdir) || ln -sf $(htdocsdir).default $(htdocsdir) -+.if !defined(NOPORTDOCS) -+ @test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir) -+ @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir)) -+.endif -+ @(cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \;) - - install-error: - @echo Installing error documents -@@ -113,9 +116,10 @@ - - install-cgi: - @echo Installing CGIs -- @test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir) -- @(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir)) -- @(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;) -+ @test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default -+ @(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir).default) -+ @test -e $(cgidir) || ln -sf $(cgidir).default $(cgidir) -+ @(cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;) - - install-other: - @test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir) diff --git a/www/apache21/files/patch-config.layout b/www/apache21/files/patch-config.layout deleted file mode 100644 index 0bb23d72594f..000000000000 --- a/www/apache21/files/patch-config.layout +++ /dev/null @@ -1,28 +0,0 @@ ---- config.layout.orig Fri Oct 26 11:59:26 2001 -+++ config.layout Fri Nov 16 18:36:14 2001 -@@ -285,3 +285,25 @@ - logfiledir: $prefix/logs - proxycachedir: $prefix/proxy - </Layout> -+ -+<Layout FreeBSD> -+ prefix: /usr/local -+ exec_prefix: $prefix -+ bindir: $exec_prefix/bin -+ sbindir: $exec_prefix/sbin -+ libexecdir: $exec_prefix/libexec/apache -+ mandir: $prefix/man -+ sysconfdir: $prefix/etc/apache -+ datadir: $prefix/www -+ installbuilddir: $prefix/share/mk/apache -+ errordir: $datadir/error -+ iconsdir: $datadir/icons -+ htdocsdir: $datadir/data -+ manualdir: ${prefix}/share/doc/apache -+ cgidir: $datadir/cgi-bin -+ includedir: $prefix/include/apache -+ localstatedir: /var -+ runtimedir: $localstatedir/run -+ logfiledir: $localstatedir/log -+ proxycachedir: $datadir/proxy -+</Layout> diff --git a/www/apache21/files/patch-configure b/www/apache21/files/patch-configure deleted file mode 100644 index 007d46173167..000000000000 --- a/www/apache21/files/patch-configure +++ /dev/null @@ -1,32 +0,0 @@ ---- configure.orig Tue Nov 13 04:07:39 2001 -+++ configure Fri Nov 16 23:32:52 2001 -@@ -1084,7 +1084,7 @@ - esac - - # The eval makes quoting arguments work. -- if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "$apache_apr_flags --prefix=$prefix $disable_shared" -+ if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "$apache_apr_flags --prefix=$prefix $disable_shared" - then : - echo "srclib/apr configured properly" - else -@@ -1175,7 +1175,7 @@ - esac - - # The eval makes quoting arguments work. -- if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "--with-apr=../apr --prefix=$prefix $disable_shared" -+ if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "--with-apr=../apr --prefix=$prefix $disable_shared" - then : - echo "srclib/apr-util configured properly" - else -@@ -10508,7 +10508,10 @@ - EOF - - cat >> confdefs.h <<EOF --#define SERVER_CONFIG_FILE "conf/$progname.conf" -+#define SERVER_CONFIG_FILE "etc/apache/$progname.conf" -+#define DEFAULT_ERRORLOG "/var/log/httpd-error.log" -+#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types" -+#define DOCUMENT_LOCATION HTTPD_ROOT "/www/data" - EOF - - cat >> confdefs.h <<EOF diff --git a/www/apache21/files/patch-docs:conf:httpd-std.conf b/www/apache21/files/patch-docs:conf:httpd-std.conf deleted file mode 100644 index eb63c30ac79a..000000000000 --- a/www/apache21/files/patch-docs:conf:httpd-std.conf +++ /dev/null @@ -1,164 +0,0 @@ ---- docs/conf/httpd-std.conf.orig Fri Nov 9 07:31:28 2001 -+++ docs/conf/httpd-std.conf Sat Nov 17 01:49:29 2001 -@@ -64,7 +64,7 @@ - # - <IfModule !mpm_winnt.c> - <IfModule !perchild.c> --ScoreBoardFile logs/apache_runtime_status -+ScoreBoardFile /var/run/apache_runtime_status - </IfModule> - </IfModule> - -@@ -73,7 +73,7 @@ - # PidFile: The file in which the server should record its process - # identification number when it starts. - # --PidFile logs/httpd.pid -+PidFile /var/run/httpd.pid - - # - # Timeout: The number of seconds before receives and sends time out. -@@ -229,8 +229,8 @@ - # when the value of (unsigned)Group is above 60000; - # don't use Group #-1 on these systems! - # --User nobody --Group #-1 -+User www -+Group www - </IfModule> - - # -@@ -259,7 +259,7 @@ - # documents. By default, all requests are taken from this directory, but - # symbolic links and aliases may be used to point to other locations. - # --DocumentRoot "@@ServerRoot@@/htdocs" -+DocumentRoot "@@ServerRoot@@/www/data" - - # - # Each directory to which Apache has access, can be configured with respect -@@ -284,7 +284,7 @@ - # - # This should be changed to whatever you set DocumentRoot to. - # --<Directory "@@ServerRoot@@/htdocs"> -+<Directory "@@ServerRoot@@/www/data"> - - # - # This may also be "None", "All", or any combination of "Indexes", -@@ -377,7 +377,7 @@ - # TypesConfig describes where the mime.types file (or equivalent) is - # to be found. - # --TypesConfig conf/mime.types -+TypesConfig etc/apache/mime.types - - # - # DefaultType is the default MIME type the server will use for a document -@@ -396,7 +396,7 @@ - # directive tells the module where the hint definitions are located. - # - <IfModule mod_mime_magic.c> -- MIMEMagicFile conf/magic -+ MIMEMagicFile etc/apache/magic - </IfModule> - - # -@@ -416,7 +416,7 @@ - # logged here. If you *do* define an error logfile for a <VirtualHost> - # container, that host's errors will be logged there and not here. - # --ErrorLog logs/error_log -+ErrorLog /var/log/httpd-error.log - - # - # LogLevel: Control the number of messages logged to the error_log. -@@ -441,7 +441,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 -@@ -454,7 +454,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 /var/log/httpd-access.log combined - - # - # Optionally add a line containing the server version and virtual host -@@ -478,9 +478,9 @@ - # We include the /icons/ alias for FancyIndexed directory listings. If you - # do not use FancyIndexing, you may comment this out. - # --Alias /icons/ "@@ServerRoot@@/icons/" -+Alias /icons/ "@@ServerRoot@@/www/icons/" - --<Directory "@@ServerRoot@@/icons"> -+<Directory "@@ServerRoot@@/www/icons"> - Options Indexes MultiViews - AllowOverride None - Order allow,deny -@@ -492,9 +492,9 @@ - # the manual, even if you choose to move your DocumentRoot. You may comment - # this out if you do not care for the documentation. - # --Alias /manual "@@ServerRoot@@/manual" -+Alias /manual "@@ServerRoot@@/share/doc/apache" - --<Directory "@@ServerRoot@@/manual"> -+<Directory "@@ServerRoot@@/share/doc/apache"> - Options Indexes FollowSymLinks MultiViews - AllowOverride None - Order allow,deny -@@ -509,21 +509,21 @@ - # The same rules about trailing "/" apply to ScriptAlias directives as to - # Alias. - # --ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/" -+ScriptAlias /cgi-bin/ "@@ServerRoot@@/www/cgi-bin/" - - <IfModule mod_cgid.c> - # - # Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path> - # for setting UNIX socket for communicating with cgid. - # --#Scriptsock logs/cgisock -+Scriptsock /var/run/cgisock - </IfModule> - - # - # "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased - # CGI directory exists, if you have that configured. - # --<Directory "@@ServerRoot@@/cgi-bin"> -+<Directory "@@ServerRoot@@/www/cgi-bin"> - AllowOverride None - Options None - Order allow,deny -@@ -851,9 +851,9 @@ - # - - <IfModule mod_include.c> -- Alias /error/ "@@ServerRoot@@/error/" -+ Alias /error/ "@@ServerRoot@@/www/error/" - -- <Directory "@@ServerRoot@@/error"> -+ <Directory "@@ServerRoot@@/www/error"> - AllowOverride None - Options IncludesNoExec - AddOutputFilter Includes html -@@ -964,7 +964,7 @@ - # Bring in additional module-specific configurations - # - <IfModule mod_ssl.c> -- Include conf/ssl.conf -+ Include etc/apache/ssl.conf - </IfModule> - - diff --git a/www/apache21/files/patch-docs:conf:ssl-std.conf b/www/apache21/files/patch-docs:conf:ssl-std.conf deleted file mode 100644 index f647b91fac48..000000000000 --- a/www/apache21/files/patch-docs:conf:ssl-std.conf +++ /dev/null @@ -1,96 +0,0 @@ ---- docs/conf/ssl-std.conf.orig Fri Nov 16 21:56:55 2001 -+++ docs/conf/ssl-std.conf Fri Nov 16 22:00:27 2001 -@@ -57,7 +57,7 @@ - #SSLSessionCache none - #SSLSessionCache shmht:logs/ssl_scache(512000) - #SSLSessionCache shmcb:logs/ssl_scache(512000) --SSLSessionCache dbm:logs/ssl_scache -+SSLSessionCache dbm:/var/log/httpd-ssl_scache - SSLSessionCacheTimeout 300 - - # Semaphore: -@@ -99,11 +99,11 @@ - <VirtualHost _default_:443> - - # General setup for the virtual host --DocumentRoot "@@ServerRoot@@/htdocs" -+DocumentRoot "@@ServerRoot@@/www/data" - ServerName new.host.name:443 - ServerAdmin you@your.address --ErrorLog logs/error_log --TransferLog logs/access_log -+ErrorLog /var/log/httpd-error.log -+TransferLog /var/log/httpd-access.log - - # SSL Engine Switch: - # Enable/Disable SSL for this virtual host. -@@ -122,16 +122,16 @@ - # built time. Keep in mind that if you've both a RSA and a DSA - # certificate you can configure both in parallel (to also allow - # the use of DSA ciphers, etc.) --SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server.crt --#SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server-dsa.crt -+SSLCertificateFile @@ServerRoot@@/etc/apache/ssl.crt/server.crt -+#SSLCertificateFile @@ServerRoot@@/etc/apache/ssl.crt/server-dsa.crt - - # Server Private Key: - # If the key is not combined with the certificate, use this - # directive to point at the key file. Keep in mind that if - # you've both a RSA and a DSA private key you can configure - # both in parallel (to also allow the use of DSA ciphers, etc.) --SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server.key --#SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server-dsa.key -+SSLCertificateKeyFile @@ServerRoot@@/etc/apache/ssl.key/server.key -+#SSLCertificateKeyFile @@ServerRoot@@/etc/apache/ssl.key/server-dsa.key - - # Server Certificate Chain: - # Point SSLCertificateChainFile at a file containing the -@@ -140,7 +140,7 @@ - # the referenced file can be the same as SSLCertificateFile - # when the CA certificates are directly appended to the server - # certificate for convinience. --#SSLCertificateChainFile @@ServerRoot@@/conf/ssl.crt/ca.crt -+#SSLCertificateChainFile @@ServerRoot@@/etc/apache/ssl.crt/ca.crt - - # Certificate Authority (CA): - # Set the CA certificate verification path where to find CA -@@ -149,8 +149,8 @@ - # Note: Inside SSLCACertificatePath you need hash symlinks - # to point to the certificate files. Use the provided - # Makefile to update the hash symlinks after changes. --#SSLCACertificatePath @@ServerRoot@@/conf/ssl.crt --#SSLCACertificateFile @@ServerRoot@@/conf/ssl.crt/ca-bundle.crt -+#SSLCACertificatePath @@ServerRoot@@/etc/apache/ssl.crt -+#SSLCACertificateFile @@ServerRoot@@/etc/apache/ssl.crt/ca-bundle.crt - - # Certificate Revocation Lists (CRL): - # Set the CA revocation path where to find CA CRLs for client -@@ -159,8 +159,8 @@ - # Note: Inside SSLCARevocationPath you need hash symlinks - # to point to the certificate files. Use the provided - # Makefile to update the hash symlinks after changes. --#SSLCARevocationPath @@ServerRoot@@/conf/ssl.crl --#SSLCARevocationFile @@ServerRoot@@/conf/ssl.crl/ca-bundle.crl -+#SSLCARevocationPath @@ServerRoot@@/etc/apache/ssl.crl -+#SSLCARevocationFile @@ServerRoot@@/etc/apache/ssl.crl/ca-bundle.crl - - # Client Authentication (Type): - # Client certificate verification type and depth. Types are -@@ -220,7 +220,7 @@ - <Files ~ "\.(cgi|shtml|phtml|php3?)$"> - SSLOptions +StdEnvVars - </Files> --<Directory "@@ServerRoot@@/cgi-bin"> -+<Directory "@@ServerRoot@@/www/cgi-bin"> - SSLOptions +StdEnvVars - </Directory> - -@@ -255,7 +255,7 @@ - # Per-Server Logging: - # The home of a custom SSL log file. Use this when you want a - # compact non-error SSL logfile on a virtual host basis. --CustomLog logs/ssl_request_log \ -+CustomLog /var/log/httpd-ssl_request.log \ - "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" - - </VirtualHost> diff --git a/www/apache21/files/patch-support:apachectl.in b/www/apache21/files/patch-support:apachectl.in deleted file mode 100644 index f5b347b4633d..000000000000 --- a/www/apache21/files/patch-support:apachectl.in +++ /dev/null @@ -1,23 +0,0 @@ ---- support/apachectl.in.orig Fri Nov 16 21:22:36 2001 -+++ support/apachectl.in Fri Nov 16 22:07:31 2001 -@@ -25,10 +25,10 @@ - # -------------------- -------------------- - # - # the path to your PID file --PIDFILE=@prefix@/logs/@progname@.pid -+PIDFILE=/var/run/@progname@.pid - # - # the path to your httpd binary, including options if necessary --HTTPD='@prefix@/bin/@progname@' -+HTTPD='@prefix@/sbin/@progname@' - # - # a command that outputs a formatted text version of the HTML at the - # url given on the command line. Designed for lynx, however other -@@ -41,6 +41,7 @@ - # - # -------------------- -------------------- - # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| -+eval `limits -e -C daemon` >/dev/null 2>&1 - - ERROR=0 - ARGV="$@" diff --git a/www/apache21/files/patch-support:apxs.in b/www/apache21/files/patch-support:apxs.in deleted file mode 100644 index 4106153d5e90..000000000000 --- a/www/apache21/files/patch-support:apxs.in +++ /dev/null @@ -1,47 +0,0 @@ ---- support/apxs.in.orig Sat Nov 3 05:09:20 2001 -+++ support/apxs.in Sun Dec 9 14:47:57 2001 -@@ -66,7 +66,7 @@ - - # read the configuration variables once - my %config_vars = (); --get_config_vars("$prefix/build/config_vars.mk",\%config_vars); -+get_config_vars("$prefix/share/mk/apache/config_vars.mk",\%config_vars); - - my $exec_prefix = get_vars("exec_prefix"); - my $CFG_TARGET = get_vars("progname"); -@@ -218,7 +218,7 @@ - ## - ## Initial shared object support check - ## --my $httpd = get_vars("bindir") . "/" . get_vars("progname"); -+my $httpd = get_vars("sbindir") . "/" . get_vars("progname"); - $httpd = eval qq("$httpd"); - $httpd = eval qq("$httpd"); - -@@ -412,7 +412,7 @@ - $la =~ s|\.c$|.la|; - my $o = $s; - $o =~ s|\.c$|.o|; -- push(@cmds, "$prefix/build/libtool --silent --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo"); -+ push(@cmds, "$prefix/share/mk/apache/libtool --silent --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo"); - unshift(@objs, $lo); - } - -@@ -437,7 +437,7 @@ - $opt .= " -l$opt_l"; - } - -- push(@cmds, "$prefix/build/libtool --silent --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo"); -+ push(@cmds, "$prefix/share/mk/apache/libtool --silent --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo"); - - # execute the commands - &execute_cmds(@cmds); -@@ -467,7 +467,7 @@ - my $t = $f; - $t =~ s|^.+/([^/]+)$|$1|; - if ($opt_i) { -- push(@cmds, "$prefix/build/libtool --mode=install cp $f $CFG_LIBEXECDIR/$t"); -+ push(@cmds, "$prefix/share/mk/apache/libtool --mode=install cp $f $CFG_LIBEXECDIR/$t"); - push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); - } - diff --git a/www/apache21/files/patch-support:log_server_status.in b/www/apache21/files/patch-support:log_server_status.in deleted file mode 100644 index d8a970ebe8cd..000000000000 --- a/www/apache21/files/patch-support:log_server_status.in +++ /dev/null @@ -1,24 +0,0 @@ ---- support/log_server_status.in.orig Fri Nov 16 22:11:16 2001 -+++ support/log_server_status.in Fri Nov 16 22:13:50 2001 -@@ -63,10 +63,10 @@ - # - require 'sys/socket.ph'; - --$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312" -+$wherelog = "/var/log/httpd-status-"; # Logs will be like "/var/log/httpd-status-19960312.log" - $server = "localhost"; # Name of server, could be "www.foo.com" - $port = "80"; # Port on server --$request = "/status/?auto"; # Request to send -+$request = "/status-status/?auto"; # Request to send - - sub tcp_connect - { -@@ -96,7 +96,7 @@ - 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; |
