diff --git a/security/nmap/Makefile b/security/nmap/Makefile index c5b9f5e04c8f..ad9c156c64ab 100644 --- a/security/nmap/Makefile +++ b/security/nmap/Makefile @@ -1,97 +1,96 @@ PORTNAME= nmap -DISTVERSION= 7.98 -PORTREVISION= 1 +DISTVERSION= 7.99 CATEGORIES= security MASTER_SITES= https://nmap.org/dist/ \ LOCAL/ohauer 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_PERMS= auto-accept dist-mirror pkg-mirror pkg-sell LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libpcre2-16.so:devel/pcre2 .if !defined(MASTERDIR) USES= tar:bzip2 gmake cpe # XXX limit results if we do a grep in the sources! EXTRACT_AFTER_ARGS= --exclude ${DISTNAME}/mswin32 \ --no-same-owner --no-same-permissions MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE= yes OPTIONS_SUB= yes OPTIONS_DEFINE= DOCS NLS PCAP SSH2 SSL OPTIONS_DEFAULT=NLS SSH2 SSL PCAP_DESC= Build with libpcap from nmap SSH2_DESC= SSH2 protocol support NLS_CONFIGURE_ENABLE= nls PCAP_CONFIGURE_ON= --with-libpcap=included PCAP_LIB_DEPENDS= libdbus-1.so:devel/dbus PCAP_USES= localbase:ldflags PCAP_LDFLAGS= -ldbus-1 SSH2_CONFIGURE_ON= --with-libssh2=included SSH2_CONFIGURE_OFF= --without-libssh2 SSH2_IMPLIES= SSL 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 CONFIGURE_ARGS+=--without-localdirs \ --without-zenmap \ --without-ndiff \ --with-liblua=included \ --without-nmap-update .include .if defined(SSL_DEFAULT) && ${SSL_DEFAULT} == libressl BROKEN= error: OpenSSL-1.1.1 is the minimum supported version. LibreSSL is 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/distinfo b/security/nmap/distinfo index 3afdf4d89497..c0c55eee2d96 100644 --- a/security/nmap/distinfo +++ b/security/nmap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1770074516 -SHA256 (nmap-7.98.tar.bz2) = ce847313eaae9e5c9f21708e42d2ab7b56c7e0eb8803729a3092f58886d897e6 -SIZE (nmap-7.98.tar.bz2) = 12273108 +TIMESTAMP = 1774752926 +SHA256 (nmap-7.99.tar.bz2) = df512492ffd108e53a27a06f26d8635bbe89e0e569455dc8ffef058c035d51b2 +SIZE (nmap-7.99.tar.bz2) = 13036588 diff --git a/security/nmap/files/patch-libdnet-stripped_configure b/security/nmap/files/patch-libdnet-stripped_configure deleted file mode 100644 index 5547001d4baa..000000000000 --- a/security/nmap/files/patch-libdnet-stripped_configure +++ /dev/null @@ -1,29 +0,0 @@ ---- libdnet-stripped/configure.orig 2025-08-09 12:07:16.000000000 -0700 -+++ libdnet-stripped/configure 2026-02-02 15:30:56.588281000 -0800 -@@ -643,6 +643,9 @@ - #ifdef HAVE_SYS_STAT_H - # include - #endif -+#ifdef HAVE_SYS_SOCKET_H -+# include -+#endif - #ifdef HAVE_UNISTD_H - # include - #endif" -@@ -15136,13 +15139,9 @@ - if test ${ac_cv_dnet_bsd_bpf+y} - then : - printf %s "(cached) " >&6 --else case e in #( -- e) if test -c /dev/bpf -o -c /dev/bpf0 ; then -- ac_cv_dnet_bsd_bpf=yes -- else -- ac_cv_dnet_bsd_bpf=no -- fi ;; --esac -+else -+ # PR ports/154353 : support building in FreeBSD jail -+ ac_cv_dnet_bsd_bpf=yes - fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dnet_bsd_bpf" >&5 diff --git a/security/nmap/files/patch-libdnet-stripped_src_intf.c b/security/nmap/files/patch-libdnet-stripped_src_intf.c deleted file mode 100644 index f7adb16d22d2..000000000000 --- a/security/nmap/files/patch-libdnet-stripped_src_intf.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libdnet-stripped/src/intf.c.orig 2025-03-31 12:30:47.000000000 -0700 -+++ libdnet-stripped/src/intf.c 2026-02-02 15:34:47.918928000 -0800 -@@ -178,7 +178,7 @@ - #if defined(SIOCGLIFCONF) || defined(SIOCGIFNETMASK_IN6) || defined(SIOCGIFNETMASK6) - if ((intf->fd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { - # ifdef EPROTONOSUPPORT -- if (errno != EPROTONOSUPPORT) -+ if (errno != EPROTONOSUPPORT && errno != EAFNOSUPPORT) - #endif - return (intf_close(intf)); - } diff --git a/security/nmap/files/patch-liblua_Makefile b/security/nmap/files/patch-liblua_Makefile index 5ff1968b2350..d21c7f3f7947 100644 --- a/security/nmap/files/patch-liblua_Makefile +++ b/security/nmap/files/patch-liblua_Makefile @@ -1,13 +1,13 @@ ---- liblua/Makefile.orig 2016-07-02 17:02:27 UTC +--- liblua/Makefile.orig 2025-04-30 19:58:18 UTC +++ liblua/Makefile -@@ -6,8 +6,8 @@ +@@ -6,8 +6,8 @@ PLAT= guess # Your platform. See PLATS for possible values. - PLAT= none + PLAT= guess -CC= gcc -std=gnu99 -CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) +CC?= gcc -std=gnu99 +CFLAGS= -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) LIBS= -lm $(SYSLIBS) $(MYLIBS) diff --git a/security/nmap/files/patch-nping_Crypto.cc b/security/nmap/files/patch-nping_Crypto.cc deleted file mode 100644 index c234e6c8d6cf..000000000000 --- a/security/nmap/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/files/patch-nse__openssl.cc b/security/nmap/files/patch-nse__openssl.cc deleted file mode 100644 index 43474fefa8b6..000000000000 --- a/security/nmap/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/files/patch-nse__ssl__cert.cc b/security/nmap/files/patch-nse__ssl__cert.cc deleted file mode 100644 index 3f02236bb5af..000000000000 --- a/security/nmap/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