• Update to nspr-4.11.

• Update to wireshark-2.0.0. Many simplifications in the instructions.
• Update to xmlto-0.0.28. Links problem not solved. Two (test?) files
  installed in the ~/Desktop directory, as before.


git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16676 af4574ff-66df-0310-9fd7-8a98e5e911e0

general.ent

@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "18">                   <!-- Always 2 digits -->
+<!ENTITY day          "19">                   <!-- Always 2 digits -->
 <!ENTITY month        "11">                   <!-- Always 2 digits -->
 <!ENTITY year         "2015">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "November 18th &year;">
+<!ENTITY releasedate  "November 19th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->

general/genlib/nspr.xml

@@ -7,7 +7,7 @@
   <!ENTITY nspr-download-http "https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">
 <!--  <!ENTITY nspr-download-ftp "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">-->
   <!ENTITY nspr-download-ftp " ">
-  <!ENTITY nspr-md5sum        "cf43d04668ab20f12cd0b5fa24315354">
+  <!ENTITY nspr-md5sum        "4f24b2fb88ca03b5d6d6931d6a67ef9a">
   <!ENTITY nspr-size          "1.1 MB">
   <!ENTITY nspr-buildsize     "12 MB">
   <!ENTITY nspr-time          "less than 0.1 SBU">

introduction/welcome/changelog.xml

@@ -44,6 +44,27 @@
 
 -->
 
+    <listitem>
+      <para>November 19th, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to xmlto-0.0.28. Links problem not solved.
+          Two (test?) files installed in the ~/Desktop directory, as before.
+          Fixes
+          <ulink url="&blfs-ticket-root;7145">#7145</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to wireshark-2.0.0. Many simplifications in
+          the instructions. Fixes
+          <ulink url="&blfs-ticket-root;7144">#7144</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to nspr-4.11. Fixes
+          <ulink url="&blfs-ticket-root;7143">#7143</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>November 18th, 2015</para>
       <itemizedlist>

networking/netutils/wireshark.xml

@@ -6,10 +6,10 @@
 
   <!ENTITY wireshark-download-http "https://www.wireshark.org/download/src/all-versions/wireshark-&wireshark-version;.tar.bz2">
   <!ENTITY wireshark-download-ftp  "ftp://ftp.uni-kl.de/pub/wireshark/src/wireshark-&wireshark-version;.tar.bz2">
-  <!ENTITY wireshark-md5sum        "988a4595a4a87dafb3c4870ea40e89b5">
+  <!ENTITY wireshark-md5sum        "5909af2a09a9a3023ba61bc62e787ad2">
-  <!ENTITY wireshark-size          "28 MB">
+  <!ENTITY wireshark-size          "30 MB">
-  <!ENTITY wireshark-buildsize     "1.4 GB, with the Qt GUI">
+  <!ENTITY wireshark-buildsize     "2.1 GB, with default GUI front-ends">
-  <!ENTITY wireshark-time          "7.2 SBU, with the Qt GUI">
+  <!ENTITY wireshark-time          "8.1 SBU, with default GUI front-ends">
 ]>
 
 <sect1 id="wireshark" xreflabel="Wireshark-&wireshark-version;">
@@ -73,7 +73,7 @@
         <para>
           Optional patch:
           <ulink url=
-              "&patch-root;/wireshark-&wireshark-version;-lua_5_3_0-1.patch"/>
+              "&patch-root;/wireshark-&wireshark-version;-lua_5_3_1-1.patch"/>
           (allows building the LUA bindings if <xref linkend="lua"/> is
           installed and LUA is not disabled by passing <option>--without-lua
           </option> to <command>configure</command>)
@@ -97,29 +97,33 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gtk3"/> (to build the <application>Gtk+3</application>
+      <xref linkend="gtk3"/> (for the <application>Gtk+3</application> GUI),
-      GUI) and
+      <xref linkend="libpcap"/> (required to capture data), and
-      <xref linkend="libpcap"/> (required to capture data)
+      <xref linkend="qt5"/> (for the <application>Qt5</application> GUI)
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="gnutls"/>,
       <xref linkend="libgcrypt"/>,
+      <xref linkend="libnl"/>,
       <xref linkend="lua"/>,
       <xref linkend="mitkrb"/>,
       <xref linkend="openssl"/>,
+      <xref linkend="sbc"/>,
       <ulink url="http://www.gnu.org/software/adns/adns.html">adns</ulink>,
+      <ulink url="http://c-ares.haxx.se/">c-ares</ulink>,
+      <ulink url="http://www.ibr.cs.tu-bs.de/projects/libsmi/">libsmi</ulink>,
       <ulink url="http://www.maxmind.com/app/c">GeoIP</ulink>, and
-      <ulink url="http://www.portaudio.com/download.html">PortAudio</ulink>
+      <ulink url="http://www.portaudio.com/">PortAudio</ulink>
+      (for GTK+ RTP player)
     </para>
 
-    <bridgehead renderas="sect4">Optional (to build more GUI front-ends)
+    <bridgehead renderas="sect4">Optional (for GUI front-ends)
     </bridgehead>
     <para role="optional">
-      <xref linkend="gtk2"/>,
+      <xref linkend="gtk2"/>, or
-      <xref linkend="qt4"/>, or
+      <xref linkend="qt4"/>,
-      <xref linkend="qt5"/>
     </para>
 
     <note>
@@ -136,13 +140,10 @@
       </para>
 
       <para>
-        Both GTK+ and Qt GUI can be built at the same time. If you want to
+        Both GTK+ and Qt GUI front-ends are built, as recommended by the
-        override the defaults, some configure switches have to be set
+        upstream developers.  If you want to override the defaults, some
-        (see <quote>Command Explanations</quote>) or some special instructions
+        configure switches have to be set (see <quote>Command
-        have to be issued (see below) when both Qt4 and Qt5 are installed and
+        Explanations</quote>).
-        you want to use Qt4.  SBU and disk space required are larger for the
-        Qt GUI. The instructions below suppose you only want to build the
-        GTK+3 GUI.
       </para>
     </note>
 
@@ -179,22 +180,6 @@
   <sect2 role="installation">
     <title>Installation of Wireshark</title>
 
-    <para>
-      Optionally, fix the description of the program in the title.
-      The first change overwrites the default <quote>SVN Unknown</quote> in
-      the title and the second overwrites a utility script that resets the
-      version to <quote>unknown</quote>.
-    </para>
-
-<screen><userinput>cat > svnversion.h &lt;&lt; "EOF" &amp;&amp;
-#define SVNVERSION "BLFS"
-#define SVNPATH "source"
-EOF
-
-cat > make-version.pl &lt;&lt; "EOF"
-<literal>#!/usr/bin/perl</literal>
-EOF</userinput></screen>
-
     <para>
       <application>Wireshark</application> is a very large and complex
       application. These instructions provide additional security measures to
@@ -205,35 +190,15 @@ EOF</userinput></screen>
 
 <screen role="root"><userinput>groupadd -g 62 wireshark</userinput></screen>
 
-    <para>
-      If you want to build the Qt GUI (see <quote>Command Explanations</quote>),
-      for the <application>Qt5</application> GUI, issue:
-    </para>
-
-<screen><userinput>source setqt5 &amp;&amp;
-
-sed -e 's/"-fPIE"/""/' \
-    -e 's/"-pie"/""/'  \
-    -i configure</userinput></screen>
-
-    <para>
-      and add <envar>CXXFLAGS="-fPIC"</envar> to the configure line, or, for the <application>Qt4</application> GUI, issue:
-    </para>
-
-<screen><userinput>source setqt4 &amp;&amp;
-sed -i 's/Qt5 Qt/Qt/' configure</userinput></screen>
-
     <para>
       Continue to install <application>Wireshark</application> by running
       the following commands:
     </para>
 
-<screen><userinput>patch -Np1 -i ../wireshark-&wireshark-version;-lua_5_3_0-1.patch  &amp;&amp;
+<screen><userinput>patch -Np1 -i ../wireshark-&wireshark-version;-lua_5_3_1-1.patch  &amp;&amp;
+
+./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 
-./configure --prefix=/usr     \
-            --with-gtk3       \
-            --without-qt      \
-            --sysconfdir=/etc &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -247,8 +212,6 @@ make</userinput></screen>
 <screen role="root"><userinput>make install &amp;&amp;
 
 install -v -m755 -d /usr/share/doc/wireshark-&wireshark-version; &amp;&amp;
-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;
 
@@ -256,17 +219,8 @@ pushd /usr/share/doc/wireshark-&wireshark-version; &amp;&amp;
    for FILENAME in ../../wireshark/*.html; do
       ln -s -v -f $FILENAME .
    done &amp;&amp;
-popd &amp;&amp;
+popd
-unset FILENAME
+unset FILENAME</userinput></screen>
-
-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 -m644    image/*.{png,ico,xpm,bmp} \
-                    /usr/share/pixmaps/wireshark</userinput></screen>
 
     <para>
       If you downloaded any of the documentation files from the page
@@ -294,37 +248,32 @@ chmod -v 6550 /usr/bin/{tshark,dumpcap}</userinput></screen>
 
 <screen role="root"><userinput>usermod -a -G wireshark &lt;username&gt;</userinput></screen>
 
+    <para>
+      If you are installing wireshark for the first time, it will be necessary
+      to leave the session and login again, thus you will now have wireshark
+      between your groups, otherwise, it will not run properly.
+    </para>
+
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
 
     <para>
-      <command>sed -e 's/"-fPIE"/""/' ... configure</command>: This command is
+      <option>--with-gtk2=[yes/no]</option>: For the Gtk+2 GUI. If both Gtk+2
-      required for Qt-5.5, because it is necessary to compile with
+      and 3 are installed, default is no. Notice that the GUI for only one Gtk+
-      <envar>CXXFLAGS="-fPIC"</envar>.
+      version (either 2 or 3) can be built.
     </para>
 
     <para>
-      <command>sed -i 's/Qt5 Qt/Qt/' ...</command>: This command is required
+      <option>--with-gtk3=[yes/no]</option>: For the Gtk+3 GUI. If both Gtk+2
-      because, without it, libraries and includes from
+      and 3 are installed, default is yes.
-      <application>Qt5</application> are found and used first, if both versions
-      are installed, when trying to build with <application>Qt4</application>,
-      and <command>make</command> does not complete.
     </para>
 
     <para>
-      <parameter>--with-gtk3</parameter>: By default, the build machinery
+      <option>--with-qt=[yes/no/4/5]</option>: For the Qt GUI. Default is yes.
-      will build a GUI for both Qt and GTK+, if those libraries are found.
+      If both Qt4 and 5 are installed, Qt5 is chosen by default. Notice that the
-      If Qt is installed and you do not want the GUI for it to be built,
+      GUI for only one Qt version (either 4 or 5) can be built.
-      you need to pass <parameter>--without-qt</parameter> to the configure
-      script. That overrides the default, so that you must specify
-      <parameter>--with-gtk3</parameter>  or <parameter>--with-gtk2</parameter>
-      in order to have the GTK+ GUI built.
-    </para>
-
-    <para>
-      <parameter>--without-qt</parameter>: disables building of the Qt GUI.
     </para>
 
     <para>
@@ -333,13 +282,6 @@ chmod -v 6550 /usr/bin/{tshark,dumpcap}</userinput></screen>
       any of the GUIs.
     </para>
 
-    <para>
-      <option>--with-gtk2</option>: Use this option if you want
-      the <application>GTK+2</application> GUI.
-      Notice that the GUI for only one GTK+ version (either 2 or 3) can be
-      built.
-    </para>
-
   </sect2>
 
   <sect2 role="configuration">
@@ -349,7 +291,8 @@ chmod -v 6550 /usr/bin/{tshark,dumpcap}</userinput></screen>
       <title>Config Files</title>
 
       <para><filename>/etc/wireshark.conf</filename> and
-      <filename>~/.wireshark/*</filename></para>
+      <filename>~/.config/wireshark/*</filename> (unless there is already
+      <filename>~/.wireshark/*</filename> in the system)</para>
 
       <indexterm zone="wireshark wireshark-config">
         <primary sortas="e-AA.wireshark-star">~/.wireshark/*</primary>
@@ -364,42 +307,18 @@ chmod -v 6550 /usr/bin/{tshark,dumpcap}</userinput></screen>
     <sect3>
       <title>Configuration Information</title>
 
-      <para>Though the default configuration parameters are very sane,
+      <para>Though the default configuration parameters are very sane, reference
-      reference the configuration section of the
+      the configuration section of the <ulink
-      <ulink url="http://www.wireshark.org/docs/wsug_html/">Wireshark User's
+      url="http://www.wireshark.org/docs/wsug_html/">Wireshark User's
       Guide</ulink> for configuration information. Most of
       <application>Wireshark</application>'s configuration can be accomplished
-      using the menu options of the <command>wireshark</command>
+      using the menu options of the <command>wireshark</command> graphical
-      graphical interfaces.</para>
+      interfaces.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Desktop file for the Qt GUI</title>
-
-      <para>If Qt GUI was built and you wish an entry in the desktop menu,
-      there are two possibilities (instructions must be run as root).</para>
-
-      <para>If only the Qt GUI was built:</para>
-
-<screen role="root"><userinput>mv -v /usr/share/applications/wireshark.desktop \
-      /usr/share/applications/wireshark-qt.desktop</userinput></screen>
-
-      <para>If both, GTK+ and Qt GUIs were built:</para>
-
-<screen role="root"><userinput>cp -v /usr/share/applications/wireshark.desktop \
-      /usr/share/applications/wireshark-qt.desktop</userinput></screen>
-
-      <para>Now, fix it for <command>wireshark-qt</command>:</para>
-
-<screen role="root"><userinput>sed -e 's/ireshark/&amp;-qt/' \
-    -e 's/^\(Icon=wireshark\)-qt/\1/' \
-    -i /usr/share/applications/wireshark-qt.desktop</userinput></screen>
 
       <note>
-        <para>If you want to look at packets, make sure you don't filter
+        <para>If you want to look at packets, make sure you don't filter them
-        them out with <xref linkend="iptables"/>. If you want to exclude
+        out with <xref linkend="iptables"/>. If you want to exclude certain
-        certain classes of packets, it is more efficient to do it with
+        classes of packets, it is more efficient to do it with
         <application>iptables</application> than it is with
         <application>Wireshark</application>.</para>
       </note>
@@ -417,13 +336,19 @@ chmod -v 6550 /usr/bin/{tshark,dumpcap}</userinput></screen>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>capinfos, captype, dftest, dumpcap, editcap, mergecap, randpkt,
+        <seg>
-        rawshark, reordercap, text2pcap, tshark,
+          androiddump, capinfos, captype, dftest, dumpcap, editcap, idl2wrs,
-        wireshark, and optionally wireshark-qt</seg>
+          mergecap, randpkt, rawshark, reordercap, text2pcap, tshark, wireshark,
-        <seg>libfiletap.so, libwireshark.so, libwiretap.so, libwsutil.so, and
+          and wireshark-gtk
-        numerous modules under /usr/lib/wireshark/plugins</seg>
+        </seg>
-        <seg>/usr/lib/wireshark, /usr/share/doc/wireshark-&wireshark-version;,
+        <seg>
-        /usr/share/pixmaps/wireshark, and /usr/share/wireshark</seg>
+          libwireshark.so, libwiretap.so, libwsutil.so, and numerous modules
+          under /usr/lib/wireshark/plugins
+        </seg>
+        <seg>
+          /usr/{lib,share}/wireshark and
+          /usr/share/doc/wireshark-&wireshark-version;
+         </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -557,23 +482,27 @@ chmod -v 6550 /usr/bin/{tshark,dumpcap}</userinput></screen>
       <varlistentry id="wireshark-prog">
         <term><command>wireshark</command></term>
         <listitem>
-          <para>is the GTK+ GUI network protocol analyzer. It lets you
+          <para>
-          interactively browse packet data from a live network or from a
+            is the Qt GUI network protocol analyzer. It lets you interactively
-          previously saved capture file.</para>
+            browse packet data from a live network or from a previously saved
+            capture file.
+          </para>
           <indexterm zone="wireshark wireshark-prog">
             <primary sortas="b-wireshark">wireshark</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="wireshark-qt-prog">
+      <varlistentry id="wireshark-gtk-prog">
-        <term><command>wireshark-qt</command></term>
+        <term><command>wireshark-gtk</command></term>
         <listitem>
-          <para>is the Qt GUI network protocol analyzer. It lets you
+          <para>
-          interactively browse packet data from a live network or from a
+            is the Gtk+ GUI network protocol analyzer. It lets you interactively
-          previously saved capture file.</para>
+            browse packet data from a live network or from a previously saved
-          <indexterm zone="wireshark wireshark-qt-prog">
+            capture file.
-            <primary sortas="b-wireshark-qt">wireshark-qt</primary>
+          </para>
+          <indexterm zone="wireshark wireshark-gtk-prog">
+            <primary sortas="b-wireshark-gtk">wireshark-gtk</primary>
           </indexterm>
         </listitem>
       </varlistentry>

packages.ent

@@ -140,7 +140,7 @@
 <!ENTITY lzo-version                  "2.09">
 <!ENTITY mtdev-version                "1.1.5">
 <!ENTITY npth-version                 "1.2">
-<!ENTITY nspr-version                 "4.10.10">
+<!ENTITY nspr-version                 "4.11">
 <!ENTITY openobex-version             "1.7.1">
 <!ENTITY pcre-version                 "8.37">
 <!ENTITY popt-version                 "1.16">
@@ -376,7 +376,7 @@
 <!ENTITY traceroute-version           "2.0.21">
 <!ENTITY whois-version                "5.2.10">
 <!ENTITY wicd-version                 "1.7.3">
-<!ENTITY wireshark-version            "1.12.8">  <!-- even minors only -->
+<!ENTITY wireshark-version            "2.0.0">  <!-- even minors only -->
 
 <!ENTITY wicd-major-version           "1.7">
 
@@ -787,7 +787,7 @@
 <!ENTITY DocBook-version              "4.5">
 <!ENTITY docbook-xsl-version          "1.78.1">
 <!ENTITY itstool-version              "2.0.2">
-<!ENTITY xmlto-version                "0.0.27">
+<!ENTITY xmlto-version                "0.0.28">
 
 <!-- Chapter 54 -->
 <!ENTITY a2ps-version                 "4.14">

pst/xml/xmlto.xml

@@ -6,7 +6,7 @@
 
   <!ENTITY xmlto-download-http "https://fedorahosted.org/releases/x/m/xmlto/xmlto-&xmlto-version;.tar.bz2">
   <!ENTITY xmlto-download-ftp  " ">
-  <!ENTITY xmlto-md5sum        "bd1189afde95083d81bad967e4b4526c">
+  <!ENTITY xmlto-md5sum        "93bab48d446c826399d130d959fe676f">
   <!ENTITY xmlto-size          "128 KB">
   <!ENTITY xmlto-buildsize     "1.5 MB (with tests)">
   <!ENTITY xmlto-time          "less than 0.1 SBU (with tests)">
@@ -90,12 +90,6 @@
   <sect2 role="installation">
     <title>Installation of xmlto</title>
 
-    <para>First fix some regressions in the last update:</para>
-
-<screen><userinput>sed -e '87  s/2/{!2}/'                        \
-    -e '138 s/f "$CLEANFILES"/f $CLEANFILES/' \
-    -i xmlto.in</userinput></screen>
-
     <para>Install <application>xmlto</application> by running the following
     commands:</para>