Author: igor Date: 2005-10-15 18:18:48 -0600 (Sat, 15 Oct 2005) New Revision: 1193
Added: trunk/httpd/httpd-2.0.55-config-1.patch Removed: trunk/httpd/httpd-2.0.53-config-1.patch Log: Updated Apache config patch. Deleted: trunk/httpd/httpd-2.0.53-config-1.patch =================================================================== --- trunk/httpd/httpd-2.0.53-config-1.patch 2005-10-15 22:36:07 UTC (rev 1192) +++ trunk/httpd/httpd-2.0.53-config-1.patch 2005-10-16 00:18:48 UTC (rev 1193) @@ -1,102 +0,0 @@ -Submitted By: BLFS Book <[email protected]> -Date: 2004-09-21 -Initial Package Version: 2.0.47 -Upstream Status: Not submitted (LFS specific) -Origin: BLFS Book -Description: Modify the FHS layout for installing Apache - -$LastChangedBy: bdubbs $ -$Date: 2005-03-13 22:01:46 -0700 (Sun, 13 Mar 2005) $ - -diff -Naur httpd-2.0.50-orig/config.layout httpd-2.0.50/config.layout ---- httpd-2.0.50-orig/config.layout 2004-07-15 15:07:48.000000000 +0000 -+++ httpd-2.0.50/config.layout 2004-07-15 15:08:03.000000000 +0000 -@@ -322,3 +322,26 @@ - installbuilddir: ${prefix}/etc/apache2/build - errordir: ${datadir}/error - </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.0.50-orig/srclib/apr/config.layout httpd-2.0.50/srclib/apr/config.layout ---- httpd-2.0.50-orig/srclib/apr/config.layout 2004-07-15 15:07:48.000000000 +0000 -+++ httpd-2.0.50/srclib/apr/config.layout 2004-07-15 15:08:03.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 -- 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.0.50-orig/srclib/apr-util/config.layout httpd-2.0.50/srclib/apr-util/config.layout ---- httpd-2.0.50-orig/srclib/apr-util/config.layout 2004-07-15 15:07:48.000000000 +0000 -+++ httpd-2.0.50/srclib/apr-util/config.layout 2004-07-15 15:08:03.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> - Copied: trunk/httpd/httpd-2.0.55-config-1.patch (from rev 1107, trunk/httpd/httpd-2.0.53-config-1.patch) -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
