diff options
| -rw-r--r-- | security/nmap/Makefile | 18 | ||||
| -rw-r--r-- | security/nmap/distinfo | 4 | ||||
| -rw-r--r-- | security/nmap/files/patch-libnetutil_netutil.cc | 20 | ||||
| -rw-r--r-- | security/nmap/pkg-plist | 25 |
4 files changed, 30 insertions, 37 deletions
diff --git a/security/nmap/Makefile b/security/nmap/Makefile index 170fff8a4da0..d734c23c05d0 100644 --- a/security/nmap/Makefile +++ b/security/nmap/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nmap -DISTVERSION= 6.49BETA5 +DISTVERSION= 6.49BETA6 CATEGORIES= security ipv6 MASTER_SITES= http://nmap.org/dist/ \ LOCAL/ohauer @@ -30,22 +30,16 @@ SSL_USE= OPENSSL=yes SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} SSL_CONFIGURE_OFF= --without-openssl SSL_CFLAGS= -I${OPENSSLINC} +SSL_VARS= STRIP_FILES=ncat +# PR: ports/159376 Workaround if OS is build with WITHOUT_INET6 +IPV6_LIB_DEPENDS_OFF= libpcap.so:${PORTSDIR}/net/libpcap IPV6_CONFIGURE_OFF= --with-libpcap=${LOCALBASE}/IPv6 .include <bsd.port.options.mk> -# PR: ports/159376 Workaround if OS is build with WITHOUT_INET6 -.if ! ${PORT_OPTIONS:MIPV6} -LIB_DEPENDS+= libpcap.so:${PORTSDIR}/net/libpcap -.endif - DOCS= CHANGELOG HACKING -STRIP_FILES= nmap nping - -.if ${PORT_OPTIONS:MSSL} -STRIP_FILES+= ncat -.endif +STRIP_FILES+= nmap nping CONFIGURE_ARGS+=--without-localdirs \ --without-zenmap \ @@ -66,6 +60,8 @@ pre-install: post-install: ${STRIP_CMD} ${STRIP_FILES:S|^|${STAGEDIR}${PREFIX}/bin/|} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} diff --git a/security/nmap/distinfo b/security/nmap/distinfo index 76f54c3aeb2c..dd7c0b607d06 100644 --- a/security/nmap/distinfo +++ b/security/nmap/distinfo @@ -1,2 +1,2 @@ -SHA256 (nmap-6.49BETA5.tar.bz2) = 747a961d735da518cb00884c46c13e73ee1d06253d03c176ce54dde1f6681c36 -SIZE (nmap-6.49BETA5.tar.bz2) = 8816982 +SHA256 (nmap-6.49BETA6.tar.bz2) = 9c548ee0e3f0db73c4b5f8434c0bc7c99188333562c4bc4e04fb721533ff1637 +SIZE (nmap-6.49BETA6.tar.bz2) = 8904750 diff --git a/security/nmap/files/patch-libnetutil_netutil.cc b/security/nmap/files/patch-libnetutil_netutil.cc deleted file mode 100644 index 23df9e6c5ed9..000000000000 --- a/security/nmap/files/patch-libnetutil_netutil.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- libnetutil/netutil.cc.orig 2015-09-21 19:57:10 UTC -+++ libnetutil/netutil.cc -@@ -3604,7 +3604,7 @@ int send_ip_packet_sd(int sd, const stru - must deal with it here rather than when building the packet, - because they should be in NBO when I'm sending over raw - ethernet */ --#if (defined(FREEBSD) && (__FreeBSD_version < 1000022)) || BSDI || NETBSD || DEC || MACOSX -+#if (defined(FREEBSD) && (__FreeBSD_version < 1100030)) || BSDI || NETBSD || DEC || MACOSX - ip->ip_len = ntohs(ip->ip_len); - ip->ip_off = ntohs(ip->ip_off); - #endif -@@ -3614,7 +3614,7 @@ int send_ip_packet_sd(int sd, const stru - (int) sizeof(struct sockaddr_in)); - - /* Undo the byte order switching. */ --#if (defined(FREEBSD) && (__FreeBSD_version < 1000022)) || BSDI || NETBSD || DEC || MACOSX -+#if (defined(FREEBSD) && (__FreeBSD_version < 1100030)) || BSDI || NETBSD || DEC || MACOSX - ip->ip_len = htons(ip->ip_len); - ip->ip_off = htons(ip->ip_off); - #endif diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist index d02bc9053060..8ac05b702dd4 100644 --- a/security/nmap/pkg-plist +++ b/security/nmap/pkg-plist @@ -51,6 +51,7 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/nselib/cvs.lua %%DATADIR%%/nselib/data/dns-srv-names %%DATADIR%%/nselib/data/drupal-modules.lst +%%DATADIR%%/nselib/data/drupal-themes.lst %%DATADIR%%/nselib/data/enterprise_numbers.txt %%DATADIR%%/nselib/data/favicon-db %%DATADIR%%/nselib/data/http-default-accounts-fingerprints.lua @@ -121,6 +122,7 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/nselib/lfs.luadoc %%DATADIR%%/nselib/listop.lua %%DATADIR%%/nselib/lpeg-utility.lua +%%DATADIR%%/nselib/ls.lua %%DATADIR%%/nselib/match.lua %%DATADIR%%/nselib/membase.lua %%DATADIR%%/nselib/mobileme.lua @@ -157,6 +159,7 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/nselib/sasl.lua %%DATADIR%%/nselib/shortport.lua %%DATADIR%%/nselib/sip.lua +%%DATADIR%%/nselib/slaxml.lua %%DATADIR%%/nselib/smb.lua %%DATADIR%%/nselib/smbauth.lua %%DATADIR%%/nselib/smtp.lua @@ -320,6 +323,7 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/scripts/hbase-master-info.nse %%DATADIR%%/scripts/hbase-region-info.nse %%DATADIR%%/scripts/hddtemp-info.nse +%%DATADIR%%/scripts/hnap-info.nse %%DATADIR%%/scripts/hostmap-bfk.nse %%DATADIR%%/scripts/hostmap-ip2hosts.nse %%DATADIR%%/scripts/hostmap-robtex.nse @@ -341,7 +345,7 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/scripts/http-comments-displayer.nse %%DATADIR%%/scripts/http-config-backup.nse %%DATADIR%%/scripts/http-cors.nse -%%DATADIR%%/scripts/http-crossdomainxml.nse +%%DATADIR%%/scripts/http-cross-domain-policy.nse %%DATADIR%%/scripts/http-csrf.nse %%DATADIR%%/scripts/http-date.nse %%DATADIR%%/scripts/http-default-accounts.nse @@ -350,13 +354,13 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/scripts/http-dombased-xss.nse %%DATADIR%%/scripts/http-domino-enum-passwords.nse %%DATADIR%%/scripts/http-drupal-enum-users.nse -%%DATADIR%%/scripts/http-drupal-modules.nse -%%DATADIR%%/scripts/http-email-harvest.nse +%%DATADIR%%/scripts/http-drupal-enum.nse %%DATADIR%%/scripts/http-enum.nse %%DATADIR%%/scripts/http-errors.nse %%DATADIR%%/scripts/http-exif-spider.nse %%DATADIR%%/scripts/http-favicon.nse %%DATADIR%%/scripts/http-feed.nse +%%DATADIR%%/scripts/http-fetch.nse %%DATADIR%%/scripts/http-fileupload-exploiter.nse %%DATADIR%%/scripts/http-form-brute.nse %%DATADIR%%/scripts/http-form-fuzzer.nse @@ -374,6 +378,7 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/scripts/http-iis-webdav-vuln.nse %%DATADIR%%/scripts/http-joomla-brute.nse %%DATADIR%%/scripts/http-litespeed-sourcecode-download.nse +%%DATADIR%%/scripts/http-ls.nse %%DATADIR%%/scripts/http-majordomo2-dir-traversal.nse %%DATADIR%%/scripts/http-malware-host.nse %%DATADIR%%/scripts/http-method-tamper.nse @@ -401,6 +406,8 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/scripts/http-slowloris.nse %%DATADIR%%/scripts/http-sql-injection.nse %%DATADIR%%/scripts/http-stored-xss.nse +%%DATADIR%%/scripts/http-svn-enum.nse +%%DATADIR%%/scripts/http-svn-info.nse %%DATADIR%%/scripts/http-title.nse %%DATADIR%%/scripts/http-tplink-dir-traversal.nse %%DATADIR%%/scripts/http-trace.nse @@ -431,6 +438,7 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/scripts/http-vuln-wnr1000-creds.nse %%DATADIR%%/scripts/http-waf-detect.nse %%DATADIR%%/scripts/http-waf-fingerprint.nse +%%DATADIR%%/scripts/http-webdav-scan.nse %%DATADIR%%/scripts/http-wordpress-brute.nse %%DATADIR%%/scripts/http-wordpress-enum.nse %%DATADIR%%/scripts/http-wordpress-users.nse @@ -464,6 +472,8 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/scripts/jdwp-info.nse %%DATADIR%%/scripts/jdwp-inject.nse %%DATADIR%%/scripts/jdwp-version.nse +%%DATADIR%%/scripts/knx-gateway-discover.nse +%%DATADIR%%/scripts/knx-gateway-info.nse %%DATADIR%%/scripts/krb5-enum-users.nse %%DATADIR%%/scripts/ldap-brute.nse %%DATADIR%%/scripts/ldap-novell-getpass.nse @@ -587,7 +597,6 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/scripts/sip-methods.nse %%DATADIR%%/scripts/skypev2-version.nse %%DATADIR%%/scripts/smb-brute.nse -%%DATADIR%%/scripts/smb-check-vulns.nse %%DATADIR%%/scripts/smb-enum-domains.nse %%DATADIR%%/scripts/smb-enum-groups.nse %%DATADIR%%/scripts/smb-enum-processes.nse @@ -603,8 +612,14 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/scripts/smb-security-mode.nse %%DATADIR%%/scripts/smb-server-stats.nse %%DATADIR%%/scripts/smb-system-info.nse +%%DATADIR%%/scripts/smb-vuln-conficker.nse +%%DATADIR%%/scripts/smb-vuln-cve2009-3103.nse +%%DATADIR%%/scripts/smb-vuln-ms06-025.nse +%%DATADIR%%/scripts/smb-vuln-ms07-029.nse +%%DATADIR%%/scripts/smb-vuln-ms08-067.nse %%DATADIR%%/scripts/smb-vuln-ms10-054.nse %%DATADIR%%/scripts/smb-vuln-ms10-061.nse +%%DATADIR%%/scripts/smb-vuln-regsvc-dos.nse %%DATADIR%%/scripts/smbv2-enabled.nse %%DATADIR%%/scripts/smtp-brute.nse %%DATADIR%%/scripts/smtp-commands.nse @@ -662,6 +677,7 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/scripts/telnet-encryption.nse %%DATADIR%%/scripts/tftp-enum.nse %%DATADIR%%/scripts/tls-nextprotoneg.nse +%%DATADIR%%/scripts/tor-consensus-checker.nse %%DATADIR%%/scripts/traceroute-geolocation.nse %%DATADIR%%/scripts/unittest.nse %%DATADIR%%/scripts/unusual-port.nse @@ -681,5 +697,6 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/scripts/wsdd-discover.nse %%DATADIR%%/scripts/x11-access.nse %%DATADIR%%/scripts/xdmcp-discover.nse +%%DATADIR%%/scripts/xmlrpc-methods.nse %%DATADIR%%/scripts/xmpp-brute.nse %%DATADIR%%/scripts/xmpp-info.nse |