<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f48979f15d686bb45b10f116eef45102b3941e08">https://github.com/macports/macports-ports/commit/f48979f15d686bb45b10f116eef45102b3941e08</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f48979f gnome-vfs: fix build against openssl 1.1.1
</span>f48979f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f48979f15d686bb45b10f116eef45102b3941e08
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sat Sep 7 20:04:58 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnome-vfs: fix build against openssl 1.1.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/58956
</span>---
gnome/gnome-vfs/Portfile | 3 ++-
gnome/gnome-vfs/files/patch-openssl111-fix.diff | 26 +++++++++++++++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-vfs/Portfile b/gnome/gnome-vfs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a2d91eb..a2588b9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-vfs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-vfs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,8 @@ depends_lib port:desktop-file-utils \
</span> depends_run port:shared-mime-info
patchfiles patch-acinclude.m4.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-allow-glib-deprecated.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-allow-glib-deprecated.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-openssl111-fix.diff
</span>
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-vfs/files/patch-openssl111-fix.diff b/gnome/gnome-vfs/files/patch-openssl111-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..14207f2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-vfs/files/patch-openssl111-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$NetBSD: patch-libgnomevfs_gnome-vfs-ssl.c,v 1.1 2018/02/16 13:18:26 wiz Exp $
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+struct SSL is opaque in openssl-1.1; and the SSL_free() man page
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+says that one should not free members of it manually (in both
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the openssl-1.0 and openssl-1.1 man pages).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgnomevfs/gnome-vfs-ssl.c.orig 2010-02-09 12:16:14.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgnomevfs/gnome-vfs-ssl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ssl->private->ssl->ctx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SSL_CTX_free (ssl->private->ssl->ctx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SSL_free (ssl->private->ssl);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free (ssl->private);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free (ssl);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -705,7 +702,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SSL_CTX_free (ssl->private->ssl->ctx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SSL_free (ssl->private->ssl);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close (ssl->private->sockfd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ssl->private->timeout)
</span></pre><pre style='margin:0'>
</pre>