gentoo resync : 27.10.2018

3 files changed, 49 insertions, 15 deletions

diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index f4a6703a8e8a..59786f35cbd1 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -10,6 +10,7 @@ AUX gnome-vfs-2.24.4-disable-test-async-cancel.patch 689 BLAKE2B e09b96510144b96
 AUX gnome-vfs-2.24.4-gnutls27.patch 3235 BLAKE2B f6874c9edf48200bcfb7028ef64235fd902a94490995638add7118c1e34b88e197daeca96083cbb21725bb265f62612622b1f24039028baf61ab2dc0158d3ec4 SHA512 a17ea282f22e22c2390c3a53efab2c99a3fbb2ee370c0c1a19a477ff76bdeae483bf1886f09680681b824254c14a8a411470c95319c4f3d5a7775f4369935b25
 AUX gnome-vfs-2.24.4-gnutls34.patch 1624 BLAKE2B 9b29ee3e95ad79f31a9d4adc494aa6b0587a85c308769238607be5a7284a2dfdf13cf33ae14a35624596414af1383a5fa9c647076c016fc6e86942ed8352bc8e SHA512 adbbe966be3f7193c838794fc8a8949433377c6730c55ed152c345858b4da3f97f5c372d6b4555814ea10f5c65b52cb8a625563a0329604a9d61ce57b08de620
 AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 BLAKE2B 9883ef67221c053df5ad2d3f70e3f7c3f1916660cb35dd82a0dc52008ffd1a780f685a7af82a2dda1ec25aae5d1f024322b3a8c20bd8d48227405d0c1c357b48 SHA512 dcad32f15afaa7677c6d10672c06c6d635a17d2bb686883c94f42bfc4f9fc6c525c4f097c3af718020fd224e06bba0d0a4ec68cde431545e9fe4a2c65320a48f
+AUX gnome-vfs-2.24.4-openssl-1.1.patch 839 BLAKE2B ebb91d34946354c2995a04b6c784be9cce1c93429d9ece7ac93c93795411d3c85ee8cf5ccfdfd53f15775df496ea83dfcd75d443d524442071e5412ca85aa307 SHA512 77c00b421f7026cf2ad3a05866ab9afb8cef78da3497604823c3eab1830475ad1a0d460b80f9599f579e7e789b9ef2b3a00887f6313148698a4ec4e4c98d3345
 DIST gnome-vfs-2.24.4.tar.bz2 1890370 BLAKE2B 696c8ce479de5a15660c9cc79eeb1abb6d69716f68558c7f791a3a44a7f1e9d09d9bc9adcca11dabd745f36a70222817b68888f3c56839add737b802aba0e7ac SHA512 db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581
-EBUILD gnome-vfs-2.24.4-r5.ebuild 4161 BLAKE2B 60cffdf3f01bbe0f1cdfbde6a1775485fd13bae61bdbc62e9f83ee1fff4824b7fb51545c4225d736f35e8800886f27f00b00e3395fed6bb68b2afd1249c9349c SHA512 cedf37cdabd94bdcbd3d30b228d3f789f8b221c60b01993f869c64eb28d440f7f0177844b366c6dd602d759a53cb5a1a07b80b40f633e0080a4e28ad9c27fd83
+EBUILD gnome-vfs-2.24.4-r5.ebuild 4196 BLAKE2B 0045d973ed8488b2d51448f97560fc677ceeae45b866d0ea7f17c93a68c1cfcaad2290af053f0dd7a71916e5cd5c21399ddfc1ebafe8e16468ec3c831761800a SHA512 8e4db01d7313b521abc532ad4fdef799ab41b58141636fd132636448612e1e64c8407f4c20288ac355b03a2c22f5d110a00341336c65111898688f84654f4dc2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
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
new file mode 100644
index 000000000000..14207f28d19b
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
@@ -0,0 +1,26 @@
+$NetBSD: patch-libgnomevfs_gnome-vfs-ssl.c,v 1.1 2018/02/16 13:18:26 wiz Exp $
+
+struct SSL is opaque in openssl-1.1; and the SSL_free() man page
+says that one should not free members of it manually (in both
+the openssl-1.0 and openssl-1.1 man pages).
+
+--- libgnomevfs/gnome-vfs-ssl.c.orig	2010-02-09 12:16:14.000000000 +0000
++++ libgnomevfs/gnome-vfs-ssl.c
+@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
+ 			}
+ 		}
+ 
+-                if (ssl->private->ssl->ctx)
+-                        SSL_CTX_free (ssl->private->ssl->ctx);
+-
+                 SSL_free (ssl->private->ssl);
+ 		g_free (ssl->private);
+ 		g_free (ssl);
+@@ -705,7 +702,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl,
+ 		}
+ 	}
+ 	
+-	SSL_CTX_free (ssl->private->ssl->ctx);
+ 	SSL_free (ssl->private->ssl);
+ 	close (ssl->private->sockfd);
+ 	if (ssl->private->timeout)
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
index 7b788c1a09d7..ad3dca34e334 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -47,43 +47,50 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.13
 "
 
-src_prepare() {
+PATCHES=(
 	# Allow the Trash on afs filesystems (#106118)
-	epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
+	"${FILESDIR}"/${PN}-2.12.0-afs.patch
 
 	# Fix compiling with headers missing
-	epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
+	"${FILESDIR}"/${PN}-2.15.2-headers-define.patch
 
 	# Fix for crashes running programs via sudo
-	epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
+	"${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
 
 	# Fix automagic dependencies, upstream bug #493475
-	epatch "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
-	epatch "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
+	"${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
+	"${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
 
 	# Fix to identify ${HOME} (#200897)
 	# thanks to debian folks
-	epatch "${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
+	"${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
 
 	# Configure with gnutls-2.7, bug #253729
 	# Fix building with gnutls-2.12, bug #388895
-	epatch "${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
+	"${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
 
 	# Prevent duplicated volumes, bug #193083
-	epatch "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
+	"${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
 
 	# Do not build tests with FEATURES="-test", bug #226221
-	epatch "${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch
+	"${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch
 
 	# Disable broken test, bug #285706
-	epatch "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
+	"${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
 
 	# Fix for automake-1.13 compatibility, #466944
-	epatch "${FILESDIR}"/${P}-automake-1.13.patch
+	"${FILESDIR}"/${P}-automake-1.13.patch
 
 	# Fix gnutls-3.4+ compatibility, #560084
 	# always use system defaults (patch from Arch Linux)
-	epatch "${FILESDIR}"/${P}-gnutls34.patch
+	"${FILESDIR}"/${P}-gnutls34.patch
+
+	# Fix build with openssl-1.1 #592540
+	"${FILESDIR}"/${PN}-2.24.4-openssl-1.1.patch
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
 
 	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die