<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c664a5716be47e58a40c6cb5c9e053df1295a558">https://github.com/macports/macports-ports/commit/c664a5716be47e58a40c6cb5c9e053df1295a558</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new c664a57  apache2 2.4.29: include some fixes from apache22
</span>c664a57 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit c664a5716be47e58a40c6cb5c9e053df1295a558
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Mon Nov 13 16:50:16 2017 -0600

<span style='display:block; white-space:pre;color:#404040;'>    apache2 2.4.29: include some fixes from apache22
</span>---
 www/apache2/Portfile                               | 13 ++++++++++++
 .../files/patch-docs-conf-httpd.conf.in.diff       | 24 ++++++++++++++++++++++
 2 files changed, 37 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/apache2/Portfile b/www/apache2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2fc5a8f..b542cf0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/apache2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/apache2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup           apache2 1.0
</span> 
 name                apache2
 version             2.4.29
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories          www
 maintainers         {ryandesign @ryandesign} {mps @Schamschula} pixilla openmaintainer
 license             Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,10 +43,22 @@ post-patch {
</span>         ${worksrcpath}/config.layout
     reinplace "s,@APACHE_NAME@,${name},g" \
         ${worksrcpath}/config.layout
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace -E "s/(User|Group) daemon/\\1 _www/" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${worksrcpath}/docs/conf/httpd.conf.in
</span> }
 
 platform darwin {
     patchfiles-append   patch-support-apachectl.in.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Customize userdir naming to match darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|/home/|/Users/|g" ${worksrcpath}/docs/conf/extra/httpd-userdir.conf.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|public_html|Sites|g" ${worksrcpath}/docs/conf/extra/httpd-userdir.conf.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # HFS can be case insensitive, so protect for this as in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # http://docs.info.apple.com/article.html?artnum=300422
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   patch-docs-conf-httpd.conf.in.diff
</span> }
 
 platform darwin 9 {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/apache2/files/patch-docs-conf-httpd.conf.in.diff b/www/apache2/files/patch-docs-conf-httpd.conf.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..adc2547
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/apache2/files/patch-docs-conf-httpd.conf.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/docs/conf/httpd.conf.in.orig 2016-08-16 18:12:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/docs/conf/httpd.conf.in      2017-11-13 16:42:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,12 +167,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </IfModule>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# The following lines prevent .htaccess and .htpasswd files from being 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# viewed by Web clients. 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# The following lines prevent .htaccess, .htpasswd and .DS_Store files and 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Mac resource forks and named forks from being viewed by Web clients.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-<Files ".ht*">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++<Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     Require all denied
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </Files>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++<Files "rsrc">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    Require all denied
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++</Files>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++<DirectoryMatch ".*\.\.namedfork">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    Require all denied
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++</DirectoryMatch>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ErrorLog: The location of the error log file.
</span></pre><pre style='margin:0'>

</pre>