Changeset af73a280 for networking

Timestamp:

06/05/2013 09:28:44 AM (11 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

5b00a2a

Parents:

13e0a61

Message:

Merge trunk and systemd branch.

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

Location:

networking

Files:

• netprogs/wpa_supplicant.xml (modified) (2 diffs)
• netutils/avahi.xml (modified) (1 diff)
• netutils/bind-utils.xml (modified) (2 diffs)
• netutils/nmap.xml (modified) (5 diffs)

networking/netprogs/wpa_supplicant.xml

@@ -89 +89 @@
       <xref linkend="dbus"/>,
       <xref linkend="libxml2"/> and
-      <xref linkend="qt"/>
+      <xref linkend="qt4"/>
     </para>
 
@@ -190 +190 @@
 
     <para>
-      If you have installed <xref linkend="qt"/> and wish to build
+      If you have installed <xref linkend="qt4"/> and wish to build
       the <application>WPA Supplicant</application> GUI program, run
       the following commands:

networking/netutils/avahi.xml

@@ -91 +91 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="qt"/>
+      <xref linkend="qt4"/>
     </para>
 

networking/netutils/bind-utils.xml

@@ -6 +6 @@
   <!ENTITY bind-download-http   " ">
   <!ENTITY bind-download-ftp    "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
-  <!ENTITY bind-md5sum          "2be7763c99b7e7b42ac3a18a267ce1aa">
-  <!ENTITY bind-size            "7.0 MB">
-  <!ENTITY bind-utils-buildsize "128 MB">
-  <!ENTITY bind-utils-time      "0.5 SBU">
+  <!ENTITY bind-md5sum          "7baa8359f0773e04f63d7e694db1909c">
+  <!ENTITY bind-size            "7.2 MB">
+  <!ENTITY bind-utils-buildsize "138 MB">
+  <!ENTITY bind-utils-time      "0.8 SBU">
 ]>
 
@@ -66 +66 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/></para>
+    <para role="optional">
+      <xref linkend="libcap2"/>,
+      <xref linkend="libxml2"/> and
+      <xref linkend="openssl"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:

networking/netutils/nmap.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY nmap-download-http "&sources-anduin-http;/n/nmap-&nmap-version;.tar.bz2">
+  <!ENTITY nmap-download-http "http://nmap.org/dist/nmap-&nmap-version;.tar.bz2">
   <!ENTITY nmap-download-ftp  "&gentoo-ftp-repo;/nmap-&nmap-version;.tar.bz2">
-  <!ENTITY nmap-md5sum        "a1a71940f238abb835dbf3ee7412bcea">
-  <!ENTITY nmap-size          "21 MB">
-  <!ENTITY nmap-buildsize     "115 MB">
+  <!ENTITY nmap-md5sum        "fcc80f94ff3adcb11eedf91092ea6f5e">
+  <!ENTITY nmap-size          "7.4 MB">
+  <!ENTITY nmap-buildsize     "124 MB">
   <!ENTITY nmap-time          "0.9 SBU">
 ]>
@@ -60 +60 @@
     <bridgehead renderas="sect3">Nmap Dependencies</bridgehead>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <note>
+      <para>
+        These packages are recommended because if they're not installed, the
+        build process will compile and link against its own (often older)
+        version.
+      </para>
+    </note>
+
+    <para role="recommended">
+      <xref linkend="libpcap"/>,
+      <xref linkend="pcre"/>,
+<!-- This is not recommended, see: http://nmap.org/svn/libdnet-stripped/NMAP_MODIFICATIONS
+      <ulink url="http://code.google.com/p/libdnet/">libdnet</ulink>,
+-->
+      <ulink url="http://www.csie.ntu.edu.tw/~cjlin/liblinear/">liblinear</ulink> and
+      <ulink url="http://www.lua.org/">Lua</ulink>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/>,
-    <xref linkend="pcre"/>,
-    <xref linkend="libpcap"/>,
-    <xref linkend="gtk2"/> (run time dependency), and
-    <ulink url="http://sourceforge.net/projects/libdnet/">libdnet</ulink></para>
+    <para role="optional">
+      <xref linkend="openssl"/>,
+      <xref linkend="pygtk"/> (required for <command>zenmap</command>),
+      <xref linkend="python2"/> (required for <command>ndiff</command>) and
+      <xref linkend="subversion"/> (required for <command>nmap-update</command>)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -95 +115 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>ncat, ndiff, nmap, nmapfe, nping, uninstall_zenmap, xnmap, and zenmap</seg>
+        <seg>ncat, ndiff, nmap, nmapfe, nmap-update, nping, uninstall_zenmap,
+        xnmap and zenmap</seg>
         <seg>/usr/lib/python&python2-version;/site-packages/</seg>
-        <seg>/usr/share/nmap</seg>
+        <seg>/usr/share/ncat, /usr/share/nmap and /usr/share/zenmap</seg>
       </seglistitem>
     </segmentedlist>
@@ -145 +166 @@
         <term><command>nmapfe</command></term>
         <listitem>
-          <para>is a symbolic link to <command>zenmap.</command>.</para>
+          <para>is a symbolic link to <command>zenmap</command>.</para>
           <indexterm zone="nmap nmapfe">
             <primary sortas="b-nmapfe">nmapfe</primary>
@@ -152 +173 @@
       </varlistentry>
 
+      <varlistentry id="nmap-update">
+        <term><command>nmap-update</command></term>
+        <listitem>
+          <para>is an updater for Nmap architecture-independent files.</para>
+          <indexterm zone="nmap nmap-update">
+            <primary sortas="b-nmap-update">nmap-update</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="xnmap">
         <term><command>xnmap</command></term>
         <listitem>
-          <para>is a symbolic link to <command>zenmap.</command>.</para>
+          <para>is a symbolic link to <command>zenmap</command>.</para>
           <indexterm zone="nmap xnmap">
             <primary sortas="f-xnmap">xnmap</primary>