sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (2e66c1951b7e1e5761d0dcbf8fd1d8ff5499c6c6)
- From: Thomas Orgis <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (2e66c1951b7e1e5761d0dcbf8fd1d8ff5499c6c6)
- Date: Thu, 20 Jul 2017 09:52:10 +0000
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:
security/nmap/CONFLICTS | 4 +++-
security/nmap/HISTORY | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 2e66c1951b7e1e5761d0dcbf8fd1d8ff5499c6c6
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
nmap: no unnecessary conflict with nc
diff --git a/security/nmap/CONFLICTS b/security/nmap/CONFLICTS
index 3b918f5..e354013 100755
--- a/security/nmap/CONFLICTS
+++ b/security/nmap/CONFLICTS
@@ -1,3 +1,5 @@
-conflicts nc &&
+if [[ "x$NMAP_NC_SYMLINK" == "xy" ]]; then
+ conflicts nc
+fi &&
conflicts netcat &&
conflicts cryptcat
diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY
index 468fbeb..be529c7 100644
--- a/security/nmap/HISTORY
+++ b/security/nmap/HISTORY
@@ -1,3 +1,6 @@
+2017-07-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFLICTS: Only if we link nc, there is a conflict to nc!
+
2016-12-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 7.40
- [SM-Commit] GIT changes to master grimoire by Thomas Orgis (2e66c1951b7e1e5761d0dcbf8fd1d8ff5499c6c6), Thomas Orgis, 07/20/2017
Archive powered by MHonArc 2.6.24.