Changeset 44703919

Timestamp:

09/05/2014 01:24:05 AM (10 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

systemd-11177

Children:

7adb4a7

Parents:

58a07d7

Message:

Merged nmap update from trunk.

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/netutils/nmap.xml (modified) (4 diffs)

introduction/welcome/changelog.xml

@@ -155 +155 @@
           <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>

networking/netutils/nmap.xml

@@ -8 +8 @@
 <!--  <!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)">
 ]>
 
@@ -56 +56 @@
       <listitem>
         <para>Estimated build time: &nmap-time;</para>
-      </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>
@@ -112 +102 @@
     </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>
@@ -121 +107 @@
 <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