Author: bdubbs
Date: Thu Jul 25 10:01:16 2013
New Revision: 11500

Log:
UPdate to apache-2.4.6
Tag several files as LFS-7.3

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/server/mail/exim.xml
   trunk/BOOK/server/mail/qpopper.xml
   trunk/BOOK/server/major/apache.xml
   trunk/BOOK/server/major/proftpd.xml
   trunk/BOOK/server/major/vsftpd.xml
   trunk/BOOK/server/other/xinetd.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Thu Jul 25 02:50:36 2013        (r11499)
+++ trunk/BOOK/general.ent      Thu Jul 25 10:01:16 2013        (r11500)
@@ -496,7 +496,7 @@
 
 <!-- Part V -->
 <!-- Chapter 20 -->
-<!ENTITY apache-version               "2.4.4">
+<!ENTITY apache-version               "2.4.6">
 <!ENTITY proftpd-version              "1.3.4b">
 <!ENTITY vsftpd-version               "3.0.2">
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Thu Jul 25 02:50:36 
2013        (r11499)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Thu Jul 25 10:01:16 
2013        (r11500)
@@ -47,6 +47,9 @@
       <para>July 25th, 2013</para>
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to apache-2.4.6.</para>
+        </listitem>
+        <listitem>
           <para>[igor] - Qt-4.8.5.</para>
         </listitem>
       </itemizedlist>

Modified: trunk/BOOK/server/mail/exim.xml
==============================================================================
--- trunk/BOOK/server/mail/exim.xml     Thu Jul 25 02:50:36 2013        (r11499)
+++ trunk/BOOK/server/mail/exim.xml     Thu Jul 25 10:01:16 2013        (r11500)
@@ -33,7 +33,7 @@
     Transport Agent written by the University of Cambridge, released
     under the GNU Public License.</para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/server/mail/qpopper.xml
==============================================================================
--- trunk/BOOK/server/mail/qpopper.xml  Thu Jul 25 02:50:36 2013        (r11499)
+++ trunk/BOOK/server/mail/qpopper.xml  Thu Jul 25 10:01:16 2013        (r11500)
@@ -32,7 +32,7 @@
     <para>The <application>Qpopper</application> package contains a
     POP3 mail server.</para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/server/major/apache.xml
==============================================================================
--- trunk/BOOK/server/major/apache.xml  Thu Jul 25 02:50:36 2013        (r11499)
+++ trunk/BOOK/server/major/apache.xml  Thu Jul 25 10:01:16 2013        (r11500)
@@ -7,10 +7,10 @@
   <!ENTITY apache-download-http
            
"http://archive.apache.org/dist/httpd/httpd-&apache-version;.tar.bz2";>
   <!ENTITY apache-download-ftp  " ">
-  <!ENTITY apache-md5sum        "0e712ee2119cd798c8ae39d5f11a9206">
-  <!ENTITY apache-size          "4.6 MB">
-  <!ENTITY apache-buildsize     "105 MB">
-  <!ENTITY apache-time          "0.5 SBU">
+  <!ENTITY apache-md5sum        "ea5e361ca37b8d7853404419dd502efe">
+  <!ENTITY apache-size          "4.7 MB">
+  <!ENTITY apache-buildsize     "73 MB">
+  <!ENTITY apache-time          "0.8 SBU">
 ]>
 
 <sect1 id="apache" xreflabel="Apache-&apache-version;">
@@ -102,7 +102,7 @@
       <xref linkend="openldap"/>,
       <xref linkend="pcre"/>,
       <xref linkend="rsync"/>,
-      <ulink url="http://www.distcache.org/";>Distcache</ulink> and
+      <ulink url="http://www.distcache.org/";>Distcache</ulink>, and
       <xref linkend="lua"/>
     </para>
 
@@ -130,16 +130,16 @@
     </para>
 
 <screen><userinput>patch -Np1 -i ../httpd-&apache-version;-blfs_layout-1.patch 
&amp;&amp;
-./configure --enable-layout=BLFS \
-            --enable-mods-shared="all cgi" \
-            --enable-mpms-shared=all \
-            --with-apr=/usr/bin/apr-1-config \
-            --with-apr-util=/usr/bin/apu-1-config \
-            --enable-suexec=shared \
-            --with-suexec-bin=/usr/lib/httpd/suexec \
-            --with-suexec-docroot=/srv/www \
-            --with-suexec-caller=apache \
-            --with-suexec-userdir=public_html \
+./configure --enable-layout=BLFS                            \
+            --enable-mods-shared="all cgi"                  \
+            --enable-mpms-shared=all                        \
+            --with-apr=/usr/bin/apr-1-config                \
+            --with-apr-util=/usr/bin/apu-1-config           \
+            --enable-suexec=shared                          \
+            --with-suexec-bin=/usr/lib/httpd/suexec         \
+            --with-suexec-docroot=/srv/www                  \
+            --with-suexec-caller=apache                     \
+            --with-suexec-userdir=public_html               \
             --with-suexec-logfile=/var/log/httpd/suexec.log \
             --with-suexec-uidmin=100 &amp;&amp;
 make</userinput></screen>
@@ -152,11 +152,11 @@
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make install &amp;&amp;
+<screen role="root"><userinput>make install                                 
&amp;&amp;
 
 mv -v /usr/sbin/suexec /usr/lib/httpd/suexec &amp;&amp;
-chgrp apache /usr/lib/httpd/suexec &amp;&amp;
-chmod 4754 /usr/lib/httpd/suexec &amp;&amp;
+chgrp apache           /usr/lib/httpd/suexec &amp;&amp;
+chmod 4754             /usr/lib/httpd/suexec &amp;&amp;
 
 chown -v -R apache:apache /srv/www</userinput></screen>
 
@@ -196,7 +196,7 @@
       <command>... /usr/lib/httpd/suexec</command>: These commands put
       <command>suexec</command> wrapper into proper location, since it
       is not meant to be run directly. They also adjust proper
-      permissions of the binary, making it segid
+      permissions of the binary, making it setgid
       <systemitem class="username">apache</systemitem>.
     </para>
 
@@ -275,9 +275,9 @@
 
       <seglistitem>
         <seg>
-          ab, apachectl, apxs, checkgid, dbmmanage, fcgistarter,
-          htcacheclean, htdbm, htdigest, htpasswd, httpd,
-          httxt2dbm, logresolve and rotatelogs
+          ab,           apachectl, apxs,     checkgid, dbmmanage, fcgistarter,
+          htcacheclean, htdbm,     htdigest, htpasswd, httpd,
+          httxt2dbm,    logresolve,      and rotatelogs
         </seg>
         <seg>
           None
@@ -288,7 +288,7 @@
           /usr/include/httpd,
           /usr/lib/httpd,
           /usr/share/httpd
-          /var/log/httpd and
+          /var/log/httpd, and
           /var/run/httpd
         </seg>
       </seglistitem>

Modified: trunk/BOOK/server/major/proftpd.xml
==============================================================================
--- trunk/BOOK/server/major/proftpd.xml Thu Jul 25 02:50:36 2013        (r11499)
+++ trunk/BOOK/server/major/proftpd.xml Thu Jul 25 10:01:16 2013        (r11500)
@@ -33,7 +33,7 @@
     and highly configurable FTP daemon. This is useful for serving large
     file archives over a network.</para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/server/major/vsftpd.xml
==============================================================================
--- trunk/BOOK/server/major/vsftpd.xml  Thu Jul 25 02:50:36 2013        (r11499)
+++ trunk/BOOK/server/major/vsftpd.xml  Thu Jul 25 10:01:16 2013        (r11500)
@@ -33,7 +33,7 @@
     secure and very small FTP daemon. This is useful for serving files
     over a network.</para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/server/other/xinetd.xml
==============================================================================
--- trunk/BOOK/server/other/xinetd.xml  Thu Jul 25 02:50:36 2013        (r11499)
+++ trunk/BOOK/server/other/xinetd.xml  Thu Jul 25 10:01:16 2013        (r11500)
@@ -4,7 +4,9 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY xinetd-download-http 
"http://www.xinetd.org/xinetd-&xinetd-version;.tar.gz";>
+  <!-- Development seems to be over and the xinetd.og site does not seem to 
exist any more. -->
+  <!-- <!ENTITY xinetd-download-http 
"http://www.xinetd.org/xinetd-&xinetd-version;.tar.gz";> -->
+  <!ENTITY xinetd-download-http " ">
   <!ENTITY xinetd-download-ftp  
"&gentoo-ftp-repo;/xinetd-&xinetd-version;.tar.gz">
   <!ENTITY xinetd-md5sum        "77358478fd58efa6366accae99b8b04c">
   <!ENTITY xinetd-size          "308 KB">
@@ -32,6 +34,8 @@
     <para><application>xinetd</application> is the eXtended InterNET services
     daemon, a secure replacement for <command>inetd</command>.</para>
 
+    &lfs73_checked;
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to