From dcf78651abe57bf745703d6bd95aed6ae2c12af3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 19 Apr 2026 16:05:40 +0200 Subject: [PATCH] package/nmap: bump version to 7.99 https://github.com/nmap/nmap/blob/master/CHANGELOG Removed patch which is not needed anymore due to upstream commit https://github.com/nmap/nmap/commit/1b3ca45054cd1e569f5fc0da59fceaa7a518b631 Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- ...pto.cc-fix-build-with-libressl-3.5.0.patch | 41 ------------------- package/nmap/nmap.hash | 6 +-- package/nmap/nmap.mk | 2 +- 3 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 package/nmap/0002-nping-Crypto.cc-fix-build-with-libressl-3.5.0.patch diff --git a/package/nmap/0002-nping-Crypto.cc-fix-build-with-libressl-3.5.0.patch b/package/nmap/0002-nping-Crypto.cc-fix-build-with-libressl-3.5.0.patch deleted file mode 100644 index 700b8585f1..0000000000 --- a/package/nmap/0002-nping-Crypto.cc-fix-build-with-libressl-3.5.0.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0a79771c302bf398150da78cd18b67cb9b67f47a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 21 May 2022 17:51:37 +0200 -Subject: [PATCH] nping/Crypto.cc: fix build with libressl >= 3.5.0 - -Fix the following build failure with libressl >= 3.5.0: - -Crypto.cc: In static member function 'static int Crypto::aes128_cbc_encrypt(u8*, size_t, u8*, u8*, size_t, u8*)': -Crypto.cc:139:26: error: aggregate 'EVP_CIPHER_CTX ctx' has incomplete type and cannot be defined - 139 | EVP_CIPHER_CTX ctx; - | ^~~ - -Fixes: - - http://autobuild.buildroot.org/results/2e6eebbe2ed8305b88047bc92c19350c1ecada16 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/nmap/nmap/pull/2480 -[Julien: rebased patch on version 7.95] -Signed-off-by: Julien Olivain ---- - nping/Crypto.cc | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/nping/Crypto.cc b/nping/Crypto.cc -index 6f05db6..1d11d55 100755 ---- a/nping/Crypto.cc -+++ b/nping/Crypto.cc -@@ -69,7 +69,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 - #else - #define EVP_MD_CTX_new EVP_MD_CTX_create --- -2.45.2 - diff --git a/package/nmap/nmap.hash b/package/nmap/nmap.hash index 9303ff613e..17f9eb7f5e 100644 --- a/package/nmap/nmap.hash +++ b/package/nmap/nmap.hash @@ -1,6 +1,6 @@ -# From https://nmap.org/dist/sigs/nmap-7.98.tar.bz2.digest.txt (lowercase) -sha256 ce847313eaae9e5c9f21708e42d2ab7b56c7e0eb8803729a3092f58886d897e6 nmap-7.98.tar.bz2 -sha512 14e13689d1276f70efc8c905e8eb0a15970f4312c2ef86d8d97e9df11319735e7f7cd73f728f69cf43d27a078ef5ac1e0f39cd119d8cb9262060c42606c6cab3 nmap-7.98.tar.bz2 +# From https://nmap.org/dist/sigs/nmap-7.99.tar.bz2.digest.txt (lowercase) +sha256 df512492ffd108e53a27a06f26d8635bbe89e0e569455dc8ffef058c035d51b2 nmap-7.99.tar.bz2 +sha512 9ff69659b76573eb10b6e472a0217032fd5fed20f0ac971b3736a4222fb6251c5fbf381ebea7ede313b8ff2feac90a848f645000c61200772d01b843594f4ba4 nmap-7.99.tar.bz2 # Locally calculated sha256 9d9a9a763c0e6145172cfe7d8483e23b38ce60b6c79a82e4894242917bdae6d3 LICENSE diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index 629a00f30e..b04d8b080d 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -NMAP_VERSION = 7.98 +NMAP_VERSION = 7.99 NMAP_SITE = https://nmap.org/dist NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 NMAP_DEPENDENCIES = liblinear libpcap