summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2014-12-29 17:42:21 -0800
committerEric Sandall2014-12-29 17:42:21 -0800
commita57c56c7f495f459df9fbe55d9aff7f019b8ba63 (patch)
tree7534a4e01b301051d8d6caf3f4f7ec565f15c970
parenta1f07a31f7ef854d7cbaafe69c1379b3050855b3 (diff)
nmap: Remove libdnet, add option for nc symlink, update CONFLICTS
Remove libdnet, the latest (from 2005) version is not compatible with this version of nmap. nmap.cc:166:45: fatal error: libdnet-stripped/include/config.h: No such file or directory Add option for nc -> ncat symlink Conflict with nc/netcat (even if `nc` symlink option is not selected)
-rwxr-xr-xcrypto/cryptcat/CONFLICTS3
-rw-r--r--crypto/cryptcat/HISTORY3
-rwxr-xr-xnet/nc/CONFLICTS1
-rw-r--r--net/nc/HISTORY3
-rwxr-xr-xnet/netcat/CONFLICTS1
-rw-r--r--net/netcat/HISTORY3
-rwxr-xr-xsecurity/nmap/BUILD2
-rwxr-xr-xsecurity/nmap/CONFIGURE6
-rwxr-xr-xsecurity/nmap/CONFLICTS3
-rwxr-xr-xsecurity/nmap/DEPENDS5
-rw-r--r--security/nmap/HISTORY7
-rwxr-xr-xsecurity/nmap/INSTALL5
12 files changed, 34 insertions, 8 deletions
diff --git a/crypto/cryptcat/CONFLICTS b/crypto/cryptcat/CONFLICTS
index c1f0747cec..6ce94a887e 100755
--- a/crypto/cryptcat/CONFLICTS
+++ b/crypto/cryptcat/CONFLICTS
@@ -1,2 +1,3 @@
conflicts netcat &&
-conflicts nc
+conflicts nc &&
+conflicts nmap
diff --git a/crypto/cryptcat/HISTORY b/crypto/cryptcat/HISTORY
index 0e53e5276d..706e744206 100644
--- a/crypto/cryptcat/HISTORY
+++ b/crypto/cryptcat/HISTORY
@@ -1,2 +1,5 @@
+2014-12-29 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Conflicts with nmap (even if `nc` symlink option is not selected)
+
2013-01-07 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS, DEPENDS, BUILD, INSTALL, CONFIGURE, CONFLICTS: spell created
diff --git a/net/nc/CONFLICTS b/net/nc/CONFLICTS
index bc7c602397..27928de0a3 100755
--- a/net/nc/CONFLICTS
+++ b/net/nc/CONFLICTS
@@ -1,2 +1,3 @@
conflicts netcat &&
+conflicts nmap &&
conflicts cryptcat
diff --git a/net/nc/HISTORY b/net/nc/HISTORY
index 24ee9345dd..f867055452 100644
--- a/net/nc/HISTORY
+++ b/net/nc/HISTORY
@@ -1,3 +1,6 @@
+2014-12-29 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Conflicts with nmap (even if `nc` symlink option is not selected)
+
2013-01-07 Vlad Glagolev <stealth@sourcemage.org>
* BUILD: fixed multijob build
* CONFLICTS: conflicts cryptcat
diff --git a/net/netcat/CONFLICTS b/net/netcat/CONFLICTS
index 30f1f19daa..ed5223e966 100755
--- a/net/netcat/CONFLICTS
+++ b/net/netcat/CONFLICTS
@@ -1,2 +1,3 @@
conflicts nc &&
+conflicts nmap &&
conflicts cryptcat
diff --git a/net/netcat/HISTORY b/net/netcat/HISTORY
index 3062dd11e2..13738b1265 100644
--- a/net/netcat/HISTORY
+++ b/net/netcat/HISTORY
@@ -1,3 +1,6 @@
+2014-12-29 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Conflicts with nmap (even if `nc` symlink option is not selected)
+
2013-01-07 Vlad Glagolev <stealth@sourcemage.org>
* CONFLICTS: conflicts cryptcat
diff --git a/security/nmap/BUILD b/security/nmap/BUILD
index 6f4c9ff7b5..feecaf61cc 100755
--- a/security/nmap/BUILD
+++ b/security/nmap/BUILD
@@ -1,4 +1,4 @@
LDFLAGS="${LDFLAGS/-Wl,--as-needed/}" &&
-OPTS="$NMAP_OPTS $OPTS" &&
+OPTS="$NMAP_OPTS --with-libdnet=included $OPTS" &&
default_build
diff --git a/security/nmap/CONFIGURE b/security/nmap/CONFIGURE
index 681f66fafd..6e6e626540 100755
--- a/security/nmap/CONFIGURE
+++ b/security/nmap/CONFIGURE
@@ -8,4 +8,8 @@ config_query_option NMAP_OPTS "Build Nping utility?" y \
config_query_option NMAP_OPTS "Build Ncat utility?" y \
"--with-ncat" \
- "--without-ncat"
+ "--without-ncat" &&
+
+if list_find "$NMAP_OPTS" '--with-ncat'; then
+ config_query NMAP_NC_SYMLINK "Symlink nc to ncat?" n
+fi
diff --git a/security/nmap/CONFLICTS b/security/nmap/CONFLICTS
new file mode 100755
index 0000000000..3b918f51f2
--- /dev/null
+++ b/security/nmap/CONFLICTS
@@ -0,0 +1,3 @@
+conflicts nc &&
+conflicts netcat &&
+conflicts cryptcat
diff --git a/security/nmap/DEPENDS b/security/nmap/DEPENDS
index 22833ec10d..f21f4ab6bb 100755
--- a/security/nmap/DEPENDS
+++ b/security/nmap/DEPENDS
@@ -29,11 +29,6 @@ optional_depends pcre \
"--with-libpcre=included" \
"use external PCRE lib?" &&
-optional_depends libdnet \
- "--with-libdnet=$INSTALL_ROOT/usr" \
- "--with-libdnet=included" \
- "use external dnet lib?" &&
-
optional_depends LUA \
"--with-liblua=$INSTALL_ROOT/usr" \
"--with-liblua=included" \
diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY
index 90d103a0a9..8a5448915d 100644
--- a/security/nmap/HISTORY
+++ b/security/nmap/HISTORY
@@ -1,3 +1,10 @@
+2014-12-29 Eric Sandall <sandalle@sourcemage.org>
+ * BUILD, DEPENDS: Remove libdnet, the latest (from 2005) version is not
+ compatible with this version of nmap.
+ 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)
+
2014-10-24 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: use SSL provider
diff --git a/security/nmap/INSTALL b/security/nmap/INSTALL
new file mode 100755
index 0000000000..5183e4081d
--- /dev/null
+++ b/security/nmap/INSTALL
@@ -0,0 +1,5 @@
+default_install &&
+if [[ "x$NMAP_NC_SYMLINK" == "xy" ]]; then
+ message "${MESSAGE_COLOR}Setting /usr/bin/nc -> /usr/bin/ncat${DEFAULT_COLOR}" &&
+ ln -sf "${INSTALL_ROOT}"/usr/bin/ncat "${INSTALL_ROOT}"/usr/bin/nc
+fi