Index: head/devel/gnome-vfs/Makefile =================================================================== --- head/devel/gnome-vfs/Makefile (revision 483114) +++ head/devel/gnome-vfs/Makefile (revision 483115) @@ -1,113 +1,110 @@ # Created by: Ade Lovett # $FreeBSD$ PORTNAME= gnome-vfs PORTVERSION= 2.24.4 -PORTREVISION?= 9 +PORTREVISION?= 10 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME Virtual File System LICENSE= LGPL20 LGPL20+ # dbus-utils.c is LGPL20 only 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) 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 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-openssl \ --disable-gnutls \ --disable-howl \ --with-hal-mount=/sbin/mount \ --with-hal-umount=/sbin/umount \ ac_cv_header_sys_inotify_h=no CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall GCONF_SCHEMAS= desktop_default_applications.schemas \ desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ system_http_proxy.schemas system_smb.schemas OPTIONS_DEFINE= SAMBA MDNS HAL OPTIONS_DEFAULT=SAMBA MDNS HAL SAMBA_DESC= Enable SMB volume support MDNS_DESC= Enable Bonjour/Rendezvous support .include .if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM) USES+= fam .endif .if exists(${LOCALBASE}/lib/libkrb5.so) LIB_DEPENDS+= libkrb5.so:security/heimdal .endif .if ${PORT_OPTIONS:MHAL} CONFIGURE_ARGS+=--enable-hal LIB_DEPENDS+= libhal.so:sysutils/hal .else CONFIGURE_ARGS+=--disable-hal .endif .if ${PORT_OPTIONS:MSAMBA} CONFIGURE_ARGS+=--with-samba-includes=${SAMBAINCLUDES} --with-samba-libs=${SAMBALIBS} USES+= samba:lib PLIST_SUB+= SAMBA="" .else PLIST_SUB+= SAMBA="@comment " CONFIGURE_ARGS+=--disable-samba .endif .if ${PORT_OPTIONS:MMDNS} LIB_DEPENDS+= libavahi-client.so:net/avahi-app .else CONFIGURE_ARGS+=--disable-avahi .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/libgnomevfs/Makefile.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/libgnomevfs/xdgmime.c \ ${WRKSRC}/libgnomevfs/gnome-vfs-hal-mounts.c @${REINPLACE_CMD} -e 's|-lacl||g ; \ s|inotify_support=yes|inotify_support=no|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \ ${WRKSRC}/*/Makefile.in @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} pre-configure: .if defined(WITHOUT_KERBEROS) @${ECHO_CMD} "${PKGNAME}: KERBEROS is required." @${FALSE} .endif .include .endif Index: head/devel/gnome-vfs/files/patch-openssl-1.1 =================================================================== --- head/devel/gnome-vfs/files/patch-openssl-1.1 (nonexistent) +++ head/devel/gnome-vfs/files/patch-openssl-1.1 (revision 483115) @@ -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) Property changes on: head/devel/gnome-vfs/files/patch-openssl-1.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property