From 63bc6bbd23862cb650939cae2ed4945ad22b5740 Mon Sep 17 00:00:00 2001 From: minskim Date: Fri, 7 Jul 2006 00:24:43 +0000 Subject: Add a workaround for GNOME bug #337993. This fixes "undefined symbols" errors on Darwin. --- sysutils/gnome-vfs2/distinfo | 8 +++-- sysutils/gnome-vfs2/patches/patch-ac | 42 +++++++++++++++++----- sysutils/gnome-vfs2/patches/patch-ak | 33 +++++++++++++++++ sysutils/gnome-vfs2/patches/patch-al | 70 ++++++++++++++++++++++++++++++++++++ sysutils/gnome-vfs2/patches/patch-as | 18 ++++++++-- 5 files changed, 157 insertions(+), 14 deletions(-) create mode 100644 sysutils/gnome-vfs2/patches/patch-ak create mode 100644 sysutils/gnome-vfs2/patches/patch-al (limited to 'sysutils') diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo index 2d980b917ae..2fff1fbd5db 100644 --- a/sysutils/gnome-vfs2/distinfo +++ b/sysutils/gnome-vfs2/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.55 2006/07/06 23:35:15 minskim Exp $ +$NetBSD: distinfo,v 1.56 2006/07/07 00:24:43 minskim Exp $ SHA1 (gnome-vfs-2.14.2.tar.bz2) = ffd2e5f229495f55587d8499e5f2b8b8a76e5448 RMD160 (gnome-vfs-2.14.2.tar.bz2) = e0a67e3576d72a86c898208a93ad8ee52f72f870 Size (gnome-vfs-2.14.2.tar.bz2) = 1816194 bytes SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5 -SHA1 (patch-ac) = eb1e950deca2a83a47c6d422f6ca1059958430fa +SHA1 (patch-ac) = 515faadbf5ad3eb65fb7fbaf6eb35ae8db3d133e SHA1 (patch-ad) = 5df81a0bf979f710912b42883658c10d198cca87 SHA1 (patch-ae) = b84609561dfedd1f1b55f93298f02ea841eec407 SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56 @@ -13,12 +13,14 @@ SHA1 (patch-ag) = 62c6b37f79abe8bb6b1e2e29e4071e32e4684900 SHA1 (patch-ah) = 0927ade189c14472e5768b7e4775854de519f19c SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2 SHA1 (patch-aj) = 0159ed71a69f4f15a4353d0bb9400e9341b59b9d +SHA1 (patch-ak) = 48574a70c117cd7327eb2dab9d7b8fa924f589b8 +SHA1 (patch-al) = 4eae29462d28f0de365266e4b5f78a0fda6ca8d2 SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9 SHA1 (patch-ao) = 0cc64574f6d430ca385f22d28690b9cea9181390 SHA1 (patch-ap) = 98ad7700d01007510467e2ae4ee8554f54f15320 SHA1 (patch-aq) = 1d5ed4d6c1b3a282e68bedf6892fa8a9678ea39b SHA1 (patch-ar) = 33bac387ffe861141f9cd6564c24956d3e9e4cb4 -SHA1 (patch-as) = b57e7952a84e501d298a4d822049f9faa24122e3 +SHA1 (patch-as) = 473d0980fe9b515d59deda2e43f1ce8731c4dcc7 SHA1 (patch-au) = e3c681dd445d0774981a50eb22ae14ff4db5902c SHA1 (patch-aw) = 22801eb932f8f7e7256be3863fcd5273a7a5213e SHA1 (patch-ax) = 06a104c8ae3caf01a2bf6899cd2b85980c0bb26d diff --git a/sysutils/gnome-vfs2/patches/patch-ac b/sysutils/gnome-vfs2/patches/patch-ac index 4fbecc4d7a3..1391b7362fa 100644 --- a/sysutils/gnome-vfs2/patches/patch-ac +++ b/sysutils/gnome-vfs2/patches/patch-ac @@ -1,19 +1,37 @@ -$NetBSD: patch-ac,v 1.11 2006/07/06 23:35:15 minskim Exp $ +$NetBSD: patch-ac,v 1.12 2006/07/07 00:24:43 minskim Exp $ --- imported/neon/Makefile.in.orig 2006-05-30 03:21:19.000000000 -0700 +++ imported/neon/Makefile.in -@@ -56,7 +56,8 @@ am__objects_2 = $(am__objects_1) +@@ -56,10 +56,13 @@ am__objects_2 = $(am__objects_1) am__objects_3 = ne_request.lo ne_session.lo ne_basic.lo ne_string.lo \ ne_uri.lo ne_dates.lo ne_alloc.lo ne_md5.lo ne_utils.lo \ ne_auth.lo ne_redirect.lo ne_compress.lo -am__objects_4 = ne_207.lo ne_xml.lo ne_props.lo ne_locks.lo -+am__objects_4 = ne_207.lo ne_xml.lo ne_props.lo ne_locks.lo \ +-am__objects_5 = ne_acl.lo ne_gnomevfs.lo ++am__objects_4 = ne_gnutls.lo ++am__objects_5 = ne_207.lo ne_xml.lo ne_props.lo ne_locks.lo \ + ne_xmlreq.lo - am__objects_5 = ne_acl.lo ne_gnomevfs.lo ++am__objects_6 = ne_acl.lo ne_gnomevfs.lo am_libneon_la_OBJECTS = $(am__objects_2) $(am__objects_3) \ - $(am__objects_4) $(am__objects_5) $(am__objects_1) -@@ -396,7 +397,7 @@ NEON_BASE_SOURCES = ne_request.c ne_sess +- $(am__objects_4) $(am__objects_5) $(am__objects_1) ++ $(am__objects_4) $(am__objects_5) $(am__objects_6) \ ++ $(am__objects_1) + libneon_la_OBJECTS = $(am_libneon_la_OBJECTS) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -372,6 +375,7 @@ NEON_INCLUDES = \ + ne_locks.h \ + ne_md5.h \ + ne_private.h \ ++ ne_privssl.h \ + ne_props.h \ + ne_redirect.h \ + ne_request.h \ +@@ -394,9 +398,10 @@ NEON_BASE_SOURCES = ne_request.c ne_sess + ne_redirect.c \ + ne_compress.c ++NEON_SSL_SOURCES = ne_gnutls.c NEON_DAV_SOURCES = \ ne_207.c ne_xml.c \ - ne_props.c ne_locks.c @@ -21,7 +39,7 @@ $NetBSD: patch-ac,v 1.11 2006/07/06 23:35:15 minskim Exp $ NEON_EXTRA_SOURCES = ne_acl.c ne_gnomevfs.c libneon_la_LIBADD = \ -@@ -410,6 +411,7 @@ libneon_la_LDFLAGS = \ +@@ -410,6 +415,7 @@ libneon_la_LDFLAGS = \ libneon_la_SOURCES = \ $(NEON_INCLUDES) \ $(NEON_BASE_SOURCES) \ @@ -29,7 +47,15 @@ $NetBSD: patch-ac,v 1.11 2006/07/06 23:35:15 minskim Exp $ $(NEON_DAV_SOURCES) \ $(NEON_EXTRA_SOURCES) \ $(NULL) -@@ -483,6 +485,7 @@ distclean-compile: +@@ -473,6 +479,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_compress.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_dates.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_gnomevfs.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_gnutls.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_locks.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_md5.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_props.Plo@am__quote@ +@@ -483,6 +490,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_uri.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_xml.Plo@am__quote@ diff --git a/sysutils/gnome-vfs2/patches/patch-ak b/sysutils/gnome-vfs2/patches/patch-ak new file mode 100644 index 00000000000..75c0c9499ec --- /dev/null +++ b/sysutils/gnome-vfs2/patches/patch-ak @@ -0,0 +1,33 @@ +$NetBSD: patch-ak,v 1.8 2006/07/07 00:24:43 minskim Exp $ + +http://bugzilla.gnome.org/show_bug.cgi?id=337993 + +--- imported/neon/ne_gnutls.c.orig 2006-06-26 16:17:37.000000000 -0700 ++++ imported/neon/ne_gnutls.c +@@ -0,0 +1,26 @@ ++#include "config.h" ++ ++#include ++ ++#include "ne_ssl.h" ++ ++#include "ne_private.h" ++#include "ne_privssl.h" ++ ++struct ne_ssl_dname_s { ++ int subject; /* non-zero if this is the subject DN object */ ++ gnutls_x509_crt cert; ++}; ++ ++struct ne_ssl_certificate_s { ++ ne_ssl_dname subj_dn, issuer_dn; ++ gnutls_x509_crt subject; ++ ne_ssl_certificate *issuer; ++ char *identity; ++}; ++ ++void ne_ssl_context_trustcert(ne_ssl_context *ctx, const ne_ssl_certificate *cert) ++{ ++ gnutls_x509_crt certs = cert->subject; ++ gnutls_certificate_set_x509_trust(ctx->cred, &certs, 1); ++} diff --git a/sysutils/gnome-vfs2/patches/patch-al b/sysutils/gnome-vfs2/patches/patch-al new file mode 100644 index 00000000000..da4a663ca97 --- /dev/null +++ b/sysutils/gnome-vfs2/patches/patch-al @@ -0,0 +1,70 @@ +$NetBSD: patch-al,v 1.8 2006/07/07 00:24:43 minskim Exp $ + +http://bugzilla.gnome.org/show_bug.cgi?id=337993 + +--- imported/neon/ne_privssl.h.orig 2006-06-26 16:32:19.000000000 -0700 ++++ imported/neon/ne_privssl.h +@@ -0,0 +1,63 @@ ++/* ++ SSL interface definitions internal to neon. ++ Copyright (C) 2003, 2004, Joe Orton ++ Copyright (C) 2004, Aleix Conchillo Flaque ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public ++ License along with this library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ++ MA 02111-1307, USA ++ ++*/ ++ ++/* THIS IS NOT A PUBLIC INTERFACE. You CANNOT include this header file ++ * from an application. */ ++ ++#ifndef NE_PRIVSSL_H ++#define NE_PRIVSSL_H ++ ++/* This is the private interface between ne_socket, ne_gnutls and ++ * ne_openssl. */ ++ ++#include "ne_ssl.h" ++#include "ne_socket.h" ++ ++#ifdef HAVE_OPENSSL ++ ++#include ++ ++struct ne_ssl_context_s { ++ SSL_CTX *ctx; ++ SSL_SESSION *sess; ++}; ++ ++typedef SSL *ne_ssl_socket; ++ ++#endif /* HAVE_OPENSSL */ ++ ++#ifdef HAVE_GNUTLS ++ ++#include ++ ++struct ne_ssl_context_s { ++ gnutls_certificate_credentials cred; ++ /* TODO: store session here too */ ++}; ++ ++typedef gnutls_session ne_ssl_socket; ++ ++#endif /* HAVE_GNUTLS */ ++ ++ne_ssl_socket ne__sock_sslsock(ne_socket *sock); ++ ++#endif /* NE_PRIVSSL_H */ diff --git a/sysutils/gnome-vfs2/patches/patch-as b/sysutils/gnome-vfs2/patches/patch-as index 7442b046c83..353aecec56a 100644 --- a/sysutils/gnome-vfs2/patches/patch-as +++ b/sysutils/gnome-vfs2/patches/patch-as @@ -1,9 +1,21 @@ -$NetBSD: patch-as,v 1.3 2006/07/06 23:35:15 minskim Exp $ +$NetBSD: patch-as,v 1.4 2006/07/07 00:24:43 minskim Exp $ --- imported/neon/Makefile.am.orig 2006-01-08 08:53:09.000000000 -0800 +++ imported/neon/Makefile.am -@@ -58,7 +58,7 @@ NEON_BASE_SOURCES = ne_request.c ne_sess +@@ -33,6 +33,7 @@ NEON_INCLUDES = \ + ne_locks.h \ + ne_md5.h \ + ne_private.h \ ++ ne_privssl.h \ + ne_props.h \ + ne_redirect.h \ + ne_request.h \ +@@ -56,9 +57,11 @@ NEON_BASE_SOURCES = ne_request.c ne_sess + ne_redirect.c \ + ne_compress.c ++NEON_SSL_SOURCES = ne_gnutls.c ++ NEON_DAV_SOURCES = \ ne_207.c ne_xml.c \ - ne_props.c ne_locks.c @@ -11,7 +23,7 @@ $NetBSD: patch-as,v 1.3 2006/07/06 23:35:15 minskim Exp $ NEON_EXTRA_SOURCES = ne_acl.c ne_gnomevfs.c -@@ -73,6 +73,7 @@ libneon_la_LDFLAGS = \ +@@ -73,6 +76,7 @@ libneon_la_LDFLAGS = \ libneon_la_SOURCES = \ $(NEON_INCLUDES) \ $(NEON_BASE_SOURCES) \ -- cgit v1.2.3