forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
gnome-base/gnome-vfs: Fixed build with openssl-1.1
Closes: https://bugs.gentoo.org/592540 Signed-off-by: Lars Wendler <[email protected]> Package-Manager: Portage-2.3.51, Repoman-2.3.11
- Loading branch information
Lars Wendler
committed
Oct 24, 2018
1 parent
7b61b7b
commit ac43ef9
Showing
2 changed files
with
47 additions
and
14 deletions.
There are no files selected for viewing
26 changes: 26 additions & 0 deletions
26
gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters