From: Konstantin Demin <redacted>
Date: Wed, 31 Jan 2024 09:24:53 +0000 (+0300)
Subject: nmap: unify SSL dependencies
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=b4538c87ab409d41a600412e2ebae978a21f2fca;p=openwrt-packages.git

nmap: unify SSL dependencies

ssl/full variants now depend on "ca-certs" (provided by "ca-bundle" and "ca-certificates")

Signed-off-by: Konstantin Demin <redacted>
---

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 8cd002026..d6a55dad6 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -35,6 +35,7 @@ include ../../lang/python/python3-package.mk
 NMAP_DEPENDS:=+libpcap +libstdcpp +zlib +libpcre
 NCAT_DEPENDS:=+libpcap
 NPING_DEPENDS:=+libpcap +libpthread +libstdcpp
+SSL_DEPENDS:=+libopenssl +ca-certs
 
 define Package/nmap/default
   SUBMENU:=NMAP Suite
@@ -52,14 +53,14 @@ endef
 
 define Package/nmap-ssl
 $(call Package/nmap/default)
-  DEPENDS:=$(NMAP_DEPENDS) +libopenssl
+  DEPENDS:=$(NMAP_DEPENDS) $(SSL_DEPENDS)
   VARIANT:=ssl
   TITLE:=Nmap (with OpenSSL support)
 endef
 
 define Package/nmap-full
 $(call Package/nmap/default)
-  DEPENDS:=$(NMAP_DEPENDS) +libopenssl +liblua5.3 +libssh2
+  DEPENDS:=$(NMAP_DEPENDS) $(SSL_DEPENDS) +liblua5.3 +libssh2
   VARIANT:=full
   TITLE:=Nmap (with OpenSSL and scripting support)
 endef
@@ -73,14 +74,14 @@ endef
 
 define Package/ncat-ssl
 $(call Package/nmap/default)
-  DEPENDS:=$(NCAT_DEPENDS) +libopenssl +ca-bundle
+  DEPENDS:=$(NCAT_DEPENDS) $(SSL_DEPENDS)
   VARIANT:=ssl
   TITLE:=Ncat (with OpenSSL support)
 endef
 
 define Package/ncat-full
 $(call Package/nmap/default)
-  DEPENDS:=$(NCAT_DEPENDS) +libopenssl +ca-bundle +liblua5.3
+  DEPENDS:=$(NCAT_DEPENDS) $(SSL_DEPENDS) +liblua5.3
   VARIANT:=full
   TITLE:=Ncat (with OpenSSL and scripting support)
 endef
@@ -94,7 +95,7 @@ endef
 
 define Package/nping-ssl
 $(call Package/nmap/default)
-  DEPENDS:=$(NPING_DEPENDS) +libopenssl
+  DEPENDS:=$(NPING_DEPENDS) $(SSL_DEPENDS)
   VARIANT:=ssl
   TITLE:=Nping (with OpenSSL support)
 endef