package/nmap: bump to version 7.95

For change log, see:
https://nmap.org/changelog.html#7.95

A notable change is the switch from pcre to pcre2. This change is
reflected in Config.in and nmap.mk.

This commit also adds the sha256 hash, published at:
https://nmap.org/dist/sigs/nmap-7.95.tar.bz2.digest.txt

The package patches are also rebased on this new version. The nmap
package was failing to build since commit 8f88a644ed
"support/scripts/apply-patches.sh: set the maximum fuzz factor to 0".
The patch 0001 was regenerated with "git format-patch". This operation
renamed the patch file. This change is reflected in the
".checkpackageignore" entry.

Fixes:
http://autobuild.buildroot.org/results/417ef0b2a80e8ec5859813a9f16f773881899025

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>

.checkpackageignore

@@ -1094,7 +1094,7 @@ package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch lib_patch.Upstre
 package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch lib_patch.Upstream
 package/nginx/S50nginx lib_sysv.Indent lib_sysv.Variables
 package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch lib_patch.Upstream
-package/nmap/0001-libdnet-wrapper-configure.patch lib_patch.Upstream
+package/nmap/0001-libdnet-always-build-a-static-library.patch lib_patch.Upstream
 package/nodejs/nodejs-src/0001-add-qemu-wrapper-support.patch lib_patch.Upstream
 package/nodejs/nodejs-src/0002-check-if-uclibc-has-backtrace-support.patch lib_patch.Upstream
 package/nodejs/nodejs-src/0003-include-obj-name-in-shared-intermediate.patch lib_patch.Upstream

package/nmap/0001-libdnet-always-build-a-static-library.patch

@@ -0,0 +1,25 @@
+From aeadf40bc0ebbb9fea8de8bc6786a2eccf02fa34 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Sat, 29 Jun 2024 16:50:36 +0200
+Subject: [PATCH] libdnet: always build a static library
+
+Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
+[Julien: rebased patch on version 7.95]
+Signed-off-by: Julien Olivain <ju.o@free.fr>
+---
+ libdnet-stripped/configure.gnu | 3 +++
+ 1 file changed, 3 insertions(+)
+ create mode 100644 libdnet-stripped/configure.gnu
+
+diff --git a/libdnet-stripped/configure.gnu b/libdnet-stripped/configure.gnu
+new file mode 100644
+index 0000000..989fee4
+--- /dev/null
++++ b/libdnet-stripped/configure.gnu
+@@ -0,0 +1,3 @@
++#!/bin/sh
++
++exec "${0%.gnu}" "${@}" --enable-static --disable-shared
+-- 
+2.45.2
+

package/nmap/0001-libdnet-wrapper-configure.patch

@@ -1,11 +0,0 @@
-libdnet: always build a static library
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff --git a/libdnet-stripped/configure.gnu b/libdnet-stripped/configure.gnu
---- /dev/null
-+++ b/libdnet-stripped/configure.gnu
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+
-+exec "${0%.gnu}" "${@}" --enable-static --disable-shared

package/nmap/0002-nping-Crypto.cc-fix-build-with-libressl-3.5.0.patch

@@ -1,4 +1,4 @@
-From 4ebea5c1d1a10be0d0165da3b9c0e1fa82c3db3c Mon Sep 17 00:00:00 2001
+From 0a79771c302bf398150da78cd18b67cb9b67f47a Mon Sep 17 00:00:00 2001
 From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 Date: Sat, 21 May 2022 17:51:37 +0200
 Subject: [PATCH] nping/Crypto.cc: fix build with libressl >= 3.5.0
@@ -15,15 +15,17 @@ Fixes:
 
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 Upstream: https://github.com/nmap/nmap/pull/2480
+[Julien: rebased patch on version 7.95]
+Signed-off-by: Julien Olivain <ju.o@free.fr>
 ---
  nping/Crypto.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/nping/Crypto.cc b/nping/Crypto.cc
-index 850438352..9f7c88686 100644
+index 6f05db6..1d11d55 100755
 --- a/nping/Crypto.cc
 +++ b/nping/Crypto.cc
-@@ -70,7 +70,9 @@
+@@ -69,7 +69,9 @@
  #include <openssl/evp.h>
  #include <openssl/err.h>
  
@@ -32,8 +34,8 @@ index 850438352..9f7c88686 100644
 +	((!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
+ #else
+ #define EVP_MD_CTX_new EVP_MD_CTX_create
 -- 
-2.35.1
+2.45.2
 

package/nmap/Config.in

@@ -34,7 +34,7 @@ comment "a symlink from ncat to 'nc' will be installed"
 
 config BR2_PACKAGE_NMAP_NMAP
 	bool "install nmap"
-	select BR2_PACKAGE_PCRE
+	select BR2_PACKAGE_PCRE2
 	help
 	  This option installs 'nmap' itself.
 

package/nmap/nmap.hash

@@ -1,5 +1,6 @@
-# From https://nmap.org/dist/sigs/nmap-7.94.tar.bz2.digest.txt (lowercase)
-sha512  a55cddf9c1d9272243d01251eb3315b26f232d0596818857083222a385398618b428dc2bd8282c3e832527e135a74aeb020ca8609d83d8337342f5d8a04d7f2c  nmap-7.94.tar.bz2
+# From https://nmap.org/dist/sigs/nmap-7.95.tar.bz2.digest.txt (lowercase)
+sha256  e14ab530e47b5afd88f1c8a2bac7f89cd8fe6b478e22d255c5b9bddb7a1c5778  nmap-7.95.tar.bz2
+sha512  fd95a8bc627a2b8b507353f761dc9fdc8e880a0dd2d75a51b9cb3ec664318796af9bb16a6ff9a1358bd77ad669c2a54e333be630f201f69287692a7d2d41c17e  nmap-7.95.tar.bz2
 
 # Locally calculated
 sha256  9d9a9a763c0e6145172cfe7d8483e23b38ce60b6c79a82e4894242917bdae6d3  LICENSE

package/nmap/nmap.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NMAP_VERSION = 7.94
+NMAP_VERSION = 7.95
 NMAP_SITE = https://nmap.org/dist
 NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2
 NMAP_DEPENDENCIES = liblinear libpcap
@@ -62,7 +62,7 @@ NMAP_CONF_OPTS += --without-ncat
 endif
 
 ifeq ($(BR2_PACKAGE_NMAP_NMAP),y)
-NMAP_DEPENDENCIES += pcre
+NMAP_DEPENDENCIES += pcre2
 NMAP_CONF_OPTS += --with-libpcre="$(STAGING_DIR)/usr"
 NMAP_MAKE_OPTS += nmap
 NMAP_INSTALL_TARGET_OPTS += install-nmap