ports/143331: [maintainer] Update security/nmap to 5.21

Thu Jan 28 23:00:22 UTC 2010

>Number:         143331
>Category:       ports
>Synopsis:       [maintainer] Update security/nmap to 5.21
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 28 23:00:21 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Daniel Roethlisberger
>Release:        FreeBSD 6.4-RELEASE-p7 i386
>Organization:
>Environment:
System: FreeBSD calvin.ustdmz.roe.ch 6.4-RELEASE-p7 FreeBSD 6.4-RELEASE-p7 #0: Fri Oct 2 02:46:10 UTC 2009 root at i386-builder.daemonology.net:/usr/obj/usr/src/sys/SMP i386
>Description:
Update Nmap to 5.21.
Please also update security/zenmap (separate PR).
>How-To-Repeat:
>Fix:

--- nmap-5.21.diff begins here ---
diff -ruN nmap.orig/Makefile nmap/Makefile
--- nmap.orig/Makefile	2009-07-17 00:17:10.000000000 +0200
+++ nmap/Makefile	2010-01-27 17:00:14.000000000 +0100
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nmap
-PORTVERSION=	5.00
+PORTVERSION=	5.21
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/ \
 		http://nmap.ucsd.edu/dist/ \
diff -ruN nmap.orig/distinfo nmap/distinfo
--- nmap.orig/distinfo	2009-07-17 00:17:10.000000000 +0200
+++ nmap/distinfo	2010-01-27 17:02:16.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (nmap-5.00.tar.bz2) = 32d27de32166c02d670bb4a086185886
-SHA256 (nmap-5.00.tar.bz2) = b88b987d6e81ed306c4a8c52c6d6be414feac51ca50e1a61777f162dc3e8214d
-SIZE (nmap-5.00.tar.bz2) = 9068342
+MD5 (nmap-5.21.tar.bz2) = f77fa51d89ab27d35e5cd87bb086b858
+SHA256 (nmap-5.21.tar.bz2) = 9fcb24f86157541c2f17cc8a0cc1e5d15d909b51720d163fcad5faaa6201b0ba
+SIZE (nmap-5.21.tar.bz2) = 10015121
diff -ruN nmap.orig/files/patch-output.cc nmap/files/patch-output.cc
--- nmap.orig/files/patch-output.cc	2009-04-13 11:53:53.000000000 +0200
+++ nmap/files/patch-output.cc	2010-01-27 16:44:27.000000000 +0100
@@ -1,21 +1,19 @@
---- output.cc.orig	2009-04-01 00:29:03.000000000 +0200
-+++ output.cc	2009-04-01 22:52:01.000000000 +0200
-@@ -108,6 +108,7 @@
- #include <math.h>
- 
- #include <set>
-+#include <sys/param.h>
+--- output.cc.orig	2009-12-20 04:22:19.000000000 +0100
++++ output.cc	2010-01-21 17:42:20.000000000 +0100
+@@ -111,6 +111,7 @@
  #include <string>
  #include <vector>
  #include <list>
-@@ -1030,8 +1031,8 @@
++#include <sys/param.h>
+ 
+ /* Workaround for lack of namespace std on HP-UX 11.00 */
+ namespace std {};
+@@ -1037,7 +1038,7 @@
    case LOG_MACHINE:
    case LOG_SKID:
    case LOG_XML:
 -#ifdef WIN32
--	  apcopy = ap;
 +#if defined(WIN32) || (defined(FREEBSD) && (__FreeBSD_version < 500000))
-+    apcopy = ap;
+     apcopy = ap;
  #else
-     va_copy(apcopy, ap); /* Needed in case we need to so a second vnsprintf */
- #endif
+     va_copy(apcopy, ap); /* Needed in case we need to do a second vsnprintf */
diff -ruN nmap.orig/files/patch-tcpip.cc nmap/files/patch-tcpip.cc
--- nmap.orig/files/patch-tcpip.cc	2007-01-03 18:17:43.000000000 +0100
+++ nmap/files/patch-tcpip.cc	2010-01-27 16:44:27.000000000 +0100
@@ -9,21 +9,3 @@
  extern NmapOps o;
  
  #ifdef WIN32
-@@ -1959,7 +1961,7 @@
- 
- // Returns whether the system supports pcap_get_selectable_fd() properly
- bool pcap_selectable_fd_valid() {
--#if defined(WIN32) || defined(MACOSX)
-+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000))
-   return false;
- #endif
-   return true;
-@@ -1972,7 +1974,7 @@
-    results.  If you just want to test whether the function is supported,
-    use pcap_selectable_fd_valid() instead. */
- int my_pcap_get_selectable_fd(pcap_t *p) {
--#if defined(WIN32) || defined(MACOSX)
-+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000))
-   return -1;
- #else
-   assert(pcap_selectable_fd_valid());
diff -ruN nmap.orig/pkg-plist nmap/pkg-plist
--- nmap.orig/pkg-plist	2009-07-06 00:24:15.000000000 +0200
+++ nmap/pkg-plist	2010-01-27 17:20:14.000000000 +0100
@@ -18,7 +18,6 @@
 %%DATADIR%%/scripts/smb-system-info.nse
 %%DATADIR%%/scripts/smb-server-stats.nse
 %%DATADIR%%/scripts/smb-security-mode.nse
-%%DATADIR%%/scripts/smb-pwdump.nse
 %%DATADIR%%/scripts/smb-os-discovery.nse
 %%DATADIR%%/scripts/smb-enum-users.nse
 %%DATADIR%%/scripts/smb-enum-shares.nse
@@ -60,7 +59,53 @@
 %%DATADIR%%/scripts/auth-spoof.nse
 %%DATADIR%%/scripts/auth-owners.nse
 %%DATADIR%%/scripts/asn-query.nse
+%%DATADIR%%/scripts/citrix-brute-xml.nse
+%%DATADIR%%/scripts/citrix-enum-apps-xml.nse
+%%DATADIR%%/scripts/citrix-enum-apps.nse
+%%DATADIR%%/scripts/citrix-enum-servers-xml.nse
+%%DATADIR%%/scripts/citrix-enum-servers.nse
+%%DATADIR%%/scripts/db2-info.nse
+%%DATADIR%%/scripts/dhcp-discover.nse
+%%DATADIR%%/scripts/http-date.nse
+%%DATADIR%%/scripts/http-enum.nse
+%%DATADIR%%/scripts/http-favicon.nse
+%%DATADIR%%/scripts/http-headers.nse
+%%DATADIR%%/scripts/http-malware-host.nse
+%%DATADIR%%/scripts/http-userdir-enum.nse
+%%DATADIR%%/scripts/nfs-showmount.nse
+%%DATADIR%%/scripts/ntp-info.nse
+%%DATADIR%%/scripts/oracle-sid-brute.nse
+%%DATADIR%%/scripts/pjl-ready-message.nse
+%%DATADIR%%/scripts/smb-enum-groups.nse
+%%DATADIR%%/scripts/smb-psexec.nse
+%%DATADIR%%/scripts/smbv2-enabled.nse
+%%DATADIR%%/scripts/ssl-cert.nse
+%%DATADIR%%/scripts/x11-access.nse
 @dirrm %%DATADIR%%/scripts
+%%DATADIR%%/nselib/data/psexec/backdoor.lua
+%%DATADIR%%/nselib/data/psexec/drives.lua
+%%DATADIR%%/nselib/data/psexec/nmap_service.exe
+%%DATADIR%%/nselib/data/psexec/network.lua
+%%DATADIR%%/nselib/data/psexec/nmap_service.c
+%%DATADIR%%/nselib/data/psexec/experimental.lua
+%%DATADIR%%/nselib/data/psexec/pwdump.lua
+%%DATADIR%%/nselib/data/psexec/default.lua
+%%DATADIR%%/nselib/data/psexec/nmap_service.vcproj
+%%DATADIR%%/nselib/data/psexec/encoder.c
+%%DATADIR%%/nselib/data/psexec/examples.lua
+%%DATADIR%%/nselib/data/psexec/README
+ at dirrm %%DATADIR%%/nselib/data/psexec
+%%DATADIR%%/nselib/data/usernames.lst
+%%DATADIR%%/nselib/data/favicon-db
+%%DATADIR%%/nselib/data/http-fingerprints
+%%DATADIR%%/nselib/data/folders.lst
+%%DATADIR%%/nselib/data/oracle-sids
+%%DATADIR%%/nselib/data/passwords.lst
+%%DATADIR%%/nselib/data/yokoso-fingerprints
+ at dirrm %%DATADIR%%/nselib/data
+%%DATADIR%%/nselib/citrixxml.lua
+%%DATADIR%%/nselib/proxy.lua
+%%DATADIR%%/nselib/strict.lua
 %%DATADIR%%/nselib/http.lua
 %%DATADIR%%/nselib/ipOps.lua
 %%DATADIR%%/nselib/strbuf.lua
--- nmap-5.21.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

