From 05effbbfc2fc6223aafacf8a3cb2b2d970b6bb66 Mon Sep 17 00:00:00 2001 From: Giovanni Biscuolo Date: Thu, 12 Aug 2021 18:09:02 +0200 Subject: gnu: adb: Make compatible with OpenSSL 1.1. OpenSSL version 1.1 brought some API changes which broke the build here, fix that by accessing rsa->n (and e) directly, using RSA_get0_key instead. * gnu/packages/patches/adb-libssl_11-compatibility.patch: New file * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/android.scm (android-platform-system-core)[origin]: Use it. (adb)[inputs]: Replace openssl-1.0 with openssl. --- gnu/packages/android.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/android.scm') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index eb538f6540..99c283dfaf 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -148,6 +148,7 @@ (define-public (android-platform-system-core version) "libutils-remove-damaging-includes.patch" "libutils-add-includes.patch" "adb-add-libraries.patch" + "adb-libssl_11-compatibility.patch" "libziparchive-add-includes.patch")))) (define (android-platform-system-extras version) @@ -388,7 +389,7 @@ (define-public adb `(("android-libbase" ,android-libbase) ("android-libcutils" ,android-libcutils) ("android-liblog" ,android-liblog) - ("openssl" ,openssl-1.0))) + ("openssl" ,openssl))) (home-page "https://developer.android.com/studio/command-line/adb.html") (synopsis "Android Debug Bridge") (description -- cgit v1.2.3