Author: igor
Date: 2005-10-15 17:59:55 -0600 (Sat, 15 Oct 2005)
New Revision: 5203
Added:
trunk/patches/httpd-2.0.55-config-1.patch
Removed:
trunk/patches/httpd-2.0.54-config-1.patch
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/server/major/apache.xml
Log:
Updated to Apache-2.0.55.
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2005-10-15 23:50:11 UTC (rev 5202)
+++ trunk/BOOK/general.ent 2005-10-15 23:59:55 UTC (rev 5203)
@@ -276,7 +276,7 @@
<!-- Part VI -->
<!-- Chapter 21 -->
-<!ENTITY apache-version "2.0.54">
+<!ENTITY apache-version "2.0.55">
<!-- bind (chapter 19) -->
<!ENTITY nfs-utils-version "1.0.7">
<!-- openssh (chapter 18) -->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2005-10-15 23:50:11 UTC
(rev 5202)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2005-10-15 23:59:55 UTC
(rev 5203)
@@ -45,6 +45,9 @@
<para>October 15th, 2005</para>
<itemizedlist>
<listitem>
+ <para>[igor] - Updated to Apache-2.0.55.</para>
+ </listitem>
+ <listitem>
<para>[igor] - Updated to Python-2.4.2.</para>
</listitem>
<listitem>
Modified: trunk/BOOK/server/major/apache.xml
===================================================================
--- trunk/BOOK/server/major/apache.xml 2005-10-15 23:50:11 UTC (rev 5202)
+++ trunk/BOOK/server/major/apache.xml 2005-10-15 23:59:55 UTC (rev 5203)
@@ -6,8 +6,8 @@
<!ENTITY apache-download-http
"http://www.apache.org/dist/httpd/httpd-&apache-version;.tar.bz2";>
<!ENTITY apache-download-ftp
"ftp://ftp.tux.org/pub/net/apache/dist/httpd/httpd-&apache-version;.tar.bz2";>
- <!ENTITY apache-md5sum "4ae8a38c6b5db9046616ce10a0d551a2">
- <!ENTITY apache-size "5.4 MB">
+ <!ENTITY apache-md5sum "f1b5b65c8661db9ffe38b5a4a865a0e2">
+ <!ENTITY apache-size "4.6 MB">
<!ENTITY apache-buildsize "91.6 MB">
<!ENTITY apache-time "1.7 SBU">
]>
Deleted: trunk/patches/httpd-2.0.54-config-1.patch
===================================================================
--- trunk/patches/httpd-2.0.54-config-1.patch 2005-10-15 23:50:11 UTC (rev
5202)
+++ trunk/patches/httpd-2.0.54-config-1.patch 2005-10-15 23:59:55 UTC (rev
5203)
@@ -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$
-$Date$
-
-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/patches/httpd-2.0.55-config-1.patch (from rev 5200,
trunk/patches/httpd-2.0.54-config-1.patch)
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
