diff options
author | Eric Sandall | 2014-12-29 19:25:46 -0800 |
---|---|---|
committer | Eric Sandall | 2014-12-29 19:26:02 -0800 |
commit | 41f7450ac7a8bb684af12e45de2e5b86009cfbec (patch) | |
tree | d5f51eacc941318ce81623572b3dd717e4e68a6d | |
parent | a57c56c7f495f459df9fbe55d9aff7f019b8ba63 (diff) |
libvirt: requires nmap version of ncat and symlink as nc
-rwxr-xr-x | libs/libvirt/DEPENDS | 2 | ||||
-rw-r--r-- | security/nmap/HISTORY | 1 | ||||
-rwxr-xr-x | security/nmap/PRE_SUB_DEPENDS | 5 | ||||
-rwxr-xr-x | security/nmap/REPAIR^none^PRE_SUB_DEPENDS | 5 | ||||
-rwxr-xr-x | security/nmap/SUB_DEPENDS | 11 |
5 files changed, 23 insertions, 1 deletions
diff --git a/libs/libvirt/DEPENDS b/libs/libvirt/DEPENDS index ff5ba9e4b6..08a84e8c72 100755 --- a/libs/libvirt/DEPENDS +++ b/libs/libvirt/DEPENDS @@ -81,7 +81,7 @@ optional_depends 'fuse' \ '--without-fuse' \ 'for FUSE filesystem support for lxc' && -suggest_depends nc '' '' 'for remote SSH tunneling' && +suggest_depends -sub 'NMAP_NCAT NMAP_NC_SYMLINK' nmap '' '' 'for remote SSH tunneling' && suggest_depends 'bridge-utils' '' '' 'for creating TUN/TAP bridges' && suggest_depends 'iproute2' '' '' 'for routing between TUN/TAP interfaces' && suggest_depends 'dnsmasq' '' '' 'for providing DHCP on virtual networks' && diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY index 8a5448915d..40a4524e6b 100644 --- a/security/nmap/HISTORY +++ b/security/nmap/HISTORY @@ -4,6 +4,7 @@ nmap.cc:166:45: fatal error: libdnet-stripped/include/config.h: No such file or directory * CONFIGURE: Add option for nc -> ncat symlink * INSTALL, CONFLICTS: Conflict with nc/netcat (even if `nc` symlink option is not selected) + * *SUB_DEPENDS: Allow forcing ncat utility and nc symlink 2014-10-24 Vlad Glagolev <stealth@sourcemage.org> * DEPENDS: use SSL provider diff --git a/security/nmap/PRE_SUB_DEPENDS b/security/nmap/PRE_SUB_DEPENDS new file mode 100755 index 0000000000..ec57b5eb02 --- /dev/null +++ b/security/nmap/PRE_SUB_DEPENDS @@ -0,0 +1,5 @@ +case $THIS_SUB_DEPENDS in + NMAP_NCAT) list_find "NMAP_OPTS" '--with-ncat' && return 0 ;; + NMAP_NC_SYMLINK) [[ "x$NMAP_NC_SYMLINK" == "xy" ]] && return 0 ;; + *) echo "Unknown sub-depends!"; return 1;; +esac diff --git a/security/nmap/REPAIR^none^PRE_SUB_DEPENDS b/security/nmap/REPAIR^none^PRE_SUB_DEPENDS new file mode 100755 index 0000000000..ec57b5eb02 --- /dev/null +++ b/security/nmap/REPAIR^none^PRE_SUB_DEPENDS @@ -0,0 +1,5 @@ +case $THIS_SUB_DEPENDS in + NMAP_NCAT) list_find "NMAP_OPTS" '--with-ncat' && return 0 ;; + NMAP_NC_SYMLINK) [[ "x$NMAP_NC_SYMLINK" == "xy" ]] && return 0 ;; + *) echo "Unknown sub-depends!"; return 1;; +esac diff --git a/security/nmap/SUB_DEPENDS b/security/nmap/SUB_DEPENDS new file mode 100755 index 0000000000..d2918dc1e1 --- /dev/null +++ b/security/nmap/SUB_DEPENDS @@ -0,0 +1,11 @@ +case $THIS_SUB_DEPENDS in + NMAP_NCAT) message "${MESSAGE_COLOR}ncat utility requested, forcing it.${DEFAULT_COLOR}" && + list_remove "NMAP_OPTS" '--without-ncat' && + list_add "NMAP_OPTS" '--with-ncat' + ;; + NMAP_NC_SYMLINK) message "${MESSAGE_COLOR}nc -> ncat symlink requested, forcing it.${DEFAULT_COLOR}" && + persistent_add NMAP_NC_SYMLINK && + NMAP_NC_SYMLINK="y" + ;; + *) message "${WARNING_COLOR}Unknown sub-depends!${DEFAULT_COLOR}"; return 1;; +esac |