jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

megacmd: update to 3.2.7. (#9305)

Browse source
This commit is contained in:
John 2017-11-18 17:24:59 +01:00 committed by Juan RP
parent b4c950a78d
commit a39795497c
5 changed files with 45 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/shlibs
View file

@ -2895,3 +2895,4 @@ libgnustep-base.so.1.25 gnustep-base-1.25.0_1
libtermbox.so.1 termbox-1.1.0_1
libmysofa.so.0 libmysofa-0.6_1
libzinnia.so.0 libzinnia-0.06_1
libmega.so.30207 libmega-3.2.7_1

1
srcpkgs/libmega Symbolic link
View file

@ -0,0 +1 @@
megacmd

1
srcpkgs/libmega-devel Symbolic link
View file

@ -0,0 +1 @@
megacmd

58
srcpkgs/megacmd/patches/megacmd-00-support-libressl.patch
View file

@ -1,41 +1,29 @@
diff --git src/posix/net.cpp src/posix/net.cpp
index 2bb16de5..8eb7d1d6 100644
--- src/posix/net.cpp
+++ src/posix/net.cpp
@@ -2396,7 +2396,7 @@ CURLcode CurlHttpIO::ssl_ctx_function(CURL*, void* sslctx, void*req)
return CURLE_OK;
--- net.cpp 2017-11-18 11:58:03.524955739 +0100
+++ src/posix/net.cpp 2017-11-18 11:59:41.082959457 +0100
@@ -53,7 +53,7 @@
}
}
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
#define X509_STORE_CTX_get0_cert(ctx) (ctx->cert)
#define X509_STORE_CTX_get0_untrusted(ctx) (ctx->untrusted)
#define EVP_PKEY_get0_DSA(_pkey_) ((_pkey_)->pkey.dsa)
@@ -2405,7 +2405,7 @@ CURLcode CurlHttpIO::ssl_ctx_function(CURL*, void* sslctx, void*req)
const BIGNUM *RSA_get0_n(const RSA *rsa)
-#if OPENSSL_VERSION_NUMBER >= 0x10000000
+#if OPENSSL_VERSION_NUMBER >= 0x10000000 || defined (LIBRESSL_VERSION_NUMBER)
void CurlHttpIO::id_function(CRYPTO_THREADID* id)
{
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
return rsa->n;
#else
const BIGNUM *result;
@@ -2416,7 +2416,7 @@ const BIGNUM *RSA_get0_n(const RSA *rsa)
CRYPTO_THREADID_set_pointer(id, (void *)THREAD_CLASS::currentThreadId());
@@ -137,7 +137,7 @@
#if defined(USE_OPENSSL) && !defined(OPENSSL_IS_BORINGSSL)
const BIGNUM *RSA_get0_e(const RSA *rsa)
{
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
return rsa->e;
if (!CRYPTO_get_locking_callback()
-#if OPENSSL_VERSION_NUMBER >= 0x10000000
+#if OPENSSL_VERSION_NUMBER >= 0x10000000 || defined (LIBRESSL_VERSION_NUMBER)
&& !CRYPTO_THREADID_get_callback())
#else
const BIGNUM *result;
@@ -2427,7 +2427,7 @@ const BIGNUM *RSA_get0_e(const RSA *rsa)
const BIGNUM *RSA_get0_d(const RSA *rsa)
{
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
return rsa->d;
&& !CRYPTO_get_id_callback())
@@ -147,7 +147,7 @@
int numLocks = CRYPTO_num_locks();
sslMutexes = new MUTEX_CLASS*[numLocks];
memset(sslMutexes, 0, numLocks * sizeof(MUTEX_CLASS*));
-#if OPENSSL_VERSION_NUMBER >= 0x10000000
+#if OPENSSL_VERSION_NUMBER >= 0x10000000 || defined (LIBRESSL_VERSION_NUMBER)
CRYPTO_THREADID_set_callback(CurlHttpIO::id_function);
#else
const BIGNUM *result;
CRYPTO_set_id_callback(CurlHttpIO::id_function);

21
srcpkgs/megacmd/template
View file

@ -1,6 +1,6 @@
# Template file for 'megacmd'
pkgname=megacmd
version=3.2.0
version=3.2.7
revision=1
wrksrc=sdk-${version}
build_style=gnu-configure
@ -15,7 +15,7 @@ maintainer="jbgg <jbosco.gg@gmail.com>"
license="2-clause-BSD"
homepage="https://mega.nz"
distfiles="https://github.com/meganz/sdk/archive/v${version}.tar.gz"
checksum=4f4b607caa80fc7a91ba1cbb882b1c9b903d9b67b59db47fb7ec821e33de29f3
checksum=fc0bab64a45f01988b5c9956047f4e5037608ec7c39d6c2e661dfa33020c8ac1
case "$XBPS_TARGET_MACHINE" in
aarch64*) broken="https://travis-ci.org/voidlinux/void-packages/jobs/281616641";;
@ -28,3 +28,20 @@ pre_configure() {
post_install() {
vlicense LICENSE
}
libmega_package() {
short_desc="Library for the cloud service mega.nz"
pkg_install() {
vmove "usr/lib/*.so.*"
}
}
libmega-devel_package() {
depends="libmega>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
}
}