diff options
author | Trevor Johnson <trevor@FreeBSD.org> | 2003-10-29 22:46:45 +0000 |
---|---|---|
committer | Trevor Johnson <trevor@FreeBSD.org> | 2003-10-29 22:46:45 +0000 |
commit | 15bb1ce95f7db6723388fae5f18403783fb53bd7 (patch) | |
tree | 99ac6a000561cb46ded0ebb01b9bb692a81ab184 /www/apache22/files | |
parent | c4e1c333d7f25f922b6d72b66c7d3fbca6dcd460 (diff) | |
download | ports-15bb1ce95f7db6723388fae5f18403783fb53bd7.tar.gz ports-15bb1ce95f7db6723388fae5f18403783fb53bd7.zip |
Notes
Diffstat (limited to 'www/apache22/files')
-rw-r--r-- | www/apache22/files/patch-Makefile.in | 23 | ||||
-rw-r--r-- | www/apache22/files/patch-docs:conf:ssl-std.conf | 107 | ||||
-rw-r--r-- | www/apache22/files/patch-docs:conf:ssl-std.conf.in | 24 |
3 files changed, 39 insertions, 115 deletions
diff --git a/www/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in index 728fb88af957..59c5532562bd 100644 --- a/www/apache22/files/patch-Makefile.in +++ b/www/apache22/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Mon Sep 30 08:34:40 2002 -+++ Makefile.in Thu Oct 3 21:05:42 2002 -@@ -36,10 +36,13 @@ +--- Makefile.in.orig Tue Jul 29 15:40:09 2003 ++++ Makefile.in Tue Sep 30 00:31:14 2003 +@@ -37,10 +37,13 @@ if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \ fi; \ @@ -14,7 +14,7 @@ ( \ n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \ if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \ -@@ -57,6 +60,9 @@ +@@ -58,6 +61,9 @@ if test "x$$j" = "xssl"; then \ echo "<IfDefine SSL>"; \ fi; \ @@ -24,7 +24,7 @@ if test $$j != "^EOL^"; then \ echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ fi; \ -@@ -106,45 +112,33 @@ +@@ -109,45 +115,41 @@ doxygen $(top_srcdir)/docs/doxygen.conf install-htdocs: @@ -36,11 +36,13 @@ - test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \ - cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi ++.if !defined(NO_WWWDATA) + @echo Installing HTML documents + @test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist + @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)-dist) + @test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir)-dist $(DESTDIR)$(htdocsdir) + -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find . -name "CVS" -print | xargs rm -rf ++.endif install-error: - -@if [ -d $(DESTDIR)$(errordir) ]; then \ @@ -51,11 +53,13 @@ - cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \ - test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi ++.if !defined(NO_ERROR) + @echo Installing error documents + @test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist + cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir)-dist + -@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir)-dist && find . -name "CVS" -print | xargs rm -rf + @test -e $(DESTDIR)$(errordir) || ln -sf $(DESTDIR)$(errordir)-dist $(DESTDIR)$(errordir) ++.endif install-icons: - -@if [ -d $(DESTDIR)$(iconsdir) ]; then \ @@ -66,13 +70,14 @@ - cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \ - test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi -- ++.if !defined(NO_ICONS) + @echo Installing icons + @test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist + cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist + -@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name "CVS" -print | xargs rm -rf + @test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir) -+ ++.endif + install-cgi: - -@if [ -d $(DESTDIR)$(cgidir) ];then \ - echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \ @@ -83,16 +88,18 @@ - test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi - ++.if !defined(NO_CGI) + @echo Installing CGIs + @test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist + cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist + -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf + @test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir) ++.endif + install-other: @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) @test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir) -@@ -185,11 +179,13 @@ +@@ -190,11 +192,13 @@ @test -d $(DESTDIR)$(mandir) || $(MKINSTALLDIRS) $(DESTDIR)$(mandir) @test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1 @test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8 diff --git a/www/apache22/files/patch-docs:conf:ssl-std.conf b/www/apache22/files/patch-docs:conf:ssl-std.conf deleted file mode 100644 index 39ea9c6e7483..000000000000 --- a/www/apache22/files/patch-docs:conf:ssl-std.conf +++ /dev/null @@ -1,107 +0,0 @@ ---- docs/conf/ssl-std.conf.orig Fri May 17 04:05:24 2002 -+++ docs/conf/ssl-std.conf Tue Jun 18 23:15:32 2002 -@@ -55,15 +55,15 @@ - # Configure the SSL Session Cache: First the mechanism - # to use and second the expiring timeout (in seconds). - #SSLSessionCache none --#SSLSessionCache shmht:logs/ssl_scache(512000) --#SSLSessionCache shmcb:logs/ssl_scache(512000) --SSLSessionCache dbm:logs/ssl_scache -+#SSLSessionCache shmht:/var/log/httpd-ssl_scache(512000) -+#SSLSessionCache shmcb:/var/log/httpd-ssl_scache(512000) -+SSLSessionCache dbm:/var/log/httpd-ssl_scache - SSLSessionCacheTimeout 300 - - # Semaphore: - # Configure the path to the mutual exclusion semaphore the - # SSL engine uses internally for inter-process synchronization. --SSLMutex file:logs/ssl_mutex -+SSLMutex file:/var/log/httpd-ssl_mutex - - # Pseudo Random Number Generator (PRNG): - # Configure one or more sources to seed the PRNG of the -@@ -89,11 +89,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. -@@ -111,16 +111,16 @@ - # in mind that if you have both an 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/apache2/ssl.crt/server.crt -+#SSLCertificateFile @@ServerRoot@@/etc/apache2/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/apache2/ssl.key/server.key -+#SSLCertificateKeyFile @@ServerRoot@@/etc/apache2/ssl.key/server-dsa.key - - # Server Certificate Chain: - # Point SSLCertificateChainFile at a file containing the -@@ -129,7 +129,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/apache2/ssl.crt/ca.crt - - # Certificate Authority (CA): - # Set the CA certificate verification path where to find CA -@@ -138,8 +138,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/apache2/ssl.crt -+#SSLCACertificateFile @@ServerRoot@@/etc/apache2/ssl.crt/ca-bundle.crt - - # Certificate Revocation Lists (CRL): - # Set the CA revocation path where to find CA CRLs for client -@@ -148,8 +148,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/apache2/ssl.crl -+#SSLCARevocationFile @@ServerRoot@@/etc/apache2/ssl.crl/ca-bundle.crl - - # Client Authentication (Type): - # Client certificate verification type and depth. Types are -@@ -209,7 +209,7 @@ - <Files ~ "\.(cgi|shtml|phtml|php3?)$"> - SSLOptions +StdEnvVars - </Files> --<Directory "@@ServerRoot@@/cgi-bin"> -+<Directory "@@ServerRoot@@/www/cgi-bin"> - SSLOptions +StdEnvVars - </Directory> - -@@ -244,7 +244,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/apache22/files/patch-docs:conf:ssl-std.conf.in b/www/apache22/files/patch-docs:conf:ssl-std.conf.in new file mode 100644 index 000000000000..cf0bbeab218d --- /dev/null +++ b/www/apache22/files/patch-docs:conf:ssl-std.conf.in @@ -0,0 +1,24 @@ +$FreeBSD$ + +--- docs/conf/ssl-std.conf.in.orig Mon Oct 13 16:14:10 2003 ++++ docs/conf/ssl-std.conf.in Mon Oct 13 16:15:17 2003 +@@ -88,8 +88,8 @@ + DocumentRoot "@exp_htdocsdir@" + ServerName www.example.com:443 + ServerAdmin you@example.com +-ErrorLog @exp_logfiledir@/error_log +-TransferLog @exp_logfiledir@/access_log ++ErrorLog @exp_logfiledir@/httpd-error.log ++TransferLog @exp_logfiledir@/httpd-access.log + + # SSL Engine Switch: + # Enable/Disable SSL for this virtual host. +@@ -240,7 +240,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 @exp_logfiledir@/ssl_request_log \ ++CustomLog @exp_logfiledir@/httpd-ssl_request.log \ + "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" + + </VirtualHost> |