apply patch from Martin Schlemmer <azarah@nosferatu.za.org> to fix #133096. Patch sent upstream.

Package-Manager: portage-2.1.1_pre3-r3

4 files changed, 173 insertions, 1 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 1dc83f00cd73..8d6dc0be0495 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.203 2006/07/18 01:08:27 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.204 2006/07/23 22:43:50 allanonjl Exp $
+
+*gnome-vfs-2.14.2-r1 (23 Jul 2006)
+
+  23 Jul 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +files/gnome-vfs-2.14.2-http_module-undef-neon-symbols.patch,
+  -gnome-vfs-2.14.1.ebuild, +gnome-vfs-2.14.2-r1.ebuild:
+  apply patch from Martin Schlemmer <azarah@nosferatu.za.org> to fix #133096.
+  Patch sent upstream.
 
   18 Jul 2006; John N. Laliberte <allanonjl@gentoo.org>
   -gnome-vfs-2.10.0-r2.ebuild, -gnome-vfs-2.10.1-r1.ebuild,
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.14.2-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.14.2-r1
new file mode 100644
index 000000000000..c361566b351b
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.14.2-r1
@@ -0,0 +1,3 @@
+MD5 b657e31974d6981adf9b2c4db981f62c gnome-vfs-2.14.2.tar.bz2 1816194
+RMD160 e0a67e3576d72a86c898208a93ad8ee52f72f870 gnome-vfs-2.14.2.tar.bz2 1816194
+SHA256 15da9d174d2373826a6921c8af2aac18aa64c6d93ac201903c9fb432e142bba7 gnome-vfs-2.14.2.tar.bz2 1816194
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.14.2-http_module-undef-neon-symbols.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.14.2-http_module-undef-neon-symbols.patch
new file mode 100644
index 000000000000..3297ab7df9f2
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.14.2-http_module-undef-neon-symbols.patch
@@ -0,0 +1,87 @@
+On hardened there are problems when loading modules with undefined symbols that
+do not resolve, so add stubs and make sure the neon symbols are local for
+libhttp.so.
+
+Martin Schlemmer <azarah@nosferatu.za.org> (22 July 2006)
+
+diff -urpN gnome-vfs-2.14.2/imported/neon/Makefile.am gnome-vfs-2.14.2.az/imported/neon/Makefile.am
+--- gnome-vfs-2.14.2/imported/neon/Makefile.am	2006-01-08 18:53:09.000000000 +0200
++++ gnome-vfs-2.14.2.az/imported/neon/Makefile.am	2006-07-22 15:30:26.000000000 +0200
+@@ -53,8 +53,9 @@ NEON_BASE_SOURCES = ne_request.c ne_sess
+ 	ne_uri.c ne_dates.c ne_alloc.c  	\
+ 	ne_md5.c ne_utils.c    			\
+ 	ne_auth.c 				\
+-	ne_redirect.c		\
+-	ne_compress.c
++	ne_redirect.c				\
++	ne_compress.c				\
++	ne_stubs.c
+ 
+ NEON_DAV_SOURCES = \
+ 	ne_207.c ne_xml.c \
+diff -urpN gnome-vfs-2.14.2/imported/neon/ne_stubs.c gnome-vfs-2.14.2.az/imported/neon/ne_stubs.c
+--- gnome-vfs-2.14.2/imported/neon/ne_stubs.c	1970-01-01 02:00:00.000000000 +0200
++++ gnome-vfs-2.14.2.az/imported/neon/ne_stubs.c	2006-07-22 15:29:49.000000000 +0200
+@@ -0,0 +1,28 @@
++#include "ne_ssl.h"
++#include "ne_request.h"
++#include "ne_xml.h"
++
++/*
++ * Stubs so that the functions are not marked as UND in the global symbol
++ * table.  Assuming that nothing that calls them are actually used in
++ * gnome-vfs, they are bare.
++ */
++
++void ne_ssl_context_trustcert(ne_ssl_context *ctx, const ne_ssl_certificate *cert)
++{
++  NE_DEBUG(NE_DBG_SSL, "SSL: stub ne_ssl_context_trustcert() in use\n");
++  return;
++}
++
++int ne_xml_parse_response(ne_request *req, ne_xml_parser *parser)
++{
++  NE_DEBUG(NE_DBG_XMLPARSE, "XML: stub ne_xml_parse_response() in use\n");
++  return 0;
++}
++
++int ne_xml_dispatch_request(ne_request *req, ne_xml_parser *parser)
++{
++  NE_DEBUG(NE_DBG_XML, "XML: stub ne_xml_dispatch_request() in use\n");
++  return 0;
++}
++
+diff -urpN gnome-vfs-2.14.2/modules/libhttp.map gnome-vfs-2.14.2.az/modules/libhttp.map
+--- gnome-vfs-2.14.2/modules/libhttp.map	1970-01-01 02:00:00.000000000 +0200
++++ gnome-vfs-2.14.2.az/modules/libhttp.map	2006-07-22 15:05:30.000000000 +0200
+@@ -0,0 +1,6 @@
++{
++  local:
++    # Neon symbols should not be global
++    ne_*;
++};
++
+diff -urpN gnome-vfs-2.14.2/modules/Makefile.am gnome-vfs-2.14.2.az/modules/Makefile.am
+--- gnome-vfs-2.14.2/modules/Makefile.am	2005-12-11 01:50:19.000000000 +0200
++++ gnome-vfs-2.14.2.az/modules/Makefile.am	2006-07-22 15:05:30.000000000 +0200
+@@ -44,7 +44,8 @@ EXTRA_DIST =					\
+ 	inotify-path.h				\
+ 	inotify-path.c				\
+ 	local_inotify.h				\
+-	local_inotify_syscalls.h
++	local_inotify_syscalls.h		\
++	libhttp.map
+ 
+ ###  Module setup
+ if HAVE_CDDA
+@@ -230,6 +231,10 @@ libhttp_la_SOURCES =			\
+ 	$(NULL)
+ 
+ libhttp_la_LDFLAGS = $(module_flags)
++if USE_HTTP_NEON
++libhttp_la_LDFLAGS +=			\
++        -Wl,--version-script,$(srcdir)/libhttp.map
++endif
+ libhttp_la_LIBADD  = $(HTTP_LIBS)
+ 
+ libtar_la_SOURCES = tar-method.c tarpet.h 
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.14.2-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.14.2-r1.ebuild
new file mode 100644
index 000000000000..2e19892008e3
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.14.2-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.14.2-r1.ebuild,v 1.1 2006/07/23 22:43:50 allanonjl Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="http://www.gnome.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="avahi doc gnutls hal ipv6 samba ssl"
+
+RDEPEND=">=gnome-base/libbonobo-2.3.1
+	>=gnome-base/gconf-1.2
+	>=dev-libs/glib-2.9.3
+	>=gnome-base/orbit-2.12.4
+	>=dev-libs/libxml2-2.6
+	>=net-misc/neon-0.25.3
+	app-arch/bzip2
+	virtual/fam
+	gnome-base/gnome-mime-data
+	>=x11-misc/shared-mime-info-0.14
+	dev-libs/popt
+	samba? ( >=net-fs/samba-3 )
+	ssl? (
+		>=dev-libs/openssl-0.9.5
+		!gnome-extra/gnome-vfs-sftp )
+	gnutls? (
+		!ssl? (
+			net-libs/gnutls
+			!gnome-extra/gnome-vfs-sftp ) )
+	hal? (
+		>=sys-apps/hal-0.5.7
+		>=sys-apps/dbus-0.32 )
+	avahi? ( >=net-dns/avahi-0.6 )"
+
+# ssl/gnutls USE deps : if both are enabled choose openssl
+# foser <foser@gentoo.org> 19 Apr 2004
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="--disable-schemas-install \
+		--disable-howl			  \
+		--enable-http-neon        \
+		$(use_enable ssl openssl) \
+		$(use_enable gnutls)      \
+		$(use_enable samba)       \
+		$(use_enable ipv6)        \
+		$(use_enable hal)         \
+		$(use_enable avahi)"
+
+	# this works because of the order of conifgure parsing
+	# so should always be behind the use_enable options
+	# foser <foser@gentoo.org 19 Apr 2004
+	use gnutls && use ssl && G2CONF="${G2CONF} --disable-gnutls"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Allow the Trash on afs filesystems (#106118)
+	epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
+
+	# fix unresolved symbols #133096
+	epatch "${FILESDIR}"/${PN}-2.14.2-http_module-undef-neon-symbols.patch
+}