nmap: Upgrade to 7.95

License-Update: Use full file for checksum ( COPYING -> LICENSE )

Use system libpcre
Drop py3 support patches, its default now

Signed-off-by: Khem Raj <raj.khem@gmail.com>

meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch

@@ -1,48 +0,0 @@
-From 562893e665a6c9e1b60c8b3242bab6fe78318b3b Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Fri, 14 Feb 2020 08:19:54 +0000
-Subject: [PATCH] configure.ac: make ndiff depend on python3
-
-Python 2 ceased being maintained on the 1st January 2020.
-We've already removed all users of it from oe-core, so
-let ndiff depend on python3.
-
-Upstream-Status: Pending
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- .../nmap/7.80-r0/nmap-7.80/configure.ac               | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9d2fff8..5ffdd55 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -237,16 +237,21 @@ if test $HAVE_PYTHON && test "x${PYTHON_VERSION%%.*}" = "x2"; then
-     HAVE_PYTHON2=true
- fi
- 
-+HAVE_PYTHON3=false
-+if test $HAVE_PYTHON && test "x${PYTHON_VERSION%%.*}" = "x3"; then
-+    HAVE_PYTHON3=true
-+fi
-+
- NDIFFDIR=ndiff
- 
- # Do they want Ndiff?
- AC_ARG_WITH(ndiff, AC_HELP_STRING([--without-ndiff], [Skip installation of the Ndiff utility]), [], [with_ndiff=check])
--if $HAVE_PYTHON2 ; then : ;
-+if $HAVE_PYTHON3 ; then : ;
- else
-   if test "$with_ndiff" = "check" ; then
--    AC_MSG_WARN([Not building Ndiff because Python 2.x with x>=4 was not found])
-+    AC_MSG_WARN([Not building Ndiff because Python3 was not found])
-   elif test "$with_ndiff" = "yes"; then
--    AC_MSG_FAILURE([--with-ndiff requires Python 2.x with x>=4])
-+    AC_MSG_FAILURE([--with-ndiff requires Python3])
-   fi
-   with_ndiff=no
- fi
--- 
-2.24.1
-

meta-oe/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch

@@ -10,20 +10,9 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com>
  Makefile.in | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/Makefile.in b/Makefile.in
-index 1bb062c..cced2fb 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -311,7 +311,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZENMAPDIR)/zenmapCore/Version.py
+@@ -383,7 +383,7 @@ build-nping: $(NPINGDIR)/Makefile build-
- 
- install-zenmap: $(ZENMAPDIR)/setup.py
- 	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
--	cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)")
-+	cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" --force $(if $(DESTDIR),--root "$(DESTDIR)")
- 	$(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
- # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is
- # already a link.
-@@ -328,7 +328,7 @@ build-nping: $(NPINGDIR)/Makefile nbase_build nsock_build netutil_build $(NPINGD
  	@cd $(NPINGDIR) && $(MAKE)
  
  install-ndiff:
@@ -32,6 +21,3 @@ index 1bb062c..cced2fb 100644
  
  NSE_FILES = scripts/script.db scripts/*.nse
  NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc
--- 
-1.9.1
-

meta-oe/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch

@@ -12,11 +12,9 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com>
  nmap-update/Makefile.in | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/ncat/Makefile.in b/ncat/Makefile.in
-index cfd306d..2166e08 100644
 --- a/ncat/Makefile.in
 +++ b/ncat/Makefile.in
-@@ -163,11 +163,11 @@ $(NSOCKDIR)/libnsock.a: $(NSOCKDIR)/Makefile
+@@ -162,11 +162,11 @@ $(NSOCKDIR)/libnsock.a: $(NSOCKDIR)/Make
  
  install: $(TARGET)
  	@echo Installing Ncat;
@@ -30,19 +28,3 @@ index cfd306d..2166e08 100644
  		$(INSTALL) -c -m 644 $(DATAFILES) $(DESTDIR)$(pkgdatadir)/; \
  	fi
  	$(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/$(TARGET).1
-diff --git a/nmap-update/Makefile.in b/nmap-update/Makefile.in
-index 89ff928..93f48d8 100644
---- a/nmap-update/Makefile.in
-+++ b/nmap-update/Makefile.in
-@@ -37,7 +37,7 @@ $(NBASELIB):
- 	cd $(NBASEDIR) && $(MAKE)
- 
- install: nmap-update
--	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
-+	mkdir -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
- 	$(INSTALL) -c -m 755 nmap-update $(DESTDIR)$(bindir)
- 	$(STRIP) -x $(DESTDIR)$(bindir)/nmap-update
- 	$(INSTALL) -c -m 644 ../docs/nmap-update.1 $(DESTDIR)$(mandir)/man1/
--- 
-1.9.1
-

meta-oe/recipes-security/nmap/nmap_7.95.bb

@@ -1,25 +1,20 @@
 SUMMARY = "network auditing tool"
-DESCRIPTION = "Nmap ("Network Mapper") is a free and open source (license) utility for network discovery and security auditing.\nGui support via appending to IMAGE_FEATURES x11-base in local.conf"
+DESCRIPTION = "Nmap (Network Mapper) is a free and open source (license) utility for network discovery and security auditing.\nGui support via appending to IMAGE_FEATURES x11-base in local.conf"
 SECTION = "security"
 LICENSE = "GPL-2.0-only"
 
-LIC_FILES_CHKSUM = "file://COPYING;beginline=7;endline=12;md5=66938a7e5b4c118eda78271de14874c2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=895af8527fe4bcb72f271fd1841fd2f6"
 
 SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2 \
            file://nmap-redefine-the-python-library-dir.patch \
            file://nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch \
            file://0001-Include-time.h-header-to-pass-clang-compilation.patch \
            file://0002-Fix-building-with-libc.patch \
-           file://0001-Make-ndiff-support-python3.patch \
-           file://0001-configure.ac-make-ndiff-depend-on-python3.patch \
            "
-
+SRC_URI[sha256sum] = "e14ab530e47b5afd88f1c8a2bac7f89cd8fe6b478e22d255c5b9bddb7a1c5778" 
-SRC_URI[md5sum] = "d37b75b06d1d40f27b76d60db420a1f5"
-SRC_URI[sha256sum] = "fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4773faa"
-
 inherit autotools-brokensep pkgconfig python3native
 
-PACKAGECONFIG ?= "ncat nping pcap"
+PACKAGECONFIG ?= "pcre ncat nping pcap"
 
 PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap"
 PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpcre"