Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (8f693e6f2d5aff82633572aafa2544eb73fde6da)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (8f693e6f2d5aff82633572aafa2544eb73fde6da)
  • Date: Thu, 20 Jul 2017 12:31:15 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

security/nmap/CONFLICTS | 4 ++--
security/nmap/HISTORY | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 8f693e6f2d5aff82633572aafa2544eb73fde6da
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

nmap: optional conflict to both nc and netcat

diff --git a/security/nmap/CONFLICTS b/security/nmap/CONFLICTS
index e354013..a4eb408 100755
--- a/security/nmap/CONFLICTS
+++ b/security/nmap/CONFLICTS
@@ -1,5 +1,5 @@
if [[ "x$NMAP_NC_SYMLINK" == "xy" ]]; then
- conflicts nc
+ conflicts nc &&
+ conflicts netcat
fi &&
-conflicts netcat &&
conflicts cryptcat
diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY
index be529c7..76c2252 100644
--- a/security/nmap/HISTORY
+++ b/security/nmap/HISTORY
@@ -1,5 +1,6 @@
2017-07-20 Thomas Orgis <sobukus AT sourcemage.org>
- * CONFLICTS: Only if we link nc, there is a conflict to nc!
+ * CONFLICTS: Only if we link nc, there is a conflict to nc
+ (and netcat)! Cryptcat might be special.

2016-12-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 7.40



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (8f693e6f2d5aff82633572aafa2544eb73fde6da), Thomas Orgis, 07/20/2017

Archive powered by MHonArc 2.6.24.

Top of Page