Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (4a1ac1a69784f570ef74967dae2a88b0acc67e3f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (4a1ac1a69784f570ef74967dae2a88b0acc67e3f)
  • Date: Sat, 18 Jan 2014 22:20:45 -0600

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

crypto/openssh/CONFLICTS | 1 -
crypto/openssh/HISTORY | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 4a1ac1a69784f570ef74967dae2a88b0acc67e3f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

openssh: Remove conflict with dropbear

diff --git a/crypto/openssh/CONFLICTS b/crypto/openssh/CONFLICTS
index 373ef6b..795e3d0 100755
--- a/crypto/openssh/CONFLICTS
+++ b/crypto/openssh/CONFLICTS
@@ -1,3 +1,2 @@
-conflicts dropbear &&
conflicts ssh &&
conflicts lsh
diff --git a/crypto/openssh/HISTORY b/crypto/openssh/HISTORY
index 2eac0d0..4ef0e29 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,6 @@
+2013-12-26 Ismael Luceno <ismael AT sourcemage.org>
+ * CONFLICTS: doesn't conflict with dropbear
+
2013-11-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 6.4p1, SECURITY_PATCH=7
http://www.openssh.com/txt/gcmrekey.adv



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (4a1ac1a69784f570ef74967dae2a88b0acc67e3f), Ismael Luceno, 01/18/2014

Archive powered by MHonArc 2.6.24.

Top of Page