Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

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

 crypto/libssh2/CONFIGURE |    5 ++++-
 crypto/libssh2/DEPENDS   |   14 ++++++--------
 crypto/libssh2/DETAILS   |    2 +-
 crypto/libssh2/HISTORY   |    5 +++++
 ftp/aria2/DEPENDS        |    3 +++
 ftp/aria2/DETAILS        |    8 ++++----
 ftp/aria2/HISTORY        |    5 +++++
 7 files changed, 28 insertions(+), 14 deletions(-)

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

    aria2: Normalise LICENSE

commit 9331bb319377b1a5c13af3859abda1ff602032e6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    aria2: Add optional dep on libssh2

commit b0f84e067384550ad5bd0e60ffbe8a59e827ae40
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    aria2 1.36.0

commit 766bf6ce31ee0846389628bd1ad914ec34db6e8a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    libssh2: Normalise license to SPDX

commit b0d9edc5509abf54f06d329301c4cedebeb4bd65
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    libssh2: Remove dependency on automake & autoconf

commit 8a66b2567aca663723cc13275d01ff0319eac68b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    libssh2: Add support for mbedtls backend

diff --git a/crypto/libssh2/CONFIGURE b/crypto/libssh2/CONFIGURE
index f5187f5..9cc58cf 100755
--- a/crypto/libssh2/CONFIGURE
+++ b/crypto/libssh2/CONFIGURE
@@ -1 +1,4 @@
-config_query_list SSH2_CRYPTO "which crypto library" libgcrypt 
openssl/libressl
+config_query_list SSH2_CRYPTO "which crypto library" \
+                 libgcrypt \
+                 mbedtls \
+                 openssl/libressl
diff --git a/crypto/libssh2/DEPENDS b/crypto/libssh2/DEPENDS
index 1d16889..d27d8ef 100755
--- a/crypto/libssh2/DEPENDS
+++ b/crypto/libssh2/DEPENDS
@@ -1,8 +1,6 @@
-if [ "$SSH2_CRYPTO" = libgcrypt ]; then
-  depends libgcrypt --with-libgcrypt
-else
-  depends SSL --with-openssl
-fi &&
-depends  zlib    &&
-depends automake &&
-depends autoconf
+depends zlib &&
+case "$SSH2_CRYPTO" in
+  (libgcrypt) depends libgcrypt --with-crypto=libgcrypt ;;
+  (mbedtls) depends mbedtls --with-crypto=mbedtls ;;
+  (*) depends SSL --with-crypto=openssl ;;
+esac
diff --git a/crypto/libssh2/DETAILS b/crypto/libssh2/DETAILS
index 4698786..de4efb4 100755
--- a/crypto/libssh2/DETAILS
+++ b/crypto/libssh2/DETAILS
@@ -8,7 +8,7 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=https://www.libssh2.org/download/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
-      LICENSE[0]=BSD
+      LICENSE[0]=BSD-3-Clause
         WEB_SITE=https://www.libssh2.org/
          ENTERED=20070130
         KEYWORDS="crypto"
diff --git a/crypto/libssh2/HISTORY b/crypto/libssh2/HISTORY
index 7808561..116b9ef 100644
--- a/crypto/libssh2/HISTORY
+++ b/crypto/libssh2/HISTORY
@@ -1,3 +1,8 @@
+2022-10-13 Ismael Luceno <ismael AT sourcemage.org>
+       * CONFIGURE, DEPENDS: added support for mbedtls backend
+         removed dependencies on automake & autoconf
+       * DETAILS: normalised LICENSE to SPDX
+
 2019-09-19 Florian Franzmann <bwlf AT bandrate.org>
        * TRIGGERS: add trigger for openssl
 
diff --git a/ftp/aria2/DEPENDS b/ftp/aria2/DEPENDS
index a295999..9984757 100755
--- a/ftp/aria2/DEPENDS
+++ b/ftp/aria2/DEPENDS
@@ -14,5 +14,8 @@ optional_depends ca-certificates                   \
    "--with-ca-bundle='${INSTALL_ROOT}/etc/ssl/certs/ca-certificates.crt'" \
                 ""                                 \
                 "Do you want certificate support?" &&
+optional_depends libssh2 \
+                --{with,without}-libssh2 \
+                'for SFTP support' &&
 depends -sub CXX gcc &&
 depends zlib
diff --git a/ftp/aria2/DETAILS b/ftp/aria2/DETAILS
index c844c60..8832853 100755
--- a/ftp/aria2/DETAILS
+++ b/ftp/aria2/DETAILS
@@ -1,12 +1,12 @@
            SPELL=aria2
-         VERSION=1.18.8
-     
SOURCE_HASH=sha512:59ca3f1d387bc58ba571ce137af08892e43c869760915a3acbb88ba536046a235ce4fd5662ce051de72df28251452db42bb565f1853f9927d3255a149e5620db
+         VERSION=1.36.0
+     
SOURCE_HASH=sha512:8203dbb75274455a78c50dd4f894e631de6931ac889f26896dceed78ec38c98cdbcf07e164744f308f2bfffeae1016beec1bfdbe8cad7f3280d11376aa0c2542
           SOURCE=$SPELL-$VERSION.tar.xz
-   
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/stable/$SPELL-$VERSION/$SOURCE
+   
SOURCE_URL[0]=https://github.com/aria2/aria2/releases/download/release-$VERSION/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://aria2.sourceforge.net/
          ENTERED=20060322
-      LICENSE[0]=GPL
+      LICENSE[0]=GPL-2.0-or-later
         KEYWORDS="ftp http https bittorrent"
            SHORT="A utility for downloading files."
 cat << EOF
diff --git a/ftp/aria2/HISTORY b/ftp/aria2/HISTORY
index 558c5c9..f400677 100644
--- a/ftp/aria2/HISTORY
+++ b/ftp/aria2/HISTORY
@@ -1,3 +1,8 @@
+2022-10-13 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: updated spell to 1.36.0
+         normalised LICENSE to SPDX
+       * DEPENDS: added optional dep on libssh2
+
 2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: remove SOURCEFORGE_URL usage (automated)