Ignore:
Timestamp:
08/01/2015 04:26:22 AM (9 years ago)
Author:
Douglas R. Reno <renodr@…>
Branches:
systemd-13485
Children:
ad6910d
Parents:
4a83293
Message:

Import back into SVN from Github

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@16309 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:
networking/netutils
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • networking/netutils/avahi-systemd.xml

    r4a83293 rac38e9dc  
    55  %general-entities;
    66
    7 <!ENTITY avahi-download-http "http://avahi.org/download/avahi-&avahi-version;.tar.gz">
    8 <!--  <!ENTITY avahi-download-http "&fed/avahi/avahi-&avahi-version;.tar.gz/&avahi-md5sum;/avahi-&avahi-version;.tar.gz">-->
     7  <!ENTITY avahi-download-http "http://avahi.org/download/avahi-&avahi-version;.tar.gz">
    98  <!ENTITY avahi-download-ftp  " ">
    109  <!ENTITY avahi-md5sum        "2f22745b8f7368ad5a0a3fddac343f2d">
    … …  
    3635    </para>
    3736
    38     &lfs76_checked;
     37    &lfs77_checked;
    3938
    4039    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    127126<!-- final part of sed removes " -DGDK_DISABLE_DEPRECATED=1 -DGTK_DISABLE_DEPRECATED=1 \" -->
    128127<screen><userinput>sed -i 's/\(CFLAGS=.*\)-Werror \(.*\)/\1\2/' configure &amp;&amp;
    129 sed -i -e 's/-DG_DISABLE_DEPRECATED=1//' \
    130  -e '/-DGDK_DISABLE_DEPRECATED/d' avahi-ui/Makefile.in &amp;&amp;
     128
     129sed -e 's/-DG_DISABLE_DEPRECATED=1//' \
     130    -e '/-DGDK_DISABLE_DEPRECATED/d'  \
     131    -i avahi-ui/Makefile.in &amp;&amp;
     132
    131133./configure --prefix=/usr        \
    132134            --sysconfdir=/etc    \

  • networking/netutils/bind-utils.xml

    r4a83293 rac38e9dc  
    66  <!ENTITY bind-download-http   " ">
    77  <!ENTITY bind-download-ftp    "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
    8   <!ENTITY bind-md5sum          "bdb9af9db9d389f8b8b3db6e0bc1bfee">
    9   <!ENTITY bind-size            "8.0 MB">
    10   <!ENTITY bind-utils-buildsize "90 MB">
    11   <!ENTITY bind-utils-time      "0.7 SBU">
     8  <!ENTITY bind-md5sum          "7550a262cbd0753e49f77fb4ef721522">
     9  <!ENTITY bind-size            "8.1 MB">
     10  <!ENTITY bind-utils-buildsize "159 MB">
     11  <!ENTITY bind-utils-time      "0.5 SBU">
    1212]>
    1313
    … …  
    3939    client side applications.</para>
    4040
    41     &lfs76_checked;
     41    &lfs77_checked;
    4242
    4343    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    6767    <bridgehead renderas="sect4">Optional</bridgehead>
    6868    <para role="optional">
    69       <xref linkend="libxml2"/> and
     69      <xref linkend="libcap-pam"/>,
     70      <xref linkend="libxml2"/>, and
    7071      <xref linkend="openssl"/>
    7172    </para>

  • networking/netutils/mod_dnssd.xml

    r4a83293 rac38e9dc  
    55  %general-entities;
    66
    7 <!--  <!ENTITY mod_dnssd-download-http "http://0pointer.de/lennart/projects/mod_dnssd/mod_dnssd-&mod_dnssd-version;.tar.gz">-->
    8   <!ENTITY mod_dnssd-download-http "&fedora-http-repo;/mod_dnssd/mod_dnssd-&mod_dnssd-version;.tar.gz/&mod_dnssd-md5sum;/mod_dnssd-&mod_dnssd-version;.tar.gz">
     7  <!ENTITY mod_dnssd-download-http "http://0pointer.de/lennart/projects/mod_dnssd/mod_dnssd-&mod_dnssd-version;.tar.gz">
    98  <!ENTITY mod_dnssd-download-ftp  " ">
    109  <!ENTITY mod_dnssd-md5sum        "bed3d95a98168bf0515922d1c05020c5">
    … …  
    3938    </para>
    4039
    41     &lfs76_checked;
     40    &lfs77_checked;
    4241
    4342    <bridgehead renderas="sect3">Package Information</bridgehead>

  • networking/netutils/networkmanager-systemd.xml

    r4a83293 rac38e9dc  
    99  <!ENTITY NetworkManager-download-ftp
    1010           "&gnome-download-ftp;/NetworkManager/1.0/NetworkManager-&NetworkManager-version;.tar.xz">
    11   <!ENTITY NetworkManager-md5sum        "71cae8707a90fa92e28cafbc9262b548">
    12   <!ENTITY NetworkManager-size          "3.0 MB">
    13   <!ENTITY NetworkManager-buildsize     "232.3 MB (includes building documentation and tests.)">
    14   <!ENTITY NetworkManager-time          "2.9 SBU (includes building documentation and tests.)">
     11  <!ENTITY NetworkManager-md5sum        "5a4899f89edcbdd1ac46d2d947e8d6eb">
     12  <!ENTITY NetworkManager-size          "3.1 MB">
     13  <!ENTITY NetworkManager-buildsize     "319 MB">
     14  <!ENTITY NetworkManager-time          "1.6 SBU">
    1515]>
    1616
    … …  
    4040    </para>
    4141
    42     &lfs76_checked;
     42    &lfs77_checked;
    4343
    4444    <note>
    4545      <para>
    46         Make sure you disable <command>systemd-networkd</command> service
    47         or make it not configure the connections you want to manage with
     46        Make sure that you disable the <command>systemd-networkd</command> service
     47        or configure it not to manage the interfaces you want to manage with
    4848        <application>NetworkManager</application>.
    4949      </para>
    … …  
    8989    <para role="required">
    9090      <xref linkend="dbus-glib"/>,
     91      <xref linkend="libgudev"/>,
    9192      <xref linkend="libndp"/>,
    92       <xref linkend="libnl"/>,
    93       <xref linkend="nss"/>,
    94       (or <xref linkend="gnutls"/>), and
    95       <xref linkend="systemd"/> (for GUdev and Logind)
     93      <xref linkend="libnl"/> and
     94      <xref linkend="nss"/>
    9695    </para>
    9796
    … …  
    104103      <xref linkend="libsoup"/>,
    105104      <xref linkend="newt"/> (for <command>nmtui</command>),
    106       <xref linkend="polkit"/>, and
     105      <xref linkend="polkit"/>,
     106      <xref linkend="systemd"/> and
    107107      <xref linkend="vala"/>
    108108    </para>
    … …  
    116116      <xref linkend="qt4"/>,
    117117      <xref linkend="valgrind"/>,
    118       <xref linkend="wpa_supplicant"/> (built with D-Bus support),
    119       <ulink url="http://libteam.org/">libteam</ulink>, and
    120       <ulink url="http://search.cpan.org/~ingy/YAML-1.13/">YAML</ulink> (perl module to build documentation)
     118      <xref linkend="wpa_supplicant"/> (built with D-Bus support),
     119      <ulink url="http://libteam.org/">libteam</ulink>,
     120      <ulink url="https://www.samba.org/ftp/ppp/">PPP</ulink> and
     121      <ulink url="https://www.roaringpenguin.com/products/pppoe">RP-PPPoE</ulink>
    121122    </para>
    122123
    … …  
    135136            --with-nmtui                    \
    136137            --with-session-tracking=systemd \
    137             --with-systemdsystemunitdir=/lib/systemd/system &amp;&amp;
     138            --with-systemdsystemunitdir=/lib/systemd/system \
     139            --docdir=/usr/share/doc/NetworkManager-&NetworkManager-version;    &amp;&amp;
    138140make</userinput></screen>
    139141
    … …  
    272274      <seglistitem>
    273275        <seg>
    274           NetworkManager, nm-online, nmcli, nmtui, nmtui-connect,
     276          NetworkManager, nmcli, nm-online, nmtui, nmtui-connect,
    275277          nmtui-edit, and nmtui-hostname
    276278        </seg>
    277279        <seg>
    278           libnm-glib.so, libnm-glib-vpn.so, libnm-util.so and libnm.so
     280          libnm.so, libnm-glib.so, libnm-glib-vpn.so, and libnm-util.so
    279281        </seg>
    280282        <seg>
    281283          /etc/NetworkManager,
    282           /usr/include/libnm-glib,
    283           /usr/include/NetworkManager,
     284          /usr/include/{libnm,libnm-glib,NetworkManager},
    284285          /usr/lib/NetworkManager,
    285           /usr/share/doc/NetworkManager,
    286           /usr/share/gtk-doc/html/libnm-glib,
    287           /usr/share/gtk-doc/html/libnm-util,
     286          /usr/share/doc/NetworkManager-&NetworkManager-version;,
     287          /usr/share/gtk-doc/html/{libnm,libnm-glib,libnm-util},
    288288          /usr/share/gtk-doc/html/NetworkManager,
    289289          /var/lib/NetworkManager, and
    … …  
    426426      </varlistentry>
    427427
    428       <varlistentry id="libnm">
    429         <term><filename class="libraryfile">libnm.so</filename></term>
    430         <listitem>
    431           <para>
    432             contains functions used by <application>NetworkManager</application>
    433             utils.
    434           </para>
    435           <indexterm zone="NetworkManager libnm">
    436             <primary sortas="c-libnm">libnm.so</primary>
    437           </indexterm>
    438         </listitem>
    439       </varlistentry>
    440428    </variablelist>
    441429

  • networking/netutils/nmap.xml

    r4a83293 rac38e9dc  
    3535    TCP/IP fingerprinting.</para>
    3636
    37     &lfs76_checked;
     37    &lfs77_checked;
    3838
    3939    <bridgehead renderas="sect3">Package Information</bridgehead>

  • networking/netutils/traceroute.xml

    r4a83293 rac38e9dc  
    88  <!ENTITY traceroute-download-ftp  " ">
    99  <!ENTITY traceroute-md5sum        "79289adabd6f3ebf9160fc0815ab3150">
    10   <!ENTITY traceroute-size          "66 KB">
    11   <!ENTITY traceroute-buildsize     "531 KB">
     10  <!ENTITY traceroute-size          "68 KB">
     11  <!ENTITY traceroute-buildsize     "912 KB">
    1212  <!ENTITY traceroute-time          "Less than 0.1 SBU">
    1313]>
    … …  
    4141    the standard version.</para></note>
    4242
    43     &lfs76_checked;
     43    &lfs77_checked;
    4444
    4545    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    8282    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
    8383
    84 <screen role='root'><userinput>make prefix=/usr install &amp;&amp;
    85 mv /usr/bin/traceroute /bin &amp;&amp;
    86 ln -sv -f traceroute /bin/traceroute6 &amp;&amp;
    87 ln -sv -f traceroute.8 /usr/share/man/man8/traceroute6.8</userinput></screen>
     84<screen role='root'><userinput>make prefix=/usr install                               &amp;&amp;
     85mv /usr/bin/traceroute /bin                            &amp;&amp;
     86ln -sfv traceroute /bin/traceroute6                    &amp;&amp;
     87ln -sfv traceroute.8 /usr/share/man/man8/traceroute6.8 &amp;&amp;
     88rm -fv /usr/share/man/man1/traceroute.1</userinput></screen>
    8889
    89     <para>Use <command>man 8 traceroute</command> and/or
    90     <command>man 8 traceroute6</command>, because
    91     <command>man traceroute</command> refer to the overwritten version
    92     installed in LFS by inetutils.</para>
     90    <para>The traceroute.1 file that was installed in LFS
     91    by inetutils is no longer relevant.  This package overwrites
     92    that version of traceroute and installs the man page in man
     93    chapter 8.</para>
    9394  </sect2>
    9495

  • networking/netutils/whois.xml

    r4a83293 rac38e9dc  
    77  <!ENTITY whois-download-http "http://ftp.debian.org/debian/pool/main/w/whois/whois_&whois-version;.tar.xz">
    88  <!ENTITY whois-download-ftp  "ftp://ftp.debian.org/debian/pool/main/w/whois/whois_&whois-version;.tar.xz">
    9   <!ENTITY whois-md5sum        "fc928c97d9f438257496e695eafedfca">
    10   <!ENTITY whois-size          "78 KB">
    11   <!ENTITY whois-buildsize     "945 KB">
     9  <!ENTITY whois-md5sum        "6bb5bf65bc24f1dc60059f69a930015c">
     10  <!ENTITY whois-size          "80 KB">
     11  <!ENTITY whois-buildsize     "1.7 MB">
    1212  <!ENTITY whois-time          "less than 0.1 SBU">
    1313]>
    … …  
    3737    <xref linkend="expect"/> package.</para>
    3838
    39     &lfs76_checked;
     39    &lfs77_checked;
    4040
    4141    <bridgehead renderas="sect3">Package Information</bridgehead>

  • networking/netutils/wicd-systemd.xml

    r4a83293 rac38e9dc  
    77  <!ENTITY wicd-download-http "http://launchpad.net/wicd/&wicd-major-version;/&wicd-version;/+download/wicd-&wicd-version;.tar.gz">
    88  <!ENTITY wicd-download-ftp  " ">
    9   <!ENTITY wicd-md5sum        "c2435ddfdef0b9898852d72a85a45f0f">
    10   <!ENTITY wicd-size          "429 KB">
    11   <!ENTITY wicd-buildsize     "4.2 MB">
     9  <!ENTITY wicd-md5sum        "162ca2e6f4ab903bb7ab2bc0adb7d1aa">
     10  <!ENTITY wicd-size          "532 KB">
     11  <!ENTITY wicd-buildsize     "4.1 MB">
    1212  <!ENTITY wicd-time          "less than 0.1 SBU">
    1313]>
    … …  
    3939    </para>
    4040
    41     &lfs76_checked;
     41    &lfs77_checked;
    4242
    4343    <note>
    4444      <para>
    45         Make sure you disable <command>systemd-networkd</command> service
    46         or make it not configure the connections you want to manage with
     45        Make sure that you disable the <command>systemd-networkd</command> service
     46        or configure it not to manage the interfaces you want to manage with
    4747        <application>Wicd</application>.
    4848      </para>
    … …  
    7070      </listitem>
    7171    </itemizedlist>
    72 <!--
    73     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    74     <itemizedlist spacing='compact'>
    75       <listitem>
    76         <para></para>
    77       </listitem>
    78     </itemizedlist>
    79 -->
     72
    8073    <bridgehead renderas="sect3">Wicd Dependencies</bridgehead>
    8174
    … …  
    123116    commands:</para>
    124117
    125 <screen><userinput>rm po/*.po &amp;&amp;
     118<screen><userinput>sed -e "/detection failed/ a\                self.init=\'init\/default\/wicd\'" \
     119    -i setup.py &amp;&amp;
     120rm po/*.po      &amp;&amp;
    126121python setup.py configure --no-install-kde     \
    127122                          --no-install-acpi    \
    128123                          --no-install-pmutils \
    129                           --no-install-init</userinput></screen>
     124                          --no-install-init    \
     125                          --docdir=/usr/share/doc/wicd-&wicd-version;</userinput></screen>
    130126
    131127    <para>This package does not come with a test suite.</para>
    … …  
    133129    <para>Now, as the <systemitem class="username">root</systemitem> user, install the package:</para>
    134130
    135 <screen role="root"><userinput>python setup.py install</userinput></screen>
     131<screen role="root"><userinput>LANG=C python setup.py install</userinput></screen>
    136132
    137133  </sect2>
    … …  
    139135  <sect2 role="commands">
    140136    <title>Command Explanations</title>
     137
     138    <para><command>sed -e ... -i setup.py</command>: This <command>sed</command>
     139    prevents <command>setup.py</command> from failing when used on a LFS system.
     140    </para>
    141141
    142142    <para><command>rm po/*.po</command>: This command removes the international
    … …  
    163163    The group that will have permission to use the Wicd client (default is the
    164164    <systemitem class="groupname">users</systemitem> group).</para>
     165
     166    <para><envar>LANG=C</envar>: This environment variable is needed to allow
     167    the installation to complete.</para>
     168
    165169  </sect2>
    166170
    … …  
    218222        <seg>wicd, wicd-cli, wicd-client, wicd-curses, and wicd-gtk</seg>
    219223        <seg>none</seg>
    220         <seg>/etc/wicd, /usr/lib/python&python2-majorver;/site-packages/wicd, /usr/share/doc/wicd,
    221         /usr/share/pixmaps/wicd, /usr/share/wicd, /var/lib/wicd, and /var/log/wicd</seg>
     224        <seg>/etc/wicd, /usr/lib/python&python2-majorver;/site-packages/wicd,
     225        /usr/share/doc/wicd-&wicd-version;, /usr/share/pixmaps/wicd,
     226        /usr/share/wicd, /var/lib/wicd, /var/log/wicd, and /var/run/wicd</seg>
    222227      </seglistitem>
    223228    </segmentedlist>

  • networking/netutils/wireshark-systemd.xml

    r4a83293 rac38e9dc  
    55  %general-entities;
    66
    7   <!ENTITY wireshark-download-http "http://www.wireshark.org/download/src/all-versions/wireshark-&wireshark-version;.tar.bz2">
    8   <!ENTITY wireshark-download-ftp  " ">
    9   <!ENTITY wireshark-md5sum        "2f2a16be8b087227cb17733c72288ae4">
     7  <!ENTITY wireshark-download-http "https://www.wireshark.org/download/src/all-versions/wireshark-&wireshark-version;.tar.bz2">
     8  <!ENTITY wireshark-download-ftp  "ftp://ftp.uni-kl.de/pub/wireshark/src/wireshark-&wireshark-version;.tar.bz2">
     9  <!ENTITY wireshark-md5sum        "25ad2bc1c2a21396827c238fcff51bf3">
    1010  <!ENTITY wireshark-size          "28 MB">
    11   <!ENTITY wireshark-buildsize     "750 MB (up to 1.5 GB)">
    12   <!ENTITY wireshark-time          "7.32 SBU">
     11  <!ENTITY wireshark-buildsize     "1.6 GB">
     12  <!ENTITY wireshark-time          "6.0 SBU">
    1313]>
    1414
    … …  
    3030    <title>Introduction to Wireshark</title>
    3131
    32     <para>The <application>Wireshark</application> package contains a network
    33     protocol analyzer, also known as a <quote>sniffer</quote>. This is useful
    34     for analyzing data captured <quote>off the wire</quote> from a live network
    35     connection, or data read from a capture file.
    36     <application>Wireshark</application> provides both a graphical and a TTY-mode
    37     front-end for examining captured network packets from over 500 protocols,
    38     as well as the capability to read capture files from many other popular
    39     network analyzers.</para>
    40 
    41     &lfs76_checked;
     32    <para>
     33      The <application>Wireshark</application> package contains a network
     34      protocol analyzer, also known as a <quote>sniffer</quote>. This is useful
     35      for analyzing data captured <quote>off the wire</quote> from a live
     36      network connection, or data read from a capture file.
     37    </para>
     38
     39    <para>
     40      <application>Wireshark</application> provides both a graphical and a
     41      TTY-mode front-end for examining captured network packets from over 500
     42      protocols, as well as the capability to read capture files from many
     43      other popular network analyzers.
     44    </para>
     45
     46    &lfs77_checked;
    4247
    4348    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    6671    <itemizedlist spacing="compact">
    6772      <listitem>
    68         <para>Additional Documentation:
    69            <ulink url="http://www.wireshark.org/download/docs/"/>
     73        <para>
     74          Additional Documentation:
     75          <ulink url="https://www.wireshark.org/download/docs/"/>
     76          (contains links to docs in a variety of formats)
    7077         </para>
    7178      </listitem>
    7279    </itemizedlist>
    73 
    74     <para>From this page you can download many different docs in a variety
    75     of formats.</para>
    76 
    7780    <bridgehead renderas="sect3">Wireshark dependencies</bridgehead>
    7881
    7982    <bridgehead renderas="sect4">Required</bridgehead>
    8083    <para role="required">
    81       <xref linkend="glib2"/> (to build the TTY-mode front-end only)
    82     </para>
    83 
    84     <para>Note that you need <application>GTK+</application> or
    85     <application>Qt</application> installed, otherwise, pass
    86     <option>--disable-wireshark</option> to the
    87     <command>configure</command> command.</para>
     84      <xref linkend="glib2"/>
     85    </para>
    8886
    8987    <bridgehead renderas="sect4">Recommended</bridgehead>
    … …  
    113111    </para>
    114112
    115     <para condition="html" role="usernotes">User Notes:
    116     <ulink url="&blfs-wiki;/wireshark"/></para>
    117 
     113    <para condition="html" role="usernotes">
     114      User Notes: <ulink url="&blfs-wiki;/wireshark"/>
     115    </para>
    118116  </sect2>
    119117
    … …  
    121119    <title>Kernel Configuration</title>
    122120
    123       <para>The kernel must have the Packet protocol enabled for
    124       <application>Wireshark</application> to capture live packets from the
    125       network.</para>
     121    <para>
     122      The kernel must have the Packet protocol enabled for <application>
     123      Wireshark</application> to capture live packets from the network:
     124    </para>
    126125     
    127 <screen><literal>Networking support: Y
    128   Networking options:
    129     Packet: sockets monitoring interface: M or Y</literal></screen>
    130 
    131       <para>If built as a module, the name is
    132       <filename>af_packet.ko</filename>.</para>
    133 
    134       <indexterm zone="wireshark wireshark-kernel">
    135         <primary sortas="d-Capturing-network-packets">Capturing network
    136         packets</primary>
    137       </indexterm>
     126<screen><literal>[*] Networking support ---&gt;          [CONFIG_NET]
     127      Networking options ---&gt;
     128        &lt;*/M&gt; Packet socket          [CONFIG_PACKET]</literal></screen>
     129
     130    <indexterm zone="wireshark wireshark-kernel">
     131      <primary sortas="d-Capturing-network-packets">
     132        Capturing network packets
     133      </primary>
     134    </indexterm>
    138135
    139136  </sect2>
    … …  
    142139    <title>Installation of Wireshark</title>
    143140
    144     <para>Optionally, fix the description of the program in the title.
    145     The first change overwrites the default "SVN Unknown" in the title
    146     and the second overwrites a utility script that resets the version
    147     to "unknown".</para>
    148 
    149 <screen><userinput>cat > svnversion.h &lt;&lt; "EOF"
     141    <para>
     142      Optionally, fix the description of the program in the title.
     143      The first change overwrites the default <quote>SVN Unknown</quote> in
     144      the title and the second overwrites a utility script that resets the
     145      version to <quote>unknown</quote>.
     146    </para>
     147
     148<screen><userinput>cat > svnversion.h &lt;&lt; "EOF" &amp;&amp;
    150149#define SVNVERSION "BLFS"
    151150#define SVNPATH "source"
    … …  
    153152
    154153cat > make-version.pl &lt;&lt; "EOF"
    155 #!/usr/bin/perl
     154<literal>#!/usr/bin/perl</literal>
    156155EOF</userinput></screen>
    157156
    158     <para><application>Wireshark</application> is a very large and complex
    159     application.  These instructions provide additional security measures to
    160     ensure that only trusted users are allowed to view network traffic.  First,
    161     set up a system group for wireshark.  As the <systemitem
    162     class="username">root</systemitem> user:</para>
     157    <para>
     158      <application>Wireshark</application> is a very large and complex
     159      application. These instructions provide additional security measures to
     160      ensure that only trusted users are allowed to view network traffic. First,
     161      set up a system group for wireshark.  As the <systemitem
     162      class="username">root</systemitem> user:
     163    </para>
    163164
    164165<screen role="root"><userinput>groupadd -g 62 wireshark</userinput></screen>
    165 
    166     <para>If you want an unpriviledged user to execute
    167     <application>wireshark</application>, run the following command as the
    168     <systemitem class="username">root</systemitem> user:</para>
    169 
    170 <screen><userinput>usermod -a -G wireshark <replaceable>&lt;username&gt;</replaceable></userinput></screen>
    171166
    172167    <para>
    … …  
    190185    </para>
    191186
    192 <screen><userinput>export QT_SELECT=qt5</userinput></screen>
     187<screen><userinput>sed -i "s:moc;:moc-qt5;:g" configure &amp;&amp;
     188sed -i "s:uic;:uic-qt5;:g" configure &amp;&amp;
     189sed -i "s:(AM_V_RCC)rcc:&amp;-qt5:g" ui/qt/Makefile.in</userinput></screen>
    193190
    194191    <para>
    … …  
    198195    </para>
    199196
    200 <screen><userinput>sed -i "s:Qt5 Qt:Qt:g" configure</userinput></screen>
     197<screen><userinput>sed -i "s:Qt5 Qt:Qt:g" configure     &amp;&amp;
     198sed -i "s:moc;:moc-qt4;:g" configure &amp;&amp;
     199sed -i "s:uic;:uic-qt4;:g" configure &amp;&amp;
     200sed -i "s:(AM_V_RCC)rcc:&amp;-qt4:g" ui/qt/Makefile.in</userinput></screen>
    201201
    202202    <para>
    … …  
    211211make</userinput></screen>
    212212
    213     <para>This package does not come with a test suite.</para>
    214 
    215     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
     213    <para>
     214      This package does not come with a test suite.
     215    </para>
     216
     217    <para>
     218      Now, as the <systemitem class="username">root</systemitem> user:
     219    </para>
    216220
    217221<screen role="root"><userinput>make install &amp;&amp;
    … …  
    233237if [ -e /usr/bin/wireshark-qt ]; then
    234238   install -v -Dm644 wireshark.desktop /usr/share/applications/wireshark-qt.desktop &amp;&amp;
    235    sed -i "/Exec/s:wireshark:&amp;-qt:g" /usr/share/applications/wireshark-qt.desktop
     239   sed -i "s:Exec.*wireshark:&amp;-qt:g" /usr/share/applications/wireshark-qt.desktop   &amp;&amp;
     240   sed -i "s:Name.*Wireshark:&amp; (Qt):g" /usr/share/applications/wireshark-qt.desktop
    236241fi &amp;&amp;
    237242
    … …  
    243248done &amp;&amp;
    244249
    245 unset size &amp;&amp;
    246 unset QT_SELECT</userinput></screen>
    247 
    248     <para>If you downloaded any of the documentation files from the page
    249     listed in the 'Additional Downloads', install them by issuing the following
    250     commands as the <systemitem class="username">root</systemitem> user:</para>
     250unset size</userinput></screen>
     251
     252    <para>
     253      If you downloaded any of the documentation files from the page
     254      listed in the 'Additional Downloads', install them by issuing the
     255      following commands as the <systemitem class="username">root</systemitem>
     256      user:
     257    </para>
    251258
    252259<screen role="root"><userinput>install -v -m644 <replaceable>&lt;Downloaded_Files&gt;</replaceable> /usr/share/doc/wireshark-&wireshark-version;</userinput></screen>
    253260
    254   <para>Now, set ownership and permissions of sensitive applications to
    255   only allow authorized users.  As the <systemitem
    256   class="username">root</systemitem> user:</para>
     261    <para>
     262      Now, set ownership and permissions of sensitive applications to only
     263      allow authorized users.  As the <systemitem class="username">root
     264      </systemitem> user:
     265    </para>
    257266
    258267<screen role="root"><userinput>chown -v root:wireshark /usr/bin/{tshark,dumpcap} &amp;&amp;
    259268chmod -v 6550 /usr/bin/{tshark,dumpcap}</userinput></screen>
    260269
    261   <para>Finally, add any users to the wireshark group (as root user):</para>
     270    <para>
     271      Finally, add any users to the wireshark group (as <systemitem class=
     272      "username">root</systemitem> user):
     273    </para>
    262274
    263275<screen role="root"><userinput>usermod -a -G wireshark &lt;username&gt;</userinput></screen>
    … …  
    353365        <seg>
    354366          /usr/lib/wireshark,
    355           /usr/share/doc/wireshark-&wireshark-version; and
     367          /usr/share/doc/wireshark-&wireshark-version;,
     368          /usr/share/pixmaps/wireshark and
    356369          /usr/share/wireshark
    357370        </seg>
Note: See TracChangeset for help on using the changeset viewer.