From nobody Sun May 21 22:13:29 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QPZbY6kkBz4CXtQ; Sun, 21 May 2023 22:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QPZbY5qwwz4Mkq; Sun, 21 May 2023 22:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684707209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OCnKFwpIrJ9duo/srDrjimGGlapfvn1PStTi8NIE0hY=; b=PUgKbEr8n56wkOuqHsinzKz6SKWnnoaUO16vQ+yrvKmQC2UfbBbSXM5pUI4L/E+iGBcXdA 6N/6U/d1RUq/8WRWJJVa+ik+il9juVLs1o+vvcAXnQBzO7MuUoQxIopeFwo/zBmF03kT/I 00jN+9OViT54Mmx0xPorqnlzzaNIWOfPbr/XRdE4kOjqPfBvWDgjHm/xGePgA1ueUBxM7V YyflxO6R2u+Dh8EjuqTtoG2HID6YbT7KJKNgcY4x6UvwD167vWLVS+kn8V3koKox+sJvnY y5O2EsdMc90mdctsVzVnzrFet0GkKhr24jvJBO+CP3o5Tyyza7f9QlEwb2ou/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684707209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OCnKFwpIrJ9duo/srDrjimGGlapfvn1PStTi8NIE0hY=; b=eln7+EcTXqJ+Qb6nyMuGi4XDZ4z8+s2R3Pe/a43cuMTjdVQ6yXw7GSbqxY0FkmXGIg6bq/ Ub6nn8mR8G/52xXdAZaNJkaCwbSfpJHXlKcWn2Q5+HUZOm+OYDtfCl+kR8RSHpKtvlRCwX a/tfJCn1Gyl2CStpZSx5zS2yN7hqUw/8zcqNsmBX9fdLw/wbELUpWAZVffVg1b+VMdE04N qwMSztdx1cTPK94Zp3QK+qct5WhLyCAUvlQmMps98okL9IW/vXQljbCICX3j8A+hb+cyZD NGhUetCib/S6SxKL8jnZGBTP35M/K9fP4ZdTVVw80nmLDaHOmZbrC3Tmdl9ivw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684707209; a=rsa-sha256; cv=none; b=IvvZPfcKuAGCr34cm5QR/aHe4EVjTvtV5nv7hlhg2kCqtqe4FvC17eTfClylfCRdtgF2UH /UVD0gLD79BoU9vF7txnQc0FCkjmLN8uW7XyeqFseQNpyLUolB1+Ryo0vRZ1TR+G8oDW/s JSYSfFPC/rSVL7aAMlWBIFeFikUUEhQy8KZobRLzBX8pauU9iJpFlUu+XbxFfM7ueRVPdP 2ydZkQAgWIgml+bnZGIfMvMY5Y6uqSiZhPdMtXy9AutouXdqhmHstaqRqGZjy+/wdsz2EZ +Q20A13mGIrUjmV9A0CKrJgz1HFNMkaKRfckhr+XV+BpRwZqC1FPj77YXPF4tg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QPZbY3ZtNz180K; Sun, 21 May 2023 22:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34LMDTub042663; Sun, 21 May 2023 22:13:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34LMDTaH042662; Sun, 21 May 2023 22:13:29 GMT (envelope-from git) Date: Sun, 21 May 2023 22:13:29 GMT Message-Id: <202305212213.34LMDTaH042662@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 226aacabf562 - main - security/nmap: Update 7.93 --> 7.94 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 226aacabf562752b5d105856a9842279528d4505 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=226aacabf562752b5d105856a9842279528d4505 commit 226aacabf562752b5d105856a9842279528d4505 Author: Cy Schubert AuthorDate: 2023-05-21 22:12:35 +0000 Commit: Cy Schubert 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 #include + #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