nmap: bump to version 7.94

Bump to version 7.94.
Nmap now require lua 5.4.

Patch 020-Python3-port-of-ndiff.patch has been merged upstream and can
be dropped.
Patch 001-Use-correct-HAVE_-macros-for-Lua-5.4.-Fixes-2648.patch is now
required to fix a problem with header inclusion for lua 5.4.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2023-10-25 05:41:55 +02:00 committed by Josef Schlehofer
parent da176d58ee
commit 2d94a4d2f0
3 changed files with 40 additions and 1739 deletions

View File

@ -13,13 +13,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=nmap
PKG_VERSION:=7.93
PKG_RELEASE:=4
PKG_VERSION:=7.94
PKG_RELEASE:=1
PKG_MAINTAINER:=Nuno Gonçalves <nunojpg@gmail.com>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://nmap.org/dist/
PKG_HASH:=55bcfe4793e25acc96ba4274d8c4228db550b8e8efd72004b38ec55a2dd16651
PKG_HASH:=d71be189eec43d7e099bac8571509d316c4577ca79491832ac3e1217bc8f92cc
PKG_LICENSE:=NPSL-0.94-or-NPSL-0.95
PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:nmap:nmap
@ -60,7 +60,7 @@ endef
define Package/nmap-full
$(call Package/nmap/default)
DEPENDS:=$(NMAP_DEPENDS) $(SSL_DEPENDS) +liblua5.3 +libssh2
DEPENDS:=$(NMAP_DEPENDS) +libopenssl +liblua5.4 +libssh2
VARIANT:=full
TITLE:=Nmap (with OpenSSL and scripting support)
endef
@ -81,7 +81,7 @@ endef
define Package/ncat-full
$(call Package/nmap/default)
DEPENDS:=$(NCAT_DEPENDS) $(SSL_DEPENDS) +liblua5.3
DEPENDS:=$(NCAT_DEPENDS) +libopenssl +liblua5.4
VARIANT:=full
TITLE:=Ncat (with OpenSSL and scripting support)
endef

View File

@ -0,0 +1,35 @@
From b9263f056ab3acd666d25af84d399410560d48ac Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Tue, 30 May 2023 18:33:07 +0000
Subject: [PATCH] Use correct HAVE_ macros for Lua 5.4. Fixes #2648
---
ncat/config.h.in | 4 ++--
nmap_config.h.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- a/ncat/config.h.in
+++ b/ncat/config.h.in
@@ -191,7 +191,7 @@
/* Defines for locating Lua */
#undef LUA_INCLUDED
-#undef HAVE_LUA5_3_LUA_H
-#undef HAVE_LUA_5_3_LUA_H
+#undef HAVE_LUA5_4_LUA_H
+#undef HAVE_LUA_5_4_LUA_H
#undef HAVE_LUA_H
#undef HAVE_LUA_LUA_H
--- a/nmap_config.h.in
+++ b/nmap_config.h.in
@@ -172,8 +172,8 @@ extern "C" int gethostname (char *, unsi
#undef HAVE_PCAP_SET_IMMEDIATE_MODE
/* Various possibilities for lua.h */
-#undef HAVE_LUA5_3_LUA_H
-#undef HAVE_LUA_5_3_LUA_H
+#undef HAVE_LUA5_4_LUA_H
+#undef HAVE_LUA_5_4_LUA_H
#undef HAVE_LUA_H
#undef HAVE_LUA_LUA_H

File diff suppressed because it is too large Load Diff