r1301 - trunk/httpd

randy at linuxfromscratch.org randy at linuxfromscratch.org
Wed Dec 14 17:06:28 PST 2005


Author: randy
Date: 2005-12-14 18:06:27 -0700 (Wed, 14 Dec 2005)
New Revision: 1301

Added:
   trunk/httpd/httpd-2.2.0-config-1.patch
Log:
Added Apache HTTP Server-2.2.0 BLFS/FHS config patch

Added: trunk/httpd/httpd-2.2.0-config-1.patch
===================================================================
--- trunk/httpd/httpd-2.2.0-config-1.patch	2005-12-13 06:22:43 UTC (rev 1300)
+++ trunk/httpd/httpd-2.2.0-config-1.patch	2005-12-15 01:06:27 UTC (rev 1301)
@@ -0,0 +1,104 @@
+Submitted By:            BLFS Book <blfs-book at linuxfromscratch.org>
+Date:                    2005-12-14
+Initial Package Version: 2.2.0 (patch rediffed from a 2.0.54 version)
+Upstream Status:         Not submitted (LFS specific)
+Origin:                  BLFS Book
+Description:             Modify the FHS layout for installing Apache
+
+
+diff -Naur httpd-2.2.0-orig/config.layout httpd-2.2.0/config.layout
+--- httpd-2.2.0-orig/config.layout	2004-11-21 18:50:36.000000000 +0000
++++ httpd-2.2.0/config.layout	2005-12-14 21:07:24.000000000 +0000
+@@ -322,3 +322,28 @@
+     installbuilddir: ${prefix}/etc/apache2/build
+     errordir:      ${datadir}/error
+ </Layout>
++
++# BLFS FHS layout
++<Layout FHS>
++    prefix:             /usr
++    exec_prefix:        ${prefix}
++    bindir:             ${exec_prefix}/bin
++    sbindir:            ${exec_prefix}/sbin
++    libdir:             ${exec_prefix}/lib
++    libexecdir:         ${exec_prefix}/lib/apache
++    mandir:             ${prefix}/share/man
++    sysconfdir:         /etc/apache
++    datadir:            /srv/www
++    installbuilddir:    ${libexecdir}/build
++    errordir:           ${datadir}/error
++    iconsdir:           ${datadir}/icons
++    htdocsdir:          ${datadir}/htdocs
++    manualdir:          ${datadir}/manual
++    cgidir:             ${datadir}/cgi-bin
++    includedir:         ${prefix}/include/apache
++    localstatedir:      ${datadir}
++    runtimedir:         /var/run
++    logfiledir:         /var/log/apache
++    proxycachedir:      /var/cache/apache/proxy
++</Layout>
++
+
+diff -Naur httpd-2.2.0-orig/srclib/apr/config.layout httpd-2.2.0/srclib/apr/config.layout
+--- httpd-2.2.0-orig/srclib/apr/config.layout	2004-11-24 22:51:51.000000000 +0000
++++ httpd-2.2.0/srclib/apr/config.layout	2005-12-14 21:06:37.000000000 +0000
+@@ -11,18 +11,18 @@
+ 
+ #   Classical APR path layout designed for parallel installs.
+ <Layout apr>
+-    prefix:        /usr/local/apr
++    prefix:        /usr
+     exec_prefix:   ${prefix}
+     bindir:        ${exec_prefix}/bin
+-    sbindir:       ${exec_prefix}/bin
++    sbindir:       ${exec_prefix}/sbin
+     libdir:        ${exec_prefix}/lib
+-    libexecdir:    ${exec_prefix}/modules
+-    mandir:        ${prefix}/man
+-    sysconfdir:    ${prefix}/conf
+-    datadir:       ${prefix}
+-    installbuilddir: ${datadir}/build-${APR_MAJOR_VERSION}
+-    includedir:    ${prefix}/include/apr-${APR_MAJOR_VERSION}
+-    localstatedir: ${prefix}
++    libexecdir:    ${exec_prefix}/lib/apache
++    mandir:        ${prefix}/share/man
++    sysconfdir:    /etc/apache
++    datadir:       /srv/www
++    installbuilddir: ${libexecdir}/build
++    includedir:    ${prefix}/include/apache
++    localstatedir: ${datadir}
+     libsuffix:     -${APR_MAJOR_VERSION}
+ </Layout>
+ 
+
+diff -Naur httpd-2.2.0-orig/srclib/apr-util/config.layout httpd-2.2.0/srclib/apr-util/config.layout
+--- httpd-2.2.0-orig/srclib/apr-util/config.layout	2005-02-09 12:18:43.000000000 +0000
++++ httpd-2.2.0/srclib/apr-util/config.layout	2005-12-14 21:06:37.000000000 +0000
+@@ -11,18 +11,18 @@
+ 
+ #   Classical APR-util path layout designed for parallel installs.
+ <Layout apr-util>
+-    prefix:        /usr/local/apr
++    prefix:        /usr
+     exec_prefix:   ${prefix}
+     bindir:        ${exec_prefix}/bin
+-    sbindir:       ${exec_prefix}/bin
++    sbindir:       ${exec_prefix}/sbin
+     libdir:        ${exec_prefix}/lib
+-    libexecdir:    ${exec_prefix}/modules
+-    mandir:        ${prefix}/man
+-    sysconfdir:    ${prefix}/conf
+-    datadir:       ${prefix}
+-    installbuilddir: ${datadir}/build
+-    includedir:    ${prefix}/include/apr-${APRUTIL_MAJOR_VERSION}
+-    localstatedir: ${prefix}
++    libexecdir:    ${exec_prefix}/lib/apache
++    mandir:        ${prefix}/share/man
++    sysconfdir:    /etc/apache
++    datadir:       /srv/www
++    installbuilddir: ${libexecdir}/build
++    includedir:    ${prefix}/include/apache
++    localstatedir: ${datadir}
+     libsuffix:     -${APRUTIL_MAJOR_VERSION}
+ </Layout>
+ 




More information about the patches mailing list