Re: pkg/45438: regex error in net/nmap

[Fredrik Pettai <pettai%nordu.net@localhost>]

On Nov 21, 2011, at 09:20 , Jörn Clausen wrote:
> On 11/19/11 11:36 PM, Fredrik Pettai wrote:
>> I haven't checked the nmap svn repo, but did you suggest this to upstream?
> 
> See the link I mentioned in the initial ticket 
> (http://seclists.org/nmap-dev/2011/q3/640).
> 
> BTW: There is a very recent tar archive http://nmap.org/dist/nmap-5.51.5.tgz 
> (and other patched versions like 5.51.4, 5.51.3, ...). I guess switching to 
> that version is the better solution, nmap-service-probes has been fixed in 
> that release.


Can you try this patch, see if it works fine for you?

$ cvs diff -u
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/nmap/Makefile,v
retrieving revision 1.83
diff -u -u -r1.83 Makefile
--- Makefile    1 Nov 2011 06:11:57 -0000       1.83
+++ Makefile    21 Nov 2011 15:01:34 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.83 2011/11/01 06:11:57 sbd Exp $
 #
 
-DISTNAME=      nmap-5.51
-PKGREVISION=   3
+DISTNAME=      nmap-5.51.5
 CATEGORIES=    net security
 MASTER_SITES=  http://nmap.org/dist/
 EXTRACT_SUFX=  .tar.bz2
@@ -30,7 +29,10 @@
 
 .include "options.mk"
 
-CHECK_INTERPRETER_SKIP+= share/zenmap/su-to-zenmap.sh
+CHECK_INTERPRETER_SKIP=        bin/uninstall_zenmap
+CHECK_INTERPRETER_SKIP+=       share/zenmap/su-to-zenmap.sh
+CHECK_INTERPRETER_SKIP+=       share/nmap/nselib/data/oracle-sids
+CHECK_INTERPRETER_SKIP+=       share/nmap/nselib/data/passwords.lst
 
 CONFIGURE_ARGS+=       --with-libpcap=${BUILDLINK_PREFIX.libpcap}
 CONFIGURE_ARGS+=       --with-libpcre=${BUILDLINK_PREFIX.pcre}
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/net/nmap/PLIST,v
retrieving revision 1.14
diff -u -u -r1.14 PLIST
--- PLIST       31 Jan 2011 23:22:47 -0000      1.14
+++ PLIST       21 Nov 2011 15:01:34 -0000
@@ -216,6 +216,7 @@
 share/nmap/scripts/oracle-brute.nse
 share/nmap/scripts/oracle-enum-users.nse
 share/nmap/scripts/oracle-sid-brute.nse
+share/nmap/scripts/ovs-agent-version.nse
 share/nmap/scripts/p2p-conficker.nse
 share/nmap/scripts/path-mtu.nse
 share/nmap/scripts/pgsql-brute.nse
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/nmap/distinfo,v
retrieving revision 1.52
diff -u -u -r1.52 distinfo
--- distinfo    19 Nov 2011 22:11:00 -0000      1.52
+++ distinfo    21 Nov 2011 15:01:34 -0000
@@ -1,11 +1,9 @@
 $NetBSD: distinfo,v 1.52 2011/11/19 22:11:00 pettai Exp $
 
-SHA1 (nmap-5.51.tar.bz2) = 3415ad9a3915d7e162c9e91435cc35d9c73ac7f6
-RMD160 (nmap-5.51.tar.bz2) = d5ac8b245234e122936b40c80927a3c4afba53bd
-Size (nmap-5.51.tar.bz2) = 16869068 bytes
+SHA1 (nmap-5.51.5.tar.bz2) = 321a9c77e28c85032cd9b5c003f99cdab2dc46dc
+RMD160 (nmap-5.51.5.tar.bz2) = bd118b9cae550cc1efda756f4db36cfc1ea2bf0d
+Size (nmap-5.51.5.tar.bz2) = 16877768 bytes
 SHA1 (patch-ab) = b709689e4bda3bc928ba120678f24a2e2321f612
 SHA1 (patch-ac) = c22e8f6411b1152a6e7582c90e5ec5bd4c6acaad
 SHA1 (patch-al) = c56396c28d96314c8d7e8b19a92bd5db7959e289
-SHA1 (patch-am) = 8d9515d1247ab5ad5855f7f7065e90cde5fb2b9f
 SHA1 (patch-nbase_configure) = 3db822d392defd92d531b71f466b61be82e525a1
-SHA1 (patch-nmap-service-probes) = 0bc1d96b4d2e7993237552faac459caab622c980
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/nmap/options.mk,v
retrieving revision 1.5
diff -u -u -r1.5 options.mk
--- options.mk  25 Feb 2011 09:47:26 -0000      1.5
+++ options.mk  21 Nov 2011 15:01:34 -0000
@@ -22,6 +22,9 @@
 PLIST_SRC+=                    ${PKGDIR}/PLIST.zenmap
 PYTHON_VERSIONS_ACCEPTED=      27 26 25 24
 PY_PATCHPLIST=                 yes
+REPLACE_PYTHON=                        zenmap/zenmapCore/*.py
+REPLACE_PYTHON+=               zenmap/zenmapGUI/*.py
+REPLACE_PYTHON+=               zenmap/zenmapGUI/higwidgets/*.py
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"