Gentoo Archives: gentoo-commits

From: Stefan Strogin <steils@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-pda/libimobiledevice/, app-pda/libimobiledevice/files/
Date: Sat, 15 Aug 2020 05:50:05
Message-Id: 1597470581.17e61fb1aa62d3de6ae10b48689a9f58eb74cd1a.steils@gentoo
1 commit: 17e61fb1aa62d3de6ae10b48689a9f58eb74cd1a
2 Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 15 05:47:57 2020 +0000
4 Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 15 05:49:41 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17e61fb1
7
8 app-pda/libimobiledevice: add patch for LibreSSL
9
10 Closes: https://bugs.gentoo.org/732908
11 Package-Manager: Portage-3.0.2, Repoman-2.3.23
12 Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
13
14 .../files/libimobiledevice-1.3.0-libressl.patch | 25 ++++++++++++++++++++++
15 .../libimobiledevice-1.3.0-r1.ebuild | 2 ++
16 2 files changed, 27 insertions(+)
17
18 diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-libressl.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-libressl.patch
19 new file mode 100644
20 index 00000000000..0957c9132cb
21 --- /dev/null
22 +++ b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-libressl.patch
23 @@ -0,0 +1,25 @@
24 +From 170e1c445e8c930f4ee9dddfb9f1bcf24c089962 Mon Sep 17 00:00:00 2001
25 +From: Nikias Bassen <nikias@×××.li>
26 +Date: Thu, 6 Aug 2020 20:43:08 +0200
27 +Subject: [PATCH] idevice: Fix build with LibreSSL
28 +
29 +Upstream-Status: Accepted
30 +[https://github.com/libimobiledevice/libimobiledevice/commit/170e1c445e8c930f4ee9dddfb9f1bcf24c089962]
31 +Signed-off-by: Stefan Strogin <steils@g.o>
32 +---
33 + src/idevice.c | 2 +-
34 + 1 file changed, 1 insertion(+), 1 deletion(-)
35 +
36 +diff --git a/src/idevice.c b/src/idevice.c
37 +index fea1e03f..47c9ab4d 100644
38 +--- a/src/idevice.c
39 ++++ b/src/idevice.c
40 +@@ -1015,7 +1015,7 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_enable_ssl(idevice_conne
41 + return ret;
42 + }
43 +
44 +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
45 ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
46 + SSL_CTX_set_security_level(ssl_ctx, 0);
47 + #endif
48 +
49
50 diff --git a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
51 index 2a630796735..8ff61a7c4d2 100644
52 --- a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
53 +++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
54 @@ -46,6 +46,8 @@ BDEPEND="
55
56 BUILD_DIR="${S}_build"
57
58 +PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
59 +
60 src_prepare() {
61 default
62 eautoreconf