summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2014-10-08 21:37:22 +0200
committerTreeve Jelbert2014-10-14 16:55:57 +0200
commit68b384ac93fe2ff576895f4032cb9ccbc91dca71 (patch)
treee5087303a7bb3b515a592983f3b765f7a67dafdb
parentac7ff20937c14e8ef30f7a50025cf0cc904e5077 (diff)
openssl - fix permissions on CONFLICTS
-rwxr-xr-x[-rw-r--r--]crypto/openssl/CONFLICTS0
-rw-r--r--crypto/openssl/HISTORY3
2 files changed, 3 insertions, 0 deletions
diff --git a/crypto/openssl/CONFLICTS b/crypto/openssl/CONFLICTS
index 4ac1907ee6..4ac1907ee6 100644..100755
--- a/crypto/openssl/CONFLICTS
+++ b/crypto/openssl/CONFLICTS
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 2767afce3a..23aec6cc82 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,6 @@
+2014-10-08 Treeve Jelbert <treeve@sourcemage.org>
+ * CONFLICTSL fix permissions
+
2014-08-19 Treeve Jelbert <treeve@sourcemage.org>
* PROVIDES, CONFLICTS: added, to allow libressl as na alternative
* UP_TRIGGERS: test for libressl as well