r2837 - in trunk: BOOK BOOK/content/web BOOK/introduction/welcome patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Mon Oct 18 21:34:21 PDT 2004


Author: randy
Date: 2004-10-18 22:34:20 -0600 (Mon, 18 Oct 2004)
New Revision: 2837

Added:
   trunk/patches/httpd-2.0.52-config-1.patch
Removed:
   trunk/patches/httpd-2.0.51-config-1.patch
Modified:
   trunk/BOOK/content/web/apache.xml
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Updated to Apache-2.0.52

Modified: trunk/BOOK/content/web/apache.xml
===================================================================
--- trunk/BOOK/content/web/apache.xml	2004-10-19 03:48:30 UTC (rev 2836)
+++ trunk/BOOK/content/web/apache.xml	2004-10-19 04:34:20 UTC (rev 2837)
@@ -4,9 +4,10 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY apache-download-http "http://www.apache.org/dist/httpd/httpd-&apache-version;.tar.gz">
-  <!ENTITY apache-download-ftp  "ftp://ftp.tux.org/pub/net/apache/dist/httpd/httpd-&apache-version;.tar.gz">
-  <!ENTITY apache-size          "6.7 MB">
+  <!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        "0e1b47c53921a1fc8fb006effdb3bf1c">
+  <!ENTITY apache-size          "5.2 MB">
   <!ENTITY apache-buildsize     "78 MB">
   <!ENTITY apache-time          "1.12 SBU">
 ]>
@@ -33,6 +34,7 @@
 <ulink url="&apache-download-http;"/></para></listitem>
 <listitem><para>Download (FTP): 
 <ulink url="&apache-download-ftp;"/></para></listitem>
+<listitem><para>MD5 sum: &apache-md5sum;</para></listitem>
 <listitem><para>Download size: &apache-size;</para></listitem>
 <listitem><para>Estimated Disk space required: 
 &apache-buildsize;</para></listitem>
@@ -146,6 +148,14 @@
 detailed instructions on customizing your <application>Apache</application> 
 <acronym>HTTP</acronym> server.</para>
 
+<para>There's a problem with the ISAPI <acronym>DSO</acronym> module
+caused from compiling with 
+<application><acronym>GCC</acronym></application>-3.4.1. Comment out the
+module from the configuration file with the following command:</para>
+
+<screen><userinput><command>sed -i -e "s/^LoadModule isapi_module/# &/" \
+    /etc/apache/httpd.conf</command></userinput></screen>
+
 <para>Install the <filename>/etc/rc.d/init.d/apache</filename>
 init script included in the <xref linkend="intro-important-bootscripts"/> 
 package.</para>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2004-10-19 03:48:30 UTC (rev 2836)
+++ trunk/BOOK/general.ent	2004-10-19 04:34:20 UTC (rev 2837)
@@ -221,7 +221,7 @@
 <!ENTITY postgresql-version           "7.4.3"> 
                                      
 <!-- Chapter 24 -->                  
-<!ENTITY apache-version               "2.0.51">  
+<!ENTITY apache-version               "2.0.52">  
 <!ENTITY php-version                  "5.0.1">  
 <!ENTITY proftpd-version              "1.2.10">  
 <!ENTITY vsftpd-version               "2.0.1">  

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-10-19 03:48:30 UTC (rev 2836)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-10-19 04:34:20 UTC (rev 2837)
@@ -23,7 +23,7 @@
 <itemizedlist>
 
 <listitem><para>October 18th, 2004 [randy]: Added optional dependency 
-to HTML Tidy.</para></listitem>
+to HTML Tidy; updated to Apache-2.0.52.</para></listitem>
 
 <listitem><para>October 18th, 2004 [randy]: Updated to 
 DocBook XSL Stylesheets-1.66.1; modified DocBook-utils, FontConfig and

Deleted: trunk/patches/httpd-2.0.51-config-1.patch
===================================================================
--- trunk/patches/httpd-2.0.51-config-1.patch	2004-10-19 03:48:30 UTC (rev 2836)
+++ trunk/patches/httpd-2.0.51-config-1.patch	2004-10-19 04:34:20 UTC (rev 2837)
@@ -1,102 +0,0 @@
-Submitted By:            BLFS Book <blfs-book at linuxfromscratch.org>
-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.52-config-1.patch (from rev 2833, trunk/patches/httpd-2.0.51-config-1.patch)




More information about the blfs-book mailing list