Index: general.ent
===================================================================
--- general.ent	(revision f0af58fb9ba13dd3f4439ef50d40615996e5eb3c)
+++ general.ent	(revision a079e73c2ffbb25279b14e5824bff996fbb4b0ec)
@@ -500,5 +500,5 @@
 <!ENTITY whois-version                "5.0.12">
 <!ENTITY bind-version                 "9.8.1-P1">
-<!ENTITY wireshark-version            "0.99.6">
+<!ENTITY wireshark-version            "1.6.5">
 <!ENTITY avahi-version                "0.6.31">
 <!ENTITY mod_dnssd-version            "0.6">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f0af58fb9ba13dd3f4439ef50d40615996e5eb3c)
+++ introduction/welcome/changelog.xml	(revision a079e73c2ffbb25279b14e5824bff996fbb4b0ec)
@@ -46,4 +46,11 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to wireshark-1.6.5.  Add instructions
+          to restrict use to authorized users.
+          Fixes 
+          <ulink url="&blfs-ticket-root;2816">#2815</ulink> and
+          <ulink url="&blfs-ticket-root;2911">#2911</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Fix screen to use the LFS value for gid.
           Fixes 
Index: networking/netutils/wireshark.xml
===================================================================
--- networking/netutils/wireshark.xml	(revision f0af58fb9ba13dd3f4439ef50d40615996e5eb3c)
+++ networking/netutils/wireshark.xml	(revision a079e73c2ffbb25279b14e5824bff996fbb4b0ec)
@@ -6,9 +6,9 @@
 
   <!ENTITY wireshark-download-http "http://www.wireshark.org/download/src/all-versions/wireshark-&wireshark-version;.tar.bz2">
-  <!ENTITY wireshark-download-ftp  "&sources-anduin-ftp;/w/wireshark-&wireshark-version;.tar.bz2">
-  <!ENTITY wireshark-md5sum        "e57a8c8b364c38df3da97e2ee9f0d0bc">
-  <!ENTITY wireshark-size          "11.8 MB">
-  <!ENTITY wireshark-buildsize     "449 MB">
-  <!ENTITY wireshark-time          "6.4 SBU">
+  <!ENTITY wireshark-download-ftp  " ">
+  <!ENTITY wireshark-md5sum        "794948a10d387fc8e37d824ea11dbac9">
+  <!ENTITY wireshark-size          "21 MB">
+  <!ENTITY wireshark-buildsize     "952 MB">
+  <!ENTITY wireshark-time          "5.8 SBU">
 ]>
 
@@ -39,4 +39,6 @@
     network analyzers.</para>
 
+    &lfs71_checked;
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -64,6 +66,7 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Additional Documentation: <ulink
-        url="http://www.wireshark.org/docs/"/></para>
+        <para>Additional Documentation: 
+           <ulink url="http://www.wireshark.org/download/docs/"/>
+         </para>
       </listitem>
     </itemizedlist>
@@ -83,29 +86,22 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libpcap"/>
-    (required to capture data)</para>
+    <para role="recommended">
+      <xref linkend="libpcap"/> (required to capture data)
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><!-- <xref linkend="pkgconfig"/>, -->
-    <xref linkend="gtk2"/> (to build the GUI front-end),
-    <xref linkend="openssl"/>,
-    <xref linkend="mitkrb"/>,
-    <xref linkend="python2"/>,
-    <xref linkend="pcre"/>,
-    <xref linkend="gnutls"/>,
-    <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
-    <ulink url="http://www.gnu.org/software/adns/adns.html">adns</ulink>, and
-    <ulink url="http://www.lua.org/">Lua</ulink></para>
-
-    <!-- Though configure looks for all these, and the developers I'm
-         sure use them, the doc sources are not included in the release
-         tarball (they are in SVN, though)
-    <bridgehead renderas="sect4">Optional (to build additional
-    documentation)</bridgehead>
-    <para role="optional"><xref linkend="doxygen"/>,
-    <xref linkend="libxml"/>,
-    <xref linkend="libxslt"/>, and
-    <xref linkend="fop"/></para>
-    -->
+      <xref linkend="gtk2"/> or <xref linkend="gtk3"/> (to build the GUI front-end),
+      <xref linkend="openssl"/>,
+      <xref linkend="mitkrb"/>,
+      <xref linkend="python2"/>,
+      <xref linkend="pcre"/>,
+      <xref linkend="gnutls"/>,
+      <ulink url="http://www.portaudio.com/download.html">PortAudio</ulink>,
+      <ulink url="http://www.maxmind.com/app/c">GeoIP</ulink>,
+      <!-- <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>, -->
+      <ulink url="http://www.gnu.org/software/adns/adns.html">adns</ulink>, and
+      <ulink url="http://www.lua.org/">Lua</ulink>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -135,6 +131,28 @@
     <title>Installation of Wireshark</title>
 
-    <para>Install <application>Wireshark</application> by running the following
-    commands:</para>
+    <para>Optionally, fix the description of the program in the title. 
+    The first change overwrites the default "SVN Unknown" in the title
+    and the secong overwrites a utility script that resets the version
+    to "unknown".</para>
+
+<screen><userinput>cat > svnversion.h &lt;&lt; "EOF"
+#define SVNVERSION "BLFS"
+#define SVNPATH "source"
+EOF
+
+cat > make-version.pl &lt;&lt; "EOF"
+#!/usr/bin/perl
+EOF</userinput></screen>
+
+    <para><application>Wireshark</application> is a very large and complex
+    application.  These instructions provide additional security measures to
+    ensure that only trusted users are allowed to view network traffic.  First,
+    set up a system groub for wireshark.  As the <systemitem
+    class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>groupadd -g 62 wireshark</userinput></screen>
+
+    <para>Continue to install <application>Wireshark</application> by running
+    the following commands:</para>
 
 <screen><userinput>./configure --prefix=/usr \
@@ -150,19 +168,23 @@
 
 install -v -m755 -d /usr/share/doc/wireshark-&wireshark-version; &amp;&amp;
-install -v -m644    FAQ README{,.linux} doc/README.* doc/*.{pod,txt} \
+install -v -m755 -d /usr/share/pixmaps/wireshark &amp;&amp;
+
+install -v -m644    README{,.linux} doc/README.* doc/*.{pod,txt} \
                     /usr/share/doc/wireshark-&wireshark-version; &amp;&amp;
+
 pushd /usr/share/doc/wireshark-&wireshark-version; &amp;&amp;
-for FILENAME in ../../wireshark/*.html; do \
-    ln -s -v $FILENAME .
-done &amp;&amp;
+   for FILENAME in ../../wireshark/*.html; do 
+      ln -s -v $FILENAME .
+   done &amp;&amp;
 popd &amp;&amp;
 
 install -v -m644 -D wireshark.desktop \
                     /usr/share/applications/wireshark.desktop &amp;&amp;
+
 install -v -m644 -D image/wsicon48.png \
                     /usr/share/pixmaps/wireshark.png &amp;&amp;
-install -v -m755 -d /usr/share/pixmaps/wireshark &amp;&amp;
-install -v -m644 image/*.{png,ico,xpm,bmp} \
-                 /usr/share/pixmaps/wireshark</userinput></screen>
+
+install -v -m644    image/*.{png,ico,xpm,bmp} \
+                    /usr/share/pixmaps/wireshark</userinput></screen>
 
     <para>If you downloaded any of the documentation files from the page
@@ -171,4 +193,14 @@
 
 <screen role="root"><userinput>install -v -m644 <replaceable>&lt;Downloaded_Files&gt;</replaceable> /usr/share/doc/wireshark-&wireshark-version;</userinput></screen>
+
+  <para>Now, set ownership and permissions of sensitive applications to to
+  only allow authorized users.  As the <systemitem
+  class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>chown -v root:wireshark /usr/bin/{tshark,dumpcap} &amp;&amp;
+chmod -v 6550 /usr/bin/{tshark,dumpcap}</userinput></screen>
+
+  <para>Finally, add any users to the wireshark group with <userinput>usermod -a -G
+  wireshark &lt;username&gt;</userinput>.</para>
 
   </sect2>
@@ -184,4 +216,7 @@
     <application>OpenSSL</application>
     <filename class='libraryfile'>libcrypto</filename> library is found.</para>
+
+    <para><option>--with-python</option>: This parameter is required if you
+    want Python bindings built.</para>
 
   </sect2>
@@ -239,7 +274,7 @@
       <seglistitem>
         <seg>capinfos, dftest, dumpcap, editcap, idl2wrs, mergecap, randpkt,
-        text2pcap, tshark and wireshark</seg>
-        <seg>libwireshark.so, libwiretap.so and numerous dissector plugin
-        modules</seg>
+        rawshark, text2pcap, tshark and wireshark</seg>
+        <seg>libwireshark.so, libwiretap.so, libwsutil.so, and 
+        numerous plugin modules</seg>
         <seg>/usr/lib/wireshark, /usr/share/doc/wireshark-&wireshark-version;,
         /usr/share/pixmaps/wireshark and /usr/share/wireshark</seg>
@@ -333,4 +368,14 @@
       </varlistentry>
 
+      <varlistentry id="rawshark">
+        <term><command>rawshark</command></term>
+        <listitem>
+          <para>dump and analyze raw libpcap data.</para>
+          <indexterm zone="wireshark rawshark">
+            <primary sortas="b-rawshark">rawshark</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="text2pcap">
         <term><command>text2pcap</command></term>
Index: postlfs/config/users.xml
===================================================================
--- postlfs/config/users.xml	(revision f0af58fb9ba13dd3f4439ef50d40615996e5eb3c)
+++ postlfs/config/users.xml	(revision a079e73c2ffbb25279b14e5824bff996fbb4b0ec)
@@ -99,4 +99,5 @@
         <row><entry>games   </entry><entry>60</entry><entry>60</entry></row>
         <row><entry>kvm     </entry><entry>  </entry><entry>61</entry></row>
+        <row><entry>wireshark</entry><entry> </entry><entry>62</entry></row>
         <row><entry>scanner </entry><entry>  </entry><entry>70</entry></row>
         <row><entry>avahi   </entry><entry>84</entry><entry>84</entry></row>
@@ -112,7 +113,6 @@
   <para>One value that is missing is 65534.  This value is customarily assigned
   to the user <systemitem class="username">nobody</systemitem> and group
-  <systemitem class="groupname">nogroup</systemitem> and is unnecessary.  <!--The
-  issue is explained in more detail in the first note in the <xref
-  linkend="nfs-utils-install"/> section.--></para>
+  <systemitem class="groupname">nogroup</systemitem> and is unnecessary.
+  </para>
 
 </sect1>
