Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 crypto/libp11/HISTORY                        |    3 +
 crypto/libp11/patches/libressl-2.7-fix.patch |   62 
+++++++++++++++++++++++++++
 crypto/sshfs-fuse/DETAILS                    |    2 
 crypto/sshfs-fuse/HISTORY                    |    3 +
 4 files changed, 69 insertions(+), 1 deletion(-)

New commits:
commit b217ebe3fd0919ace9d662cd09ca4b9f6973e5ec
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    sshfs-fuse: => 3.3.2

commit c430470096beb7654ad712821b92fc2c6ac5c8aa
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    libp11 - fix for libressl-2.7

diff --git a/crypto/libp11/HISTORY b/crypto/libp11/HISTORY
index 7a61cbf..1782e92 100644
--- a/crypto/libp11/HISTORY
+++ b/crypto/libp11/HISTORY
@@ -1,3 +1,6 @@
+2018-05-06 Treeve Jelbert <treeve AT sourcemage.org>
+       * libressl-2.7-fix.patch: added
+
 2017-08-04 Treeve Jelbert <treeve AT sourcemage.org>
        * PRE_BUILD patches/*: added - fix build with libressl
 
diff --git a/crypto/libp11/patches/libressl-2.7-fix.patch 
b/crypto/libp11/patches/libressl-2.7-fix.patch
new file mode 100644
index 0000000..f935a9d
--- /dev/null
+++ b/crypto/libp11/patches/libressl-2.7-fix.patch
@@ -0,0 +1,62 @@
+From 41b30e7b49d91d31ab396c1cd163e92f72b25ae5 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Sun, 6 May 2018 09:32:23 +0200
+Subject: [PATCH] libressl-2.7 fix
+
+---
+ src/p11_rsa.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/p11_rsa.c b/src/p11_rsa.c
+index 97cd5a2..e94fcd9 100644
+--- a/src/p11_rsa.c
++++ b/src/p11_rsa.c
+@@ -403,7 +403,7 @@ static void free_rsa_ex_index()
+ #endif
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100005L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100005L
+ 
+ static RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth)
+ {
+@@ -418,7 +418,7 @@ static RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth)
+       }
+       return ret;
+ }
+-
++#if defined(LIBRESSL_VERSION_NUMBER)
+ static int RSA_meth_set1_name(RSA_METHOD *meth, const char *name)
+ {
+       char *tmp = OPENSSL_strdup(name);
+@@ -434,6 +434,7 @@ static int RSA_meth_set_flags(RSA_METHOD *meth, int 
flags)
+       meth->flags = flags;
+       return 1;
+ }
++#else
+ 
+ static int RSA_meth_set_priv_enc(RSA_METHOD *meth,
+               int (*priv_enc) (int flen, const unsigned char *from,
+@@ -456,6 +457,7 @@ static int RSA_meth_set_finish(RSA_METHOD *meth, int 
(*finish)(RSA *rsa))
+       meth->finish = finish;
+       return 1;
+ }
++#endif //libressl
+ 
+ #endif
+ 
+@@ -471,8 +473,11 @@ RSA_METHOD *PKCS11_get_rsa_method(void)
+               ops = RSA_meth_dup(RSA_get_default_method());
+               if (ops == NULL)
+                       return NULL;
++
++#if !defined(LIBRESSL_VERSION_NUMBER)
+               RSA_meth_set1_name(ops, "libp11 RSA method");
+               RSA_meth_set_flags(ops, 0);
++#endif
+               RSA_meth_set_priv_enc(ops, pkcs11_rsa_priv_enc_method);
+               RSA_meth_set_priv_dec(ops, pkcs11_rsa_priv_dec_method);
+               RSA_meth_set_finish(ops, pkcs11_rsa_free_method);
+-- 
+2.17.0
+
diff --git a/crypto/sshfs-fuse/DETAILS b/crypto/sshfs-fuse/DETAILS
index 19a939e..1d00db0 100755
--- a/crypto/sshfs-fuse/DETAILS
+++ b/crypto/sshfs-fuse/DETAILS
@@ -1,6 +1,6 @@
 source $GRIMOIRE/MESON_FUNCTIONS
            SPELL=sshfs-fuse
-         VERSION=3.3.1
+         VERSION=3.3.2
           SOURCE=sshfs-$VERSION.tar.xz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/sshfs-$VERSION"
         WEB_SITE=https://github.com/libfuse/sshfs
diff --git a/crypto/sshfs-fuse/HISTORY b/crypto/sshfs-fuse/HISTORY
index 9db41a3..3e17604 100644
--- a/crypto/sshfs-fuse/HISTORY
+++ b/crypto/sshfs-fuse/HISTORY
@@ -1,3 +1,6 @@
+2018-05-06 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 3.3.2
+
 2018-04-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.3.1
        * DETAILS: add gpg checking