[41709] trunk/dports/www/apache2

[nox at macports.org]

Revision: 41709
          http://trac.macports.org/changeset/41709
Author:   nox at macports.org
Date:     2008-11-09 08:18:08 -0800 (Sun, 09 Nov 2008)
Log Message:
-----------
apache2:
 * Updated to 2.2.10 (closes #17078).
 * Patch the default httpd.conf to protect the various Apple files which should not be readable through the web server (closes #7277).

Modified Paths:
--------------
    trunk/dports/www/apache2/Portfile

Added Paths:
-----------
    trunk/dports/www/apache2/files/
    trunk/dports/www/apache2/files/patch-httpd.conf.in-sensitive-files.diff

Modified: trunk/dports/www/apache2/Portfile
===================================================================
--- trunk/dports/www/apache2/Portfile	2008-11-09 11:08:51 UTC (rev 41708)
+++ trunk/dports/www/apache2/Portfile	2008-11-09 16:18:08 UTC (rev 41709)
@@ -3,8 +3,7 @@
 PortSystem       1.0
 
 name             apache2
-version          2.2.9
-revision         1
+version          2.2.10
 categories       www
 maintainers      imajes at macports.org
 description      The extremely popular second version of the Apache http server 
@@ -22,9 +21,9 @@
 use_bzip2        yes
 use_parallel_build  yes
 
-checksums       md5 3afa8137dc1999be695a20b62fdf032b \
-                sha1 71715d81e7a5ace4499803df7369c78b85251083 \
-                rmd160 8fd62ae78271aa0ded6ba2f5bfeea8c63b79060a
+checksums       md5 6697772ba5f8d34988fe297417ccaacc \
+                sha1 3a71f4904e359603c3338b07a1178ddfacfaa8c6 \
+                rmd160 30f240222a775efa14b104a2b8df1e1dc65f4b8a
 
 depends_lib      port:apr \
                  port:apr-util \
@@ -41,11 +40,11 @@
 		# Customize userdir naming to match darwin
 		reinplace "s|/home/|/Users/|g" ${worksrcpath}/docs/conf/extra/httpd-userdir.conf.in
 		reinplace "s|public_html|Sites|g" ${worksrcpath}/docs/conf/extra/httpd-userdir.conf.in
-
-		# HFS can be case insensitive, so protect for this as in 
-		# http://docs.info.apple.com/article.html?artnum=300422
-		
 	}
+
+	# HFS can be case insensitive, so protect for this as in 
+	# http://docs.info.apple.com/article.html?artnum=300422
+	patchfiles-append   patch-httpd.conf.in-sensitive-files.diff
 }
 
 platform darwin 7 {

Added: trunk/dports/www/apache2/files/patch-httpd.conf.in-sensitive-files.diff
===================================================================
--- trunk/dports/www/apache2/files/patch-httpd.conf.in-sensitive-files.diff	                        (rev 0)
+++ trunk/dports/www/apache2/files/patch-httpd.conf.in-sensitive-files.diff	2008-11-09 16:18:08 UTC (rev 41709)
@@ -0,0 +1,43 @@
+--- docs/conf/httpd.conf.in.orig	2008-11-03 13:50:25.000000000 +0100
++++ docs/conf/httpd.conf.in	2008-11-03 13:52:00.000000000 +0100
+@@ -168,14 +168,36 @@
+ </IfModule>
+ 
+ #
+-# The following lines prevent .htaccess and .htpasswd files from being 
+-# viewed by Web clients. 
++# The following lines prevent .htaccess files from being viewed by
++# Web clients.  Since .htaccess files often contain authorization
++# information, access is disallowed for security reasons.  Comment
++# these lines out if you want Web visitors to see the contents of
++# .htaccess files.
+ #
+-<FilesMatch "^\.ht">
++# Also, folks tend to use names such as .htpasswd for password
++# files, so this will protect those as well.
++#
++<Files ~ "^<.([Hh][Tt]|[Dd][Ss]_[Ss])">
++    Order allow,deny
++    Deny from all
++    Satisfy All
++</Files>
++
++#
++# Apple specific filesystem protection.
++# 
++
++<Files "rsrc">
++    Order allow,deny
++    Deny from all
++    Satisfy All
++</Files>
++
++<Directory  ~ ".\.\.namedfork">
+     Order allow,deny
+     Deny from all
+     Satisfy All
+-</FilesMatch>
++</Directory>
+ 
+ #
+ # ErrorLog: The location of the error log file.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081109/2c2bc9ed/attachment.html>