diff --git a/security/nmap-devel/Makefile b/security/nmap-devel/Makefile index 7cc72de61ad3..0c58887e9c1a 100644 --- a/security/nmap-devel/Makefile +++ b/security/nmap-devel/Makefile @@ -1,94 +1,94 @@ PORTNAME= nmap PORTVERSION= 7.95.${NMAP_COMMIT_DATE} CATEGORIES= security PKGNAMESUFFIX= -devel MAINTAINER?= cy@FreeBSD.org COMMENT?= Port scanning utility for large networks WWW= https://nmap.org/ # nmap-6.47 => svn.nmap.org/nmap-releases/nmap-6.47 (r33605) # https://nmap.org/book/man-legal.html # Install the nmap modified license because of # http://insecure.org/news/download-com-fiasco.html LICENSE= NPSL LICENSE_NAME= Nmap Public Source License LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= auto-accept dist-mirror pkg-mirror pkg-sell .if !defined(MASTERDIR) LIB_DEPENDS= libpcre2-16.so:devel/pcre2 USES= gmake cpe libtool # XXX limit results if we do a grep in the sources! EXTRACT_AFTER_ARGS= --exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/mswin32 \ --no-same-owner --no-same-permissions USE_GITHUB= yes -GH_TAGNAME= a74125aef -NMAP_COMMIT_DATE= 20251101 +GH_TAGNAME= 240174c03 +NMAP_COMMIT_DATE= 20260112 GNU_CONFIGURE= yes CONFIGURE_ARGS=--without-localdirs \ --without-zenmap \ --without-ndiff \ --with-libpcre=${LOCALBASE} \ --with-liblua=included \ --without-nmap-update MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share OPTIONS_DEFINE= DOCS NLS PCAP SSH2 SSL OPTIONS_DEFAULT=NLS SSH2 SSL OPTIONS_SUB= yes PCAP_DESC= Build with libpcap from nmap SSH2_DESC= SSH2 protocol support NLS_CONFIGURE_ENABLE= nls PCAP_CONFIGURE_ON= --with-libpcap=included SSH2_IMPLIES= SSL SSH2_CONFIGURE_ON= --with-libssh2=included SSH2_CONFIGURE_OFF= --without-libssh2 SSL_USES= ssl SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} SSL_CONFIGURE_OFF= --without-openssl SSL_CFLAGS= -I${OPENSSLINC} SSL_VARS= STRIP_FILES+=ncat DOCS= CHANGELOG HACKING STRIP_FILES+= nmap nping .include .if defined(SSL_DEFAULT) && ${SSL_DEFAULT} == libressl BROKEN= error: OpenSSL-1.1.1 is the minimum supported version. LibreSSLis not supported .endif .if exists(/usr/lib/libibverbs.a) # Link with libibverbs is needed by static libpcap post-patch-PCAP-on: @${REINPLACE_CMD} -E -e "s|(PCAP_LIBS=['\"].*)(['\"])$$|\1 -libverbs\2|" \ ${WRKSRC}/configure \ ${WRKSRC}/nping/configure \ ${WRKSRC}/ncat/configure .endif post-configure: @${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" ${WRKSRC}/Makefile pre-install: ${FIND} ${WRKSRC} -type f \( -name \*.orig -o -name \*.bak \) -delete post-install: ${STRIP_CMD} ${STRIP_FILES:S|^|${STAGEDIR}${PREFIX}/bin/|} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .endif .include diff --git a/security/nmap-devel/distinfo b/security/nmap-devel/distinfo index d6c6415becfa..c06cf2683822 100644 --- a/security/nmap-devel/distinfo +++ b/security/nmap-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1763397793 -SHA256 (nmap-nmap-7.95.20251101-a74125aef_GH0.tar.gz) = a5bbdb5cadbb316012aa76672c6bab5c44f4585a66bf499be0c109a62a7c6391 -SIZE (nmap-nmap-7.95.20251101-a74125aef_GH0.tar.gz) = 15920785 +TIMESTAMP = 1768319302 +SHA256 (nmap-nmap-7.95.20260112-240174c03_GH0.tar.gz) = 714d6d9ac0d23c05c603ec333f763906953dabf15aa2fcee11716560b24f0aeb +SIZE (nmap-nmap-7.95.20260112-240174c03_GH0.tar.gz) = 15923986 diff --git a/security/nmap-devel/files/patch-nping_Crypto.cc b/security/nmap-devel/files/patch-nping_Crypto.cc deleted file mode 100644 index c234e6c8d6cf..000000000000 --- a/security/nmap-devel/files/patch-nping_Crypto.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- nping/Crypto.cc.orig 2022-02-18 17:38:46 UTC -+++ nping/Crypto.cc -@@ -70,7 +70,9 @@ - #include - #include - --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined LIBRESSL_VERSION_NUMBER -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ -+ ((!defined LIBRESSL_VERSION_NUMBER) || \ -+ (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER >= 0x30500000L)) - #define HAVE_OPAQUE_EVP_PKEY 1 - #define FUNC_EVP_MD_CTX_init EVP_MD_CTX_reset - #define FUNC_EVP_MD_CTX_cleanup EVP_MD_CTX_reset diff --git a/security/nmap-devel/files/patch-nse__openssl.cc b/security/nmap-devel/files/patch-nse__openssl.cc deleted file mode 100644 index 43474fefa8b6..000000000000 --- a/security/nmap-devel/files/patch-nse__openssl.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- nse_openssl.cc.orig 2022-09-01 22:22:29 UTC -+++ nse_openssl.cc -@@ -13,7 +13,9 @@ - #include - #include - --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined LIBRESSL_VERSION_NUMBER -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ -+ ((!defined LIBRESSL_VERSION_NUMBER) || \ -+ (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER >= 0x30500000L)) - #define HAVE_OPAQUE_STRUCTS 1 - #define FUNC_EVP_MD_CTX_init EVP_MD_CTX_reset - #define FUNC_EVP_MD_CTX_cleanup EVP_MD_CTX_reset diff --git a/security/nmap-devel/files/patch-nse__ssl__cert.cc b/security/nmap-devel/files/patch-nse__ssl__cert.cc deleted file mode 100644 index 3f02236bb5af..000000000000 --- a/security/nmap-devel/files/patch-nse__ssl__cert.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- nse_ssl_cert.cc.orig 2022-08-31 13:43:38 UTC -+++ nse_ssl_cert.cc -@@ -80,7 +80,9 @@ - #include - #include - --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined LIBRESSL_VERSION_NUMBER -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ -+ ((!defined LIBRESSL_VERSION_NUMBER) || \ -+ (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER >= 0x30500000L)) - /* Technically some of these things were added in 0x10100006 - * but that was pre-release. */ - #define HAVE_OPAQUE_STRUCTS 1