From owner-svn-ports-all@freebsd.org Thu Nov 1 18:22:27 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E034F10FAFBC; Thu, 1 Nov 2018 18:22:26 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 95CF484697; Thu, 1 Nov 2018 18:22:26 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 77F0A1F739; Thu, 1 Nov 2018 18:22:26 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA1IMQGR010258; Thu, 1 Nov 2018 18:22:26 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA1IMQGc010256; Thu, 1 Nov 2018 18:22:26 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811011822.wA1IMQGc010256@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 1 Nov 2018 18:22:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483700 - in branches/2018Q4/devel/gnome-vfs: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/devel/gnome-vfs: . files X-SVN-Commit-Revision: 483700 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Nov 2018 18:22:27 -0000 Author: antoine Date: Thu Nov 1 18:22:25 2018 New Revision: 483700 URL: https://svnweb.freebsd.org/changeset/ports/483700 Log: MFH: r483115 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 Reported by: brnrd Approved by: gnome (maintainer timeout) Obtained from: NetBSD Added: branches/2018Q4/devel/gnome-vfs/files/patch-openssl-1.1 - copied unchanged from r483115, head/devel/gnome-vfs/files/patch-openssl-1.1 Modified: branches/2018Q4/devel/gnome-vfs/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/devel/gnome-vfs/Makefile ============================================================================== --- branches/2018Q4/devel/gnome-vfs/Makefile Thu Nov 1 18:19:09 2018 (r483699) +++ branches/2018Q4/devel/gnome-vfs/Makefile Thu Nov 1 18:22:25 2018 (r483700) @@ -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 Copied: branches/2018Q4/devel/gnome-vfs/files/patch-openssl-1.1 (from r483115, head/devel/gnome-vfs/files/patch-openssl-1.1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/devel/gnome-vfs/files/patch-openssl-1.1 Thu Nov 1 18:22:25 2018 (r483700, copy of r483115, head/devel/gnome-vfs/files/patch-openssl-1.1) @@ -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)