r4625 - in trunk: BOOK BOOK/introduction/welcome BOOK/server/major patches

igor at linuxfromscratch.org igor at linuxfromscratch.org
Fri Jun 17 13:44:46 PDT 2005


Author: igor
Date: 2005-06-17 14:44:45 -0600 (Fri, 17 Jun 2005)
New Revision: 4625

Added:
   trunk/patches/httpd-2.0.54-config-1.patch
Removed:
   trunk/patches/httpd-2.0.53-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.54.

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-06-17 19:34:50 UTC (rev 4624)
+++ trunk/BOOK/general.ent	2005-06-17 20:44:45 UTC (rev 4625)
@@ -242,7 +242,7 @@
 
 <!-- Part VI -->
 <!-- Chapter 21 -->
-<!ENTITY apache-version               "2.0.53">
+<!ENTITY apache-version               "2.0.54">
 <!-- 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-06-17 19:34:50 UTC (rev 4624)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-06-17 20:44:45 UTC (rev 4625)
@@ -25,6 +25,10 @@
   <itemizedlist>
 
     <listitem>
+      <para>June 17th, 2005 [igor]: Updated to Apache-2.0.54.</para>
+    </listitem>
+
+    <listitem>
       <para>June 17th, 2005 [djensen]: Updated to NcFTP-3.1.9.
       Separated root/user.</para>
     </listitem>

Modified: trunk/BOOK/server/major/apache.xml
===================================================================
--- trunk/BOOK/server/major/apache.xml	2005-06-17 19:34:50 UTC (rev 4624)
+++ trunk/BOOK/server/major/apache.xml	2005-06-17 20:44:45 UTC (rev 4625)
@@ -6,10 +6,10 @@
 
   <!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        "94f3a793fb1665365724943206cce23f">
-  <!ENTITY apache-size          "5.0 MB">
+  <!ENTITY apache-md5sum        "4ae8a38c6b5db9046616ce10a0d551a2">
+  <!ENTITY apache-size          "5.4 MB">
   <!ENTITY apache-buildsize     "91.6 MB">
-  <!ENTITY apache-time          "1.69 SBU">
+  <!ENTITY apache-time          "1.7 SBU">
 ]>
 
 <sect1 id="apache" xreflabel="Apache-&apache-version;">

Deleted: trunk/patches/httpd-2.0.53-config-1.patch
===================================================================
--- trunk/patches/httpd-2.0.53-config-1.patch	2005-06-17 19:34:50 UTC (rev 4624)
+++ trunk/patches/httpd-2.0.53-config-1.patch	2005-06-17 20:44:45 UTC (rev 4625)
@@ -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.54-config-1.patch (from rev 4623, trunk/patches/httpd-2.0.53-config-1.patch)




More information about the blfs-book mailing list