Attachment #197881 for bug #228896

View | Details | Raw Unified | Return to bug 228896 | Differences between
Collapse All | Expand All





PORTNAME=	gnome-vfs
PORTVERSION=	2.24.4
PORTREVISION?=	10
CATEGORIES=	devel gnome
MASTER_SITES=	GNOME
DIST_SUBDIR=	gnome2

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)

LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
		libdbus-1.so:devel/dbus

USES+=		gettext gmake gnome libtool:keepla pathfix pkgconfig ssl
USE_GNOME=	gconf2 gnomemimedata intlhack referencehack
INSTALL_TARGET=	install-strip
USE_LDCONFIG=	yes




--- libgnomevfs/gnome-vfs-ssl.c.orig	2010-02-09 12:16:14 UTC
+++ libgnomevfs/gnome-vfs-ssl.c
@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSSL **handle_ret
 			}
 		}
 
-                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)

Return to bug 228896

Lines 3-9 Link Here

(-)devel/gnome-vfs/Makefile (-5 / +2 lines)
3		3
4	PORTNAME= gnome-vfs	4	PORTNAME= gnome-vfs
5	PORTVERSION= 2.24.4	5	PORTVERSION= 2.24.4
6	PORTREVISION?= 9	6	PORTREVISION?= 10
7	CATEGORIES= devel gnome	7	CATEGORIES= devel gnome
8	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
9	DIST_SUBDIR= gnome2	9	DIST_SUBDIR= gnome2
Lines 16-24 Link Here
16	LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB	16	LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB
17	LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING.LIB	17	LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING.LIB
18		18
19	BROKEN_SSL= openssl-devel
20	BROKEN_SSL_REASON_openssl-devel= incomplete definition of type 'struct ssl_st'
21
22	USES= tar:bzip2	19	USES= tar:bzip2
23		20
24	.if !defined(REFERENCE_PORT)	21	.if !defined(REFERENCE_PORT)
Lines 27-33 Link Here
27	LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \	24	LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
28	libdbus-1.so:devel/dbus	25	libdbus-1.so:devel/dbus
29		26
30	USES+= gettext gmake libtool:keepla pathfix pkgconfig ssl	27	USES+= gettext gmake gnome libtool:keepla pathfix pkgconfig ssl
31	USE_GNOME= gconf2 gnomemimedata intlhack referencehack	28	USE_GNOME= gconf2 gnomemimedata intlhack referencehack
32	INSTALL_TARGET= install-strip	29	INSTALL_TARGET= install-strip
33	USE_LDCONFIG= yes	30	USE_LDCONFIG= yes

Line 0 Link Here

(-)devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-ssl.c (+20 lines)
	1	--- libgnomevfs/gnome-vfs-ssl.c.orig 2010-02-09 12:16:14 UTC
	2	+++ libgnomevfs/gnome-vfs-ssl.c
	3	@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSSL **handle_ret
	4	}
	5	}
	6
	7	- if (ssl->private->ssl->ctx)
	8	- SSL_CTX_free (ssl->private->ssl->ctx);
	9	-
	10	SSL_free (ssl->private->ssl);
	11	g_free (ssl->private);
	12	g_free (ssl);
	13	@@ -705,7 +702,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl,
	14	}
	15	}
	16
	17	- SSL_CTX_free (ssl->private->ssl->ctx);
	18	SSL_free (ssl->private->ssl);
	19	close (ssl->private->sockfd);
	20	if (ssl->private->timeout)