<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d2edb2f5a15211ee415f0c06393ba958cd7cf8ad">https://github.com/macports/macports-ports/commit/d2edb2f5a15211ee415f0c06393ba958cd7cf8ad</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 d2edb2f apache22: EOL, mark as obsolete
</span>d2edb2f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d2edb2f5a15211ee415f0c06393ba958cd7cf8ad
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Mon May 13 11:41:16 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> apache22: EOL, mark as obsolete
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58404
</span>---
www/apache22/Portfile | 197 +--------------------
www/apache22/files/libtool-tag.diff | 68 -------
.../files/patch-docs-cgi-examples-printenv.diff | 8 -
.../files/patch-httpd.conf.in-sensitive-files.diff | 31 ----
4 files changed, 5 insertions(+), 299 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/apache22/Portfile b/www/apache22/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a32ac5a..08dbdb6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/apache22/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/apache22/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,202 +1,15 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup obsolete 1.0
</span>
name apache22
version 2.2.34
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories www
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {ryandesign @ryandesign} openmaintainer
</span> license Apache-2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description The extremely popular second version of the Apache http server
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Apache is an HTTP server designed as a plug-in replacement for \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the NCSA server version 1.3 (or 1.4). It fixes numerous bugs in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the NCSA server and includes many frequently requested new \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- features, and has an API which allows it to be extended to meet \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- users' needs more easily.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://httpd.apache.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin freebsd openbsd
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites apache:httpd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname httpd-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir apache2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Apache 2.2 replaced by Apache 2.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by apache2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7e913d60ac02c815edac6ab0614f5dc40618c073 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e53183d5dfac5740d768b4c9bea193b1099f4b06b57e5f28d7caaf9ea7498160 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5779739
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:apr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:apr-util \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:expat \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pcre \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:perl5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts thttpd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-docs-cgi-examples-printenv.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libtool-tag.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/docs/cgi-examples/printenv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s/(User|Group) daemon/\\1 www/" ${worksrcpath}/docs/conf/httpd.conf.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Customize userdir naming to match darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/home/|/Users/|g" ${worksrcpath}/docs/conf/extra/httpd-userdir.conf.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|public_html|Sites|g" ${worksrcpath}/docs/conf/extra/httpd-userdir.conf.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # HFS can be case insensitive, so protect for this as in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # http://docs.info.apple.com/article.html?artnum=300422
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-httpd.conf.in-sensitive-files.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 9 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-export-symbols-regex ssl_module||g" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args --prefix=${prefix}/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-apr=${prefix}/bin/apr-1-config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-apr-util=${prefix}/bin/apu-1-config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --libdir=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-expat=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pcre=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-z=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-mods-shared=all \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-authn-alias=shared \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-ssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-ssl=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-cache \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-disk_cache \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-file_cache \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-mem_cache \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-deflate \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-proxy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-proxy-connect \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-proxy-http \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-proxy-ftp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Setting DYLD_FALLBACK_LIBRARY_PATH instead of DYLD_LIBRARY_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # avoids issues with library collisions (bug #3013)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|DYLD_LIBRARY_PATH|DYLD_FALLBACK_LIBRARY_PATH|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/support/envvars-std
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s| -arch [a-z0-9_]+||g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/config.nice \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/build/config_vars.mk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[tbool configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s|ccache ||g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/config.nice \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/build/config_vars.mk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.violate_mtree yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set confDir ${destroot}${prefix}/${name}/conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/${name}/bin/envvars \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${confDir}/httpd.conf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}[glob -directory ${confDir}/extra *.conf]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/${name}/htdocs/index.html ${destroot}${prefix}/${name}/htdocs/index.html.sample
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.keepdirs ${destroot}${prefix}/${name}/logs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${confDir}/extra
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix libtool path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/${name}/build/libtool|/share/apr-1/build/libtool|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/${name}/build/config_vars.mk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set docdir ${prefix}/share/doc/apache-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath} ABOUT_APACHE CHANGES LICENSE NOTICE README \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- README.platforms ROADMAP VERSIONING ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set confDir ${prefix}/${name}/conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copy into place sample or default versions of files user is likely to modify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${prefix}/${name}/htdocs/index.html]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${prefix}/${name}/htdocs/index.html.sample ${prefix}/${name}/htdocs/index.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${prefix}/${name}/bin/envvars]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${prefix}/${name}/bin/envvars-std ${prefix}/${name}/bin/envvars
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${confDir}/httpd.conf]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${confDir}/original/httpd.conf ${confDir}/httpd.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob -tails -directory ${confDir}/original/extra *.conf] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${confDir}/extra/${f}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${confDir}/original/extra/${f} ${confDir}/extra/${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform openbsd {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append "LD_LIBRARY_PATH=${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant openldap description {Enable LDAP support through OpenLDAP} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-ldap --enable-authnz-ldap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:openldap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants apr-util openldap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant preforkmpm conflicts workermpm eventmpm description {Use prefork MPM} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mpm=prefork
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant workermpm conflicts preforkmpm eventmpm description {Use worker MPM} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mpm=worker
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant eventmpm conflicts preforkmpm workermpm description {Use event MPM (experimental)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mpm=event
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset workermpm] && ![variant_isset eventmpm]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +preforkmpm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.create yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.start \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"\[ -x ${prefix}/${name}/bin/apachectl \] && ${prefix}/${name}/bin/apachectl start > /dev/null"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.stop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"\[ -r ${prefix}/${name}/logs/httpd.pid \] && ${prefix}/${name}/bin/apachectl stop > /dev/null"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.restart \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"${prefix}/${name}/bin/apachectl restart > /dev/null"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[info exists pkg.asroot]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pkg.asroot yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-pkg {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![info exists pkg.asroot]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Packaging ${name} ${version} requires MacPorts 2.3.5 or greater (pkg.asroot support)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Incompatible MacPorts version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # at this point the destroot has been pruned and bin doesn't exist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # apache2 needs daemondo; ram a copy into the destroot so it will be packaged
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${prefix}/bin/daemondo ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}download.cgi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex httpd-(2\.2\.\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# remove after 2020-05-13
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/apache22/files/libtool-tag.diff b/www/apache22/files/libtool-tag.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b45a432..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/apache22/files/libtool-tag.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,68 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://issues.apache.org/bugzilla/show_bug.cgi?id=47691
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/rules.mk.in.orig 2006-07-12 05:38:44.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/rules.mk.in 2009-08-12 18:08:08.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,17 +38,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMPILE = $(BASE_CC) @PICFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX_COMPILE = $(BASE_CXX) @PICFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SH_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CC) @SHLTCFLAGS@ -c $< && touch $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SH_CXX_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CXX) @SHLTCFLAGS@ -c $< && touch $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SH_COMPILE = $(LIBTOOL) --mode=compile --tag=CC $(BASE_CC) @SHLTCFLAGS@ -c $< && touch $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SH_CXX_COMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(BASE_CXX) @SHLTCFLAGS@ -c $< && touch $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LT_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) @LTCFLAGS@ -c $< && touch $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) @LTCFLAGS@ -c $< && touch $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LT_COMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE) @LTCFLAGS@ -c $< && touch $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LT_CXX_COMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX_COMPILE) @LTCFLAGS@ -c $< && touch $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Link-related commands
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) @PILDFLAGS@ $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SH_LINK = $(SH_LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MOD_LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LINK = $(LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) @PILDFLAGS@ $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SH_LINK = $(SH_LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MOD_LINK = $(LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Cross compile commands
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -216,7 +216,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Makes an import library from a def file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .def.la:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(LIBTOOL) --mode=compile $(MK_IMPLIB) -o $@ $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LIBTOOL) --mode=compile --tag=CC $(MK_IMPLIB) -o $@ $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Dependencies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- srclib/apr/configure.orig 2012-08-21 13:39:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ srclib/apr/configure 2013-01-03 02:10:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24342,7 +24342,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$use_libtool" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile --tag=CC $(COMPILE) -o $@ -c $< && touch $@'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- so_ext='lo'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- support/apxs.in.orig 2010-05-10 15:02:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ support/apxs.in 2011-10-20 23:37:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -408,7 +408,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $la =~ s|\.c$|.la|;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $o = $s;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $o =~ s|\.c$|.o|;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- push(@cmds, "$libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ push(@cmds, "$libtool $ltflags --mode=compile --tag=CC $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unshift(@objs, $lo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -445,7 +445,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- push(@cmds, "$libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt $lo");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ push(@cmds, "$libtool $ltflags --mode=link --tag=CC $CFG_CC -o $dso_file $opt $lo");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # execute the commands
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &execute_cmds(@cmds);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/apache22/files/patch-docs-cgi-examples-printenv.diff b/www/apache22/files/patch-docs-cgi-examples-printenv.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6fd8e2a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/apache22/files/patch-docs-cgi-examples-printenv.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- docs/cgi-examples/printenv.orig 2004-12-10 23:52:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ docs/cgi-examples/printenv 2011-02-27 23:12:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/local/bin/perl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@PREFIX@/bin/perl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## printenv -- demo CGI program which just prints its environment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ##
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/apache22/files/patch-httpd.conf.in-sensitive-files.diff b/www/apache22/files/patch-httpd.conf.in-sensitive-files.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0f61d49..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/apache22/files/patch-httpd.conf.in-sensitive-files.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- docs/conf/httpd.conf.in.orig 2012-02-06 10:54:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ docs/conf/httpd.conf.in 2013-01-03 02:10:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -169,14 +169,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </IfModule>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# The following lines prevent .htaccess and .htpasswd files from being
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# viewed by Web clients.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# The following lines prevent .htaccess, .htpasswd and .DS_Store files and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Mac resource forks and named forks from being viewed by Web clients.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--<FilesMatch "^\.ht">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+<Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Order allow,deny
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Deny from all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Satisfy All
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--</FilesMatch>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+</Files>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+<Files "rsrc">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Order allow,deny
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Deny from all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Satisfy All
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+</Files>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+<DirectoryMatch ".*\.\.namedfork">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Order allow,deny
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Deny from all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Satisfy All
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+</DirectoryMatch>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ErrorLog: The location of the error log file.
</span></pre><pre style='margin:0'>
</pre>