Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e7af8c137e42522e32f6051ff9203d381c80b43e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e7af8c137e42522e32f6051ff9203d381c80b43e)
  • Date: Sat, 5 Nov 2016 04:31:28 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/megatools/DEPENDS | 16 +++-------------
net/megatools/DETAILS | 2 +-
net/megatools/HISTORY | 7 +++++++
net/megatools/PRE_BUILD | 6 ++++++
net/megatools/libressl.patch | 22 ++++++++++++++++++++++
net/megatools/megous.gpg |binary
6 files changed, 39 insertions(+), 14 deletions(-)

New commits:
commit e7af8c137e42522e32f6051ff9203d381c80b43e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

megatools: => 1.9.98

diff --git a/net/megatools/DEPENDS b/net/megatools/DEPENDS
index 1308b49..c6b3777 100755
--- a/net/megatools/DEPENDS
+++ b/net/megatools/DEPENDS
@@ -2,17 +2,7 @@ depends glib2 &&
depends curl &&
depends SSL &&

-optional_depends gobject-introspection \
- "--enable-introspection" \
- "--disable-introspection" \
- "to enable introspection for this build" &&
-
optional_depends asciidoc \
- "--enable-docs-build" \
- "--disable-docs-build" \
- "to build man pages instead of using bundled ones" &&
-
-optional_depends fuse \
- "--with-fuse" \
- "--without-fuse" \
- "to build megafs utility"
+ "--enable-docs" \
+ "--disable-docs" \
+ "to build manual pages"
diff --git a/net/megatools/DETAILS b/net/megatools/DETAILS
index ef056c7..5ce9d4b 100755
--- a/net/megatools/DETAILS
+++ b/net/megatools/DETAILS
@@ -1,5 +1,5 @@
SPELL=megatools
- VERSION=1.9.97
+ VERSION=1.9.98
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://megatools.megous.com/builds/$SOURCE
diff --git a/net/megatools/HISTORY b/net/megatools/HISTORY
index d59d0e2..ff99d7d 100644
--- a/net/megatools/HISTORY
+++ b/net/megatools/HISTORY
@@ -1,3 +1,10 @@
+2016-11-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.9.98
+ * DEPENDS: dropped deprecated dependencies; fixed docs flags
+ * PRE_BUILD: added, to apply patch
+ * libressl.patch: added, official patch to fix build with LibreSSL
+ * megous.gpg: added 77CFEFF1 public key (Ondřej Jirman <megi AT xff.cz>)
+
2016-02-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.9.97; updated Mega website; switched to
upstream GPG-checking
diff --git a/net/megatools/PRE_BUILD b/net/megatools/PRE_BUILD
new file mode 100755
index 0000000..72e8980
--- /dev/null
+++ b/net/megatools/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if [[ $(get_spell_provider $SPELL SSL) == "libressl" ]]; then
+ patch -p1 < "$SPELL_DIRECTORY/libressl.patch"
+fi
diff --git a/net/megatools/libressl.patch b/net/megatools/libressl.patch
new file mode 100644
index 0000000..2ca0982
--- /dev/null
+++ b/net/megatools/libressl.patch
@@ -0,0 +1,22 @@
+From 3111b1b11330feb8b81d163bce67c5579a289796 Mon Sep 17 00:00:00 2001
+From: Johnathan Jenkins <john AT nixheads.co.uk>
+Date: Fri, 4 Nov 2016 09:53:36 -0700
+Subject: [PATCH] Fix compiling against libressl
+
+---
+ lib/mega.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/mega.c b/lib/mega.c
+index 6ff99df..b3ddcc1 100644
+--- a/lib/mega.c
++++ b/lib/mega.c
+@@ -803,7 +803,7 @@ static gboolean rsa_key_gen(rsa_key* k)
+ return FALSE;
+ }
+
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x101000000L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ RSA_get0_key(key, &k->m, &k->e, &k->d);
+ RSA_get0_factors(key, &k->q, &k->p);
+ RSA_get0_crt_params(key, NULL, NULL, &k->u);
diff --git a/net/megatools/megous.gpg b/net/megatools/megous.gpg
index e2c7073..6982b77 100644
Binary files a/net/megatools/megous.gpg and b/net/megatools/megous.gpg differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e7af8c137e42522e32f6051ff9203d381c80b43e), Vlad Glagolev, 11/05/2016

Archive powered by MHonArc 2.6.24.

Top of Page