Changeset bd80dca7

Timestamp:

03/06/2024 11:48:27 AM (8 weeks ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

ken/TL2024, trunk, xry111/llvm18

Children:

39eac921

Parents:

a4fa495

git-author:

Xi Ruoyao <xry111@…> (03/06/2024 11:47:42 AM)

git-committer:

Xi Ruoyao <xry111@…> (03/06/2024 11:48:27 AM)

Message:

nmap: Use a patch to allow building with pcre2

BTW fix another "imp removal" error in the test suite.

File:

• networking/netutils/nmap.xml (modified) (4 diffs)

networking/netutils/nmap.xml

@@ -64 +64 @@
         <para>
           Estimated build time: &nmap-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>
+          Recommended patch: <ulink url=
+            "&patch-root;/nmap-&nmap-version;-pcre_2-1.patch"/>
         </para>
       </listitem>
@@ -84 +94 @@
       <xref linkend="libssh2"/>,
       <xref linkend="lua"/>,
-      <xref linkend="pcre"/>, and
+      <xref linkend="pcre2"/>, and
       <xref linkend="pygobject3"/>
 <!--  libdnet is not recommended, see:
@@ -102 +112 @@
 
     <para>
+      If and only if the recommended dependency
+      <xref linkend='pcre2'/> is installed, apply a patch to allow building
+      this package with system <xref linkend='pcre2'/> instead of an
+      internal copy of the outdated PCRE1:
+    </para>
+
+    <screen><userinput>patch -Np1 -i ../nmap-&nmap-version;-pcre_2-1.patch</userinput></screen>
+
+    <para>
       Install <application>Nmap</application> by running the following
       commands:
@@ -108 +127 @@
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</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>
--->
+    <screen><userinput>sed -e '/import imp/d'                \
+    -e 's/^ndiff = .*$/import ndiff/' \
+    -i ndiff/ndifftest.py</userinput></screen>
+
     <para>
       To test the results, issue: <command>make check</command> as the