From b456e58139a41e1757d4711213c6852dcb931f65 Mon Sep 17 00:00:00 2001 From: Enno Boland <gottox@voidlinux.eu> Date: Wed, 27 Sep 2017 14:04:50 +0200 Subject: [PATCH] megatools: remove -devel subpackage, fix libressl --- srcpkgs/megatools-devel | 1 - srcpkgs/megatools/patches/fix-libressl.patch | 11 +++++++++++ srcpkgs/megatools/template | 13 ------------- 3 files changed, 11 insertions(+), 14 deletions(-) delete mode 120000 srcpkgs/megatools-devel create mode 100644 srcpkgs/megatools/patches/fix-libressl.patch diff --git a/srcpkgs/megatools-devel b/srcpkgs/megatools-devel deleted file mode 120000 index 331c0be4bf..0000000000 --- a/srcpkgs/megatools-devel +++ /dev/null @@ -1 +0,0 @@ -megatools/ \ No newline at end of file diff --git a/srcpkgs/megatools/patches/fix-libressl.patch b/srcpkgs/megatools/patches/fix-libressl.patch new file mode 100644 index 0000000000..2d6ae11a98 --- /dev/null +++ b/srcpkgs/megatools/patches/fix-libressl.patch @@ -0,0 +1,11 @@ +--- lib/mega.c.orig 2017-09-27 13:56:24.880875673 +0200 ++++ lib/mega.c 2017-09-27 13:56:28.285869611 +0200 +@@ -803,7 +803,7 @@ static gboolean rsa_key_gen(rsa_key* k) + return FALSE; + } + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !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/srcpkgs/megatools/template b/srcpkgs/megatools/template index b454ef78f7..392b625450 100644 --- a/srcpkgs/megatools/template +++ b/srcpkgs/megatools/template @@ -11,16 +11,3 @@ license="GPL-2" homepage="https://megatools.megous.com/" distfiles="${homepage}/builds/megatools-${version}.tar.gz" checksum=9b0521a4d27dbc417fc8e12610ac1e1da729bf6d6eb5bef927ef3670b372a16f -broken=https://build.voidlinux.eu/builders/x86_64_builder/builds/5012/steps/shell_3/logs/stdio - -megatools-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/share/gir-1.0 - } -}