r2746 - in trunk: BOOK BOOK/content/web BOOK/introduction/welcome BOOK/xsoft/other patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Tue Sep 21 15:29:46 PDT 2004


Author: randy
Date: 2004-09-21 16:29:44 -0600 (Tue, 21 Sep 2004)
New Revision: 2746

Added:
   trunk/patches/httpd-2.0.51-config-1.patch
Removed:
   trunk/patches/httpd-2.0.50-config-2.patch
Modified:
   trunk/BOOK/content/web/apache.xml
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/xsoft/other/thunderbird.xml
Log:
Updated to Apache-2.0.51; modified commands in Thunderbird instructions to fit on a printed page

Modified: trunk/BOOK/content/web/apache.xml
===================================================================
--- trunk/BOOK/content/web/apache.xml	2004-09-21 14:54:27 UTC (rev 2745)
+++ trunk/BOOK/content/web/apache.xml	2004-09-21 22:29:44 UTC (rev 2746)
@@ -6,9 +6,9 @@
 
   <!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          "5.9 MB">
+  <!ENTITY apache-size          "6.7 MB">
   <!ENTITY apache-buildsize     "78 MB">
-  <!ENTITY apache-time          "1.32 SBU">
+  <!ENTITY apache-time          "1.12 SBU">
 ]>
 
 <sect1 id="apache" xreflabel="Apache-&apache-version;">
@@ -29,24 +29,31 @@
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&apache-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&apache-download-ftp;"/></para></listitem>
+<listitem><para>Download (HTTP): 
+<ulink url="&apache-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&apache-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &apache-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &apache-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &apache-time;</para></listitem></itemizedlist>
+<listitem><para>Estimated Disk space required: 
+&apache-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &apache-time;</para></listitem>
+</itemizedlist>
 </sect3>
 
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Required Patch: <ulink
-url="&patch-root;/httpd-&apache-version;-config-2.patch"/></para></listitem>
+<listitem><para>Required Patch: <ulink 
+url="&patch-root;/httpd-&apache-version;-config-1.patch"/></para></listitem>
 </itemizedlist></sect3>
 
 <sect3><title><application>Apache</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="db"/> or <xref linkend="gdbm"/>, <xref linkend="openssl"/>, 
-<xref linkend="openldap"/>, <xref linkend="expat"/> and 
-<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink></para></sect4>
+<para><xref linkend="db"/> or <xref linkend="gdbm"/>, 
+<xref linkend="openssl"/>, 
+<xref linkend="openldap"/>, 
+<xref linkend="expat"/> and 
+<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink></para>
+</sect4>
 </sect3>
 
 </sect2>
@@ -66,7 +73,7 @@
 will allow the modules added to <application>Apache</application> to
 be configured without errors. Apply the patch:</para>
 
-<screen><userinput><command>patch -Np1 -i ../httpd-&apache-version;-config-2.patch</command></userinput></screen>
+<screen><userinput><command>patch -Np1 -i ../httpd-&apache-version;-config-1.patch</command></userinput></screen>
 
 <para>Build and install <application>Apache</application> by running the 
 following commands:</para>
@@ -74,20 +81,23 @@
 <screen><userinput><command>./configure --enable-layout=FHS \
     --enable-mods-shared=all &&
 make &&
-make install</command></userinput></screen>
+make install &&
+chown root:root /usr/sbin/{apxs,apachectl,dbmmanage,envvars-std,envvars} &&
+chown -R apache:apache /srv/www</command></userinput></screen>
 
 </sect2>
 
 <sect2>
 <title>Command explanations</title>
 
-<para><parameter>--with-expat=/usr</parameter>: Uses system installed
-expat. <emphasis>If you have installed expat and do not use this switch, the
-apache installation may overwrite some files from the expat 
-installation.</emphasis></para>
+<para><option>--with-expat=/usr</option>: Uses system installed
+<application>expat</application>. <emphasis>If you have installed 
+<application>expat</application> and do not use this switch, the
+<application>Apache</application> installation may overwrite some files from 
+the <application>expat</application> installation.</emphasis></para>
 
-<para><parameter>--enable-mods-shared=all</parameter>: We want modules
-to be compiled and used as Dynamic Shared Objects
+<para><parameter>--enable-mods-shared=all</parameter>: The modules should be 
+compiled and used as Dynamic Shared Objects
 (<acronym>DSO</acronym>s) so they can be included and excluded from the
 server using the run-time configuration directives.</para>
 
@@ -95,6 +105,18 @@
 to create the <filename class="libraryfile">mod_ssl</filename>
 module and enable <acronym>SSL</acronym> support.</para>
 
+<para><command>chown root:root /usr/sbin/{...}</command>: This command changes 
+the ownership of some installed files, the result of building the package as a 
+user other than root.</para>
+
+<para><command>chown -R apache:apache /srv/www</command>: By default, the 
+installation process installs files (documentation, error messages, default 
+icons, etc.) with the ownership of the user that extracted the files from the 
+tar file.  If you want to change the ownership to another user, you should do 
+so at this point.  The only requirement is that the document directories need 
+to be accessable by the <command>httpd</command> process with (r-x) permissions 
+and files need to be readable (r--) by the apache user.</para>
+
 </sect2>
 
 <sect2>
@@ -107,25 +129,25 @@
 
 </sect3>
 
-<sect3><title>Configuration Information</title>
+<sect3>
+<title>Configuration Information</title>
 
-<para>The main configuration file is called
-<filename>httpd.conf</filename>. Modify it to run the server as a
-dedicated user:</para>
+<para>The main configuration file is named <filename>httpd.conf</filename>. 
+Modify it to run the server as a dedicated user:</para>
 
-<screen><userinput><command>sed -i -e "s%User nobody%User apache%" -e "s%^Group #-1%Group apache%" /etc/apache/httpd.conf</command></userinput></screen>
+<screen><userinput><command>sed -i -e "s%User nobody%User apache%" \
+       -e "s%^Group #-1%Group apache%" \
+    /etc/apache/httpd.conf</command></userinput></screen>
 
-<para>See 
-<ulink url="http://httpd.apache.org/docs-2.0/configuring.html"/> for
-detailed instructions on customizing your Apache <acronym>HTTP</acronym>
-server.</para>
+<para>See <ulink url="http://httpd.apache.org/docs-2.0/configuring.html"/> for 
+detailed instructions on customizing your <application>Apache</application> 
+<acronym>HTTP</acronym> server.</para>
 
 <para>Install the <filename>/etc/rc.d/init.d/apache</filename>
 init script included in the <xref linkend="intro-important-bootscripts"/> 
 package.</para>
 
 <screen><userinput><command>make install-apache</command></userinput></screen>
-
 </sect3>
 
 </sect2>
@@ -164,7 +186,8 @@
 <para><command>apachectl</command> is a front end to the
 <application>Apache</application> <acronym>HTTP</acronym> 
 server which is designed to help the administrator control the
-functioning of the <application>Apache</application> httpd daemon.</para></sect3>
+functioning of the <application>Apache</application> httpd daemon.</para>
+</sect3>
 
 <sect3><title>apxs</title>
 <para><command>apxs</command> 

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2004-09-21 14:54:27 UTC (rev 2745)
+++ trunk/BOOK/general.ent	2004-09-21 22:29:44 UTC (rev 2746)
@@ -1,8 +1,8 @@
-<!ENTITY day          "20">
+<!ENTITY day          "21">
 <!ENTITY month        "09">
 <!ENTITY year         "2004">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "September &day;th, &year;">
+<!ENTITY releasedate  "September &day;st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "cvs">                  <!-- cvs|[release #] -->
 <!ENTITY lfs-version  "testing">              <!-- stable|testing|unstable] -->
@@ -217,7 +217,7 @@
 <!ENTITY postgresql-version           "7.4.3"> 
                                      
 <!-- Chapter 24 -->                  
-<!ENTITY apache-version               "2.0.50">  
+<!ENTITY apache-version               "2.0.51">  
 <!ENTITY php-version                  "5.0.1">  
 <!ENTITY proftpd-version              "1.2.9">  
 <!ENTITY vsftpd-version               "2.0.1">  

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-09-21 14:54:27 UTC (rev 2745)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-09-21 22:29:44 UTC (rev 2746)
@@ -22,10 +22,14 @@
 
 <itemizedlist>
 
-<listitem><para>September 20th, 2004 [randy]: Updated to
+<listitem><para>September 21th, 2004 [randy]: Updated to 
+Apache-2.0.51; modified commands in Thunderbird instructions to fit on a
+printed page.</para></listitem>
+
+<listitem><para>September 20th, 2004 [randy]: Updated to 
 Thunderbird-0.8.</para></listitem>
 
-<listitem><para>September 19th, 2004 [randy]: Updated to
+<listitem><para>September 19th, 2004 [randy]: Updated to 
 Firefox-1.0 Preview Edition.</para></listitem>
 
 <listitem><para>September 19th, 2004 [randy]: Added new package 

Modified: trunk/BOOK/xsoft/other/thunderbird.xml
===================================================================
--- trunk/BOOK/xsoft/other/thunderbird.xml	2004-09-21 14:54:27 UTC (rev 2745)
+++ trunk/BOOK/xsoft/other/thunderbird.xml	2004-09-21 22:29:44 UTC (rev 2746)
@@ -161,11 +161,14 @@
 cp -Lf dist/private/nss/*.h dist/public/nss/*.h \
     /opt/thunderbird-&thunderbird-version;/include/thunderbird-&thunderbird-version;/nss &&
 chown -R root:root /opt/thunderbird-&thunderbird-version;/include/thunderbird-&thunderbird-version;/nss &&
+export CHROME_PATH="/opt/thunderbird-&thunderbird-version;/lib/thunderbird-&thunderbird-version;/chrome" &&
 sed -i.orig -e "/cookieContextOverlay/d" \
-    /opt/thunderbird-&thunderbird-version;/lib/thunderbird-&thunderbird-version;/chrome/overlayinfo/messenger/content/overlays.rdf &&
+    $CHROME_PATH/overlayinfo/messenger/content/overlays.rdf &&
 sed -i.orig -e "/cookieContextOverlay/d" -e "/helpMenuOverlay/d" \
-    /opt/thunderbird-&thunderbird-version;/lib/thunderbird-&thunderbird-version;/chrome/overlayinfo/communicator/content/overlays.rdf &&
-ln -sf /opt/thunderbird-&thunderbird-version;/bin/thunderbird /usr/bin/MozillaThunderbird</command></userinput></screen>
+    $CHROME_PATH/overlayinfo/communicator/content/overlays.rdf &&
+unset CHROME_PATH &&
+ln -sf /opt/thunderbird-&thunderbird-version;/bin/thunderbird \
+    /usr/bin/MozillaThunderbird</command></userinput></screen>
 
 <para>Install the <application>Enigmail</application> extension by running 
 the following commands:</para>

Deleted: trunk/patches/httpd-2.0.50-config-2.patch
===================================================================
--- trunk/patches/httpd-2.0.50-config-2.patch	2004-09-21 14:54:27 UTC (rev 2745)
+++ trunk/patches/httpd-2.0.50-config-2.patch	2004-09-21 22:29:44 UTC (rev 2746)
@@ -1,103 +0,0 @@
-Submitted By: BLFS Book <blfs-book at linuxfromscratch.org>
-Date: 2004-07-15
-Initial Package Version: 2.0.47
-Upstream Status: Not submitted.
-Origin: BLFS Book
-Description: Add a layout for installing Apache as per the FHS
-             guidelines.
-
-$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>
- 

Added: trunk/patches/httpd-2.0.51-config-1.patch
===================================================================
--- trunk/patches/httpd-2.0.51-config-1.patch	2004-09-21 14:54:27 UTC (rev 2745)
+++ trunk/patches/httpd-2.0.51-config-1.patch	2004-09-21 22:29:44 UTC (rev 2746)
@@ -0,0 +1,102 @@
+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>
+ 


Property changes on: trunk/patches/httpd-2.0.51-config-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list