Tags for networking and server sections

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11781 af4574ff-66df-0310-9fd7-8a98e5e911e0
2025-01-24 06:52:14 +08:00 · 2013-09-06 17:46:32 +00:00 · 2013-09-06 17:46:32 +00:00 · 283bd88084
commit 283bd88084
parent 40452959df
17 changed files with 61 additions and 52 deletions
--- a/general/sysutils/hdparm.xml
+++ b/general/sysutils/hdparm.xml
@ -35,7 +35,7 @@
      increase performance and sometimes to increase stability.
    </para>

-    &lfs73_checked;
+    &lfs74_checked;

    <warning>
      <para>
--- a/networking/connect/dhcpcd.xml
+++ b/networking/connect/dhcpcd.xml
@ -35,7 +35,7 @@
    addresses. dhcpcd strives to be a fully featured, yet very lightweight
    DHCP client.</para>

-    &lfs73_checked;
+    &lfs74_checked;

    <bridgehead renderas="sect3">Package Information</bridgehead>
    <itemizedlist spacing="compact">
--- a/networking/mailnews/re-alpine.xml
+++ b/networking/mailnews/re-alpine.xml
@ -32,7 +32,7 @@
    <para><application>Re-alpine</application> is the continuation of Alpine;
    a text-based email client developed by the University of Washington.</para>

-    &lfs73_checked;
+    &lfs74_checked;

    <bridgehead renderas="sect3">Package Information</bridgehead>
    <itemizedlist spacing='compact'>
@ -83,10 +83,11 @@
    <para>Install <application>Re-alpine</application> by running the following
    commands:</para>

-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --without-ldap \
-            --without-krb5 \
+<screen><userinput>
+./configure --prefix=/usr       \
+            --sysconfdir=/etc   \
+            --without-ldap      \
+            --without-krb5      \
            --with-ssl-dir=/usr \
            --with-passfile=.pine-passfile &amp;&amp;
 make</userinput></screen>
--- a/networking/netlibs/ldns.xml
+++ b/networking/netlibs/ldns.xml
@ -36,7 +36,7 @@
      includes the <command>drill</command> tool.
    </para>

-    &lfs73_checked;
+    &lfs74_checked;

    <bridgehead renderas="sect3">Package Information</bridgehead>
    <itemizedlist spacing="compact">
@ -101,10 +101,11 @@
      commands:
    </para>

-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>
+./configure --prefix=/usr     \
            --sysconfdir=/etc \
-            --disable-static \
-            --with-drill &amp;&amp;
+            --disable-static  \
+            --with-drill      &amp;&amp;
 make</userinput></screen>

    <para>
--- a/networking/netlibs/serf.xml
+++ b/networking/netlibs/serf.xml
@ -37,7 +37,7 @@
      performance operation.
    </para>

-    &lfs73_checked;
+    &lfs74_checked;

    <bridgehead renderas="sect3">Package Information</bridgehead>
    <itemizedlist spacing="compact">
@ -78,7 +78,7 @@
    <bridgehead renderas="sect4">Required</bridgehead>
    <para role="required">
      <xref linkend="apr-util"/>,
-      <xref linkend="openssl"/> and
+      <xref linkend="openssl"/>, and
      <xref linkend="scons"/>
    </para>

@ -95,8 +95,8 @@
      commands:
    </para>

-<screen><userinput>sed -i "/Append/s:RPATH=libdir,::" SConstruct &amp;&amp;
-sed -i "/Default/s:lib_static,::" SConstruct &amp;&amp;
+<screen><userinput>sed -i "/Append/s:RPATH=libdir,::"  SConstruct &amp;&amp;
+sed -i "/Default/s:lib_static,::"   SConstruct &amp;&amp;
 sed -i "/Alias/s:install_static,::" SConstruct &amp;&amp;
 scons PREFIX=/usr</userinput></screen>

@ -116,8 +116,8 @@ scons PREFIX=/usr</userinput></screen>
    <title>Command Explanations</title>

    <para>
-      <command>sed -i "..."</command>: First command removes runtime path
-      from shared library and last two commands disable building and
+      <command>sed -i "..."</command>: First command removes the runtime path
+      from a shared library and the last two commands disable building and
      installing of the static library.
    </para>    

--- a/networking/netprogs/bridgeutils.xml
+++ b/networking/netprogs/bridgeutils.xml
@ -33,7 +33,7 @@
    needed to create and manage bridge devices.  This is useful in setting up
    networks for a hosted virtual machine (VM).</para>

-    &lfs73_checked;
+    &lfs74_checked;

    <bridgehead renderas="sect3">Package Information</bridgehead>
    <itemizedlist spacing="compact">
--- a/networking/netutils/mod_dnssd.xml
+++ b/networking/netutils/mod_dnssd.xml
@ -37,7 +37,7 @@
      available to clients compatible with the protocol.
    </para>

-    &lfs73_checked;
+    &lfs74_checked;

    <bridgehead renderas="sect3">Package Information</bridgehead>
    <itemizedlist spacing="compact">
--- a/networking/netutils/wicd.xml
+++ b/networking/netutils/wicd.xml
@ -38,7 +38,7 @@
    url="http://projects.kde.org/projects/extragear/network/wicd-kde">here</ulink>.
    </para>

-    &lfs73_checked;
+    &lfs74_checked;

    <bridgehead renderas="sect3">Package Information</bridgehead>
    <itemizedlist spacing="compact">
@ -84,7 +84,7 @@
    <para role="required">
    <xref linkend="python2"/>,
    <xref linkend="dbus-python"/>,
-    <xref linkend="wireless_tools"/> and
+    <xref linkend="wireless_tools"/>, and
    <xref linkend="net-tools"/> (Wicd needs <command>ifconfig</command> and
    <command>mii-tool</command> from this package)
    </para>
@ -92,14 +92,14 @@
    <bridgehead renderas="sect4">Recommended</bridgehead>
    <para role="recommended">
    <xref linkend="pygtk"/> (for the GTK frontend),
-    <xref linkend="wpa_supplicant"/> (for WPA support) and
+    <xref linkend="wpa_supplicant"/> (for WPA support), and
    <xref linkend="dhcpcd"/> or <xref linkend="dhcp"/> (for DHCP support)
    </para>

    <bridgehead renderas="sect4">Optional</bridgehead>
    <para role="optional">
    <xref linkend="pm-utils"/> (for suspend/resume integration),
-    <ulink url="http://excess.org/urwid/">Urwid</ulink> (for the Curses-based frontend) and
+    <ulink url="http://excess.org/urwid/">Urwid</ulink> (for the Curses-based frontend), and
    <ulink url="http://babel.edgewall.org/">Babel</ulink> (for internationalization)
    </para>

@ -116,8 +116,8 @@

 <screen><userinput>sed -i '/wpath.logrotate\|wpath.systemd/d' setup.py &amp;&amp;
 rm po/*.po                                          &amp;&amp;
-python setup.py configure --no-install-kde \
-                          --no-install-acpi \
+python setup.py configure --no-install-kde     \
+                          --no-install-acpi    \
                          --no-install-pmutils \
                          --no-install-init</userinput></screen>

@ -219,10 +219,10 @@ python setup.py configure --no-install-kde \
      <segtitle>Installed Directories</segtitle>

      <seglistitem>
-        <seg>wicd, wicd-cli, wicd-client, wicd-curses and wicd-gtk</seg>
+        <seg>wicd, wicd-cli, wicd-client, wicd-curses, and wicd-gtk</seg>
        <seg>none</seg>
        <seg>/etc/wicd, /usr/lib/python2.7/site-packages/wicd, /usr/share/doc/wicd,
-        /usr/share/pixmaps/wicd, /usr/share/wicd, /var/lib/wicd and /var/log/wicd</seg>
+        /usr/share/pixmaps/wicd, /usr/share/wicd, /var/lib/wicd, and /var/log/wicd</seg>
      </seglistitem>
    </segmentedlist>

--- a/networking/netutils/wireshark.xml
+++ b/networking/netutils/wireshark.xml
@ -38,7 +38,7 @@
    as well as the capability to read capture files from many other popular
    network analyzers.</para>

-    &lfs73_checked;
+    &lfs74_checked;

    <bridgehead renderas="sect3">Package Information</bridgehead>
    <itemizedlist spacing="compact">
@ -157,7 +157,7 @@ EOF</userinput></screen>

 <screen role="root"><userinput>groupadd -g 62 wireshark</userinput></screen>

-    <para>There is one issues that prevents the build from completing
+    <para>There is one issue that prevents the build from completing
    when generating the man pages.  Fix it up with:</para>

 <screen><userinput>sed -i '/=item/s/$/\n\n=back/' doc/reordercap.pod</userinput></screen>
--- a/networking/textweb/w3m.xml
+++ b/networking/textweb/w3m.xml
@ -32,7 +32,7 @@
    <para><application>w3m</application> is primarily a pager but it can
    also be used as a text-mode WWW browser.</para>

-    &lfs73_checked;
+    &lfs74_checked;

    <bridgehead renderas="sect3">Package Information</bridgehead>
    <itemizedlist spacing="compact">
@ -84,7 +84,9 @@
      <xref linkend="gdk-pixbuf"/>,
      <xref linkend="compface"/>, and
      <ulink url="http://packages.debian.org/unstable/text/nkf">nkf</ulink>,
-        a Mail User Agent and an External Browser</para>
+      a Mail User Agent, and 
+      an External Browser
+    </para>

    <para condition="html" role="usernotes">User Notes:
    <ulink url="&blfs-wiki;/W3M"/></para>
@ -99,6 +101,7 @@
 <screen><userinput>patch -Np1 -i ../w3m-&w3m-version;-bdwgc72-1.patch &amp;&amp;
 sed -i 's/file_handle/file_foo/' istream.{c,h} &amp;&amp;
 sed -i 's#gdk-pixbuf-xlib-2.0#&amp; x11#' configure &amp;&amp;
+
 ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib &amp;&amp;
 make</userinput></screen>

@ -166,8 +169,9 @@ install -v -m644    doc/{HISTORY,READ*,keymap.*,menu.*,*.html} \
      <seglistitem>
        <seg>w3m and w3mman</seg>
        <seg>None</seg>
-        <seg>/usr/libexec/w3m, /usr/share/w3m and
-        usr/share/doc/w3m-&w3m-version;</seg>
+        <seg>/usr/libexec/w3m, 
+             /usr/share/w3m, and
+             /usr/share/doc/w3m-&w3m-version;</seg>
      </seglistitem>
    </segmentedlist>

--- a/server/mail/exim.xml
+++ b/server/mail/exim.xml
@ -33,7 +33,7 @@
    Transport Agent written by the University of Cambridge, released
    under the GNU Public License.</para>

-    &lfs73_checked;
+    &lfs73_built;

    <bridgehead renderas="sect3">Package Information</bridgehead>
    <itemizedlist spacing="compact">
@ -83,7 +83,7 @@
      <xref linkend="cyrus-sasl"/>,
      <xref linkend="mysql"/>,
      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/> and
+      <xref linkend="sqlite"/>, and
      <xref linkend="linux-pam"/>
    </para>

@ -306,7 +306,7 @@ exim -v -bi &amp;&amp;
        <seg>exicyclog, exigrep, exim, exim-4.43-2, exim_checkaccess,
        exim_dbmbuild, exim_dumpdb, exim_fixdb, exim_lock, exim_tidydb,
        eximstats, exinext, exipick, exiqgrep, exiqsumm, exiwhat, and
-        optionally, eximon, and eximon.bin</seg>
+        optionally, eximon and eximon.bin</seg>
        <seg>None</seg>
        <seg>/usr/share/doc/exim-&exim-version; and /var/spool/exim</seg>
      </seglistitem>
--- a/server/mail/qpopper.xml
+++ b/server/mail/qpopper.xml
@ -32,7 +32,7 @@
    <para>The <application>Qpopper</application> package contains a
    POP3 mail server.</para>

-    &lfs73_checked;
+    &lfs74_built;

    <bridgehead renderas="sect3">Package Information</bridgehead>
    <itemizedlist spacing="compact">
--- a/server/mail/sendmail.xml
+++ b/server/mail/sendmail.xml
@ -34,7 +34,7 @@
    <para>The <application>sendmail</application> package contains a Mail
    Transport Agent (MTA).</para>

-    &lfs73_checked;
+    &lfs74_built;

    <bridgehead renderas="sect3">Package Information</bridgehead>
    <itemizedlist spacing="compact">
--- a/server/major/proftpd.xml
+++ b/server/major/proftpd.xml
@ -33,7 +33,7 @@
    and highly configurable FTP daemon. This is useful for serving large
    file archives over a network.</para>

-    &lfs73_checked;
+    &lfs74_checked;

    <bridgehead renderas="sect3">Package Information</bridgehead>
    <itemizedlist spacing="compact">
@ -78,11 +78,12 @@
    <application>ProFTPD</application> using an unprivileged user and group.
    As the <systemitem class="username">root</systemitem> user:</para>

-<screen role="root"><userinput>groupadd -g 46 proftpd &amp;&amp;
+<screen role="root"><userinput>groupadd -g 46 proftpd                             &amp;&amp;
 useradd -c proftpd -d /srv/ftp -g proftpd \
-        -s /usr/bin/proftpdshell -u 46 proftpd &amp;&amp;
+        -s /usr/bin/proftpdshell -u 46 proftpd     &amp;&amp;
+
 install -v -d -m775 -o proftpd -g proftpd /srv/ftp &amp;&amp;
-ln -v -s /bin/false /usr/bin/proftpdshell &amp;&amp;
+ln -v -s /bin/false /usr/bin/proftpdshell          &amp;&amp;
 echo /usr/bin/proftpdshell &gt;&gt; /etc/shells</userinput></screen>

    <para>Install <application>ProFTPD</application> as an unprivileged user by
--- a/server/major/vsftpd.xml
+++ b/server/major/vsftpd.xml
@ -33,7 +33,7 @@
    secure and very small FTP daemon. This is useful for serving files
    over a network.</para>

-    &lfs73_checked;
+    &lfs74_checked;

    <bridgehead renderas="sect3">Package Information</bridgehead>
    <itemizedlist spacing="compact">
@ -62,7 +62,7 @@
    <bridgehead renderas="sect4">Optional</bridgehead>
    <para role="optional">
      <xref linkend="linux-pam"/>,
-      <xref linkend="openssl"/> and
+      <xref linkend="openssl"/>, and
      <xref linkend="libcap2"/>
    </para>

@ -84,6 +84,7 @@
 install -v -d -m 0755 /home/ftp      &amp;&amp;
 groupadd -g 47 vsftpd                &amp;&amp;
 groupadd -g 45 ftp                   &amp;&amp;
+
 useradd -c "vsftpd User"  -d /dev/null -g vsftpd -s /bin/false -u 47 vsftpd &amp;&amp;
 useradd -c anonymous_user -d /home/ftp -g ftp    -s /bin/false -u 45 ftp</userinput></screen>

--- a/server/other/unbound.xml
+++ b/server/other/unbound.xml
@ -37,7 +37,7 @@
      library API as an integral part of the architecture.
    </para>

-    &lfs73_checked;
+    &lfs74_checked;

    <bridgehead renderas="sect3">Package Information</bridgehead>
    <itemizedlist spacing="compact">
@ -78,14 +78,14 @@
    <bridgehead renderas="sect4">Required</bridgehead>
    <para role="required">
      <xref linkend="expat"/>,
-      <xref linkend="ldns"/> and
+      <xref linkend="ldns"/>, and
      <xref linkend="openssl"/>
    </para>

    <bridgehead renderas="sect4">Optional</bridgehead>
    <para role="optional">
      <xref linkend="libevent"/>,
-      <xref linkend="python2"/> and
+      <xref linkend="python2"/>,
      <ulink url="http://www.swig.org/">SWIG</ulink> (for Python bindings), and
      <xref linkend="doxygen"/> (for html documentation)
    </para>
@ -113,10 +113,10 @@ useradd -c "Unbound DNS resolver" -d /var/lib/unbound -u 88 \
      commands:
    </para>

-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>./configure --prefix=/usr     \
            --sysconfdir=/etc \
-            --with-pidfile=/run/unbound.pid \
-            --disable-static &amp;&amp;
+            --disable-static  \
+            --with-pidfile=/run/unbound.pid &amp;&amp;
 make</userinput></screen>

    <para>
@ -236,7 +236,7 @@ install -v -m644 doc/html/* /usr/share/doc/unbound-&unbound-version;</userinput>
      <seglistitem>
        <seg>
          unbound, unbound-anchor, unbound-checkconf, unbound-control,
-          unbound-control-setup and unbound-host
+          unbound-control-setup, and unbound-host
        </seg>
        <seg>
          libunbound.so
--- a/server/other/xinetd.xml
+++ b/server/other/xinetd.xml
@ -34,7 +34,7 @@
    <para><application>xinetd</application> is the eXtended InterNET services
    daemon, a secure replacement for <command>inetd</command>.</para>

-    &lfs73_checked;
+    &lfs74_checked;

    <bridgehead renderas="sect3">Package Information</bridgehead>
    <itemizedlist spacing="compact">
@ -79,6 +79,7 @@

 <screen><userinput>sed -i -e "/^LIBS/s/-lpset/&amp; -ltirpc/" xinetd/Makefile.in       &amp;&amp;
 sed -i -e "/register unsigned count/s/register//" xinetd/itox.c &amp;&amp;
+
 ./configure --prefix=/usr --with-loadavg                        &amp;&amp;
 make</userinput></screen>