Commit e5274f9c authored by Cy Schubert's avatar Cy Schubert
Browse files

security/nmap: Update to 7.93 

PR:		266623
Reported by:	takefu@airport.fm
parent dacca301

security/nmap/Makefile

+1 −2
Original line number Diff line number Diff line 
PORTNAME=	nmap

DISTVERSION=	7.91

PORTREVISION=	2

DISTVERSION=	7.93

CATEGORIES=	security

MASTER_SITES=	https://nmap.org/dist/ \

		LOCAL/ohauer

security/nmap/distinfo

+3 −3
Original line number Diff line number Diff line 
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

security/nmap/files/patch-libpcap_Makefile.in

+5 −3
Original line number Diff line number Diff line 
--- 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@

security/nmap/files/patch-ncat_ncat__connect.c

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
--- 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 */

security/nmap/files/patch-ncat_ncat__ssl.h

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- 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 <openssl/ssl.h>

 #include <openssl/err.h>

 

+#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