Update to latest version, comments ? ok ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nmap/Makefile,v
retrieving revision 1.86
diff -u -p -r1.86 Makefile
--- Makefile 28 Jan 2010 15:31:28 -0000 1.86
+++ Makefile 8 Feb 2010 07:49:35 -0000
@@ -3,13 +3,13 @@
COMMENT-main= scan ports and fingerprint stack of network hosts
COMMENT-zenmap= graphical frontend for nmap
-MODPY_EGG_VERSION= 5.00
+MODPY_EGG_VERSION= 5.21
DISTNAME= nmap-${MODPY_EGG_VERSION}
-PKGNAME-main= ${DISTNAME}p1
-PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION}p0
+PKGNAME-main= ${DISTNAME}
+PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION}
CATEGORIES= net security
-MASTER_SITES= http://download.insecure.org/nmap/dist/
+MASTER_SITES= http://nmap.org/dist/
EXTRACT_SUFX= .tgz
HOMEPAGE= http://www.nmap.org/
@@ -39,7 +39,8 @@ CONFIGURE_ARGS= --with-libpcap=/usr \
--with-libdnet=${LOCALBASE} \
--with-liblua=${LOCALBASE} \
--with-libpcre=${LOCALBASE} \
- --with-mandir=${LOCALBASE}/man
+ --with-mandir=${LOCALBASE}/man \
+ --disable-nls
LIB_DEPENDS= pcre::devel/pcre \
dnet::net/libdnet \
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/nmap/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo 22 Oct 2009 10:00:57 -0000 1.23
+++ distinfo 8 Feb 2010 07:49:35 -0000
@@ -1,5 +1,5 @@
-MD5 (nmap-5.00.tgz) = a1so9CHK5x/ScQwSR8jbZg==
-RMD160 (nmap-5.00.tgz) = DFPJh6U8idH9ZPZ8VgaDUHfP8m8=
-SHA1 (nmap-5.00.tgz) = 1bbU5FIqpdpYQHcPuBDELoCQYMo=
-SHA256 (nmap-5.00.tgz) = ddzr5P1zzJGyY0DZ9rM7WhA20iqEl51DzRJ+RgdaOPI=
-SIZE (nmap-5.00.tgz) = 9902346
+MD5 (nmap-5.21.tgz) = jOdz1wplAHRSFh4L3jKZDA==
+RMD160 (nmap-5.21.tgz) = X5P0sah3z/wNcKSsLcM9/kMaGE4=
+SHA1 (nmap-5.21.tgz) = ziEs52X4QrFgWUVs8MnZz7vOJdY=
+SHA256 (nmap-5.21.tgz) = p/jBjmxAsrLiu/0S5ZN9sG4o4F76gk4uvHFVw9vWLvg=
+SIZE (nmap-5.21.tgz) = 11096893
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-Makefile_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-Makefile_in
--- patches/patch-Makefile_in 22 Oct 2009 10:00:57 -0000 1.10
+++ patches/patch-Makefile_in 8 Feb 2010 07:49:35 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.10 2009/10/22 10:00:57 giovanni Exp $
---- Makefile.in.orig Wed Jun 24 23:35:54 2009
-+++ Makefile.in Tue Jul 21 20:16:43 2009
-@@ -217,8 +217,8 @@ $(NCATDIR)/ncat.h: nmap.h
- sed -i -e 's/^#[ \t]*define[ \t]\+NCAT_VERSION[ \t]\+\(".*"\)/#define
NCAT_VERSION "$(NMAP_VERSION)"/' $@
+--- Makefile.in.orig Sat Dec 12 21:26:15 2009
++++ Makefile.in Wed Jan 20 19:54:57 2010
+@@ -234,8 +234,8 @@ $(NCATDIR)/ncat.h: nmap.h
+ mv -f $...@.tmp $@
# Update the version number used by Zenmap.
-$(ZENMAPDIR)/zenmapCore/Version.py
$(ZENMAPDIR)/share/zenmap/config/zenmap_version: nmap.h
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-configure,v
retrieving revision 1.10
diff -u -p -r1.10 patch-configure
--- patches/patch-configure 22 Oct 2009 10:00:57 -0000 1.10
+++ patches/patch-configure 8 Feb 2010 07:49:35 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.10 2009/10/22 10:00:57 giovanni Exp $
---- configure.orig Wed Jun 24 23:35:54 2009
-+++ configure Tue Jul 21 19:57:38 2009
-@@ -7108,6 +7108,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+--- configure.orig Thu Nov 5 20:50:33 2009
++++ configure Wed Jan 20 19:54:57 2010
+@@ -7161,6 +7161,7 @@ cat >>conftest.$ac_ext <<_ACEOF
extern char pcap_version[];
int main() {
int major, minor1, minor2;
@@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.10 2009/10
sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
if (major > 0)
exit(0);
-@@ -7439,7 +7440,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -7492,7 +7493,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.10 2009/10
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
-@@ -7640,7 +7641,7 @@ if test $have_pcre != yes ; then
+@@ -7693,7 +7694,7 @@ if test $have_pcre != yes ; then
else
# We only need to check for and use this if we are NOT using included pcre
Index: patches/patch-nsock_include_nsock_h
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-nsock_include_nsock_h,v
retrieving revision 1.4
diff -u -p -r1.4 patch-nsock_include_nsock_h
--- patches/patch-nsock_include_nsock_h 22 Oct 2009 10:00:57 -0000 1.4
+++ patches/patch-nsock_include_nsock_h 8 Feb 2010 07:49:35 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-nsock_include_nsock_h,v 1.4 2009/10/22 10:00:57 giovanni Exp $
---- nsock/include/nsock.h.orig Sat May 30 01:19:07 2009
-+++ nsock/include/nsock.h Tue Jul 21 19:57:38 2009
+--- nsock/include/nsock.h.orig Thu Aug 20 23:36:58 2009
++++ nsock/include/nsock.h Wed Jan 20 19:54:57 2010
@@ -79,6 +79,8 @@
extern "C" {
#endif
@@ -10,7 +10,7 @@ $OpenBSD: patch-nsock_include_nsock_h,v
/* The read calls will generally return after reading at least this
* much data so that the caller can process it and so that the
* connection spewing data doesn't monopolize resources. The caller
-@@ -542,7 +544,7 @@ nsock_event_id nsock_pcap_read_packet(nsock_pool nsp,
+@@ -563,7 +565,7 @@ nsock_event_id nsock_pcap_read_packet(nsock_pool nsp,
void nse_readpcap(nsock_event nsee,
const unsigned char **l2_data, size_t *l2_len,
const unsigned char **l3_data, size_t *l3_len,
Index: patches/patch-scan-engine_cc
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-scan-engine_cc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-scan-engine_cc
--- patches/patch-scan-engine_cc 22 Oct 2009 10:00:57 -0000 1.1
+++ patches/patch-scan-engine_cc 8 Feb 2010 07:49:35 -0000
@@ -1,6 +1,6 @@
---- scan_engine.cc.orig Wed Jun 24 23:35:54 2009
-+++ scan_engine.cc Tue Jul 21 19:57:38 2009
-@@ -107,6 +107,7 @@
+--- scan_engine.cc.orig Fri Jan 15 04:55:23 2010
++++ scan_engine.cc Wed Jan 20 19:54:57 2010
+@@ -108,6 +108,7 @@
#include <math.h>
#include <list>
#include <map>
@@ -8,7 +8,7 @@
using namespace std;
extern NmapOps o;
-@@ -5061,13 +5062,13 @@ static void begin_sniffer(UltraScanInfo *USI, vector<T
+@@ -4915,13 +4916,13 @@ static void begin_sniffer(UltraScanInfo *USI, vector<T
if (doIndividual){
pcap_filter="dst host ";
pcap_filter+=inet_ntoa(Targets[0]->v4source());
Index: patches/patch-tcpip_cc
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-tcpip_cc,v
retrieving revision 1.10
diff -u -p -r1.10 patch-tcpip_cc
--- patches/patch-tcpip_cc 22 Oct 2009 10:00:57 -0000 1.10
+++ patches/patch-tcpip_cc 8 Feb 2010 07:49:35 -0000
@@ -1,5 +1,5 @@
---- tcpip.cc.orig Wed Jun 24 23:35:54 2009
-+++ tcpip.cc Tue Jul 21 19:57:38 2009
+--- tcpip.cc.orig Fri Jan 15 04:55:23 2010
++++ tcpip.cc Wed Jan 20 19:56:46 2010
@@ -127,6 +127,8 @@
#endif /* NETINET_IF_ETHER_H */
#endif /* HAVE_NETINET_IF_ETHER_H */
@@ -9,12 +9,12 @@
extern NmapOps o;
#ifdef WIN32
-@@ -2314,7 +2316,7 @@ bool pcap_selectable_fd_valid() {
+@@ -2432,7 +2434,7 @@ bool pcap_selectable_fd_valid() {
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 __OpenBSD__
+-#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) &&
(__FreeBSD_version < 500000))
++#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) &&
(__FreeBSD_version < 500000)) || defined(__OpenBSD__)
return -1;
#else
assert(pcap_selectable_fd_valid());
Index: patches/patch-traceroute_cc
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-traceroute_cc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-traceroute_cc
--- patches/patch-traceroute_cc 22 Oct 2009 10:00:57 -0000 1.1
+++ patches/patch-traceroute_cc 8 Feb 2010 07:49:35 -0000
@@ -1,10 +1,10 @@
---- traceroute.cc.orig Fri Jul 17 22:43:30 2009
-+++ traceroute.cc Fri Jul 17 22:44:21 2009
-@@ -172,6 +172,7 @@
- #include "utils.h"
- #include <algorithm>
- #include <stdlib.h>
+--- traceroute.cc.orig Fri Jan 15 04:55:23 2010
++++ traceroute.cc Wed Jan 20 19:57:26 2010
+@@ -136,6 +136,7 @@ individually.
+ #include "timing.h"
+ #include "NmapOps.h"
+ #include "Target.h"
+#include "sctp.h"
- using namespace std;
- extern NmapOps o;
+ #include <dnet.h>
+
Index: patches/patch-zenmap_setup_py
===================================================================
RCS file: /cvs/ports/net/nmap/patches/patch-zenmap_setup_py,v
retrieving revision 1.6
diff -u -p -r1.6 patch-zenmap_setup_py
--- patches/patch-zenmap_setup_py 22 Oct 2009 10:00:57 -0000 1.6
+++ patches/patch-zenmap_setup_py 8 Feb 2010 07:49:35 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-zenmap_setup_py,v 1.6 2009/10/22 10:00:57 giovanni Exp $
---- zenmap/setup.py.orig Thu May 28 08:26:49 2009
-+++ zenmap/setup.py Tue Jul 21 19:57:38 2009
-@@ -125,12 +125,11 @@ def path_strip_prefix(path, prefix):
+--- zenmap/setup.py.orig Wed Nov 4 04:36:50 2009
++++ zenmap/setup.py Wed Jan 20 19:54:57 2010
+@@ -192,12 +192,11 @@ def path_strip_prefix(path, prefix):
class my_install(install):
def run(self):
@@ -15,7 +15,7 @@ $OpenBSD: patch-zenmap_setup_py,v 1.6 20
self.write_installed_files()
def get_installed_files(self):
-@@ -284,17 +283,10 @@ for dir in dirs:
+@@ -350,17 +349,10 @@ for dir in dirs:
"MISC_DIR": os.path.join(self.prefix, misc_dir),
"PIXMAPS_DIR": os.path.join(self.prefix,
pixmaps_dir)}
@@ -36,7 +36,7 @@ $OpenBSD: patch-zenmap_setup_py,v 1.6 20
# Replace the path definitions.
for path, replacement in interesting_paths.items():
-@@ -315,11 +307,6 @@ for dir in dirs:
+@@ -381,11 +373,6 @@ for dir in dirs:
desktop_filename = None
root_desktop_filename = None
Index: pkg/PFRAG.shared-main
===================================================================
RCS file: /cvs/ports/net/nmap/pkg/PFRAG.shared-main,v
retrieving revision 1.7
diff -u -p -r1.7 PFRAG.shared-main
--- pkg/PFRAG.shared-main 22 Oct 2009 10:00:57 -0000 1.7
+++ pkg/PFRAG.shared-main 8 Feb 2010 07:49:35 -0000
@@ -2,7 +2,29 @@
share/nmap/nse_main.lua
share/nmap/nselib/
share/nmap/nselib/base64.lua
+share/nmap/nselib/citrixxml.lua
share/nmap/nselib/comm.lua
+share/nmap/nselib/data/
+share/nmap/nselib/data/favicon-db
+share/nmap/nselib/data/folders.lst
+share/nmap/nselib/data/http-fingerprints
+share/nmap/nselib/data/oracle-sids
+share/nmap/nselib/data/passwords.lst
+share/nmap/nselib/data/psexec/
+share/nmap/nselib/data/psexec/README
+share/nmap/nselib/data/psexec/backdoor.lua
+share/nmap/nselib/data/psexec/default.lua
+share/nmap/nselib/data/psexec/drives.lua
+share/nmap/nselib/data/psexec/encoder.c
+share/nmap/nselib/data/psexec/examples.lua
+share/nmap/nselib/data/psexec/experimental.lua
+share/nmap/nselib/data/psexec/network.lua
+share/nmap/nselib/data/psexec/nmap_service.c
+share/nmap/nselib/data/psexec/nmap_service.exe
+share/nmap/nselib/data/psexec/nmap_service.vcproj
+share/nmap/nselib/data/psexec/pwdump.lua
+share/nmap/nselib/data/usernames.lst
+share/nmap/nselib/data/yokoso-fingerprints
share/nmap/nselib/datafiles.lua
share/nmap/nselib/dns.lua
share/nmap/nselib/http.lua
@@ -17,6 +39,7 @@ share/nmap/nselib/netbios.lua
share/nmap/nselib/nsedebug.lua
share/nmap/nselib/packet.lua
share/nmap/nselib/pop3.lua
+share/nmap/nselib/proxy.lua
share/nmap/nselib/shortport.lua
share/nmap/nselib/smb.lua
share/nmap/nselib/smbauth.lua
@@ -25,6 +48,7 @@ share/nmap/nselib/ssh1.lua
share/nmap/nselib/ssh2.lua
share/nmap/nselib/stdnse.lua
share/nmap/nselib/strbuf.lua
+share/nmap/nselib/strict.lua
share/nmap/nselib/tab.lua
share/nmap/nselib/unpwdb.lua
share/nmap/nselib/url.lua
@@ -33,7 +57,14 @@ share/nmap/scripts/asn-query.nse
share/nmap/scripts/auth-owners.nse
share/nmap/scripts/auth-spoof.nse
share/nmap/scripts/banner.nse
+share/nmap/scripts/citrix-brute-xml.nse
+share/nmap/scripts/citrix-enum-apps-xml.nse
+share/nmap/scripts/citrix-enum-apps.nse
+share/nmap/scripts/citrix-enum-servers-xml.nse
+share/nmap/scripts/citrix-enum-servers.nse
share/nmap/scripts/daytime.nse
+share/nmap/scripts/db2-info.nse
+share/nmap/scripts/dhcp-discover.nse
share/nmap/scripts/dns-random-srcport.nse
share/nmap/scripts/dns-random-txid.nse
share/nmap/scripts/dns-recursion.nse
@@ -44,17 +75,27 @@ share/nmap/scripts/ftp-bounce.nse
share/nmap/scripts/ftp-brute.nse
share/nmap/scripts/html-title.nse
share/nmap/scripts/http-auth.nse
+share/nmap/scripts/http-date.nse
+share/nmap/scripts/http-enum.nse
+share/nmap/scripts/http-favicon.nse
+share/nmap/scripts/http-headers.nse
share/nmap/scripts/http-iis-webdav-vuln.nse
+share/nmap/scripts/http-malware-host.nse
share/nmap/scripts/http-open-proxy.nse
share/nmap/scripts/http-passwd.nse
share/nmap/scripts/http-trace.nse
+share/nmap/scripts/http-userdir-enum.nse
share/nmap/scripts/iax2-version.nse
share/nmap/scripts/imap-capabilities.nse
share/nmap/scripts/irc-info.nse
share/nmap/scripts/ms-sql-info.nse
share/nmap/scripts/mysql-info.nse
share/nmap/scripts/nbstat.nse
+share/nmap/scripts/nfs-showmount.nse
+share/nmap/scripts/ntp-info.nse
+share/nmap/scripts/oracle-sid-brute.nse
share/nmap/scripts/p2p-conficker.nse
+share/nmap/scripts/pjl-ready-message.nse
share/nmap/scripts/pop3-brute.nse
share/nmap/scripts/pop3-capabilities.nse
share/nmap/scripts/pptp-version.nse
@@ -66,15 +107,17 @@ share/nmap/scripts/skypev2-version.nse
share/nmap/scripts/smb-brute.nse
share/nmap/scripts/smb-check-vulns.nse
share/nmap/scripts/smb-enum-domains.nse
+share/nmap/scripts/smb-enum-groups.nse
share/nmap/scripts/smb-enum-processes.nse
share/nmap/scripts/smb-enum-sessions.nse
share/nmap/scripts/smb-enum-shares.nse
share/nmap/scripts/smb-enum-users.nse
share/nmap/scripts/smb-os-discovery.nse
-share/nmap/scripts/smb-pwdump.nse
+share/nmap/scripts/smb-psexec.nse
share/nmap/scripts/smb-security-mode.nse
share/nmap/scripts/smb-server-stats.nse
share/nmap/scripts/smb-system-info.nse
+share/nmap/scripts/smbv2-enabled.nse
share/nmap/scripts/smtp-commands.nse
share/nmap/scripts/smtp-open-relay.nse
share/nmap/scripts/smtp-strangeport.nse
@@ -85,7 +128,9 @@ share/nmap/scripts/socks-open-proxy.nse
share/nmap/scripts/sql-injection.nse
share/nmap/scripts/ssh-hostkey.nse
share/nmap/scripts/sshv1.nse
+share/nmap/scripts/ssl-cert.nse
share/nmap/scripts/sslv2.nse
share/nmap/scripts/telnet-brute.nse
share/nmap/scripts/upnp-info.nse
share/nmap/scripts/whois.nse
+share/nmap/scripts/x11-access.nse
Index: pkg/PLIST-zenmap
===================================================================
RCS file: /cvs/ports/net/nmap/pkg/PLIST-zenmap,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-zenmap
--- pkg/PLIST-zenmap 22 Dec 2009 00:31:23 -0000 1.9
+++ pkg/PLIST-zenmap 8 Feb 2010 07:49:36 -0000
@@ -130,6 +130,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/DiffCompare.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/FileChoosers.py
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/FileChoosers.pyc
+lib/python${MODPY_VERSION}/site-packages/zenmapGUI/FilterBar.py
+lib/python${MODPY_VERSION}/site-packages/zenmapGUI/FilterBar.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/Icons.py
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/Icons.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/MainWindow.py
@@ -150,10 +152,10 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ScanHostDetailsPage.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ScanHostsView.py
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ScanHostsView.pyc
+lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ScanInterface.py
+lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ScanInterface.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ScanNmapOutputPage.py
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ScanNmapOutputPage.pyc
-lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ScanNotebook.py
-lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ScanNotebook.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ScanOpenPortsPage.py
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ScanOpenPortsPage.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/ScanRunDetailsPage.py
@@ -236,6 +238,9 @@ share/zenmap/locale/hr/LC_MESSAGES/zenma
share/zenmap/locale/pt_BR/
share/zenmap/locale/pt_BR/LC_MESSAGES/
share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo
+share/zenmap/locale/ru/
+share/zenmap/locale/ru/LC_MESSAGES/
+share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo
share/zenmap/misc/
share/zenmap/misc/profile_editor.xml
share/zenmap/pixmaps/
