mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-27 10:03:20 +00:00
Code Issues Releases Activity

devel/gnome-vfs: Fix OpenSSL 1.1.X build

Browse Source 
- 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@yahoo.com>
Reported by:	brnrd
Approved by:	gnome (maintainer timeout)
Obtained from:	NetBSD
MFH:		2018Q4
This commit is contained in:
Ben Woods 2018-10-27 08:19:22 +00:00
parent 537a0ae9dc
commit 284b54baf7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=483115
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devel/gnome-vfs/Makefile
View File

@ -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-info
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

26
devel/gnome-vfs/files/patch-openssl-1.1 Normal file
View File

@ -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)