From nobody Wed Sep 28 15:54:36 2022 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 4Md1Jr5ln0z4cfdK; Wed, 28 Sep 2022 15:54:36 +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 4Md1Jr58RZz3ljg; Wed, 28 Sep 2022 15:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664380476; 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=CvSZMvNlnCoBLVDocvqDU2Ni3ExK8iz6rBILBNedWVo=; b=eWvafFecYP0Ew5UGWro7q6Rvv45PQF5A/Pf9qiozUBO4ml8RlHFQF+DfhYpe/RhNG2D15G HVstrCOAvTw7YPMH+SRwts5ixn+JKhHD8cypuUdHm26yE7BrfPUh+wBlmQD0F2/3di/G4a /OEq1MS6KjTNn0bJyAuqdRGGYCbqNKmKCjDcEF+SCLt3bObbJR3gXV4IqRr5V6UK/hJ9li H8ogw1huycorpc98EH8Ozstk1nZOC3N2NVcbov7YPPMunX3X/h8RhnfyxTsCJ5m/8EQtgT g2to4jZUQNXpzCGRzc90EoDI76+0Q+OR57FwCfH2hF7E2NEBmr+ZF004S0e6gg== 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 4Md1Jr49rHzXB8; Wed, 28 Sep 2022 15:54:36 +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 28SFsaC7050986; Wed, 28 Sep 2022 15:54:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28SFsaWs050985; Wed, 28 Sep 2022 15:54:36 GMT (envelope-from git) Date: Wed, 28 Sep 2022 15:54:36 GMT Message-Id: <202209281554.28SFsaWs050985@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: e5274f9c6003 - main - security/nmap: Update to 7.93 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: e5274f9c60037a3649382753b2370e6fea2e2b94 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664380476; 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=CvSZMvNlnCoBLVDocvqDU2Ni3ExK8iz6rBILBNedWVo=; b=r+bXqAHfZW9NUeyCI8Vuo7wA13zUocvIjEbVD4H5Ris175PXBHkv59d4DGKgbN/k6sbpZT 8SY+RCyxgrzlL4uF3STNU304diArBhrL3oV/VFQ9g/Rb4aSKdWdcUBDZdfDCuWST0Nq6zO dobu30kMu7dWZ8XqYgTbmcJmf3a5yHg1e2OF3q97PgeMRUgo2IbYcD0zZ9SsnP9Cu0E3mK gTRvHkm57ATVQiq5Cjs8Si0mL3UvC9i02NPsFHgUy9hVVmOJ0iYAAqAC/h+fCm3iXCdDD0 O2ITU10wrueqjHoPDTvVeaRlce6G+Hd3e7b48XLJuE7Ebe0LlXSkvmlZ9QR+GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664380476; a=rsa-sha256; cv=none; b=kezlPaUpEzK5vURlu0RK81b4OOY+f/iqcPSWbl5yy+SpsLg8WxyX45GA/oX2g35j7VNJBP lrZ7B3Dv4dAcIFa+Pru+1wfWjkHdS56MPe2ahDYlOGdqg2T3mEWbvOm22bK7i/bdF4E6hn WtdAWXwxgP+YIHll1xlRtg3bOw5p42e3cULmXIuS2d8pKYwTpgKtuBLcoCjYDJ6p6o1ErN /dFKGcRgCGQydeZgmpI6V/KSt6SSZrZ+nt1JJuBn3qRi4MymccEahLT0FOktfZwnZUdYNu SofOxDMFMaUdkrup9zIC7AnLSmd8FxQrwTDuz8Xmhue10HWbAqzVcavo27KSiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=e5274f9c60037a3649382753b2370e6fea2e2b94 commit e5274f9c60037a3649382753b2370e6fea2e2b94 Author: Cy Schubert AuthorDate: 2022-09-28 15:48:39 +0000 Commit: Cy Schubert CommitDate: 2022-09-28 15:54:31 +0000 security/nmap: Update to 7.93 PR: 266623 Reported by: takefu@airport.fm --- security/nmap/Makefile | 3 +-- security/nmap/distinfo | 6 +++--- security/nmap/files/patch-libpcap_Makefile.in | 8 +++++--- security/nmap/files/patch-ncat_ncat__connect.c | 23 ----------------------- security/nmap/files/patch-ncat_ncat__ssl.h | 11 +++++++++++ security/nmap/pkg-plist | 3 +++ 6 files changed, 23 insertions(+), 31 deletions(-) diff --git a/security/nmap/Makefile b/security/nmap/Makefile index bd72bedf10a9..3250219d2442 100644 --- a/security/nmap/Makefile +++ b/security/nmap/Makefile @@ -1,6 +1,5 @@ PORTNAME= nmap -DISTVERSION= 7.91 -PORTREVISION= 2 +DISTVERSION= 7.93 CATEGORIES= security MASTER_SITES= https://nmap.org/dist/ \ LOCAL/ohauer diff --git a/security/nmap/distinfo b/security/nmap/distinfo index b024db74fe94..604360bac13e 100644 --- a/security/nmap/distinfo +++ b/security/nmap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1602357099 -SHA256 (nmap-7.91.tar.bz2) = 18cc4b5070511c51eb243cdd2b0b30ff9b2c4dc4544c6312f75ce3a67a593300 -SIZE (nmap-7.91.tar.bz2) = 10503500 +TIMESTAMP = 1664379242 +SHA256 (nmap-7.93.tar.bz2) = 55bcfe4793e25acc96ba4274d8c4228db550b8e8efd72004b38ec55a2dd16651 +SIZE (nmap-7.93.tar.bz2) = 10823114 diff --git a/security/nmap/files/patch-libpcap_Makefile.in b/security/nmap/files/patch-libpcap_Makefile.in index a71ba748570a..91bae33073bf 100644 --- a/security/nmap/files/patch-libpcap_Makefile.in +++ b/security/nmap/files/patch-libpcap_Makefile.in @@ -1,11 +1,13 @@ ---- libpcap/Makefile.in.orig 2020-10-05 09:03:33 UTC -+++ libpcap/Makefile.in -@@ -69,7 +69,7 @@ INSTALL_RPCAPD=@INSTALL_RPCAPD@ +--- libpcap/Makefile.in.orig 2022-08-31 11:39:55.000000000 -0700 ++++ libpcap/Makefile.in 2022-09-28 08:38:02.131119000 -0700 +@@ -70,8 +70,8 @@ EXTRA_NETWORK_LIBS=@EXTRA_NETWORK_LIBS@ # Standard CFLAGS for building members of a shared library -FULL_CFLAGS = $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS) +-CXXFLAGS = $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS) +FULL_CFLAGS = -I. $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS) ++CXXFLAGS = -I. $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS) INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/security/nmap/files/patch-ncat_ncat__connect.c b/security/nmap/files/patch-ncat_ncat__connect.c deleted file mode 100644 index 8d6260912e07..000000000000 --- a/security/nmap/files/patch-ncat_ncat__connect.c +++ /dev/null @@ -1,23 +0,0 @@ ---- ncat/ncat_connect.c -+++ ncat/ncat_connect.c -@@ -1064,12 +1064,17 @@ int ncat_connect(void) - bye("Failed to set hostname on iod."); - if (o.ssl) - { -+ /* connect_handler creates stdin_nsi and calls post_connect */ - nsock_reconnect_ssl(mypool, cs.sock_nsi, connect_handler, o.conntimeout, NULL, NULL); - } -+ else -+ { -+ /* Create IOD for nsp->stdin */ -+ if ((cs.stdin_nsi = nsock_iod_new2(mypool, 0, NULL)) == NULL) -+ bye("Failed to create stdin nsiod."); - -- /* Create IOD for nsp->stdin */ -- if ((cs.stdin_nsi = nsock_iod_new2(mypool, 0, NULL)) == NULL) -- bye("Failed to create stdin nsiod."); -+ post_connect(mypool, cs.sock_nsi); -+ } - } - - /* connect */ diff --git a/security/nmap/files/patch-ncat_ncat__ssl.h b/security/nmap/files/patch-ncat_ncat__ssl.h new file mode 100644 index 000000000000..173e55061612 --- /dev/null +++ b/security/nmap/files/patch-ncat_ncat__ssl.h @@ -0,0 +1,11 @@ +--- 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 @@ + #include + #include + ++#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 ad84a3a3e117..df89afcb742c 100644 --- a/security/nmap/pkg-plist +++ b/security/nmap/pkg-plist @@ -600,6 +600,7 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/scripts/nat-pmp-info.nse %%DATADIR%%/scripts/nat-pmp-mapport.nse %%DATADIR%%/scripts/nbd-info.nse +%%DATADIR%%/scripts/nbns-interfaces.nse %%DATADIR%%/scripts/nbstat.nse %%DATADIR%%/scripts/ncp-enum-users.nse %%DATADIR%%/scripts/ncp-serverinfo.nse @@ -625,6 +626,7 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/scripts/omp2-brute.nse %%DATADIR%%/scripts/omp2-enum-targets.nse %%DATADIR%%/scripts/omron-info.nse +%%DATADIR%%/scripts/openflow-info.nse %%DATADIR%%/scripts/openlookup-info.nse %%DATADIR%%/scripts/openvas-otp-brute.nse %%DATADIR%%/scripts/openwebnet-discovery.nse @@ -643,6 +645,7 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/scripts/pop3-brute.nse %%DATADIR%%/scripts/pop3-capabilities.nse %%DATADIR%%/scripts/pop3-ntlm-info.nse +%%DATADIR%%/scripts/port-states.nse %%DATADIR%%/scripts/pptp-version.nse %%DATADIR%%/scripts/puppet-naivesigning.nse %%DATADIR%%/scripts/qconn-exec.nse