- mod_deflate needs mod_filter now

[packages/apache.git] / apache-layout.patch

diff --git a/apache-layout.patch b/apache-layout.patch
index bfcac7751858730aa5e0204062ac8d33aa5b5760..1f6d92b53a09f3bb8232e0e29a180156ce841914 100644 (file)
--- a/apache-layout.patch
+++ b/apache-layout.patch
@@ -1,9 +1,8 @@
-diff -urN httpd-2.0.45.org/config.layout httpd-2.0.45/config.layout
---- httpd-2.0.45.org/config.layout     Thu Apr  3 09:27:42 2003
-+++ httpd-2.0.45/config.layout Thu Apr  3 09:27:59 2003
-@@ -298,3 +298,28 @@
-     installbuilddir: ${prefix}/etc/apache2/build
-     errordir:      ${datadir}/error
+--- httpd-2.4.3/config.layout.orig     2012-04-17 16:01:41.000000000 +0200
++++ httpd-2.4.3/config.layout  2012-08-23 13:01:27.879147377 +0200
+@@ -370,3 +370,29 @@
+     logfiledir:      ${localstatedir}/log/httpd
+     proxycachedir:   ${localstatedir}/cache/httpd
  </Layout>
 +
 +# PLD layout
@@ -13,87 +12,21 @@ diff -urN httpd-2.0.45.org/config.layout httpd-2.0.45/config.layout
 +    bindir:        ${exec_prefix}/bin
 +    sbindir:       ${exec_prefix}/sbin
 +    libdir:        ${exec_prefix}/lib
-+    libexecdir:    ${exec_prefix}/lib/apache/modules
++    libexecdir:    ${libdir}/apache
 +    mandir:        /usr/share/man
 +    infodir:       /usr/share/info
 +    sysconfdir:    /etc/httpd
-+    datadir:       ${exec_prefix}/share/apache
-+    iconsdir:      /home/services/httpd/icons
-+    htdocsdir:     /home/services/httpd/html
-+    manualdir:     /home/services/httpd/manual
-+    errordir:      /home/services/httpd/error
-+    cgidir:        /home/services/httpd/cgi-bin
-+    includedir:    ${exec_prefix}/include/apache
++    datadir:       /home/services/httpd
++    iconsdir:      ${datadir}/icons
++    htdocsdir:     ${datadir}/html
++    manualdir:     ${datadir}/manual
++    errordir:      ${datadir}/error
++    cgidir:        ${prefix}/lib/cgi-bin/apache
++    includedir:    ${prefix}/include/apache
 +    localstatedir: /var/lib/httpd
 +    runtimedir:    /var/run
 +    logfiledir:    /var/log/httpd
-+    proxycachedir: /var/cache/apache
-+    installbuilddir: ${exec_prefix}/lib/apache/build
-+</Layout>
-diff -urN httpd-2.0.45.org/srclib/apr/config.layout httpd-2.0.45/srclib/apr/config.layout
---- httpd-2.0.45.org/srclib/apr/config.layout  Thu Apr  3 09:27:43 2003
-+++ httpd-2.0.45/srclib/apr/config.layout      Thu Apr  3 09:30:15 2003
-@@ -229,3 +229,30 @@
-     infodir:       ${exec_prefix}/share/info
-     libsuffix:    -${APR_MAJOR_VERSION}
- </Layout>
-+
-+
-+# PLD layout
-+<Layout PLD>
-+    prefix:        /usr
-+    exec_prefix:   ${prefix}
-+    bindir:        ${exec_prefix}/bin
-+    sbindir:       ${exec_prefix}/sbin
-+    libdir:        ${exec_prefix}/lib
-+    libexecdir:    ${exec_prefix}/lib/apache/modules
-+    mandir:        /usr/share/man
-+    infodir:       /usr/share/info
-+    sysconfdir:    /etc/httpd
-+    datadir:       ${exec_prefix}/share/apache
-+    iconsdir:      /home/services/httpd/icons
-+    htdocsdir:     /home/services/httpd/html
-+    manualdir:     /home/services/httpd/manual
-+    errordir:      /home/services/httpd/error
-+    cgidir:        /home/services/httpd/cgi-bin
-+    includedir:    ${exec_prefix}/include/apache
-+    localstatedir: /var/lib/httpd
-+    runtimedir:    /var/run
-+    logfiledir:    /var/log/httpd
-+    proxycachedir: /var/cache/apache
-+    installbuilddir: ${exec_prefix}/lib/apache/build
-+</Layout>
-+
-diff -urN httpd-2.0.45.org/srclib/apr-util/config.layout httpd-2.0.45/srclib/apr-util/config.layout
---- httpd-2.0.45.org/srclib/apr-util/config.layout     Thu Apr  3 09:27:44 2003
-+++ httpd-2.0.45/srclib/apr-util/config.layout Thu Apr  3 09:30:28 2003
-@@ -229,3 +229,29 @@
-     infodir:       ${exec_prefix}/share/info
-     libsuffix     -${APRUTIL_MAJOR_VERSION}
- </Layout>
-+
-+# PLD layout
-+<Layout PLD>
-+    prefix:        /usr
-+    exec_prefix:   ${prefix}
-+    bindir:        ${exec_prefix}/bin
-+    sbindir:       ${exec_prefix}/sbin
-+    libdir:        ${exec_prefix}/lib
-+    libexecdir:    ${exec_prefix}/lib/apache/modules
-+    mandir:        /usr/share/man
-+    infodir:       /usr/share/info
-+    sysconfdir:    /etc/httpd
-+    datadir:       ${exec_prefix}/share/apache
-+    iconsdir:      /home/services/httpd/icons
-+    htdocsdir:     /home/services/httpd/html
-+    manualdir:     /home/services/httpd/manual
-+    errordir:      /home/services/httpd/error
-+    cgidir:        /home/services/httpd/cgi-bin
-+    includedir:    ${exec_prefix}/include/apache
-+    localstatedir: /var/lib/httpd
-+    runtimedir:    /var/run
-+    logfiledir:    /var/log/httpd
-+    proxycachedir: /var/cache/apache
-+    installbuilddir: ${exec_prefix}/lib/apache/build
++    proxycachedir: /var/cache/httpd
++    installbuilddir: ${libexecdir}/build
 +</Layout>
 +