Skip to Content.
Sympa Menu

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

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 (3dc1c3e53024ffe47792c245bfd8c55b9a1f3ef1)
  • Date: Thu, 20 Jul 2017 14:05:45 +0000

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

net/nc/CONFLICTS | 7 +++++--
net/nc/HISTORY | 3 +++
net/netcat/CONFLICTS | 5 ++++-
net/netcat/HISTORY | 3 +++
security/nmap/CONFLICTS | 2 +-
security/nmap/EXPORTS | 1 +
security/nmap/HISTORY | 5 +++--
security/nmap/REPAIR^all^EXPORTS | 1 +
8 files changed, 21 insertions(+), 6 deletions(-)

New commits:
commit 3dc1c3e53024ffe47792c245bfd8c55b9a1f3ef1
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

nmap,nc,netcat: Avoid unnecessary conflict.

diff --git a/net/nc/CONFLICTS b/net/nc/CONFLICTS
index 27928de..67d4111 100755
--- a/net/nc/CONFLICTS
+++ b/net/nc/CONFLICTS
@@ -1,3 +1,6 @@
conflicts netcat &&
-conflicts nmap &&
-conflicts cryptcat
+conflicts cryptcat &&
+persistent_read nmap NMAP_NC_SYMLINK NMAP_NC_SYMLINK &&
+if [[ $NMAP_NC_SYMLINK == y ]]; then
+ conflicts nmap
+fi
diff --git a/net/nc/HISTORY b/net/nc/HISTORY
index f867055..4ffcd1c 100644
--- a/net/nc/HISTORY
+++ b/net/nc/HISTORY
@@ -1,3 +1,6 @@
+2017-07-20 Thomas Orgi <sobukus AT sourcemage.org>
+ * CONFLICTS: only conflict with nmap if that provides nc
+
2014-12-29 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Conflicts with nmap (even if `nc` symlink option is not
selected)

diff --git a/net/netcat/CONFLICTS b/net/netcat/CONFLICTS
index ed5223e..697b69d 100755
--- a/net/netcat/CONFLICTS
+++ b/net/netcat/CONFLICTS
@@ -1,3 +1,6 @@
conflicts nc &&
-conflicts nmap &&
conflicts cryptcat
+persistent_read nmap NMAP_NC_SYMLINK NMAP_NC_SYMLINK &&
+if [[ $NMAP_NC_SYMLINK == y ]]; then
+ conflicts nmap
+fi
diff --git a/net/netcat/HISTORY b/net/netcat/HISTORY
index a972217..8fb9d29 100644
--- a/net/netcat/HISTORY
+++ b/net/netcat/HISTORY
@@ -1,3 +1,6 @@
+2017-07-20 Thomas Orgi <sobukus AT sourcemage.org>
+ * CONFLICTS: only conflict with nmap if that provides nc
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/security/nmap/CONFLICTS b/security/nmap/CONFLICTS
index a4eb408..8ae8659 100755
--- a/security/nmap/CONFLICTS
+++ b/security/nmap/CONFLICTS
@@ -1,4 +1,4 @@
-if [[ "x$NMAP_NC_SYMLINK" == "xy" ]]; then
+if [[ $NMAP_NC_SYMLINK = y ]]; then
conflicts nc &&
conflicts netcat
fi &&
diff --git a/security/nmap/EXPORTS b/security/nmap/EXPORTS
new file mode 100644
index 0000000..281b038
--- /dev/null
+++ b/security/nmap/EXPORTS
@@ -0,0 +1 @@
+NMAP_NC_SYMLINK
diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY
index 76c2252..64245a2 100644
--- a/security/nmap/HISTORY
+++ b/security/nmap/HISTORY
@@ -1,6 +1,7 @@
2017-07-20 Thomas Orgis <sobukus AT sourcemage.org>
- * CONFLICTS: Only if we link nc, there is a conflict to nc
- (and netcat)! Cryptcat might be special.
+ * CONFLICTS: Only if we link nc, there is a conflict
+ with nc and netcat.
+ * EXPORTS: export nc link choice for selective conflict

2016-12-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 7.40
diff --git a/security/nmap/REPAIR^all^EXPORTS
b/security/nmap/REPAIR^all^EXPORTS
new file mode 120000
index 0000000..dead913
--- /dev/null
+++ b/security/nmap/REPAIR^all^EXPORTS
@@ -0,0 +1 @@
+EXPORTS
\ No newline at end of file



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

Archive powered by MHonArc 2.6.24.

Top of Page