r8918 - in trunk: BOOK BOOK/basicnet/netprogs BOOK/introduction/welcome BOOK/postlfs/security BOOK/server/major BOOK/server/other bootscripts bootscripts/blfs/init.d

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Mon Oct 24 20:31:35 PDT 2011


Author: bdubbs
Date: 2011-10-24 21:31:31 -0600 (Mon, 24 Oct 2011)
New Revision: 8918

Added:
   trunk/BOOK/basicnet/netprogs/rsync.xml
   trunk/bootscripts/blfs/init.d/httpd
Removed:
   trunk/BOOK/server/other/rsync.xml
   trunk/bootscripts/blfs/init.d/apache
Modified:
   trunk/BOOK/basicnet/netprogs/netprogs.xml
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/postlfs/security/acl.xml
   trunk/BOOK/postlfs/security/attr.xml
   trunk/BOOK/server/major/apache.xml
   trunk/BOOK/server/other/other.xml
   trunk/bootscripts/Makefile
   trunk/bootscripts/blfs/init.d/rsyncd
Log:
Update to apache-2.2.21
Update to rsync-3.0.9. 
Remove rsync-client and move rsync to network programs.


Modified: trunk/BOOK/basicnet/netprogs/netprogs.xml
===================================================================
--- trunk/BOOK/basicnet/netprogs/netprogs.xml	2011-10-24 23:21:46 UTC (rev 8917)
+++ trunk/BOOK/basicnet/netprogs/netprogs.xml	2011-10-25 03:31:31 UTC (rev 8918)
@@ -28,7 +28,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nfs-utils-client.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ntp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="portmap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rsync-client.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rsync-client.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rsync.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="samba3-client.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="subversion.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcpwrappers.xml"/>

Copied: trunk/BOOK/basicnet/netprogs/rsync.xml (from rev 8899, trunk/BOOK/server/other/rsync.xml)
===================================================================
--- trunk/BOOK/basicnet/netprogs/rsync.xml	                        (rev 0)
+++ trunk/BOOK/basicnet/netprogs/rsync.xml	2011-10-25 03:31:31 UTC (rev 8918)
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY rsync-download-http "http://samba.org/ftp/rsync/src/rsync-&rsync-version;.tar.gz">
+  <!ENTITY rsync-download-ftp  "ftp://ftp.samba.org/pub/rsync/src/rsync-&rsync-version;.tar.gz">
+  <!ENTITY rsync-md5sum        "5ee72266fe2c1822333c407e1761b92b">
+  <!ENTITY rsync-size          "780 KB">
+  <!ENTITY rsync-buildsize     "35 MB (includes installing all documentation)">
+  <!ENTITY rsync-time          "0.4 SBU">
+]>
+
+<sect1 id="rsync" xreflabel="rsync-&rsync-version;">
+  <?dbhtml filename="rsync.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>rsync-&rsync-version;</title>
+
+  <indexterm zone="rsync">
+    <primary sortas="a-rsync">rsync</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to rsync</title>
+
+    <para>The <application>rsync</application> package contains the
+    <command>rsync</command> utility. This is useful for synchronizing large
+    file archives over a network.</para>
+
+    &lfs70_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&rsync-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&rsync-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &rsync-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &rsync-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &rsync-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &rsync-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">rsync Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="popt"/>,
+    <xref linkend="attr"/>,
+    <xref linkend="acl"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/rsync"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of rsync</title>
+
+    <para>For security reasons, running the <application>rsync</application>
+    server as an unprivileged user and group is encouraged. If you intend to
+    run <command>rsync</command> as a daemon, create the
+    <systemitem class="username">rsyncd</systemitem> user and group
+    with the following commands issued by the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>groupadd -g 48 rsyncd &&
+useradd -c "rsyncd Daemon" -d /home/rsync -g rsyncd \
+    -s /bin/false -u 48 rsyncd</userinput></screen>
+
+    <para>Install <application>rsync</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &&
+make</userinput></screen>
+
+    <para>If you have <xref linkend="doxygen"/> installed and wish to
+    build HTML API documentation, issue <command>doxygen</command>.</para>
+
+    <para>If you have <xref linkend="docbook-utils"/> installed and wish to
+    build the user documentation, issue any or all of the following
+    commands:</para>
+
+<screen><userinput>pushd doc &&
+docbook2pdf             rsync.sgml &&
+docbook2ps              rsync.sgml &&
+docbook2dvi             rsync.sgml &&
+docbook2txt             rsync.sgml &&
+docbook2html --nochunks rsync.sgml &&
+popd</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role='root'><userinput>make install</userinput></screen>
+
+    <para>If you built the documentation, install it using the following
+    commands as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role='root'><userinput>install -v -m755 -d          /usr/share/doc/rsync-&rsync-version;/api &&
+install -v -m644 dox/html/*  /usr/share/doc/rsync-&rsync-version;/api &&
+install -v -m644 doc/rsync.* /usr/share/doc/rsync-&rsync-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring rsync</title>
+
+    <sect3 id="rsync-config">
+      <title>Config Files</title>
+
+      <para><filename>/etc/rsyncd.conf</filename></para>
+
+      <indexterm zone="rsync rsync-config">
+        <primary sortas="e-etc-rsyncd.conf">/etc/rsyncd.conf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>For client access to remote files, you may need to install the
+      <xref linkend="openssh"/> package to connect to the remote server.</para>
+
+      <para>This is a simple download-only configuration to set up running
+      <command>rsync</command> as a server. See the rsyncd.conf(5)
+      man-page for additional options (i.e., user authentication).</para>
+
+<screen role="root"><userinput>cat > /etc/rsyncd.conf << "EOF"
+<literal># This is a basic rsync configuration file
+# It exports a single module without user authentication.
+
+motd file = /home/rsync/welcome.msg
+use chroot = yes
+
+[localhost]
+    path = /home/rsync
+    comment = Default rsync module
+    read only = yes
+    list = yes
+    uid = rsyncd
+    gid = rsyncd
+</literal>
+EOF</userinput></screen>
+
+    <para>You can find additional configuration information and general
+    documentation about <command>rsync</command> at
+    <ulink url="http://rsync.samba.org/documentation.html"/>.</para>
+
+    </sect3>
+
+    <sect3 id="rsync-init">
+      <title>Boot Script</title>
+
+      <para>Note that you only want to start the
+      <application>rsync</application> server if you want to provide an
+      <application>rsync</application> archive on your local machine.
+      You don't need this script to run the
+      <application>rsync</application> client.</para>
+
+      <para>Install the <filename>/etc/rc.d/init.d/rsyncd</filename> init
+      script included in the
+      <xref linkend="bootscripts"/> package.</para>
+
+<screen role="root"><userinput>make install-rsyncd</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>rsync</seg>
+        <seg>None</seg>
+        <seg>Optionally, /usr/share/doc/rsync-&rsync-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="rsync-prog">
+        <term><command>rsync</command></term>
+        <listitem>
+          <para>is a replacement for <command>rcp</command> (and
+          <command>scp</command>) that has many more features. It uses the
+          <quote>rsync algorithm</quote> which provides a very fast method of
+          syncing remote files. It does this by sending just the differences
+          in the files across the link, without requiring that both sets of
+          files are present at one end of the link beforehand.</para>
+          <indexterm zone="rsync rsync-prog">
+            <primary sortas="b-rsync">rsync</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2011-10-24 23:21:46 UTC (rev 8917)
+++ trunk/BOOK/general.ent	2011-10-25 03:31:31 UTC (rev 8918)
@@ -55,7 +55,7 @@
 <!ENTITY lfs-vim-version              "7.3">
 <!-- End LFS versions -->
 
-<!ENTITY blfs-bootscripts-version     "20111022">
+<!ENTITY blfs-bootscripts-version     "20111024">
 <!ENTITY blfs-bootscripts-download    "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2">
 
 <!ENTITY blfs-wiki                    "http://wiki.&lfs-domainname;/blfs/wiki">
@@ -443,7 +443,7 @@
 <!ENTITY ntp-version                  "4.2.6p4">
 <!ENTITY openssh-version              "5.9p1">
 <!ENTITY portmap-version              "6.0">
-<!ENTITY rsync-version                "3.0.7">
+<!ENTITY rsync-version                "3.0.9">
 <!ENTITY samba3-version               "3.5.6">
 <!ENTITY subversion-version           "1.6.15">
 <!ENTITY tcpwrappers-version          "7.6">
@@ -477,7 +477,7 @@
 
 <!-- Part VI -->
 <!-- Chapter 21 -->
-<!ENTITY apache-version               "2.2.17">
+<!ENTITY apache-version               "2.2.21">
 <!-- bind (chapter 19) -->
 <!ENTITY nfs-utils-version            "1.1.4">
 <!-- openssh (chapter 18) -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2011-10-24 23:21:46 UTC (rev 8917)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2011-10-25 03:31:31 UTC (rev 8918)
@@ -45,6 +45,13 @@
       <para>October 24th, 2011</para>
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to apache-2.2.21.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to rsync-3.0.9. Remove rsync-client
+          and move rsync to network programs.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to sqlite-3.7.8.</para>
         </listitem>
         <listitem>

Modified: trunk/BOOK/postlfs/security/acl.xml
===================================================================
--- trunk/BOOK/postlfs/security/acl.xml	2011-10-24 23:21:46 UTC (rev 8917)
+++ trunk/BOOK/postlfs/security/acl.xml	2011-10-25 03:31:31 UTC (rev 8918)
@@ -90,11 +90,12 @@
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install install-dev install-lib                     &&
-install -dv -m755          /usr/share/doc/acl-&acl-version;     &&
-install -v -m644 doc/*.txt /usr/share/doc/acl-&acl-version;     &&
-chmod   -v 755             /usr/lib/libacl.{so.1.1.0,la} &&
-chown   -v root.root       /usr/lib/libacl.{so.1.1.0,la,a}</userinput></screen>
+<screen role="root"><userinput>make install install-dev install-lib                       &&
+install -dv -m755          /usr/share/doc/acl-&acl-version;       &&
+install -v -m644 doc/*.txt /usr/share/doc/acl-&acl-version;       &&
+chmod   -v 755             /usr/lib/libacl.{so.1.1.0,la}   &&
+chown   -v root.root       /usr/lib/libacl.{so.1.1.0,la,a} &&
+chown   -v root.root       /usr/share/man/man*/*acl*</userinput></screen>
 
     <para>You should now re-install <application><ulink
     url="&lfs-root;/chapter06/coreutils.html">Coreutils</ulink>

Modified: trunk/BOOK/postlfs/security/attr.xml
===================================================================
--- trunk/BOOK/postlfs/security/attr.xml	2011-10-24 23:21:46 UTC (rev 8917)
+++ trunk/BOOK/postlfs/security/attr.xml	2011-10-25 03:31:31 UTC (rev 8918)
@@ -93,8 +93,9 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install install-dev install-lib &&
-chmod -v 755 /usr/lib/libattr.{so.1.1.0,la} &&
-chown -v root.root /usr/lib/libattr.{a,la,so.1.1.0}</userinput></screen>
+chmod -v 755 /usr/lib/libattr.{so.1.1.0,la}         &&
+chown -v root.root /usr/lib/libattr.{a,la,so.1.1.0} &&
+chown -v root.root /usr/share/man/man*/*attr*</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/server/major/apache.xml
===================================================================
--- trunk/BOOK/server/major/apache.xml	2011-10-24 23:21:46 UTC (rev 8917)
+++ trunk/BOOK/server/major/apache.xml	2011-10-25 03:31:31 UTC (rev 8918)
@@ -7,10 +7,10 @@
   <!-- <!ENTITY apache-download-http "http://www.apache.org/dist/httpd/httpd-&apache-version;.tar.bz2"> -->
   <!ENTITY apache-download-http "http://archive.apache.org/dist/httpd/httpd-&apache-version;.tar.bz2">
   <!ENTITY apache-download-ftp  "ftp://apache.mirrors.pair.com/httpd/httpd-&apache-version;.tar.bz2">
-  <!ENTITY apache-md5sum        "16eadc59ea6b38af33874d300973202e">
-  <!ENTITY apache-size          "4.9 MB">
-  <!ENTITY apache-buildsize     "102 MB (building all available DSO modules)">
-  <!ENTITY apache-time          "2.1 SBU (building all available DSO modules)">
+  <!ENTITY apache-md5sum        "b24ca6db942a4f8e57c357e5e3058d31">
+  <!ENTITY apache-size          "6.8 MB">
+  <!ENTITY apache-buildsize     "105 MB (building all available DSO modules)">
+  <!ENTITY apache-time          "1.2 SBU (building all available DSO modules)">
 ]>
 
 <sect1 id="apache" xreflabel="Apache-&apache-version;">
@@ -34,6 +34,8 @@
     open-source HTTP server. It is useful for creating local intranet
     web sites or running huge web serving operations.</para>
 
+    &lfs70_checked;
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -62,10 +64,6 @@
         <para>Required patch: <ulink
         url="&patch-root;/httpd-&apache-version;-config-1.patch"/></para>
       </listitem>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/httpd-&apache-version;-bdb51-1.patch"/></para>
-      </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">Apache Dependencies</bridgehead>
@@ -93,9 +91,9 @@
     <ulink url="http://www.oracle.com/us/products/database/index.html">Oracle 11g</ulink>, and
     <ulink url="http://www.freetds.org/">FreeTDS</ulink></para>
 
-    <para>Though you can install APR and APR-util as separate components,
-    it is recommended to use the bundled versions that come with the Apache
-    HTTPD tarball.</para>
+    <para>Though you can install APR and APR-util as separate components, the
+    bundled versions that come with the Apache HTTPD tarball are
+    recommended.</para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/apache"/></para>
@@ -155,38 +153,12 @@
       environments.</para>
     </note>
 
-    <note>
-      <para>You may see warnings and other information similar to the output
-      shown below while running the <command>autoconf</command> program in the
-      following instructions:</para>
-<screen><computeroutput>configure.in:152: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body
-../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
-../../lib/autoconf/general.m4:2591: _AC_COMPILE_IFELSE is expanded from...
-../../lib/autoconf/general.m4:2607: AC_COMPILE_IFELSE is expanded from...
-build/apr_common.m4:491: APR_TRY_COMPILE_NO_WARNING is expanded from...
-build/apu-conf.m4:215: APU_FIND_LDAP is expanded from...
-configure.in:152: the top level
-configure.in:162: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body
-../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
-../../lib/autoconf/general.m4:2591: _AC_COMPILE_IFELSE is expanded from...
-../../lib/autoconf/general.m4:2607: AC_COMPILE_IFELSE is expanded from...
-build/apr_common.m4:491: APR_TRY_COMPILE_NO_WARNING is expanded from...
-build/apu-iconv.m4:115: APU_CHECK_ICONV_INBUF is expanded from...
-build/apu-iconv.m4:34: APU_FIND_ICONV is expanded from...
-configure.in:162: the top level</computeroutput></screen>
-    </note>
-
     <para>Build and install <application>Apache</application> by running the
     following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../httpd-&apache-version;-bdb51-1.patch &&
-pushd srclib/apr-util &&
-autoconf &&
-popd &&
-
-./configure --enable-layout=FHS \
-            --enable-mods-shared=all \
-            --enable-so &&
+<screen><userinput>./configure --enable-layout=FHS      \
+                               --enable-mods-shared=all \
+                               --enable-so &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -194,9 +166,9 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &&
-chown -v root:root /usr/lib/apache/httpd.exp \
-    /usr/sbin/{apxs,apachectl,dbmmanage,envvars{,-std}} \
-    /usr/share/man/man1/{dbmmanage,ht{dbm,digest,passwd}}.1 \
+chown -v root:root /usr/lib/apache/httpd.exp                     \
+    /usr/sbin/{apxs,apachectl,dbmmanage,envvars{,-std}}          \
+    /usr/share/man/man1/{dbmmanage,ht{dbm,digest,passwd}}.1      \
     /usr/share/man/man8/{ab,apachectl,apxs,htcacheclean,httpd}.8 \
     /usr/share/man/man8/{logresolve,rotatelogs,suexec}.8 &&
 chown -v -R apache:apache /srv/www</userinput></screen>
@@ -206,10 +178,6 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>autoconf</command>: This command generates a new
-    <command>configure</command> script required after installing the
-    <filename>bdb</filename> patch.</para>
-
     <para><parameter>--enable-mods-shared=all</parameter>: The modules
     should be compiled and used as Dynamic Shared Objects
     (DSOs) so they can be included and excluded from the

Modified: trunk/BOOK/server/other/other.xml
===================================================================
--- trunk/BOOK/server/other/other.xml	2011-10-24 23:21:46 UTC (rev 8917)
+++ trunk/BOOK/server/other/other.xml	2011-10-25 03:31:31 UTC (rev 8918)
@@ -25,7 +25,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="leafnode.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openldap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rsync.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rsync.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="virtuoso.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="soprano.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvsserver.xml"/>

Deleted: trunk/BOOK/server/other/rsync.xml
===================================================================
--- trunk/BOOK/server/other/rsync.xml	2011-10-24 23:21:46 UTC (rev 8917)
+++ trunk/BOOK/server/other/rsync.xml	2011-10-25 03:31:31 UTC (rev 8918)
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY rsync-download-http "http://samba.org/ftp/rsync/src/rsync-&rsync-version;.tar.gz">
-  <!ENTITY rsync-download-ftp  "ftp://ftp.samba.org/pub/rsync/src/rsync-&rsync-version;.tar.gz">
-  <!ENTITY rsync-md5sum        "b53525900817cf1ba7ad3a516ab5bfe9">
-  <!ENTITY rsync-size          "765 KB">
-  <!ENTITY rsync-buildsize     "35 MB (includes installing all documentation)">
-  <!ENTITY rsync-time          "0.2 SBU">
-]>
-
-<sect1 id="rsync" xreflabel="rsync-&rsync-version;">
-  <?dbhtml filename="rsync.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>rsync-&rsync-version;</title>
-
-  <indexterm zone="rsync">
-    <primary sortas="a-rsync">rsync</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to rsync</title>
-
-    <para>The <application>rsync</application> package contains the
-    <command>rsync</command> utility. This is useful for synchronizing large
-    file archives over a network.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&rsync-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&rsync-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &rsync-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &rsync-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &rsync-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &rsync-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">rsync Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="popt"/>,
-    <xref linkend="attr"/>,
-    <xref linkend="acl"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/rsync"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of rsync</title>
-
-    <para>For security reasons, running the <application>rsync</application>
-    server as an unprivileged user and group is encouraged. If you intend to
-    run <command>rsync</command> as a daemon, create the
-    <systemitem class="username">rsyncd</systemitem> user and group
-    with the following commands issued by the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>groupadd -g 48 rsyncd &&
-useradd -c "rsyncd Daemon" -d /home/rsync -g rsyncd \
-    -s /bin/false -u 48 rsyncd</userinput></screen>
-
-    <para>Install <application>rsync</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &&
-make</userinput></screen>
-
-    <para>If you have <xref linkend="doxygen"/> installed and wish to
-    build HTML API documentation, issue <command>doxygen</command>.</para>
-
-    <para>If you have <xref linkend="docbook-utils"/> installed and wish to
-    build the user documentation, issue any or all of the following
-    commands:</para>
-
-<screen><userinput>pushd doc &&
-docbook2pdf             rsync.sgml &&
-docbook2ps              rsync.sgml &&
-docbook2dvi             rsync.sgml &&
-docbook2txt             rsync.sgml &&
-docbook2html --nochunks rsync.sgml &&
-popd</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-    <para>If you built the documentation, install it using the following
-    commands as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>install -v -m755 -d          /usr/share/doc/rsync-&rsync-version;/api &&
-install -v -m644 dox/html/*  /usr/share/doc/rsync-&rsync-version;/api &&
-install -v -m644 doc/rsync.* /usr/share/doc/rsync-&rsync-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring rsync</title>
-
-    <sect3 id="rsync-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/rsyncd.conf</filename></para>
-
-      <indexterm zone="rsync rsync-config">
-        <primary sortas="e-etc-rsyncd.conf">/etc/rsyncd.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>For client access to remote files, you may need to install the
-      <xref linkend="openssh"/> package to connect to the remote server.</para>
-
-      <para>This is a simple download-only configuration to set up running
-      <command>rsync</command> as a server. See the rsyncd.conf(5)
-      man-page for additional options (i.e., user authentication).</para>
-
-<screen role="root"><userinput>cat > /etc/rsyncd.conf << "EOF"
-<literal># This is a basic rsync configuration file
-# It exports a single module without user authentication.
-
-motd file = /home/rsync/welcome.msg
-use chroot = yes
-
-[localhost]
-    path = /home/rsync
-    comment = Default rsync module
-    read only = yes
-    list = yes
-    uid = rsyncd
-    gid = rsyncd
-</literal>
-EOF</userinput></screen>
-
-    <para>You can find additional configuration information and general
-    documentation about <command>rsync</command> at
-    <ulink url="http://rsync.samba.org/documentation.html"/>.</para>
-
-    </sect3>
-
-    <sect3 id="rsync-init">
-      <title>Boot Script</title>
-
-      <para>Note that you only want to start the
-      <application>rsync</application> server if you want to provide an
-      <application>rsync</application> archive on your local machine.
-      You don't need this script to run the
-      <application>rsync</application> client.</para>
-
-      <para>Install the <filename>/etc/rc.d/init.d/rsyncd</filename> init
-      script included in the
-      <xref linkend="bootscripts"/> package.</para>
-
-<screen role="root"><userinput>make install-rsyncd</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>rsync</seg>
-        <seg>None</seg>
-        <seg>Optionally, /usr/share/doc/rsync-&rsync-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rsync-prog">
-        <term><command>rsync</command></term>
-        <listitem>
-          <para>is a replacement for <command>rcp</command> (and
-          <command>scp</command>) that has many more features. It uses the
-          <quote>rsync algorithm</quote> which provides a very fast method of
-          syncing remote files. It does this by sending just the differences
-          in the files across the link, without requiring that both sets of
-          files are present at one end of the link beforehand.</para>
-          <indexterm zone="rsync rsync-prog">
-            <primary sortas="b-rsync">rsync</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>

Modified: trunk/bootscripts/Makefile
===================================================================
--- trunk/bootscripts/Makefile	2011-10-24 23:21:46 UTC (rev 8917)
+++ trunk/bootscripts/Makefile	2011-10-25 03:31:31 UTC (rev 8918)
@@ -39,15 +39,15 @@
 	ln -sf  ../init.d/alsa ${EXTDIR}/rc.d/rc1.d/K35alsa
 	ln -sf  ../init.d/alsa ${EXTDIR}/rc.d/rc6.d/K35alsa
 
-install-apache: create-dirs
-	install -m ${MODE} blfs/init.d/apache     ${EXTDIR}/rc.d/init.d/
-	ln -sf  ../init.d/apache ${EXTDIR}/rc.d/rc0.d/K28apache
-	ln -sf  ../init.d/apache ${EXTDIR}/rc.d/rc1.d/K28apache
-	ln -sf  ../init.d/apache ${EXTDIR}/rc.d/rc2.d/K28apache
-	ln -sf  ../init.d/apache ${EXTDIR}/rc.d/rc3.d/S32apache
-	ln -sf  ../init.d/apache ${EXTDIR}/rc.d/rc4.d/S32apache
-	ln -sf  ../init.d/apache ${EXTDIR}/rc.d/rc5.d/S32apache
-	ln -sf  ../init.d/apache ${EXTDIR}/rc.d/rc6.d/K28apache
+install-httpd: create-dirs
+	install -m ${MODE} blfs/init.d/httpd     ${EXTDIR}/rc.d/init.d/
+	ln -sf  ../init.d/httpd ${EXTDIR}/rc.d/rc0.d/K28httpd
+	ln -sf  ../init.d/httpd ${EXTDIR}/rc.d/rc1.d/K28httpd
+	ln -sf  ../init.d/httpd ${EXTDIR}/rc.d/rc2.d/K28httpd
+	ln -sf  ../init.d/httpd ${EXTDIR}/rc.d/rc3.d/S32httpd
+	ln -sf  ../init.d/httpd ${EXTDIR}/rc.d/rc4.d/S32httpd
+	ln -sf  ../init.d/httpd ${EXTDIR}/rc.d/rc5.d/S32httpd
+	ln -sf  ../init.d/httpd ${EXTDIR}/rc.d/rc6.d/K28httpd
 
 install-autofs: create-dirs
 	install -m $(MODE) blfs/init.d/autofs    $(EXTDIR)/rc.d/init.d/

Deleted: trunk/bootscripts/blfs/init.d/apache
===================================================================
--- trunk/bootscripts/blfs/init.d/apache	2011-10-24 23:21:46 UTC (rev 8917)
+++ trunk/bootscripts/blfs/init.d/apache	2011-10-25 03:31:31 UTC (rev 8918)
@@ -1,42 +0,0 @@
-#!/bin/sh
-# Begin $rc_base/init.d/apache
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - gerard at linuxfromscratch.org
-
-#$LastChangedBy$
-#$Date$
-
-. /etc/sysconfig/rc
-. $rc_functions
-
-case "$1" in
-	start)
-		boot_mesg "Starting Apache daemon..."
-		/usr/sbin/apachectl -k start
-		evaluate_retval
-		;;
-
-	stop)
-		boot_mesg "Stopping Apache daemon..."
-		/usr/sbin/apachectl -k stop
-		evaluate_retval
-		;;
-
-	restart)
-		boot_mesg "Restarting Apache daemon..."
-		/usr/sbin/apachectl -k restart
-		evaluate_retval
-		;;
-
-	status)
-		statusproc /usr/sbin/httpd
-		;;
-
-	*)
-		echo "Usage: $0 {start|stop|restart|status}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/apache

Copied: trunk/bootscripts/blfs/init.d/httpd (from rev 8891, trunk/bootscripts/blfs/init.d/apache)
===================================================================
--- trunk/bootscripts/blfs/init.d/httpd	                        (rev 0)
+++ trunk/bootscripts/blfs/init.d/httpd	2011-10-25 03:31:31 UTC (rev 8918)
@@ -0,0 +1,63 @@
+#!/bin/sh
+# Begin /etc/init.d/httpd
+
+#######################################################################
+# Begin ntpd
+#
+# Description : Start Apache Web Server
+#
+# Author      : DJ Lucas - dj at linuxfromscratch.org
+#               Bruce Dubbs - bdubbs at linuxfromscratch.org
+#
+# Version     : LFS 7.0
+#
+########################################################################
+
+### BEGIN INIT INFO
+# Provides:            httpd
+# Required-Start:      $syslog $local_fs $network
+# Should-Start:        $remote_fs
+# Required-Stop:       $network
+# Should-Stop:         $remote_fs
+# Default-Start:       3 4 5
+# Default-Stop:        0 1 2 6
+# Short-Description:   Apache HTTP Server
+# Description:         Controls the Apache HTTP Daemon
+# X-LFS-Provided-By:   BLFS / LFS 7.0
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+#$LastChangedBy$
+#$Date$
+
+case "$1" in
+   start)
+      log_info_msg "Starting Apache daemon..."
+      start_daemon /usr/sbin/apachectl -k start
+      evaluate_retval
+      ;;
+
+   stop)
+      log_info_msg "Stopping Apache daemon..."
+      start_daemon /usr/sbin/apachectl -k stop
+      evaluate_retval
+      ;;
+
+   restart)
+      log_info_msg "Restarting Apache daemon..."
+      start_daemon /usr/sbin/apachectl -k restart
+      evaluate_retval
+      ;;
+
+   status)
+      statusproc /usr/sbin/httpd
+      ;;
+
+   *)
+      echo "Usage: $0 {start|stop|restart|status}"
+      exit 1
+      ;;
+esac
+
+# End /etc/init.d/httpd

Modified: trunk/bootscripts/blfs/init.d/rsyncd
===================================================================
--- trunk/bootscripts/blfs/init.d/rsyncd	2011-10-24 23:21:46 UTC (rev 8917)
+++ trunk/bootscripts/blfs/init.d/rsyncd	2011-10-25 03:31:31 UTC (rev 8918)
@@ -1,45 +1,62 @@
 #!/bin/sh
-# Begin $rc_base/init.d/rsyncd
+# Begin /etc/init.d/rsyncd
 
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - gerard at linuxfromscratch.org
+#######################################################################
+# Begin ntpd
+#
+# Description : Start rsync server
+#
+# Author      : Bruce Dubbs - bdubbs at linuxfromscratch.org
+#
+# Version     : LFS 7.0
+#
+########################################################################
 
+### BEGIN INIT INFO
+# Provides:            rsyncdd
+# Required-Start:      $syslog $local_fs $network
+# Should-Start:        $remote_fs
+# Required-Stop:       $network
+# Should-Stop:         $remote_fs
+# Default-Start:       3 4 5
+# Default-Stop:        0 1 2 6
+# Short-Description:   Apache HTTP Server
+# Description:         Controls the Apache HTTP Daemon
+# X-LFS-Provided-By:   BLFS / LFS 7.0
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
 #$LastChangedBy$
 #$Date$
 
-. /etc/sysconfig/rc
-. $rc_functions
-
 case "$1" in
-	start)
-		boot_mesg "Starting RSYNC Server..."
-		loadproc /usr/bin/rsync --daemon
-		;;
+   start)
+      log_info_msg "Starting RSYNC Server..."
+      start_daemon /usr/bin/rsync --daemon
+      evaluate_retval
+      ;;
 
-	stop)
-		boot_mesg "Stopping RSYNC Server..."
-		killproc /usr/bin/rsync
-		;;
+   stop)
+      log_info_msg "Stopping RSYNC Server..."
+      killproc /usr/bin/rsync
+      evaluate_retval
+      ;;
 
-	reload)
-		boot_mesg "Reloading RSYNC Server..."
-		reloadproc /usr/bin/rsync
-		;;
+   restart)
+      $0 stop
+      sleep 1
+      $0 start
+      ;;
 
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
+   status)
+      statusproc /usr/bin/rsync
+      ;;
 
-	status)
-		statusproc /usr/bin/rsync
-		;;
-
-	*)
-		echo "Usage: $0 {start|stop|reload|restart|status}"
-		exit 1
-		;;
+   *)
+      echo "Usage: $0 {start|stop|restart|status}"
+      exit 1
+      ;;
 esac
 
-# End $rc_base/init.d/rsyncd
+# End /etc/init.d/rsyncd




More information about the blfs-book mailing list