Changeset da4ed49


Ignore:
Timestamp:
10/26/2014 10:18:37 PM (10 years ago)
Author:
Krejzi <krejzi@…>
Branches:
krejzi/svn
Children:
1be4837c
Parents:
dec19e9
Message:

More converts, finishing the networking section entirely.

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

Files:
4 edited
5 moved

Legend:

Unmodified
Added
Removed

  • introduction/welcome/changelog.xml

    rdec19e9 rda4ed49  
    5050        <listitem>
    5151          <para>[krejzi] - .</para>
     52        </listitem>
     53        <listitem>
     54          <para>[krejzi] - Fixed w3m linking with an image library.</para>
     55        </listitem>
     56        <listitem>
     57          <para>[krejzi] - Changed and simplified Wireshark instructions so they use qtchooser in case of two Qt installations.</para>
     58        </listitem>
     59        <listitem>
     60          <para>[krejzi] - Converted Avahi, NetworkManager and Wicd instructions to work on systemd setups.</para>
    5261        </listitem>
    5362        <listitem>

  • networking/netutils/avahi-systemd.xml

    rdec19e9 rda4ed49  
    140140            --enable-core-docs   \
    141141            --with-distro=none   \
    142             --with-systemdsystemunitdir=no &amp;&amp;
     142            --with-systemdsystemunitdir=/lib/systemd/system &amp;&amp;
    143143make</userinput></screen>
    144144
    … …  
    199199
    200200    <para>
     201      <parameter>--with-systemdsystemunitdir=/lib/systemd/system</parameter>:
     202      This parameter is used to set the correct installation directory for
     203      systemd units.
     204    </para>
     205
     206    <para>
    201207      <parameter>--with-distro=none</parameter>: There is an obsolete
    202208      boot script in the distribution for LFS. This option disables it.
    203     </para>
    204 
    205     <para>
    206       <parameter>--with-systemdsystemunitdir=no</parameter>: Without it, the
    207       daemon fails to start in BLFS, which does not support
    208       <application>systemd</application>.
    209209    </para>
    210210
    … …  
    248248
    249249  <sect2 role="configuration">
    250     <title>Configuring avahi</title>
     250    <title>Configuring Avahi</title>
    251251
    252252    <sect3  id="avahi-init">
    253       <title>Boot Script</title>
     253      <title>Systemd Units</title>
    254254
    255255      <para>
    256         To automatically start the <command>avahi-daemon</command>
    257         when the system is rebooted, install the
    258         <filename>/etc/rc.d/init.d/avahi</filename> bootscript from
    259         the <xref linkend="bootscripts"/> package.
     256        To start the <command>avahi-daemon</command> daemon at boot, enable
     257        the previously installed systemd unit by running the following command
     258        as the <systemitem class="username">root</systemitem> user:
    260259      </para>
    261260
    … …  
    264263      </indexterm>
    265264
    266 <screen role="root"><userinput>make install-avahi</userinput></screen>
     265<screen role="root"><userinput>systemctl enable avahi-daemon</userinput></screen>
     266
     267      <para>
     268        To start the <command>avahi-dnsconfd</command> daemon at boot, enable
     269        the previously installed systemd unit by running the following command
     270        as the <systemitem class="username">root</systemitem> user:
     271      </para>
     272
     273<screen role="root"><userinput>systemctl enable avahi-dnsconfd</userinput></screen>
    267274
    268275    </sect3>
    … …  
    279286
    280287      <seglistitem>
    281         <seg>avahi-autoipd, avahi-bookmarks, avahi-browse, avahi-browse-domains,
    282         avahi-daemon, avahi-discover, avahi-discover-standalone, avahi-dnsconfd,
    283         avahi-publish, avahi-publish-address, avahi-publish-service,
    284         avahi-resolve, avahi-resolve-address, avahi-resolve-host-name,
    285         avahi-set-host-name, bshell, bssh, and bvnc</seg>
    286         <seg>libavahi-client.so, libavahi-common.so,
    287         libavahi-core.so, libavahi-glib.so, libavahi-gobject.so,
    288         libavahi-ui-gtk3.so,, libavahi-ui.so, libdns_sd.so, and
    289         libhowl.so,</seg>
    290         <seg>/etc/avahi/services, /usr/{include/{avahi-client,avahi-common,
    291         avahi-compat-howl/{corby,discovery,rendezvous,salt},
    292         avahi-compat-libdns_sd,avahi-core,avahi-glib,avahi-gobject,avahi-ui},
    293         lib/{avahi,python&python2-majorver;/site-packages/{avahi,
    294         avahi_discover}},share/{avahi/interfaces,locale/en_NZ/LC_MESSAGES}}</seg>
     288        <seg>
     289          avahi-autoipd, avahi-bookmarks, avahi-browse, avahi-browse-domains,
     290          avahi-daemon, avahi-discover, avahi-discover-standalone, avahi-dnsconfd,
     291          avahi-publish, avahi-publish-address, avahi-publish-service,
     292          avahi-resolve, avahi-resolve-address, avahi-resolve-host-name,
     293          avahi-set-host-name, bshell, bssh, and bvnc
     294        </seg>
     295        <seg>
     296          libavahi-client.so, libavahi-common.so,libavahi-core.so,
     297          libavahi-glib.so, libavahi-gobject.so, libavahi-ui-gtk3.so,
     298          libavahi-ui.so, libdns_sd.so, and libhowl.so
     299        </seg>
     300        <seg>
     301          /etc/avahi,
     302          /usr/include/{avahi-client,avahi-common,avahi-compat-howl},
     303          /usr/include/{avahi-compat-libdns_sd,avahi-core,avahi-glib}
     304          /usr/include/{avahi-gobject,avahi-ui},
     305          /usr/lib/avahi,
     306          /usr/lib/python&python2-majorver;/site-packages/{avahi,avahi_discover}, and
     307          /usr/share/avahi
     308        </seg>
    295309      </seglistitem>
    296310    </segmentedlist>

  • networking/netutils/mod_dnssd.xml

    rdec19e9 rda4ed49  
    103103<screen><userinput>sed -i 's/unixd_setup_child/ap_&amp;/' src/mod_dnssd.c &amp;&amp;
    104104
    105 ./configure --prefix=/usr \
    106             --disable-lynx &amp;&amp;
     105./configure --prefix=/usr --disable-lynx &amp;&amp;
    107106make</userinput></screen>
    108107

  • networking/netutils/netutils.xml

    rdec19e9 rda4ed49  
    2222  <ulink url="&blfs-wiki;/basicnetworkingutilities"/></para>
    2323
    24   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="avahi.xml"/>
     24  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="avahi-systemd.xml"/>
    2525  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bind-utils.xml"/>
    2626  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mod_dnssd.xml"/>
    27   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networkmanager.xml"/>
     27  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networkmanager-systemd.xml"/>
    2828  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nmap.xml"/>
    2929  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="traceroute.xml"/>
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="whois.xml"/>
    31   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wicd.xml"/>
    32   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wireshark.xml"/>
     31  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wicd-systemd.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wireshark-systemd.xml"/>
    3333
    3434</chapter>

  • networking/netutils/networkmanager-systemd.xml

    rdec19e9 rda4ed49  
    4242    &lfs76_checked;
    4343
     44    <note>
     45      <para>
     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
     48        <application>NetworkManager</application>.
     49      </para>
     50    </note>
     51
    4452    <bridgehead renderas="sect3">Package Information</bridgehead>
    4553    <itemizedlist spacing="compact">
    … …  
    8593      <xref linkend="nss"/>,
    8694      (or <xref linkend="gnutls"/>), and
    87       <xref linkend="systemd"/> (for GUdev)
     95      <xref linkend="systemd"/> (for GUdev and Logind)
    8896    </para>
    8997
    9098    <bridgehead renderas="sect4">Recommended</bridgehead>
    9199    <para role="recommended">
    92       <xref linkend="systemd"/>,
    93100      <xref linkend="dhcpcd"/> or
    94101      <xref linkend="dhcp"/> (client only),
    … …  
    97104      <xref linkend="libsoup"/>,
    98105      <xref linkend="newt"/> (for <command>nmtui</command>),
    99       <xref linkend="polkit"/>,
    100       <xref linkend="upower"/>, and
     106      <xref linkend="polkit"/>, and
    101107      <xref linkend="vala"/>
    102108    </para>
    … …  
    104110    <bridgehead renderas="sect4">Optional</bridgehead>
    105111    <para role="optional">
     112      <xref linkend="bluez"/> (runtime),
    106113      <xref linkend="gtk-doc"/>,
     114      <xref linkend="ModemManager"/>,
     115      <xref linkend="pygobject3"/>,
    107116      <xref linkend="qt4"/>,
    108117      <xref linkend="valgrind"/>,
    109       <xref linkend="wpa_supplicant"/> (built with D-Bus support),
    110       <ulink url="http://libteam.org/">libteam</ulink>, and
    111       <ulink url="http://www.freedesktop.org/software/ModemManager/">
    112       ModemManager</ulink>,
     118      <xref linkend="wpa_supplicant"/> (built with D-Bus support), and
     119      <ulink url="http://libteam.org/">libteam</ulink>
    113120    </para>
    114121
    … …  
    121128    <title>Installation of NetworkManager</title>
    122129
    123     <para>
    124       If <xref linkend="qt4"/> and  <xref linkend="qt5"/> are installed, you
    125       need to choose <application>Qt4</application> with
    126       <command>source setqt4</command>, before starting. Install
    127       <application>NetworkManager</application> by running the following
    128       commands:
    129     </para>
    130 
    131 <screen><userinput>./configure --prefix=/usr        \
    132             --sysconfdir=/etc    \
    133             --localstatedir=/var \
    134             --with-nmtui         \
    135             --disable-ppp        \
    136             --with-systemdsystemunitdir=no \
    137             --docdir=/usr/share/doc/network-manager-&NetworkManager-version; &amp;&amp;
     130<screen><userinput>./configure --prefix=/usr                   \
     131            --sysconfdir=/etc               \
     132            --localstatedir=/var            \
     133            --disable-ppp                   \
     134            --with-nmtui                    \
     135            --with-session-tracking=systemd \
     136            --with-systemdsystemunitdir=/lib/systemd/system &amp;&amp;
    138137make</userinput></screen>
    139138
    … …  
    155154
    156155    <para>
    157       <parameter>--with-nmtui</parameter>: This parameter enables build of
    158       <command>nmtui</command>.
    159     </para>
    160 
    161     <para>
    162       <parameter>--with-systemdsystemunitdir=no</parameter>: This parameter is
    163       used for sysv init systems. If you use systemd, replace "no" by the
    164       proper directory.
    165     </para>
    166 
    167     <para>
    168       <parameter>--disable-ppp</parameter>: This parameter disables parameteral
     156      <parameter>--disable-ppp</parameter>: This switch disables
    169157      <application>PPP</application> support in
    170       <application>NetworkManager</application>.
     158      <application>NetworkManager</application> because
     159      <application>PPP</application> isn't part of BLFS.
     160    </para>
     161
     162    <para>
     163      <parameter>--with-nmtui</parameter>: This switch enables building
     164      of the <command>nmtui</command> program. Remove it if you have
     165      not installed <xref linkend="newt"/>.
     166    </para>
     167
     168    <para>
     169      <parameter>--with-session-tracking=systemd</parameter>: This switch
     170      is used to set <command>systemd-logind</command> as the default
     171      program for session tracking.
     172    </para>
     173
     174    <para>
     175      <parameter>--with-systemdsystemunitdir=/lib/systemd/system</parameter>:
     176      This switch is used to set the correct installation directory for
     177      systemd units.
    171178    </para>
    172179
    … …  
    193200
    194201      <indexterm zone="NetworkManager NetworkManager-config">
    195         <primary
    196         sortas="e-etc-NetworkManager-NetworkManager.conf">
     202        <primary sortas="e-etc-NetworkManager-NetworkManager.conf">
    197203        /etc/NetworkManager/NetworkManager.conf</primary>
    198204      </indexterm>
    … …  
    203209
    204210      <para>
    205         For <application>NetworkManager</application> to work, at least
    206         minimal configuration file must be present. Such file is not
    207         installed with <command>make install</command>. Issue following
     211        For <application>NetworkManager</application> to work, at least a
     212        basic configuration file must be present. Such file is not
     213        installed with <command>make install</command>. Run the following
    208214        command as the
    209         <systemitem class="username">root</systemitem> user to create
    210         minimal <filename>NetworkManager.conf</filename> file:
     215        <systemitem class="username">root</systemitem> user to create a
     216        basic <filename>NetworkManager.conf</filename> file:
    211217      </para>
    212218
    … …  
    217223
    218224      <para>
    219         You can add <option>dns=none</option> to suppress changes to
     225         You can add <option>dns=none</option> to suppress changes to
    220226         <filename>/etc/resolv.conf</filename>. See
    221227         <command>man 5 NetworkManager.conf</command>
    … …  
    226232
    227233    <sect3 id="NetworkManager-init">
    228       <title>Boot Script</title>
    229 
    230       <para>
    231         To automatically start the <command>NetworkManager</command> daemon when the
    232         system is rebooted, install the
    233         <filename>/etc/rc.d/init.d/networkmanager</filename> bootscript from the
    234         <xref linkend="bootscripts"/> package.
     234      <title>Systemd Units</title>
     235
     236      <para>
     237        To start the <command>NetworkManager</command> daemon at boot, enable
     238        the previously installed systemd unit by running the following command
     239        as the <systemitem class="username">root</systemitem> user:
    235240      </para>
    236241
    … …  
    239244      </indexterm>
    240245
    241 <screen role="root"><userinput>make install-networkmanager</userinput></screen>
     246<screen role="root"><userinput>systemctl enable NetworkManager</userinput></screen>
     247
     248      <para>
     249        <application>NetworkManager</application> also ships a systemd unit
     250        called <filename>NetworkManager-wait-online.service</filename> which
     251        can be used to prevent services that require network connectivity
     252        from starting until <application>NetworkManager</application> has
     253        established the connection. To enable it, run the following command
     254        as the <systemitem class="username">root</systemitem> user:
     255      </para>
     256
     257<screen role="root"><userinput>systemctl enable NetworkManager-wait-online</userinput></screen>
    242258
    243259    </sect3>
    … …  
    255271      <seglistitem>
    256272        <seg>
    257           NetworkManager, nm-avahi-autoipd.action, nm-dhcp-helper,
    258           nm-dispatcher, nm-online, nmcli, and, hardlinked to each other:
    259           nmtui, nmtui-connect, nmtui-edit, and nmtui-hostname
     273          NetworkManager, nm-online, nmcli, nmtui, nmtui-connect,
     274          nmtui-edit, and nmtui-hostname
    260275        </seg>
    261276        <seg>
    262           libnm-glib.so, libnm-glib-vpn.so, libnm-util.so, and
    263           modules under /usr/lib/NetworkManager
     277          libnm-glib.so, libnm-glib-vpn.so, and libnm-util.so
    264278        </seg>
    265279        <seg>
    … …  
    313327        <listitem>
    314328          <para>
    315             interactive ncurses based interface for
     329            is an interactive ncurses based interface for
    316330            <application>nmcli</application>.
    317331          </para>
    … …  
    326340        <listitem>
    327341          <para>
    328             interactive ncurses based interface connection activate/deactivate.
     342            is an interactive ncurses based interface connection
     343            activate/deactivate.
    329344          </para>
    330345          <indexterm zone="NetworkManager nmtui-connect">
    … …  
    338353        <listitem>
    339354          <para>
    340             interactive ncurses based interface connection editor.
     355            is an interactive ncurses based interface connection
     356            editor.
    341357          </para>
    342358          <indexterm zone="NetworkManager nmtui-edit">
    … …  
    350366        <listitem>
    351367          <para>
    352             interactive ncurses based interface hostname editor.
     368            is an interactive ncurses based interface hostname
     369            editor.
    353370          </para>
    354371          <indexterm zone="NetworkManager nmtui-hostname">

  • networking/netutils/wicd-systemd.xml

    rdec19e9 rda4ed49  
    4040
    4141    &lfs76_checked;
     42
     43    <note>
     44      <para>
     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
     47        <application>Wicd</application>.
     48      </para>
     49    </note>
    4250
    4351    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    108116    commands:</para>
    109117
    110 <screen><userinput>sed -i '/wpath.logrotate\|wpath.systemd/d' setup.py &amp;&amp;
    111 rm po/*.po                                          &amp;&amp;
    112 
     118<screen><userinput>rm po/*.po &amp;&amp;
    113119python setup.py configure --no-install-kde     \
    114120                          --no-install-acpi    \
    115121                          --no-install-pmutils \
    116                           --no-install-init    \
    117                           --docdir=/usr/share/doc/wicd-&wicd-version;</userinput></screen>
     122                          --no-install-init</userinput></screen>
    118123
    119124    <para>This package does not come with a test suite.</para>
    … …  
    127132  <sect2 role="commands">
    128133    <title>Command Explanations</title>
    129 
    130     <para><command>sed -i '/wpath...</command>: This <command>sed</command>
    131     prevents installation of <command>logrotate</command> and systemd
    132     configuration files. You may omit it if you use these utilities.</para>
    133134
    134135    <para><command>rm po/*.po</command>: This command removes the international
    … …  
    170171
    171172    <sect3 id="wicd-init">
    172       <title>Configuration Information</title>
    173 
    174       <para>To automatically start Wicd at boot time, you need to first install
    175       the Wicd bootscript,
    176       <filename>/etc/rc.d/init.d/wicd</filename>,
    177       included in the <xref linkend="bootscripts"/> package
    178       (as user <systemitem class="username">root</systemitem>):</para>
     173      <title>Systemd Units</title>
     174
     175      <para>
     176        To start the <command>wicd</command> daemon at boot, enable
     177        the previously installed systemd unit by running the following command
     178        as the <systemitem class="username">root</systemitem> user:
     179      </para>
    179180
    180181      <indexterm zone="wicd wicd-init">
    181         <primary sortas="f-wicd">wicd (bootscript)</primary>
     182        <primary sortas="f-wicd">wicd</primary>
    182183      </indexterm>
    183184
    184       <screen role='root'><userinput>make install-wicd</userinput></screen>
    185 
    186       <para>Since Wicd will now handle all configuration of network devices,
    187       the network bootscript installed by LFS should be disabled. This can be
    188       achieved by either removing any <filename>S*network</filename> and
    189       <filename>K*network</filename> symlinks in the <filename>/etc/rc*.d</filename>
    190       directories or by setting <literal>ONBOOT=no</literal> in any
    191       <filename>/etc/sysconfig/ifconfig.*</filename> files.</para>
     185      <screen role="root"><userinput>systemctl enable wicd</userinput></screen>
    192186
    193187      <para>No manual configuration of Wicd is needed if you use the graphical

  • networking/netutils/wireshark-systemd.xml

    rdec19e9 rda4ed49  
    8282    </para>
    8383
    84     <para>Note that you need <application>Gtk+</application> or
    85     <application>Qt4</application> installed, otherwise, pass
     84    <para>Note that you need <application>GTK+</application> or
     85    <application>Qt</application> installed, otherwise, pass
    8686    <option>--disable-wireshark</option> to the
    87     <command>configure</command> command. SBU and disk space required are larger
    88     for the Qt GUI.</para>
     87    <command>configure</command> command.</para>
    8988
    9089    <bridgehead renderas="sect4">Recommended</bridgehead>
    9190    <para role="recommended">
    92       <xref linkend="gtk3"/> (to build the <application>Gtk+3</application>
     91      <xref linkend="gtk3"/> (to build the <application>GTK+3</application>
    9392      GUI) and
    9493      <xref linkend="libpcap"/> (required to capture data)
    … …  
    107106    </para>
    108107
    109     <bridgehead renderas="sect4">Optional (to build the GUI front-end)</bridgehead>
     108    <bridgehead renderas="sect4">Optional (to build different GUI front-ends)</bridgehead>
    110109    <para role="optional">
    111       <xref linkend="gtk2"/>,
    112       <xref linkend="qt4"/>, or
     110      <xref linkend="gtk2"/> and
     111      <xref linkend="qt4"/> or
    113112      <xref linkend="qt5"/>
    114113    </para>
    … …  
    171170<screen><userinput>usermod -a -G wireshark <replaceable>&lt;username&gt;</replaceable></userinput></screen>
    172171
    173     <para>If you have <application>GTK+2</application> and 3, and
    174     <application>Qt4</application> and 5, one GUI linked to
    175     <application>GTK+3</application> and another one linked to
    176     <application>Qt5</application> are built, by default. Instead, we chose to
    177     only build the <application>GTK+3</application> GUI, as the BLFS default.
    178     If you prefer otherwise, some modifications are mecessary. For
    179     modifications in the <command>configure</command> switches, see
    180     "Command Explanations".</para>
    181 
    182     <para>If you want to build a Qt GUI and have both
    183     <application>Qt4</application> and 5 installed, issue either:</para>
    184 
    185 <screen><userinput>source setqt5</userinput></screen>
    186 
    187     <para>if you want the <application>Qt5</application> GUI built, or:</para>
    188 
    189 <screen><userinput>source setqt4 &amp;&amp;
    190 sed -i 's/Qt5 Qt/Qt/' configure</userinput></screen>
    191 
    192     <para>if you want the <application>Qt4</application> GUI built.</para>
    193 
    194     <para>Continue to install <application>Wireshark</application> by running
    195     the following commands:</para>
     172    <para>
     173      If you have both <application>GTK+2</application> and
     174      <application>GTK+3</application>, and both <application>Qt4</application>
     175      and <application>Qt5</application> installed, the
     176      <application>GTK+</application> GUI will be linked against
     177      <application>GTK+3</application> and <application>Qt</application> GUI
     178      will be linked against <application>Qt5</application>. The instructions
     179      below only cover building of the <application>GTK+3</application> GUI.
     180      Additional modifications must be made to the commands below if building
     181      a GUI front-end against different supported toolkits. Examine "Command
     182      Explanations" section for information on necessary modifications to the
     183      <command>configure</command> command.
     184    </para>
     185
     186    <para>
     187      If you want to build the <application>Qt5</application> GUI and have both
     188      <application>Qt4</application> and <application>Qt5</application>
     189      installed, issue:
     190    </para>
     191
     192<screen><userinput>export QT_SELECT=qt5</userinput></screen>
     193
     194    <para>
     195      If you want to build the <application>Qt4</application> GUI and have both
     196      <application>Qt4</application> and <application>Qt5</application>
     197      installed, issue:
     198    </para>
     199
     200<screen><userinput>sed -i "s:Qt5 Qt:Qt:g" configure</userinput></screen>
     201
     202    <para>
     203      Install <application>Wireshark</application> by running the following
     204      commands:
     205    </para>
    196206
    197207<screen><userinput>./configure --prefix=/usr     \
    198             --with-gtk3=yes  \
    199             --with-qt=no      \
    200             --sysconfdir=/etc &amp;&amp;
     208            --sysconfdir=/etc \
     209            --with-gtk3       \
     210            --without-qt      &amp;&amp;
    201211make</userinput></screen>
    202212
    … …  
    207217<screen role="root"><userinput>make install &amp;&amp;
    208218
    209 install -v -m755 -d /usr/share/doc/wireshark-&wireshark-version; &amp;&amp;
    210 install -v -m755 -d /usr/share/pixmaps/wireshark &amp;&amp;
    211 
    212 install -v -m644    README{,.linux} doc/README.* doc/*.{pod,txt} \
    213                     /usr/share/doc/wireshark-&wireshark-version; &amp;&amp;
     219install -v -dm755 /usr/share/doc/wireshark-&wireshark-version; &amp;&amp;
     220install -v -m644  README{,.linux} doc/README.* doc/*.{pod,txt} \
     221                  /usr/share/doc/wireshark-&wireshark-version; &amp;&amp;
    214222
    215223pushd /usr/share/doc/wireshark-&wireshark-version; &amp;&amp;
    216224   for FILENAME in ../../wireshark/*.html; do
    217       ln -s -v -f $FILENAME .
     225      ln -sfv $FILENAME
    218226   done &amp;&amp;
    219227popd &amp;&amp;
    220228
    221 install -v -m644 -D wireshark.desktop \
    222                     /usr/share/applications/wireshark.desktop &amp;&amp;
    223 
    224 install -v -m644 -D image/wsicon48.png \
    225                     /usr/share/pixmaps/wireshark.png &amp;&amp;
    226 
    227 install -v -m644    image/*.{png,ico,xpm,bmp} \
    228                     /usr/share/pixmaps/wireshark</userinput></screen>
     229if [ -e /usr/bin/wireshark ]; then
     230   install -v -Dm644 wireshark.desktop /usr/share/applications/wireshark.desktop
     231fi &amp;&amp;
     232
     233if [ -e /usr/bin/wireshark-qt ]; then
     234   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
     236fi &amp;&amp;
     237
     238for size in 16 24 32 48 64 128 256 ; do
     239    install -v -Dm644 image/wsicon${size}.png \
     240                      /usr/share/icons/hicolor/${size}x${size}/apps/wireshark.png &amp;&amp;
     241    install -v -Dm644 image/WiresharkDoc-${size}.png \
     242                      /usr/share/icons/hicolor/${size}x${size}/mimetypes/application-vnd.tcpdump.pcap.png
     243done &amp;&amp;
     244
     245unset size &amp;&amp;
     246unset QT_SELECT</userinput></screen>
    229247
    230248    <para>If you downloaded any of the documentation files from the page
    … …  
    250268    <title>Command Explanations</title>
    251269
    252     <para><command>sed -i 's/Qt5 Qt/Qt/' ...</command>: This command is required
    253     because, without it, libraries and includes from
    254     <application>Qt5</application> are found and used first, if both versions
    255     are installed, when trying to build with <application>Qt4</application>,
    256     and <command>make</command> does not complete.</para>
    257 
    258     <para><option>--disable-wireshark</option>: This option is required if you
    259     have <application>GTK+</application> installed but do not want to build
    260     the GTK+ and Qt GUIs.</para>
    261 
    262     <para><parameter>--with-gtk3=yes</parameter>: This switch is required
    263     to use <application>GTK+3</application> for the GUI, if you are using
    264     <parameter>--with-qt=no</parameter>. Change gtk3 by gtk2,to use
    265     <application>GTK+3</application> for the GUI.</para>
    266 
    267     <para><parameter>--with-qt=no</parameter>: This switch disables build of
    268     the Qt GUI. Replace "no" by "yes", if you want it to be built.</para>
    269 
    270     <para><option>--with-gtk2=yes</option>: This option is required if you want
    271     to use <application>GTK+</application>2, instead of 3, for the GUI. Notice
    272     that the GUI for only one GTK+ version (either 2 or 3) can be built.</para>
     270    <para>
     271      <parameter>--with-gtk3</parameter>: This switch enables building
     272      of the <application>GTK+3</application> GUI front-end. Replace it
     273      with <parameter>--with-gtk2</parameter> if you have both
     274      <application>GTK+2</application> and <application>GTK+3</application>
     275      installed but wish to use <application>GTK+2</application> to build
     276      the GUI front-end.
     277    </para>
     278
     279    <para>
     280      <parameter>--without-qt</parameter>: This switch disables building
     281      of the <application>Qt</application> GUI front-end. Replace it with
     282      <parameter>--with-qt</parameter> if you have installed either
     283      <application>Qt4</application> or <application>Qt5</application>
     284      and wish to build the <application>Qt</application> GUI front-end.
     285    </para>
     286
     287    <para>
     288      <option>--disable-wireshark</option>: Use this switch if you don't
     289      want to build the GUI front-end.
     290    </para>
    273291
    274292  </sect2>
    … …  
    304322      graphical interfaces.</para>
    305323
    306     </sect3>
    307 
    308     <sect3>
    309       <title>Desktop file for the Qt GUI</title>
    310 
    311       <para>If Qt GUI was built and you wish an entry in the desktop menu,
    312       there are two possibilities (instructions must be run as root).</para>
    313 
    314       <para>If only the Qt GUI was built:</para>
    315 
    316 <screen role="root"><userinput>mv -v /usr/share/applications/wireshark.desktop \
    317       /usr/share/applications/wireshark-qt.desktop</userinput></screen>
    318 
    319       <para>If both, GTK+ and Qt GUIs were built:</para>
    320 
    321 <screen role="root"><userinput>cp -v /usr/share/applications/wireshark.desktop \
    322       /usr/share/applications/wireshark-qt.desktop</userinput></screen>
    323 
    324       <para>Now, fix it for <command>wireshark-qt</command>:</para>
    325 
    326 <screen role="root"><userinput>sed -e 's/ireshark/&amp;-qt/' \
    327     -e 's/^\(Icon=wireshark\)-qt/\1/' \
    328     -i /usr/share/applications/wireshark-qt.desktop</userinput></screen>
    329 
    330324      <note>
    331325        <para>If you want to look at packets, make sure you don't filter
    … …  
    349343
    350344      <seglistitem>
    351         <seg>capinfos, captype, dftest, dumpcap, editcap, mergecap, randpkt,
    352         rawshark, reordercap, text2pcap, tshark,
    353         wireshark and wireshark-qt</seg>
    354         <seg>libfiletap.so, libwireshark.so, libwiretap.so, libwsutil.so, and
    355         numerous modules under /usr/lib/wireshark/plugins</seg>
    356         <seg>/usr/lib/wireshark, /usr/share/doc/wireshark-&wireshark-version;,
    357         /usr/share/pixmaps/wireshark, and /usr/share/wireshark</seg>
     345        <seg>
     346          capinfos, captype, dftest, dumpcap, editcap, mergecap,
     347          randpkt, rawshark, reordercap, text2pcap, tshark,
     348          wireshark and wireshark-qt
     349        </seg>
     350        <seg>
     351          libfiletap.so, libwireshark.so, libwiretap.so and libwsutil.so
     352        </seg>
     353        <seg>
     354          /usr/lib/wireshark,
     355          /usr/share/doc/wireshark-&wireshark-version; and
     356          /usr/share/wireshark
     357        </seg>
    358358      </seglistitem>
    359359    </segmentedlist>
    … …  
    511511
    512512      <varlistentry id="libwireshark">
    513         <term><filename class='libraryfile'>libwireshark.so</filename></term>
     513        <term><filename class="libraryfile">libwireshark.so</filename></term>
    514514        <listitem>
    515515          <para>contains functions used by the
    … …  
    523523
    524524      <varlistentry id="libwiretap">
    525         <term><filename class='libraryfile'>libwiretap.so</filename></term>
     525        <term><filename class="libraryfile">libwiretap.so</filename></term>
    526526        <listitem>
    527527          <para>is a library being developed as a future replacement for
    528           <filename class='libraryfile'>libpcap</filename>, the current
     528          <filename class="libraryfile">libpcap</filename>, the current
    529529          standard Unix library for packet capturing. For more information,
    530530          see the <filename>README</filename> file in the source
    531           <filename class='directory'>wiretap</filename> directory.</para>
     531          <filename class="directory">wiretap</filename> directory.</para>
    532532          <indexterm zone="wireshark libwiretap">
    533533            <primary sortas="c-libwiretap">libwiretap.so</primary>

  • networking/textweb/textweb.xml

    rdec19e9 rda4ed49  
    3232  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="links.xml"/>
    3333  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lynx.xml"/>
    34   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="w3m.xml"/>
     34  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="w3m-systemd.xml"/>
    3535
    3636</chapter>

  • networking/textweb/w3m-systemd.xml

    rdec19e9 rda4ed49  
    7272    <para role="required"><xref linkend="gc"/></para>
    7373
     74    <bridgehead renderas="sect4">Recommended</bridgehead>
     75    <para role="recommended">
     76      <xref linkend="imlib2"/>
     77    </para>
     78
    7479    <bridgehead renderas="sect4">Optional</bridgehead>
    7580    <para role="optional">
    7681      <xref linkend="gpm"/>,
    7782      <xref linkend="openssl"/>,
    78       <xref linkend="imlib2"/>,
    79       <xref linkend="gtk2"/>,
    80       <ulink url="http://ftp.gnome.org/pub/gnome/sources/imlib/1.9/">Imlib</ulink>
    81         (not recommended: obsolete, abandoned upstream,
    82         <ulink url="http://bugs.debian.org/448360">buggy</ulink>, and gives no
    83         additional functionality as compared to other image loading libraries),
    8483      <xref linkend="gdk-pixbuf"/>,
    8584      <xref linkend="compface"/>, and
    … …  
    103102sed -i 's#gdk-pixbuf-xlib-2.0#&amp; x11#' configure &amp;&amp;
    104103
    105 ./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
     104./configure --prefix=/usr --sysconfdir=/etc --with-imagelib=imlib2 &amp;&amp;
     105sed -i "s:lImlib2:&amp; -lX11:" Makefile &amp;&amp;
    106106make</userinput></screen>
    107107
    … …  
    133133    <para><command>sed -i 's#gdk-pixbuf-xlib-2.0#&amp; x11#'
    134134    configure</command>: This sed fixes compiling <application>w3m</application>
    135     using <xref linkend="gtk2"/> as its image library. It has no impact if
    136     <xref linkend="gtk2"/> is not installed.</para>
    137 
    138     <para><option>--sysconfdir=/etc</option>: This option puts the configuration
    139     files in /etc.</para>
     135    using <xref linkend="gdk-pixbuf"/> as its image library. It has no impact if
     136    <xref linkend="gdk-pixbuf"/> is not installed.</para>
     137
     138    <para>
     139      <parameter>--with-imagelib=imlib2</parameter>: This switch sets
     140      <xref linkend="imlib2"/> as the default image loading library. Remove it
     141      if you don't need image loading capabilities or you don't want to
     142      install X11. Note that build will fail if Xorg Libraries are present
     143      and this switch is not used.
     144    </para>
     145
     146    <para>
     147      <parameter>--with-imagelib=gdk-pixbuf</parameter>: Use this switch if you
     148      want to use <xref linkend="gdk-pixbuf"/> as the image loading library.
     149    </para>
     150
     151    <para>
     152      <command>sed -i "s:lImlib2:&amp; -lX11:" Makefile</command>: This sed
     153      fixes building when using <xref linkend="imlib2"/> as the image
     154      loading library.
     155    </para>
     156
    140157  </sect2>
    141158
Note: See TracChangeset for help on using the changeset viewer.