Update standards discussion for FHS 3.0 and LSB-5.0.

Update to inet-utils-1.9.4. 
Update to file-5.23. 
Update to kmod-21.


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10917 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

6 files changed, 61 insertions, 58 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a000c5417..b89af0b82 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,28 @@
 -->
 
     <listitem>
+      <para>2015-06-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update standards discussion for FHS 3.0
+          and LSB-5.0.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to inet-utils. Fixes 
+          <ulink url="&lfs-ticket-root;3796">#3796</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to file-5.23. Fixes 
+          <ulink url="&lfs-ticket-root;3795">#3795</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to kmod-21. Fixes 
+          <ulink url="&lfs-ticket-root;3794">#3794</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2015-06-07</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index fa9f6a05a..2a80fcac6 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -73,9 +73,9 @@
     <!--<listitem>
       <para>Expect &expect-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>File &file-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Findutils &findutils-version;</para>
     </listitem>-->
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 748d5bef7..464862a87 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -39,12 +39,12 @@
 
   <sect2 role="installation">
     <title>Installation of Inetutils</title>
-
+<!--
     <para>Create a definition to allow the <command>ifconfig</command> program
     to build properly:</para>
 
 <screen><userinput remap="pre">echo '#define PATH_PROCNET_DEV "/proc/net/dev"' &gt;&gt; ifconfig/system/linux.h </userinput></screen>
-
+-->
     <para>Prepare Inetutils for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr        \
diff --git a/general.ent b/general.ent
index 256090736..24314f094 100644
--- a/general.ent
+++ b/general.ent
@@ -1,7 +1,7 @@
-<!ENTITY version         "SVN-20150607">
+<!ENTITY version         "SVN-20150610">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;. Change to x.y for release 
                                       but not -rc releases -->
-<!ENTITY releasedate     "June 7, 2015">
+<!ENTITY releasedate     "June 10, 2015">
 <!ENTITY copyrightdate   "1999-2015"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.8">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index d7e9e8d14..883cdcb87 100644
--- a/packages.ent
+++ b/packages.ent
@@ -158,10 +158,10 @@
 <!ENTITY expect-ch5-du "4.6 MB">
 <!ENTITY expect-ch5-sbu "0.1 SBU">
 
-<!ENTITY file-version "5.22">
-<!ENTITY file-size "716 KB">
+<!ENTITY file-version "5.23">
+<!ENTITY file-size "721 KB">
 <!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
-<!ENTITY file-md5 "8fb13e5259fe447e02c4a37bc7225add">
+<!ENTITY file-md5 "61db35209ce71a6d576392ce6e1d2f80">
 <!ENTITY file-home "http://www.darwinsys.com/file/">
 <!ENTITY file-ch5-du "16.9 MB">
 <!ENTITY file-ch5-sbu "0.1 SBU">
@@ -300,10 +300,10 @@
 <!ENTITY iana-etc-ch6-du "3.0 MB">
 <!ENTITY iana-etc-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY inetutils-version "1.9.3">
-<!ENTITY inetutils-size "1,332 KB">
+<!ENTITY inetutils-version "1.9.4">
+<!ENTITY inetutils-size "1,333 KB">
 <!ENTITY inetutils-url "&gnu;inetutils/inetutils-&inetutils-version;.tar.xz">
-<!ENTITY inetutils-md5 "452ae548aa0421eee0bf2bfa21000e39">
+<!ENTITY inetutils-md5 "87fef1fa3f603aef11c41dcc097af75e">
 <!ENTITY inetutils-home "&gnu-software;inetutils/">
 <!ENTITY inetutils-ch6-du "34 MB">
 <!ENTITY inetutils-ch6-sbu "0.4 SBU">
@@ -332,10 +332,10 @@
 <!ENTITY kbd-ch6-du "34 MB">
 <!ENTITY kbd-ch6-sbu "0.1 SBU">
 
-<!ENTITY kmod-version "20">
-<!ENTITY kmod-size "428 KB">
+<!ENTITY kmod-version "21">
+<!ENTITY kmod-size "436 KB">
 <!ENTITY kmod-url "&kernel;linux/utils/kernel/kmod/kmod-&kmod-version;.tar.xz">
-<!ENTITY kmod-md5 "d6f4fef718a50bd88080de6a43bc64d8">
+<!ENTITY kmod-md5 "ee246fab2e1cba9fbdcad6a86ec31531">
 <!ENTITY kmod-home " ">
 <!ENTITY kmod-ch6-du "37 MB">
 <!ENTITY kmod-ch6-sbu "0.1 SBU">
diff --git a/prologue/standards.xml b/prologue/standards.xml
index 95865bd55..36a7be419 100644
--- a/prologue/standards.xml
+++ b/prologue/standards.xml
@@ -23,18 +23,19 @@
       </listitem>
       <listitem>
         <para><ulink 
-        url="http://www.linuxfoundation.org/collaborate/workgroups/lsb/fhs-30-draft-1">
-        Filesystem Hierarchy Standard version 3.0 Draft 1 (FHS)</ulink></para>
+        url="http://refspecs.linuxfoundation.org/fhs.shtml">
+        Filesystem Hierarchy Standard (FHS) Version 3.0</ulink></para>
 
       </listitem>
       <listitem>
         <para><ulink url="http://refspecs.linuxfoundation.org/lsb.shtml">Linux
-        Standard Base (LSB) Specifications</ulink></para>
+        Standard Base (LSB) Version 5.0</ulink></para>
 
-        <para>The LSB has five separate standards: Core, C++, Desktop,
-        Runtime Languages, and Printing. In addition to generic requirements
-        there are also architecture specific requirements.  LFS attempts to
-        conform to the architectures discussed in the previous section.</para>
+        <para>The LSB has four separate standards: Core, Desktop,
+        Runtime Languages, and Imaging. In addition to generic requirements
+        there are also architecture specific requirements.  There are also two
+        areas for trial use: Gtk3 and Graphics.  LFS attempts to conform to the
+        architectures discussed in the previous section.</para>
 
         <note><para>Many people do not agree with the requirements of the LSB.
         The main purpose of defining it is to ensure that proprietary software
@@ -61,19 +62,12 @@
         <term><emphasis>LSB Core:</emphasis></term>
         <listitem>
           <para>Bash, Bc, Binutils, Coreutils, Diffutils, File, Findutils, Gawk,
-                Grep, Gzip, M4, Man-DB, Ncurses, Procps, Psmisc, Sed,
+                Grep, GTK+2, Gzip, M4, Man-DB, Ncurses, Procps, Psmisc, Sed,
                 Shadow, Tar, Util-linux, Zlib</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis>LSB C++:</emphasis></term>
-        <listitem>
-          <para>Gcc</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><emphasis>LSB Desktop:</emphasis></term>
         <listitem>
           <para>None</para>
@@ -88,14 +82,14 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis>LSB Printing:</emphasis></term>
+        <term><emphasis>LSB Imaging:</emphasis></term>
         <listitem>
           <para>None</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis>LSB Multimeda:</emphasis></term>
+        <term><emphasis>LSB Gtk3 and LSB Graphics (Trial Use):</emphasis></term>
         <listitem>
           <para>None</para>
         </listitem>
@@ -113,44 +107,38 @@
         <term><emphasis>LSB Core:</emphasis></term>
         <listitem>
           <para>At, Batch (a part of At), Cpio, Ed, Fcrontab, Initd-tools,
-          Lsb_release, PAM, Pax, Sendmail (or Postfix or Exim), time </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><emphasis>LSB C++:</emphasis></term>
-        <listitem>
-          <para>None</para>
+          Lsb_release, NSPR, NSS, PAM, Pax, Sendmail (or Postfix or Exim), time
+          </para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
         <term><emphasis>LSB Desktop:</emphasis></term>
         <listitem>
-          <para>ATK, Cairo, Desktop-file-utils, Freetype, Fontconfig,
-                Glib2, GTK+2, Icon-naming-utils, Libjpeg, Libpng, Libxml2,
-                MesaLib, Pango, Qt4, Xorg</para>
+          <para>Alsa, ATK, Cairo, Desktop-file-utils, Freetype, Fontconfig,
+          Gdk-pixbuf, Glib2, Icon-naming-utils, Libjpeg-turbo, Libpng, Libtiff,
+          Libxml2, MesaLib, Pango, Qt4, Xdg-utils, Xorg</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
         <term><emphasis>LSB Runtime Languages:</emphasis></term>
         <listitem>
-          <para>Python</para>
+          <para>Python, Libxml2, Libxslt </para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis>LSB Printing:</emphasis></term>
+        <term><emphasis>LSB Imaging:</emphasis></term>
         <listitem>
-          <para>CUPS</para>
+          <para>CUPS, Cups-filters, Ghostscript, SANE</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis>LSB Multimeda:</emphasis></term>
+        <term><emphasis>LSB Gtk3 and LSB Graphics (Trial Use):</emphasis></term>
         <listitem>
-          <para>Alsa Libraries, NSPR, NSS, OpenSSL, Java, Xdg-utils</para>
+          <para>GTK+3</para>
         </listitem>
       </varlistentry>
 
@@ -170,16 +158,9 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis>LSB C++:</emphasis></term>
-        <listitem>
-          <para>None</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><emphasis>LSB Desktop:</emphasis></term>
         <listitem>
-          <para>Qt3</para>
+          <para>None</para>
         </listitem>
       </varlistentry>
 
@@ -191,14 +172,14 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis>LSB Printing:</emphasis></term>
+        <term><emphasis>LSB Imaging:</emphasis></term>
         <listitem>
           <para>None</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis>LSB Multimeda:</emphasis></term>
+        <term><emphasis>LSB Gtk3 and LSB Graphics (Trial Use):</emphasis></term>
         <listitem>
           <para>None</para>
         </listitem>