Changeset 791e3e7d


Ignore:
Timestamp:
11/19/2015 10:57:25 PM (8 years ago)
Author:
Fernando de Oliveira <fernando@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
b1478b35
Parents:
de81317
Message:
  • 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

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    rde81317 r791e3e7d  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "18">                   <!-- Always 2 digits -->
     3<!ENTITY day          "19">                   <!-- Always 2 digits -->
    44<!ENTITY month        "11">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2015">
    … …  
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "November 18th &year;">
     9<!ENTITY releasedate  "November 19th &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

  • general/genlib/nspr.xml

    rde81317 r791e3e7d  
    88<!--  <!ENTITY nspr-download-ftp "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">-->
    99  <!ENTITY nspr-download-ftp " ">
    10   <!ENTITY nspr-md5sum        "cf43d04668ab20f12cd0b5fa24315354">
     10  <!ENTITY nspr-md5sum        "4f24b2fb88ca03b5d6d6931d6a67ef9a">
    1111  <!ENTITY nspr-size          "1.1 MB">
    1212  <!ENTITY nspr-buildsize     "12 MB">

  • introduction/welcome/changelog.xml

    rde81317 r791e3e7d  
    4444
    4545-->
     46
     47    <listitem>
     48      <para>November 19th, 2015</para>
     49      <itemizedlist>
     50        <listitem>
     51          <para>[fernando] - Update to xmlto-0.0.28. Links problem not solved.
     52          Two (test?) files installed in the ~/Desktop directory, as before.
     53          Fixes
     54          <ulink url="&blfs-ticket-root;7145">#7145</ulink>.</para>
     55        </listitem>
     56        <listitem>
     57          <para>[fernando] - Update to wireshark-2.0.0. Many simplifications in
     58          the instructions. Fixes
     59          <ulink url="&blfs-ticket-root;7144">#7144</ulink>.</para>
     60        </listitem>
     61        <listitem>
     62          <para>[fernando] - Update to nspr-4.11. Fixes
     63          <ulink url="&blfs-ticket-root;7143">#7143</ulink>.</para>
     64        </listitem>
     65      </itemizedlist>
     66    </listitem>
    4667
    4768    <listitem>

  • networking/netutils/wireshark.xml

    rde81317 r791e3e7d  
    77  <!ENTITY wireshark-download-http "https://www.wireshark.org/download/src/all-versions/wireshark-&wireshark-version;.tar.bz2">
    88  <!ENTITY wireshark-download-ftp  "ftp://ftp.uni-kl.de/pub/wireshark/src/wireshark-&wireshark-version;.tar.bz2">
    9   <!ENTITY wireshark-md5sum        "988a4595a4a87dafb3c4870ea40e89b5">
    10   <!ENTITY wireshark-size          "28 MB">
    11   <!ENTITY wireshark-buildsize     "1.4 GB, with the Qt GUI">
    12   <!ENTITY wireshark-time          "7.2 SBU, with the Qt GUI">
     9  <!ENTITY wireshark-md5sum        "5909af2a09a9a3023ba61bc62e787ad2">
     10  <!ENTITY wireshark-size          "30 MB">
     11  <!ENTITY wireshark-buildsize     "2.1 GB, with default GUI front-ends">
     12  <!ENTITY wireshark-time          "8.1 SBU, with default GUI front-ends">
    1313]>
    1414
    … …  
    7474          Optional patch:
    7575          <ulink url=
    76               "&patch-root;/wireshark-&wireshark-version;-lua_5_3_0-1.patch"/>
     76              "&patch-root;/wireshark-&wireshark-version;-lua_5_3_1-1.patch"/>
    7777          (allows building the LUA bindings if <xref linkend="lua"/> is
    7878          installed and LUA is not disabled by passing <option>--without-lua
    … …  
    9898    <bridgehead renderas="sect4">Recommended</bridgehead>
    9999    <para role="recommended">
    100       <xref linkend="gtk3"/> (to build the <application>Gtk+3</application>
    101       GUI) and
    102       <xref linkend="libpcap"/> (required to capture data)
     100      <xref linkend="gtk3"/> (for the <application>Gtk+3</application> GUI),
     101      <xref linkend="libpcap"/> (required to capture data), and
     102      <xref linkend="qt5"/> (for the <application>Qt5</application> GUI)
    103103    </para>
    104104
    … …  
    107107      <xref linkend="gnutls"/>,
    108108      <xref linkend="libgcrypt"/>,
     109      <xref linkend="libnl"/>,
    109110      <xref linkend="lua"/>,
    110111      <xref linkend="mitkrb"/>,
    111112      <xref linkend="openssl"/>,
     113      <xref linkend="sbc"/>,
    112114      <ulink url="http://www.gnu.org/software/adns/adns.html">adns</ulink>,
     115      <ulink url="http://c-ares.haxx.se/">c-ares</ulink>,
     116      <ulink url="http://www.ibr.cs.tu-bs.de/projects/libsmi/">libsmi</ulink>,
    113117      <ulink url="http://www.maxmind.com/app/c">GeoIP</ulink>, and
    114       <ulink url="http://www.portaudio.com/download.html">PortAudio</ulink>
    115     </para>
    116 
    117     <bridgehead renderas="sect4">Optional (to build more GUI front-ends)
     118      <ulink url="http://www.portaudio.com/">PortAudio</ulink>
     119      (for GTK+ RTP player)
     120    </para>
     121
     122    <bridgehead renderas="sect4">Optional (for GUI front-ends)
    118123    </bridgehead>
    119124    <para role="optional">
    120       <xref linkend="gtk2"/>,
    121       <xref linkend="qt4"/>, or
    122       <xref linkend="qt5"/>
     125      <xref linkend="gtk2"/>, or
     126      <xref linkend="qt4"/>,
    123127    </para>
    124128
    … …  
    137141
    138142      <para>
    139         Both GTK+ and Qt GUI can be built at the same time. If you want to
    140         override the defaults, some configure switches have to be set
    141         (see <quote>Command Explanations</quote>) or some special instructions
    142         have to be issued (see below) when both Qt4 and Qt5 are installed and
    143         you want to use Qt4.  SBU and disk space required are larger for the
    144         Qt GUI. The instructions below suppose you only want to build the
    145         GTK+3 GUI.
     143        Both GTK+ and Qt GUI front-ends are built, as recommended by the
     144        upstream developers.  If you want to override the defaults, some
     145        configure switches have to be set (see <quote>Command
     146        Explanations</quote>).
    146147      </para>
    147148    </note>
    … …  
    181182
    182183    <para>
    183       Optionally, fix the description of the program in the title.
    184       The first change overwrites the default <quote>SVN Unknown</quote> in
    185       the title and the second overwrites a utility script that resets the
    186       version to <quote>unknown</quote>.
    187     </para>
    188 
    189 <screen><userinput>cat > svnversion.h &lt;&lt; "EOF" &amp;&amp;
    190 #define SVNVERSION "BLFS"
    191 #define SVNPATH "source"
    192 EOF
    193 
    194 cat > make-version.pl &lt;&lt; "EOF"
    195 <literal>#!/usr/bin/perl</literal>
    196 EOF</userinput></screen>
    197 
    198     <para>
    199184      <application>Wireshark</application> is a very large and complex
    200185      application. These instructions provide additional security measures to
    … …  
    207192
    208193    <para>
    209       If you want to build the Qt GUI (see <quote>Command Explanations</quote>),
    210       for the <application>Qt5</application> GUI, issue:
    211     </para>
    212 
    213 <screen><userinput>source setqt5 &amp;&amp;
    214 
    215 sed -e 's/"-fPIE"/""/' \
    216     -e 's/"-pie"/""/'  \
    217     -i configure</userinput></screen>
    218 
    219     <para>
    220       and add <envar>CXXFLAGS="-fPIC"</envar> to the configure line, or, for the <application>Qt4</application> GUI, issue:
    221     </para>
    222 
    223 <screen><userinput>source setqt4 &amp;&amp;
    224 sed -i 's/Qt5 Qt/Qt/' configure</userinput></screen>
    225 
    226     <para>
    227194      Continue to install <application>Wireshark</application> by running
    228195      the following commands:
    229196    </para>
    230197
    231 <screen><userinput>patch -Np1 -i ../wireshark-&wireshark-version;-lua_5_3_0-1.patch  &amp;&amp;
    232 
    233 ./configure --prefix=/usr     \
    234             --with-gtk3       \
    235             --without-qt      \
    236             --sysconfdir=/etc &amp;&amp;
     198<screen><userinput>patch -Np1 -i ../wireshark-&wireshark-version;-lua_5_3_1-1.patch  &amp;&amp;
     199
     200./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
     201
    237202make</userinput></screen>
    238203
    … …  
    248213
    249214install -v -m755 -d /usr/share/doc/wireshark-&wireshark-version; &amp;&amp;
    250 install -v -m755 -d /usr/share/pixmaps/wireshark &amp;&amp;
    251 
    252215install -v -m644    README{,.linux} doc/README.* doc/*.{pod,txt} \
    253216                    /usr/share/doc/wireshark-&wireshark-version; &amp;&amp;
    … …  
    257220      ln -s -v -f $FILENAME .
    258221   done &amp;&amp;
    259 popd &amp;&amp;
    260 unset FILENAME
    261 
    262 install -v -m644 -D wireshark.desktop \
    263                     /usr/share/applications/wireshark.desktop &amp;&amp;
    264 
    265 install -v -m644 -D image/wsicon48.png \
    266                     /usr/share/pixmaps/wireshark.png &amp;&amp;
    267 
    268 install -v -m644    image/*.{png,ico,xpm,bmp} \
    269                     /usr/share/pixmaps/wireshark</userinput></screen>
     222popd
     223unset FILENAME</userinput></screen>
    270224
    271225    <para>
    … …  
    295249<screen role="root"><userinput>usermod -a -G wireshark &lt;username&gt;</userinput></screen>
    296250
     251    <para>
     252      If you are installing wireshark for the first time, it will be necessary
     253      to leave the session and login again, thus you will now have wireshark
     254      between your groups, otherwise, it will not run properly.
     255    </para>
     256
    297257  </sect2>
    298258
    … …  
    301261
    302262    <para>
    303       <command>sed -e 's/"-fPIE"/""/' ... configure</command>: This command is
    304       required for Qt-5.5, because it is necessary to compile with
    305       <envar>CXXFLAGS="-fPIC"</envar>.
    306     </para>
    307 
    308     <para>
    309       <command>sed -i 's/Qt5 Qt/Qt/' ...</command>: This command is required
    310       because, without it, libraries and includes from
    311       <application>Qt5</application> are found and used first, if both versions
    312       are installed, when trying to build with <application>Qt4</application>,
    313       and <command>make</command> does not complete.
    314     </para>
    315 
    316     <para>
    317       <parameter>--with-gtk3</parameter>: By default, the build machinery
    318       will build a GUI for both Qt and GTK+, if those libraries are found.
    319       If Qt is installed and you do not want the GUI for it to be built,
    320       you need to pass <parameter>--without-qt</parameter> to the configure
    321       script. That overrides the default, so that you must specify
    322       <parameter>--with-gtk3</parameter>  or <parameter>--with-gtk2</parameter>
    323       in order to have the GTK+ GUI built.
    324     </para>
    325 
    326     <para>
    327       <parameter>--without-qt</parameter>: disables building of the Qt GUI.
     263      <option>--with-gtk2=[yes/no]</option>: For the Gtk+2 GUI. If both Gtk+2
     264      and 3 are installed, default is no. Notice that the GUI for only one Gtk+
     265      version (either 2 or 3) can be built.
     266    </para>
     267
     268    <para>
     269      <option>--with-gtk3=[yes/no]</option>: For the Gtk+3 GUI. If both Gtk+2
     270      and 3 are installed, default is yes.
     271    </para>
     272
     273    <para>
     274      <option>--with-qt=[yes/no/4/5]</option>: For the Qt GUI. Default is yes.
     275      If both Qt4 and 5 are installed, Qt5 is chosen by default. Notice that the
     276      GUI for only one Qt version (either 4 or 5) can be built.
    328277    </para>
    329278
    … …  
    334283    </para>
    335284
    336     <para>
    337       <option>--with-gtk2</option>: Use this option if you want
    338       the <application>GTK+2</application> GUI.
    339       Notice that the GUI for only one GTK+ version (either 2 or 3) can be
    340       built.
    341     </para>
    342 
    343285  </sect2>
    344286
    … …  
    350292
    351293      <para><filename>/etc/wireshark.conf</filename> and
    352       <filename>~/.wireshark/*</filename></para>
     294      <filename>~/.config/wireshark/*</filename> (unless there is already
     295      <filename>~/.wireshark/*</filename> in the system)</para>
    353296
    354297      <indexterm zone="wireshark wireshark-config">
    … …  
    365308      <title>Configuration Information</title>
    366309
    367       <para>Though the default configuration parameters are very sane,
    368       reference the configuration section of the
    369       <ulink url="http://www.wireshark.org/docs/wsug_html/">Wireshark User's
     310      <para>Though the default configuration parameters are very sane, reference
     311      the configuration section of the <ulink
     312      url="http://www.wireshark.org/docs/wsug_html/">Wireshark User's
    370313      Guide</ulink> for configuration information. Most of
    371314      <application>Wireshark</application>'s configuration can be accomplished
    372       using the menu options of the <command>wireshark</command>
    373       graphical interfaces.</para>
    374 
    375     </sect3>
    376 
    377     <sect3>
    378       <title>Desktop file for the Qt GUI</title>
    379 
    380       <para>If Qt GUI was built and you wish an entry in the desktop menu,
    381       there are two possibilities (instructions must be run as root).</para>
    382 
    383       <para>If only the Qt GUI was built:</para>
    384 
    385 <screen role="root"><userinput>mv -v /usr/share/applications/wireshark.desktop \
    386       /usr/share/applications/wireshark-qt.desktop</userinput></screen>
    387 
    388       <para>If both, GTK+ and Qt GUIs were built:</para>
    389 
    390 <screen role="root"><userinput>cp -v /usr/share/applications/wireshark.desktop \
    391       /usr/share/applications/wireshark-qt.desktop</userinput></screen>
    392 
    393       <para>Now, fix it for <command>wireshark-qt</command>:</para>
    394 
    395 <screen role="root"><userinput>sed -e 's/ireshark/&amp;-qt/' \
    396     -e 's/^\(Icon=wireshark\)-qt/\1/' \
    397     -i /usr/share/applications/wireshark-qt.desktop</userinput></screen>
     315      using the menu options of the <command>wireshark</command> graphical
     316      interfaces.</para>
    398317
    399318      <note>
    400         <para>If you want to look at packets, make sure you don't filter
    401         them out with <xref linkend="iptables"/>. If you want to exclude
    402         certain classes of packets, it is more efficient to do it with
     319        <para>If you want to look at packets, make sure you don't filter them
     320        out with <xref linkend="iptables"/>. If you want to exclude certain
     321        classes of packets, it is more efficient to do it with
    403322        <application>iptables</application> than it is with
    404323        <application>Wireshark</application>.</para>
    … …  
    418337
    419338      <seglistitem>
    420         <seg>capinfos, captype, dftest, dumpcap, editcap, mergecap, randpkt,
    421         rawshark, reordercap, text2pcap, tshark,
    422         wireshark, and optionally wireshark-qt</seg>
    423         <seg>libfiletap.so, libwireshark.so, libwiretap.so, libwsutil.so, and
    424         numerous modules under /usr/lib/wireshark/plugins</seg>
    425         <seg>/usr/lib/wireshark, /usr/share/doc/wireshark-&wireshark-version;,
    426         /usr/share/pixmaps/wireshark, and /usr/share/wireshark</seg>
     339        <seg>
     340          androiddump, capinfos, captype, dftest, dumpcap, editcap, idl2wrs,
     341          mergecap, randpkt, rawshark, reordercap, text2pcap, tshark, wireshark,
     342          and wireshark-gtk
     343        </seg>
     344        <seg>
     345          libwireshark.so, libwiretap.so, libwsutil.so, and numerous modules
     346          under /usr/lib/wireshark/plugins
     347        </seg>
     348        <seg>
     349          /usr/{lib,share}/wireshark and
     350          /usr/share/doc/wireshark-&wireshark-version;
     351         </seg>
    427352      </seglistitem>
    428353    </segmentedlist>
    … …  
    558483        <term><command>wireshark</command></term>
    559484        <listitem>
    560           <para>is the GTK+ GUI network protocol analyzer. It lets you
    561           interactively browse packet data from a live network or from a
    562           previously saved capture file.</para>
     485          <para>
     486            is the Qt GUI network protocol analyzer. It lets you interactively
     487            browse packet data from a live network or from a previously saved
     488            capture file.
     489          </para>
    563490          <indexterm zone="wireshark wireshark-prog">
    564491            <primary sortas="b-wireshark">wireshark</primary>
    … …  
    567494      </varlistentry>
    568495
    569       <varlistentry id="wireshark-qt-prog">
    570         <term><command>wireshark-qt</command></term>
    571         <listitem>
    572           <para>is the Qt GUI network protocol analyzer. It lets you
    573           interactively browse packet data from a live network or from a
    574           previously saved capture file.</para>
    575           <indexterm zone="wireshark wireshark-qt-prog">
    576             <primary sortas="b-wireshark-qt">wireshark-qt</primary>
     496      <varlistentry id="wireshark-gtk-prog">
     497        <term><command>wireshark-gtk</command></term>
     498        <listitem>
     499          <para>
     500            is the Gtk+ GUI network protocol analyzer. It lets you interactively
     501            browse packet data from a live network or from a previously saved
     502            capture file.
     503          </para>
     504          <indexterm zone="wireshark wireshark-gtk-prog">
     505            <primary sortas="b-wireshark-gtk">wireshark-gtk</primary>
    577506          </indexterm>
    578507        </listitem>

  • packages.ent

    rde81317 r791e3e7d  
    141141<!ENTITY mtdev-version                "1.1.5">
    142142<!ENTITY npth-version                 "1.2">
    143 <!ENTITY nspr-version                 "4.10.10">
     143<!ENTITY nspr-version                 "4.11">
    144144<!ENTITY openobex-version             "1.7.1">
    145145<!ENTITY pcre-version                 "8.37">
    … …  
    377377<!ENTITY whois-version                "5.2.10">
    378378<!ENTITY wicd-version                 "1.7.3">
    379 <!ENTITY wireshark-version            "1.12.8">  <!-- even minors only -->
     379<!ENTITY wireshark-version            "2.0.0">  <!-- even minors only -->
    380380
    381381<!ENTITY wicd-major-version           "1.7">
    … …  
    788788<!ENTITY docbook-xsl-version          "1.78.1">
    789789<!ENTITY itstool-version              "2.0.2">
    790 <!ENTITY xmlto-version                "0.0.27">
     790<!ENTITY xmlto-version                "0.0.28">
    791791
    792792<!-- Chapter 54 -->

  • pst/xml/xmlto.xml

    rde81317 r791e3e7d  
    77  <!ENTITY xmlto-download-http "https://fedorahosted.org/releases/x/m/xmlto/xmlto-&xmlto-version;.tar.bz2">
    88  <!ENTITY xmlto-download-ftp  " ">
    9   <!ENTITY xmlto-md5sum        "bd1189afde95083d81bad967e4b4526c">
     9  <!ENTITY xmlto-md5sum        "93bab48d446c826399d130d959fe676f">
    1010  <!ENTITY xmlto-size          "128 KB">
    1111  <!ENTITY xmlto-buildsize     "1.5 MB (with tests)">
    … …  
    9191    <title>Installation of xmlto</title>
    9292
    93     <para>First fix some regressions in the last update:</para>
    94 
    95 <screen><userinput>sed -e '87  s/2/{!2}/'                        \
    96     -e '138 s/f "$CLEANFILES"/f $CLEANFILES/' \
    97     -i xmlto.in</userinput></screen>
    98 
    9993    <para>Install <application>xmlto</application> by running the following
    10094    commands:</para>
Note: See TracChangeset for help on using the changeset viewer.