diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2018-10-24 15:07:38 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-10-24 15:08:25 +0200 |
| commit | ac43ef9f87e64583606d6654b1ede19a16d3abdd (patch) | |
| tree | b3b5ae6714ec8cb504e61a83ca11e686bb85f6b3 /gnome-base/gnome-vfs/files | |
| parent | dev-python/wsproto: Version bump to 0.12.0 (diff) | |
| download | gentoo-ac43ef9f87e64583606d6654b1ede19a16d3abdd.tar.gz gentoo-ac43ef9f87e64583606d6654b1ede19a16d3abdd.tar.bz2 gentoo-ac43ef9f87e64583606d6654b1ede19a16d3abdd.zip | |
gnome-base/gnome-vfs: Fixed build with openssl-1.1
Closes: https://bugs.gentoo.org/592540
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Diffstat (limited to 'gnome-base/gnome-vfs/files')
| -rw-r--r-- | gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch | 26 |
1 files changed, 26 insertions, 0 deletions
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) |