svn commit: r483115 - in head/devel/gnome-vfs: . files

[Ben Woods]

Author: woodsb02
Date: Sat Oct 27 08:19:22 2018
New Revision: 483115
URL: https://svnweb.freebsd.org/changeset/ports/483115

Log:
  devel/gnome-vfs: Fix OpenSSL 1.1.X build
  
  - Patch taken from NetBSD [1]
  - Add gnome to USES
  
   [1] http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/sysutils/gnome-vfs/patches/patch-libgnomevfs_gnome-vfs-ssl.c?rev=1.1&content-type=text/x-cvsweb-markup
  
  PR:		228896
  Submitted by:	Nathan <ndowens at yahoo.com>
  Reported by:	brnrd
  Approved by:	gnome (maintainer timeout)
  Obtained from:	NetBSD
  MFH:		2018Q4

Added:
  head/devel/gnome-vfs/files/patch-openssl-1.1   (contents, props changed)
Modified:
  head/devel/gnome-vfs/Makefile

Modified: head/devel/gnome-vfs/Makefile
==============================================================================
--- head/devel/gnome-vfs/Makefile	Sat Oct 27 08:07:37 2018	(r483114)
+++ head/devel/gnome-vfs/Makefile	Sat Oct 27 08:19:22 2018	(r483115)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnome-vfs
 PORTVERSION=	2.24.4
-PORTREVISION?=	9
+PORTREVISION?=	10
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,9 +16,6 @@ LICENSE_COMB=	multi
 LICENSE_FILE_LGPL20=	${WRKSRC}/COPYING.LIB
 LICENSE_FILE_LGPL20+ =	${WRKSRC}/COPYING.LIB
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	incomplete definition of type 'struct ssl_st'
-
 USES=		tar:bzip2
 
 .if !defined(REFERENCE_PORT)
@@ -27,7 +24,7 @@ RUN_DEPENDS=	update-mime-database:misc/shared-mime-inf
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libdbus-1.so:devel/dbus
 
-USES+=		gettext gmake libtool:keepla pathfix pkgconfig ssl
+USES+=		gettext gmake gnome libtool:keepla pathfix pkgconfig ssl
 USE_GNOME=	gconf2 gnomemimedata intlhack referencehack
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes

Added: head/devel/gnome-vfs/files/patch-openssl-1.1
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gnome-vfs/files/patch-openssl-1.1	Sat Oct 27 08:19:22 2018	(r483115)
@@ -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)