From 59048cd94f56c35dfa1f2e6a4d7bb7f7c6fc74a4 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 12 Feb 2012 04:47:30 +0000
Subject: [PATCH] Remove xinetd

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9382 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 general/prog/cvsserver.xml         |  6 +++---
 introduction/welcome/changelog.xml |  3 +++
 networking/netprogs/inetutils.xml  |  4 ++--
 networking/netprogs/samba3.xml     |  4 ++--
 postlfs/security/mitkrb.xml        |  2 +-
 postlfs/security/tcpwrappers.xml   |  4 ++--
 server/mail/qpopper.xml            |  4 ++--
 server/major/major.xml             |  2 +-
 server/major/proftpd.xml           |  2 +-
 server/major/vsftpd.xml            |  4 ++--
 server/other/leafnode.xml          | 22 ++++++++++++----------
 12 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/general.ent b/general.ent
index 034099b49e..4cc743b4ba 100644
--- a/general.ent
+++ b/general.ent
@@ -536,7 +536,7 @@ $Date$
 <!ENTITY proftpd-version              "1.3.0">
 <!-- samba3 (chapter 14) -->
 <!ENTITY vsftpd-version               "2.3.4">
-<!ENTITY xinetd-version               "2.3.14">
+<!-- <!ENTITY xinetd-version               "2.3.14"> -->
 
 <!-- Chapter 20 -->
 <!ENTITY exim-version                 "4.67">
diff --git a/general/prog/cvsserver.xml b/general/prog/cvsserver.xml
index 947da2feea..708cdc8398 100644
--- a/general/prog/cvsserver.xml
+++ b/general/prog/cvsserver.xml
@@ -124,7 +124,7 @@ echo anonymous &gt; /srv/cvsroot/CVSROOT/readers</userinput></screen>
 
     <para>Issue a <command>killall -HUP inetd</command> to reread the changed
     <filename>inetd.conf</filename> file.</para>
-
+<!--
     <para>If you use <command>xinetd</command>, the following command will create
     the CVS file as <filename>/etc/xinetd.d/cvspserver</filename>:</para>
 
@@ -140,7 +140,7 @@ echo anonymous &gt; /srv/cvsroot/CVSROOT/readers</userinput></screen>
           user        = root
           passenv     = PATH
           server      = /usr/bin/cvs
-          server_args = -f --allow-root=/srv/cvsroot pserver
+          server_args = -f - -allow-root=/srv/cvsroot pserver
      }
 
 # End /etc/xinetd.d/cvspserver</literal>
@@ -152,7 +152,7 @@ EOF</userinput></screen>
 
     <para>Issue a <command>/etc/rc.d/init.d/xinetd reload</command> to reread
     the changed <filename>xinetd.conf</filename> file.</para>
-
+-->
     <para>Testing anonymous access to the new repository requires an account
     on another machine that can reach the CVS server via network. No account
     on the CVS repository is needed. To test anonymous access to the CVS
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 4809649f32..164f8e9dad 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,9 @@
     <listitem>
       <para>February 12th, 2012</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Remove xinetd. </para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update ca-cert scripts.  Account for 
           changed upstream format and ensure date command works
diff --git a/networking/netprogs/inetutils.xml b/networking/netprogs/inetutils.xml
index 77e57a6730..48032ba3ec 100644
--- a/networking/netprogs/inetutils.xml
+++ b/networking/netprogs/inetutils.xml
@@ -206,8 +206,8 @@ make</userinput></screen>
       <varlistentry id="inetd">
         <term><command>inetd</command></term>
         <listitem>
-          <para>is an Internet super-server. Note that the <xref linkend="xinetd"/>
-          package provides a much better server that does the same thing.</para>
+          <para>is an Internet super-server. <!-- Note that the <xref linkend="xinetd"/>
+          package provides a much better server that does the same thing.--></para>
           <indexterm zone="inetutils inetd">
             <primary sortas="b-inetd">inetd</primary>
           </indexterm>
diff --git a/networking/netprogs/samba3.xml b/networking/netprogs/samba3.xml
index fdc7051566..10c11d29e3 100644
--- a/networking/netprogs/samba3.xml
+++ b/networking/netprogs/samba3.xml
@@ -515,7 +515,7 @@ useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup \
         http://localhost:905.</para>
         
       </sect4>
-
+<!--
       <sect4>
         <title>Setting up SWAT using xinetd</title>
 
@@ -571,7 +571,7 @@ EOF</userinput></screen>
         http://localhost:905.</para>
 
       </sect4>
-
+-->
       <sect4>
         <title>Setting up SWAT using stunnel</title>
 
diff --git a/postlfs/security/mitkrb.xml b/postlfs/security/mitkrb.xml
index 5cd0d4250a..c5791108ae 100644
--- a/postlfs/security/mitkrb.xml
+++ b/postlfs/security/mitkrb.xml
@@ -411,7 +411,7 @@ EOF</userinput></screen>
         <command>kshd</command>) requires two additional configuration steps.
         First the <filename>/etc/services</filename> file must be updated to
         include eklogin and krb5_prop. Second, the
-        <filename>inetd.conf</filename> or <filename>xinetd.conf</filename>
+        <filename>inetd.conf</filename> <!--or <filename>xinetd.conf</filename>--> file
         must be modified for each server that will be activated, usually
         replacing the server from <xref linkend="inetutils"/>.</para>
 
diff --git a/postlfs/security/tcpwrappers.xml b/postlfs/security/tcpwrappers.xml
index af15f304b5..afe1101bf6 100644
--- a/postlfs/security/tcpwrappers.xml
+++ b/postlfs/security/tcpwrappers.xml
@@ -137,7 +137,7 @@ make REAL_DAEMON_DIR=/usr/sbin STYLE=-DPROCESS_OPTIONS linux</userinput></screen
       <note>
         <para>The <command>finger</command> server is used as an example here.</para>
       </note>
-
+<!--
       <para>Similar changes must be made if <application>xinetd</application> is
       used, with the emphasis being on calling <command>/usr/sbin/tcpd</command>
       instead of calling the service daemon directly, and passing the name of the
@@ -146,7 +146,7 @@ make REAL_DAEMON_DIR=/usr/sbin STYLE=-DPROCESS_OPTIONS linux</userinput></screen
       <indexterm zone="tcpwrappers tcpwrappers-config">
         <primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
       </indexterm>
-
+-->
     </sect3>
 
   </sect2>
diff --git a/server/mail/qpopper.xml b/server/mail/qpopper.xml
index c17ad9bf02..91f640d93f 100644
--- a/server/mail/qpopper.xml
+++ b/server/mail/qpopper.xml
@@ -172,7 +172,7 @@ killall inetd || inetd</userinput></screen>
 
       <para>Issue a <command>killall -HUP inetd</command> to reread the
       changed <filename>inetd.conf</filename> file.</para>
-
+<!--
       <para>If you use <command>xinetd</command>, the following command will
       create the <application>Qpopper</application> file as
       <filename>/etc/xinetd.d/pop3</filename>:</para>
@@ -203,7 +203,7 @@ EOF</userinput></screen>
 
       <para>Issue a <command>killall -HUP xinetd</command> to reread the
       changed <filename>xinetd.conf</filename> file.</para>
-
+-->
     </sect3>
 
   </sect2>
diff --git a/server/major/major.xml b/server/major/major.xml
index 0a9bd898f8..04ba32da17 100644
--- a/server/major/major.xml
+++ b/server/major/major.xml
@@ -25,6 +25,6 @@ $Date$
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="proftpd.xml"/>
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="samba3.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vsftpd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xinetd.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xinetd.xml"/> -->
 
 </chapter>
diff --git a/server/major/proftpd.xml b/server/major/proftpd.xml
index 3c0f08710a..8d5040f881 100644
--- a/server/major/proftpd.xml
+++ b/server/major/proftpd.xml
@@ -183,7 +183,7 @@ Umask                           022
 # at once, simply increase this value.  Note that this ONLY works
 # in standalone mode, in inetd mode you should use an inetd server
 # that allows you to limit maximum number of processes per service
-# (such as xinetd)
+<!--# (such as xinetd)-->
 MaxInstances                    30
 
 # Set the user and group that the server normally runs at.
diff --git a/server/major/vsftpd.xml b/server/major/vsftpd.xml
index 2135d3bddd..6676962f68 100644
--- a/server/major/vsftpd.xml
+++ b/server/major/vsftpd.xml
@@ -163,8 +163,8 @@ install -v -m 644 vsftpd.conf   /etc</userinput></screen>
       <filename class='directory'>/etc</filename> above. While still as
       <systemitem class="username">root</systemitem>, this file should be
       modified because it is now recommended to run <command>vsftpd</command>
-      in standalone mode as opposed to
-      <command>inetd</command>/<command>xinetd</command> mode. Also, you
+      in standalone mode. <!-- as opposed to
+      <command>inetd</command>/<command>xinetd</command> mode. -->Also, you
       should specify the privilege separation user created above. Finally,
       you should specify the <command>chroot</command> directory.
       <command>man vsftpd.conf</command> will give you all the details.</para>
diff --git a/server/other/leafnode.xml b/server/other/leafnode.xml
index f1301e7b61..7263a98aea 100644
--- a/server/other/leafnode.xml
+++ b/server/other/leafnode.xml
@@ -61,8 +61,10 @@
     <xref linkend="tcpwrappers"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="xinetd"/> and
-    <xref linkend="fcron"/></para>
+    <para role="recommended">
+      <!-- <xref linkend="xinetd"/> and -->
+      <xref linkend="fcron"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/leafnode"/></para>
@@ -121,8 +123,8 @@ make</userinput></screen>
       <filename>/etc/nntpserver</filename>,
       <filename>/etc/sysconfig/createfiles</filename>
       <filename>/etc/inetd.conf</filename> or
-      <filename>/etc/xinetd.conf</filename> or
-      <filename>/etc/xinetd.d/nntp</filename></para>
+      <!-- <filename>/etc/xinetd.conf</filename> or
+      <filename>/etc/xinetd.d/nntp</filename>--></para>
 
       <indexterm zone="leafnode leafnode-config">
         <primary sortas="e-etc-leafnode-config">/etc/leafnode/config</primary>
@@ -131,11 +133,11 @@ make</userinput></screen>
       <indexterm zone="leafnode leafnode-config">
         <primary sortas="e-etc-nntpserver">/etc/nntpserver</primary>
       </indexterm>
-
+<!--
       <indexterm zone="leafnode leafnode-config">
         <primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
       </indexterm>
-
+-->
       <indexterm zone="leafnode leafnode-config">
         <primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary>
       </indexterm>
@@ -143,11 +145,11 @@ make</userinput></screen>
       <indexterm zone="leafnode leafnode-config">
         <primary sortas="e-etc-sysconfig-createfiles">/etc/sysconfig/createfiles</primary>
       </indexterm>
-
+<!--
       <indexterm zone="leafnode leafnode-config">
         <primary sortas="e-etc-xinetd.d-nntp">/etc/xinetd.d/nntp</primary>
       </indexterm>
-
+-->
     </sect3>
 
     <sect3>
@@ -194,7 +196,7 @@ EOF</userinput></screen>
 
       <para>Issue a <command>killall -HUP inetd</command> to reread the
       changed <filename>inetd.conf</filename> file.</para>
-
+<!--
       <para>If you use <command>xinetd</command>, the following command will
       create the <application>Leafnode</application> file as
       <filename>/etc/xinetd.d/nntp</filename>:</para>
@@ -220,7 +222,7 @@ EOF</userinput></screen>
 
       <para>Issue a <command>killall -HUP xinetd</command> to reread the
       changed <filename>xinetd.conf</filename> file.</para>
-
+-->
       <para>Add entries to the <systemitem class="username">root</systemitem>
       or <systemitem class="username">news</systemitem> user's crontab to run
       the <command>fetchnews</command> and <command>texpire</command> commands