[blfs-book] r14198 - in branches/systemd: introduction/welcome networking/netutils

[cjg]

Author: cjg
Date: Thu Sep  4 18:24:05 2014
New Revision: 14198

Log:
Merged nmap update from trunk.

Modified:
   branches/systemd/introduction/welcome/changelog.xml
   branches/systemd/networking/netutils/nmap.xml

Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Thu Sep  4 18:06:17 
2014        (r14197)
+++ branches/systemd/introduction/welcome/changelog.xml Thu Sep  4 18:24:05 
2014        (r14198)
@@ -155,6 +155,10 @@
           <para>[fernando] - Update to LVM2.2.02.110. Fixes
           <ulink url="&blfs-ticket-root;5435">#5435</ulink></para>
         </listitem>
+        <listitem>
+          <para>[igor] - Update to nmap-6.47. Fixes
+          <ulink url="&blfs-ticket-root;5417">#5417</ulink>.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: branches/systemd/networking/netutils/nmap.xml
==============================================================================
--- branches/systemd/networking/netutils/nmap.xml       Thu Sep  4 18:06:17 
2014        (r14197)
+++ branches/systemd/networking/netutils/nmap.xml       Thu Sep  4 18:24:05 
2014        (r14198)
@@ -7,10 +7,10 @@
   <!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-download-ftp  " ">
-  <!ENTITY nmap-md5sum        "5a36ad3a63d5b7ea5514f745a397436a">
-  <!ENTITY nmap-size          "7.6 MB">
-  <!ENTITY nmap-buildsize     "105 MB (additional 1 MB for the tests)">
-  <!ENTITY nmap-time          "0.7 SBU (additional 4.3 SBU for the tests)">
+  <!ENTITY nmap-md5sum        "edfe81f6763223c0a29bfa15a8526e2a">
+  <!ENTITY nmap-size          "7.5 MB">
+  <!ENTITY nmap-buildsize     "133 MB (additional 1 MB for the tests)">
+  <!ENTITY nmap-time          "1.3 SBU (additional 0.1 SBU for the tests)">
 ]>
 
 <sect1 id="nmap" xreflabel="Nmap-&nmap-version;">
@@ -58,16 +58,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/nmap-&nmap-version;-fix_tests-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Nmap Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -111,16 +101,16 @@
       </para>
     </note>
 
-    <para>If you wish to run the test suite, run the following command:</para>
-
-<screen><userinput>patch -Np1 -i 
../nmap-&nmap-version;-fix_tests-1.patch</userinput></screen>
-
     <para>Install <application>Nmap</application> by running the following
     commands:</para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make -j1</userinput></screen>
 
+    <para>If you wish to run the test suite, run the following command:</para>
+
+<screen><userinput>sed -i 's/lib./lib/' 
zenmap/test/run_tests.py</userinput></screen>
+
     <para>To test the results, issue: <command>make check</command> as the
     <systemitem class="username">root</systemitem> user. Tests need a
     graphical session.</para>
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page