Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 5 Oct 2020 11:04:33 +0000 (UTC)
From:      Olli Hauer <ohauer@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r551485 - in head/security/nmap: . files
Message-ID:  <202010051104.095B4Xo7027644@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ohauer
Date: Mon Oct  5 11:04:32 2020
New Revision: 551485
URL: https://svnweb.freebsd.org/changeset/ports/551485

Log:
  - update to 7.90
  
  Relnotes:	https://nmap.org/changelog#7.90

Modified:
  head/security/nmap/Makefile
  head/security/nmap/distinfo
  head/security/nmap/files/patch-Makefile.in
  head/security/nmap/files/patch-configure
  head/security/nmap/files/patch-libdnet-stripped_configure
  head/security/nmap/files/patch-libpcap_Makefile.in
  head/security/nmap/files/patch-nmap.cc
  head/security/nmap/files/patch-nping_EchoServer.cc
  head/security/nmap/files/patch-output.cc
  head/security/nmap/files/patch-tcpip.cc
  head/security/nmap/pkg-plist

Modified: head/security/nmap/Makefile
==============================================================================
--- head/security/nmap/Makefile	Mon Oct  5 11:03:12 2020	(r551484)
+++ head/security/nmap/Makefile	Mon Oct  5 11:04:32 2020	(r551485)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nmap
-DISTVERSION=	7.80
+DISTVERSION=	7.90
 PORTREVISION=	0
 CATEGORIES=	security
 MASTER_SITES=	https://nmap.org/dist/ \
@@ -15,8 +15,10 @@ COMMENT?=	Port scanning utility for large networks
 # https://nmap.org/book/man-legal.html
 # Install the nmap modified license because of
 # http://insecure.org/news/download-com-fiasco.html
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	NPSL
+LICENSE_NAME=	Nmap Public Source License
+LICENSE_PERMS=	auto-accept dist-mirror pkg-mirror pkg-sell
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 .if !defined(MASTERDIR)
 

Modified: head/security/nmap/distinfo
==============================================================================
--- head/security/nmap/distinfo	Mon Oct  5 11:03:12 2020	(r551484)
+++ head/security/nmap/distinfo	Mon Oct  5 11:04:32 2020	(r551485)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575679617
-SHA256 (nmap-7.80.tar.bz2) = fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4773faa
-SIZE (nmap-7.80.tar.bz2) = 10550327
+TIMESTAMP = 1601674097
+SHA256 (nmap-7.90.tar.bz2) = 5557c3458275e8c43e1d0cfa5dad4e71dd39e091e2029a293891ad54098a40e8
+SIZE (nmap-7.90.tar.bz2) = 10485842

Modified: head/security/nmap/files/patch-Makefile.in
==============================================================================
--- head/security/nmap/files/patch-Makefile.in	Mon Oct  5 11:03:12 2020	(r551484)
+++ head/security/nmap/files/patch-Makefile.in	Mon Oct  5 11:04:32 2020	(r551485)
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2017-07-31 20:56:53 UTC
+--- Makefile.in.orig	2020-08-27 19:13:31 UTC
 +++ Makefile.in
-@@ -13,7 +13,7 @@ mandir = @mandir@
+@@ -10,7 +10,7 @@ mandir = @mandir@
  top_srcdir = @top_srcdir@
  srcdir = @srcdir@
  nmapdatadir = @datadir@/nmap

Modified: head/security/nmap/files/patch-configure
==============================================================================
--- head/security/nmap/files/patch-configure	Mon Oct  5 11:03:12 2020	(r551484)
+++ head/security/nmap/files/patch-configure	Mon Oct  5 11:04:32 2020	(r551485)
@@ -1,6 +1,6 @@
---- configure.orig	2019-05-24 18:28:49 UTC
+--- configure.orig	2020-08-27 19:13:31 UTC
 +++ configure
-@@ -2542,7 +2542,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
+@@ -2529,7 +2529,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
@@ -9,7 +9,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if ${ac_cv_prog_CC+:} false; then :
-@@ -3375,7 +3375,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
+@@ -3362,7 +3362,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.

Modified: head/security/nmap/files/patch-libdnet-stripped_configure
==============================================================================
--- head/security/nmap/files/patch-libdnet-stripped_configure	Mon Oct  5 11:03:12 2020	(r551484)
+++ head/security/nmap/files/patch-libdnet-stripped_configure	Mon Oct  5 11:04:32 2020	(r551485)
@@ -1,6 +1,6 @@
---- libdnet-stripped/configure.orig	2017-02-13 19:46:23 UTC
+--- libdnet-stripped/configure.orig	2017-08-02 18:48:27 UTC
 +++ libdnet-stripped/configure
-@@ -733,6 +733,9 @@ ac_includes_default="\
+@@ -764,6 +764,9 @@ ac_includes_default="\
  #ifdef HAVE_STDINT_H
  # include <stdint.h>
  #endif
@@ -10,8 +10,8 @@
  #ifdef HAVE_UNISTD_H
  # include <unistd.h>
  #endif"
-@@ -11716,11 +11719,8 @@ $as_echo_n "checking for Berkeley Packet
-     if test "${ac_cv_dnet_bsd_bpf+set}" = set; then :
+@@ -11828,11 +11831,8 @@ $as_echo_n "checking for Berkeley Packet Filter... " >
+     if ${ac_cv_dnet_bsd_bpf+:} false; then :
    $as_echo_n "(cached) " >&6
  else
 -  if test -c /dev/bpf0 ; then

Modified: head/security/nmap/files/patch-libpcap_Makefile.in
==============================================================================
--- head/security/nmap/files/patch-libpcap_Makefile.in	Mon Oct  5 11:03:12 2020	(r551484)
+++ head/security/nmap/files/patch-libpcap_Makefile.in	Mon Oct  5 11:04:32 2020	(r551485)
@@ -1,11 +1,11 @@
---- libpcap/Makefile.in.orig	2019-03-29 20:24:48.000000000 -0700
-+++ libpcap/Makefile.in	2020-01-04 21:25:56.152375000 -0800
-@@ -69,7 +69,7 @@
+--- libpcap/Makefile.in.orig	2020-10-05 09:03:33 UTC
++++ libpcap/Makefile.in
+@@ -69,7 +69,7 @@ INSTALL_RPCAPD=@INSTALL_RPCAPD@
  EXTRA_NETWORK_LIBS=@EXTRA_NETWORK_LIBS@
  
  # Standard CFLAGS for building members of a shared library
--FULL_CFLAGS = $(CCOPT) $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
-+FULL_CFLAGS = -I. $(CCOPT) $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
+-FULL_CFLAGS = $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
++FULL_CFLAGS = -I. $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
  
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@

Modified: head/security/nmap/files/patch-nmap.cc
==============================================================================
--- head/security/nmap/files/patch-nmap.cc	Mon Oct  5 11:03:12 2020	(r551484)
+++ head/security/nmap/files/patch-nmap.cc	Mon Oct  5 11:04:32 2020	(r551485)
@@ -1,8 +1,8 @@
---- nmap.cc.orig	2017-07-31 16:56:48 UTC
+--- nmap.cc.orig	2020-10-02 16:12:22 UTC
 +++ nmap.cc
-@@ -130,6 +130,7 @@
- 
- /* $Id: nmap.cc 36896 2017-07-31 16:56:48Z dmiller $ */
+@@ -69,6 +69,7 @@
+ #include <shlobj.h>
+ #endif
  
 +#include <getopt.h>
  #include "nmap.h"

Modified: head/security/nmap/files/patch-nping_EchoServer.cc
==============================================================================
--- head/security/nmap/files/patch-nping_EchoServer.cc	Mon Oct  5 11:03:12 2020	(r551484)
+++ head/security/nmap/files/patch-nping_EchoServer.cc	Mon Oct  5 11:04:32 2020	(r551485)
@@ -1,6 +1,6 @@
---- nping/EchoServer.cc.orig	2018-01-28 21:18:17 UTC
+--- nping/EchoServer.cc.orig	2020-10-02 16:12:22 UTC
 +++ nping/EchoServer.cc
-@@ -281,12 +281,12 @@ int EchoServer::nep_listen_socket(){
+@@ -213,12 +213,12 @@ int EchoServer::nep_listen_socket(){
          server_addr6.sin6_len = sizeof(struct sockaddr_in6);
      #endif
      /* Bind to local address and the specified port */
@@ -15,7 +15,7 @@
                  nping_fatal(QT_3, "Could not bind to port %d (%s).", port, strerror(errno));
              }else{ 
                  nping_print(VB_1, "Server bound to port %d", port);
-@@ -319,12 +319,12 @@ int EchoServer::nep_listen_socket(){
+@@ -251,12 +251,12 @@ int EchoServer::nep_listen_socket(){
  #endif
  
      /* Bind to local address and the specified port */

Modified: head/security/nmap/files/patch-output.cc
==============================================================================
--- head/security/nmap/files/patch-output.cc	Mon Oct  5 11:03:12 2020	(r551484)
+++ head/security/nmap/files/patch-output.cc	Mon Oct  5 11:04:32 2020	(r551485)
@@ -1,6 +1,6 @@
---- output.cc.orig	2017-06-07 12:32:38 UTC
+--- output.cc.orig	2020-10-02 16:12:22 UTC
 +++ output.cc
-@@ -157,6 +157,7 @@
+@@ -90,6 +90,7 @@
  #include <set>
  #include <vector>
  #include <list>

Modified: head/security/nmap/files/patch-tcpip.cc
==============================================================================
--- head/security/nmap/files/patch-tcpip.cc	Mon Oct  5 11:03:12 2020	(r551484)
+++ head/security/nmap/files/patch-tcpip.cc	Mon Oct  5 11:04:32 2020	(r551485)
@@ -1,6 +1,6 @@
---- tcpip.cc.orig	2017-06-07 12:32:38 UTC
+--- tcpip.cc.orig	2020-10-02 16:12:22 UTC
 +++ tcpip.cc
-@@ -151,6 +151,8 @@
+@@ -83,6 +83,8 @@
  #endif /* NETINET_IF_ETHER_H */
  #endif /* HAVE_NETINET_IF_ETHER_H */
  

Modified: head/security/nmap/pkg-plist
==============================================================================
--- head/security/nmap/pkg-plist	Mon Oct  5 11:03:12 2020	(r551484)
+++ head/security/nmap/pkg-plist	Mon Oct  5 11:04:32 2020	(r551485)
@@ -100,6 +100,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/nselib/datetime.lua
 %%DATADIR%%/nselib/dhcp.lua
 %%DATADIR%%/nselib/dhcp6.lua
+%%DATADIR%%/nselib/dicom.lua
 %%DATADIR%%/nselib/dns.lua
 %%DATADIR%%/nselib/dnsbl.lua
 %%DATADIR%%/nselib/dnssd.lua
@@ -158,6 +159,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/nselib/oops.lua
 %%DATADIR%%/nselib/openssl.luadoc
 %%DATADIR%%/nselib/ospf.lua
+%%DATADIR%%/nselib/outlib.lua
 %%DATADIR%%/nselib/packet.lua
 %%DATADIR%%/nselib/pcre.luadoc
 %%DATADIR%%/nselib/pgsql.lua
@@ -301,6 +303,8 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/db2-das-info.nse
 %%DATADIR%%/scripts/deluge-rpc-brute.nse
 %%DATADIR%%/scripts/dhcp-discover.nse
+%%DATADIR%%/scripts/dicom-brute.nse
+%%DATADIR%%/scripts/dicom-ping.nse
 %%DATADIR%%/scripts/dict-info.nse
 %%DATADIR%%/scripts/distcc-cve2004-2687.nse
 %%DATADIR%%/scripts/dns-blacklist.nse
@@ -791,6 +795,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/unittest.nse
 %%DATADIR%%/scripts/unusual-port.nse
 %%DATADIR%%/scripts/upnp-info.nse
+%%DATADIR%%/scripts/uptime-agent-info.nse
 %%DATADIR%%/scripts/url-snarf.nse
 %%DATADIR%%/scripts/ventrilo-info.nse
 %%DATADIR%%/scripts/versant-info.nse



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010051104.095B4Xo7027644>