git: 226aacabf562 - main - security/nmap: Update 7.93 --> 7.94

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Sun, 21 May 2023 22:13:29 UTC
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=226aacabf562752b5d105856a9842279528d4505

commit 226aacabf562752b5d105856a9842279528d4505
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2023-05-21 22:12:35 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-05-21 22:13:23 +0000

    security/nmap: Update 7.93 --> 7.94
---
 security/nmap/Makefile                     | 2 +-
 security/nmap/distinfo                     | 6 +++---
 security/nmap/files/patch-liblua_Makefile  | 4 ++--
 security/nmap/files/patch-ncat_ncat__ssl.h | 5 +++--
 security/nmap/pkg-plist                    | 3 ++-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index 3250219d2442..3c218176a58a 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nmap
-DISTVERSION=	7.93
+DISTVERSION=	7.94
 CATEGORIES=	security
 MASTER_SITES=	https://nmap.org/dist/ \
 		LOCAL/ohauer
diff --git a/security/nmap/distinfo b/security/nmap/distinfo
index 604360bac13e..6bb14c6c3549 100644
--- a/security/nmap/distinfo
+++ b/security/nmap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1664379242
-SHA256 (nmap-7.93.tar.bz2) = 55bcfe4793e25acc96ba4274d8c4228db550b8e8efd72004b38ec55a2dd16651
-SIZE (nmap-7.93.tar.bz2) = 10823114
+TIMESTAMP = 1684706420
+SHA256 (nmap-7.94.tar.bz2) = d71be189eec43d7e099bac8571509d316c4577ca79491832ac3e1217bc8f92cc
+SIZE (nmap-7.94.tar.bz2) = 11102195
diff --git a/security/nmap/files/patch-liblua_Makefile b/security/nmap/files/patch-liblua_Makefile
index 647f655b714b..5ff1968b2350 100644
--- a/security/nmap/files/patch-liblua_Makefile
+++ b/security/nmap/files/patch-liblua_Makefile
@@ -5,9 +5,9 @@
  PLAT= none
  
 -CC= gcc -std=gnu99
--CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
+-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)
 +CC?= gcc -std=gnu99
-+CFLAGS= -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
++CFLAGS= -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)
  LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
  LIBS= -lm $(SYSLIBS) $(MYLIBS)
  
diff --git a/security/nmap/files/patch-ncat_ncat__ssl.h b/security/nmap/files/patch-ncat_ncat__ssl.h
index 173e55061612..d266e2773ebf 100644
--- a/security/nmap/files/patch-ncat_ncat__ssl.h
+++ b/security/nmap/files/patch-ncat_ncat__ssl.h
@@ -1,11 +1,12 @@
 --- ncat/ncat_ssl.h.orig	2022-08-25 07:51:59.000000000 -0700
 +++ ncat/ncat_ssl.h	2022-09-28 08:44:14.564723000 -0700
-@@ -67,6 +67,8 @@
+@@ -67,7 +67,8 @@
  #include <openssl/ssl.h>
  #include <openssl/err.h>
  
+ #define NCAT_CA_CERTS_FILE "ca-bundle.crt"
 +#define OPENSSL_API_COMPAT	OPENSSL_VERSION_NUMBER
-+
+ 
  /* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
  #ifndef OPENSSL_API_LEVEL
  # if OPENSSL_API_COMPAT < 0x900000L
diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist
index df89afcb742c..1642464d9f87 100644
--- a/security/nmap/pkg-plist
+++ b/security/nmap/pkg-plist
@@ -23,7 +23,6 @@ man/zh/man1/nmap.1.gz
 %%SSL%%share/ncat/ca-bundle.crt
 %%DATADIR%%/nmap-mac-prefixes
 %%DATADIR%%/nmap-os-db
-%%DATADIR%%/nmap-payloads
 %%DATADIR%%/nmap-protocols
 %%DATADIR%%/nmap-rpc
 %%DATADIR%%/nmap-service-probes
@@ -90,6 +89,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/nselib/data/snmpcommunities.lst
 %%DATADIR%%/nselib/data/ssl-fingerprints
 %%DATADIR%%/nselib/data/targets-ipv6-wordlist
+%%DATADIR%%/nselib/data/tftp-fingerprints.lua
 %%DATADIR%%/nselib/data/tftplist.txt
 %%DATADIR%%/nselib/data/usernames.lst
 %%DATADIR%%/nselib/data/vhosts-default.lst
@@ -786,6 +786,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/telnet-encryption.nse
 %%DATADIR%%/scripts/telnet-ntlm-info.nse
 %%DATADIR%%/scripts/tftp-enum.nse
+%%DATADIR%%/scripts/tftp-version.nse
 %%DATADIR%%/scripts/tls-alpn.nse
 %%DATADIR%%/scripts/tls-nextprotoneg.nse
 %%DATADIR%%/scripts/tls-ticketbleed.nse