5 files changed, 33 insertions, 26 deletions
diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 10e08f2b191..f464becf6b0 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2008/06/20 01:09:31 joerg Exp $
+# $NetBSD: Makefile,v 1.62 2009/01/04 15:16:11 adrianp Exp $
 #
 
-DISTNAME=	nmap-4.65
+DISTNAME=	nmap-4.76
 CATEGORIES=	net security
 MASTER_SITES=	http://download.insecure.org/nmap/dist/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/nmap/PLIST b/net/nmap/PLIST
index d9ce860bc00..aa573bd18b1 100644
--- a/net/nmap/PLIST
+++ b/net/nmap/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2008/06/08 18:12:52 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/01/04 15:16:11 adrianp Exp $
 bin/nmap
-libexec/nmap/nselib-bin/bit.so
 man/man1/nmap.1
 share/nmap/nmap-mac-prefixes
 share/nmap/nmap-os-db
@@ -33,6 +32,19 @@ share/nmap/nselib/stdnse.lua
 share/nmap/nselib/strbuf.lua
 share/nmap/nselib/tab.lua
 share/nmap/nselib/url.lua
+share/nmap/nselib/base64.lua
+share/nmap/nselib/comm.lua
+share/nmap/nselib/dns.lua
+share/nmap/nselib/pop3.lua
+share/nmap/nselib/snmp.lua
+share/nmap/nselib/unpwdb.lua
+share/nmap/scripts/ASN.nse
+share/nmap/scripts/SNMPcommunitybrute.nse
+share/nmap/scripts/brutePOP3.nse
+share/nmap/scripts/dns-safe-recursion-port.nse
+share/nmap/scripts/dns-safe-recursion-txid.nse
+share/nmap/scripts/popcapa.nse
+share/nmap/scripts/whois.nse
 share/nmap/scripts/HTTPAuth.nse
 share/nmap/scripts/HTTP_open_proxy.nse
 share/nmap/scripts/HTTPpasswd.nse
@@ -43,7 +55,6 @@ share/nmap/scripts/PPTPversion.nse
 share/nmap/scripts/RealVNC_auth_bypass.nse
 share/nmap/scripts/SMTP_openrelay_test.nse
 share/nmap/scripts/SMTPcommands.nse
-share/nmap/scripts/SNMPsysdesr.nse
 share/nmap/scripts/SQLInject.nse
 share/nmap/scripts/SSHv1-support.nse
 share/nmap/scripts/SSLv2-support.nse
@@ -55,7 +66,7 @@ share/nmap/scripts/daytimeTest.nse
 share/nmap/scripts/dns-test-open-recursion.nse
 share/nmap/scripts/SMTP_openrelay_test.nse
 share/nmap/scripts/SMTPcommands.nse
-share/nmap/scripts/SNMPsysdesr.nse
+share/nmap/scripts/SNMPsysdescr.nse
 share/nmap/scripts/SQLInject.nse
 share/nmap/scripts/SSHv1-support.nse
 share/nmap/scripts/SSLv2-support.nse
@@ -99,8 +110,6 @@ share/nmap/scripts/skype_v2-version.nse
 share/nmap/scripts/strangeSMTPport.nse
 share/nmap/scripts/xamppDefaultPass.nse
 share/nmap/scripts/zoneTrans.nse
-@dirrm libexec/nmap/nselib-bin
-@dirrm libexec/nmap
 @dirrm share/nmap/scripts
 @dirrm share/nmap/nselib
 @dirrm share/nmap
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index ffcba6343f3..ce4e1255c03 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.37 2008/06/08 18:12:52 adrianp Exp $
+$NetBSD: distinfo,v 1.38 2009/01/04 15:16:11 adrianp Exp $
 
-SHA1 (nmap-4.65.tar.bz2) = e40e794ca8330f377019edba8786b0d911f8ab9e
-RMD160 (nmap-4.65.tar.bz2) = e1eca8a2dc37a625475fec791f6754e27884a828
-Size (nmap-4.65.tar.bz2) = 4066062 bytes
-SHA1 (patch-aa) = ddd507020256c2960afb9194060264af8a44f59d
+SHA1 (nmap-4.76.tar.bz2) = a71141738b4512b6d5b35ef94258e525df30a586
+RMD160 (nmap-4.76.tar.bz2) = ec93522e05e7233e8950b28ab12b45355e63c0c7
+Size (nmap-4.76.tar.bz2) = 6061317 bytes
+SHA1 (patch-aa) = b47bb158aa9504e7bc0f3092e3370d49a82ec608
 SHA1 (patch-ab) = bef6a0bc8481702319d14d3427169562f13e1526
-SHA1 (patch-aj) = 1500c5a1ea2af3f7ffd355740dace674875e0ea6
+SHA1 (patch-aj) = 5e306f51f5e0a07eb05d498547f95b526ffbdfc7
diff --git a/net/nmap/patches/patch-aa b/net/nmap/patches/patch-aa
index a65c90cfa32..62362808175 100644
--- a/net/nmap/patches/patch-aa
+++ b/net/nmap/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.21 2008/06/08 18:12:52 adrianp Exp $
+$NetBSD: patch-aa,v 1.22 2009/01/04 15:16:11 adrianp Exp $
 
---- Makefile.in.orig	2008-05-31 04:24:50.000000000 +0100
+--- Makefile.in.orig	2008-09-05 06:32:06.000000000 +0100
 +++ Makefile.in
 @@ -24,8 +24,8 @@ CXX = @CXX@
  CCOPT = 
@@ -13,9 +13,9 @@ $NetBSD: patch-aa,v 1.21 2008/06/08 18:12:52 adrianp Exp $
  export LIBDNETDIR = @LIBDNETDIR@
  ZENMAPDIR = zenmap
  PYTHON = @PYTHON@
-@@ -88,14 +88,14 @@ nsestdlib: nselib-bin/Makefile 
- 	@echo Compiling nse-standard-library; cd nselib-bin && $(MAKE)
- 
+@@ -82,14 +82,14 @@ $(TARGET): @LUA_DEPENDS@ @PCAP_DEPENDS@ 
+ 	rm -f $@
+ 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
  
 -pcre_build: $(LIBPCREDIR)/Makefile
 -	@echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE)
diff --git a/net/nmap/patches/patch-aj b/net/nmap/patches/patch-aj
index 56e5cd7a66c..cceb6380c4d 100644
--- a/net/nmap/patches/patch-aj
+++ b/net/nmap/patches/patch-aj
@@ -1,10 +1,8 @@
-$NetBSD: patch-aj,v 1.1 2007/01/09 15:25:48 rillig Exp $
+$NetBSD: patch-aj,v 1.2 2009/01/04 15:16:11 adrianp Exp $
 
-SunPro cannot handle struct { ...; union { ...; variable length array }}.
-
---- libdnet-stripped/include/dnet/os.h.orig	2005-08-24 02:06:27.000000000 +0200
-+++ libdnet-stripped/include/dnet/os.h	2007-01-09 16:18:57.602654556 +0100
-@@ -120,7 +120,7 @@ typedef unsigned int                ssiz
+--- libdnet-stripped/include/dnet/os.h.orig	2008-08-29 21:23:56.000000000 +0100
++++ libdnet-stripped/include/dnet/os.h
+@@ -115,7 +115,7 @@
  # ifdef __GNUC__
  #  define __flexarr	[0]
  # else
@@ -12,4 +10,4 @@ SunPro cannot handle struct { ...; union { ...; variable length array }}.
 +#  if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && !defined(__SUNPRO_C)
  #   define __flexarr	[]
  #  elif defined(_WIN32)
- /* MS VC++ -- using just [] may work, but gives a non-standard extension warning */
+ /* MS VC++ */