Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/, gnome-base/gnome-vfs/files/
Date: Wed, 24 Oct 2018 13:08:38
Message-Id: 1540386505.ac43ef9f87e64583606d6654b1ede19a16d3abdd.polynomial-c@gentoo
1 commit: ac43ef9f87e64583606d6654b1ede19a16d3abdd
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 24 13:07:38 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 24 13:08:25 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac43ef9f
7
8 gnome-base/gnome-vfs: Fixed build with openssl-1.1
9
10 Closes: https://bugs.gentoo.org/592540
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12 Package-Manager: Portage-2.3.51, Repoman-2.3.11
13
14 .../files/gnome-vfs-2.24.4-openssl-1.1.patch | 26 ++++++++++++++++
15 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild | 35 +++++++++++++---------
16 2 files changed, 47 insertions(+), 14 deletions(-)
17
18 diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
19 new file mode 100644
20 index 00000000000..14207f28d19
21 --- /dev/null
22 +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
23 @@ -0,0 +1,26 @@
24 +$NetBSD: patch-libgnomevfs_gnome-vfs-ssl.c,v 1.1 2018/02/16 13:18:26 wiz Exp $
25 +
26 +struct SSL is opaque in openssl-1.1; and the SSL_free() man page
27 +says that one should not free members of it manually (in both
28 +the openssl-1.0 and openssl-1.1 man pages).
29 +
30 +--- libgnomevfs/gnome-vfs-ssl.c.orig 2010-02-09 12:16:14.000000000 +0000
31 ++++ libgnomevfs/gnome-vfs-ssl.c
32 +@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
33 + }
34 + }
35 +
36 +- if (ssl->private->ssl->ctx)
37 +- SSL_CTX_free (ssl->private->ssl->ctx);
38 +-
39 + SSL_free (ssl->private->ssl);
40 + g_free (ssl->private);
41 + g_free (ssl);
42 +@@ -705,7 +702,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl,
43 + }
44 + }
45 +
46 +- SSL_CTX_free (ssl->private->ssl->ctx);
47 + SSL_free (ssl->private->ssl);
48 + close (ssl->private->sockfd);
49 + if (ssl->private->timeout)
50
51 diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
52 index 7b788c1a09d..ad3dca34e33 100644
53 --- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
54 +++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
55 @@ -1,4 +1,4 @@
56 -# Copyright 1999-2018 Gentoo Foundation
57 +# Copyright 1999-2018 Gentoo Authors
58 # Distributed under the terms of the GNU General Public License v2
59
60 EAPI=5
61 @@ -47,43 +47,50 @@ DEPEND="${RDEPEND}
62 >=dev-util/gtk-doc-am-1.13
63 "
64
65 -src_prepare() {
66 +PATCHES=(
67 # Allow the Trash on afs filesystems (#106118)
68 - epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
69 + "${FILESDIR}"/${PN}-2.12.0-afs.patch
70
71 # Fix compiling with headers missing
72 - epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
73 + "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
74
75 # Fix for crashes running programs via sudo
76 - epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
77 + "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
78
79 # Fix automagic dependencies, upstream bug #493475
80 - epatch "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
81 - epatch "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
82 + "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
83 + "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
84
85 # Fix to identify ${HOME} (#200897)
86 # thanks to debian folks
87 - epatch "${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
88 + "${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
89
90 # Configure with gnutls-2.7, bug #253729
91 # Fix building with gnutls-2.12, bug #388895
92 - epatch "${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
93 + "${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
94
95 # Prevent duplicated volumes, bug #193083
96 - epatch "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
97 + "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
98
99 # Do not build tests with FEATURES="-test", bug #226221
100 - epatch "${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch
101 + "${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch
102
103 # Disable broken test, bug #285706
104 - epatch "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
105 + "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
106
107 # Fix for automake-1.13 compatibility, #466944
108 - epatch "${FILESDIR}"/${P}-automake-1.13.patch
109 + "${FILESDIR}"/${P}-automake-1.13.patch
110
111 # Fix gnutls-3.4+ compatibility, #560084
112 # always use system defaults (patch from Arch Linux)
113 - epatch "${FILESDIR}"/${P}-gnutls34.patch
114 + "${FILESDIR}"/${P}-gnutls34.patch
115 +
116 + # Fix build with openssl-1.1 #592540
117 + "${FILESDIR}"/${PN}-2.24.4-openssl-1.1.patch
118 +)
119 +
120 +src_prepare() {
121 + epatch "${PATCHES[@]}"
122
123 sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die