try to fix odd crash with gnome-mime-data-2.0.1

6 files changed, 205 insertions, 1 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index b8dead16866f..c849ffbe28b1 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.32 2002/12/24 20:41:36 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.33 2003/01/02 01:42:19 azarah Exp $
+
+*gnome-vfs-2.0.5-r3 (02 Jan 2003)
+
+  02 Jan 2003; Martin Schlemmer <azarah@gentoo.org> gnome-vfs-1.0.5-r3.ebuild :
 
   24 Dec 2002; Martin Schlemmer <azarah@gentoo.org> :
   Fix >=2.0 to depend on >=dev-libs/glib-2.0.6, as it can also use the new
diff --git a/gnome-base/gnome-vfs/files/1.0/gnome-vfs-1.0.5-codeset.patch b/gnome-base/gnome-vfs/files/1.0/gnome-vfs-1.0.5-codeset.patch
new file mode 100644
index 000000000000..f8c5a05cc312
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/1.0/gnome-vfs-1.0.5-codeset.patch
@@ -0,0 +1,59 @@
+--- gnome-vfs-1.0.5/libgnomevfs/libcharset/codeset.m4.codeset	Thu Jan 31 08:58:30 2002
++++ gnome-vfs-1.0.5/libgnomevfs/libcharset/codeset.m4	Wed Mar 20 17:08:34 2002
+@@ -18,3 +18,23 @@
+       [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+   fi
+ ])
++#serial 2
++
++dnl From Bruno Haible.
++
++AC_DEFUN([jm_LANGINFO_CODESET],
++[
++  AC_CHECK_HEADERS(langinfo.h)
++  AC_CHECK_FUNCS(nl_langinfo)
++
++  AC_CACHE_CHECK([for nl_langinfo and CODESET], jm_cv_langinfo_codeset,
++    [AC_TRY_LINK([#include <langinfo.h>],
++      [char* cs = nl_langinfo(CODESET);],
++      jm_cv_langinfo_codeset=yes,
++      jm_cv_langinfo_codeset=no)
++    ])
++  if test $jm_cv_langinfo_codeset = yes; then
++    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
++      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
++  fi
++])
+--- gnome-vfs-1.0.5/acinclude.m4.codeset	Wed Jul 11 19:02:41 2001
++++ gnome-vfs-1.0.5/acinclude.m4	Wed Mar 20 17:08:34 2002
+@@ -23,3 +23,23 @@
+    AC_PROVIDE([AC_TYPE_OFF_T])
+ ])
+ 
++#serial 2
++
++dnl From Bruno Haible.
++
++AC_DEFUN([jm_LANGINFO_CODESET],
++[
++  AC_CHECK_HEADERS(langinfo.h)
++  AC_CHECK_FUNCS(nl_langinfo)
++
++  AC_CACHE_CHECK([for nl_langinfo and CODESET], jm_cv_langinfo_codeset,
++    [AC_TRY_LINK([#include <langinfo.h>],
++      [char* cs = nl_langinfo(CODESET);],
++      jm_cv_langinfo_codeset=yes,
++      jm_cv_langinfo_codeset=no)
++    ])
++  if test $jm_cv_langinfo_codeset = yes; then
++    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
++      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
++  fi
++])
+--- gnome-vfs-1.0.5/acconfig.h.codeset	Wed Mar 20 17:12:08 2002
++++ gnome-vfs-1.0.5/acconfig.h	Wed Mar 20 17:12:30 2002
+@@ -17,3 +17,4 @@
+ #undef ENABLE_PROFILER
+ #undef HAVE_OPENSSL
+ #undef USE_LIBICONV
++#undef HAVE_LANGINFO_CODESET
diff --git a/gnome-base/gnome-vfs/files/1.0/gnome-vfs-1.0.5-fix-segfault.patch b/gnome-base/gnome-vfs/files/1.0/gnome-vfs-1.0.5-fix-segfault.patch
new file mode 100644
index 000000000000..3c263b0560f6
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/1.0/gnome-vfs-1.0.5-fix-segfault.patch
@@ -0,0 +1,14 @@
+--- gnome-vfs-1.0.5/libgnomevfs/gnome-vfs-mime-magic.c.orig	2003-01-02 01:59:52.000000000 +0200
++++ gnome-vfs-1.0.5/libgnomevfs/gnome-vfs-mime-magic.c	2003-01-02 02:03:24.000000000 +0200
+@@ -196,6 +196,11 @@
+ 		fmttype = 'u';
+ 	}
+ 
++	printf ("offset: %p, bsize: %i, result: %p\n", offset, bsize, result);
++
++	if ((offset <= 0) || (bsize <= 0) || (result <= 0))
++		return FALSE;
++
+ 	switch (bsize) {
+ 	case 1:
+ 		fmtstr[0] = '%'; 
diff --git a/gnome-base/gnome-vfs/files/1.0/gnome-vfs-1.0.5-proxy.patch b/gnome-base/gnome-vfs/files/1.0/gnome-vfs-1.0.5-proxy.patch
new file mode 100644
index 000000000000..745638b7d9bc
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/1.0/gnome-vfs-1.0.5-proxy.patch
@@ -0,0 +1,56 @@
+--- gnome-vfs-1.0.5/modules/http-method.c.proxy	2001-09-05 22:06:14.000000000 +0200
++++ gnome-vfs-1.0.5/modules/http-method.c	2002-09-12 18:35:28.000000000 +0200
+@@ -125,18 +125,18 @@
+ #define DEFAULT_HTTP_PROXY_PORT 8080
+ 
+ /* GConf paths and keys */
+-#define PATH_GCONF_GNOME_VFS "/system/gnome-vfs"
+-#define ITEM_GCONF_HTTP_PROXY_PORT "http-proxy-port"
+-#define ITEM_GCONF_HTTP_PROXY_HOST "http-proxy-host"
++#define PATH_GCONF_GNOME_VFS "/system/http_proxy"
++#define ITEM_GCONF_HTTP_PROXY_PORT "port"
++#define ITEM_GCONF_HTTP_PROXY_HOST "host"
+ #define KEY_GCONF_HTTP_PROXY_PORT (PATH_GCONF_GNOME_VFS "/" ITEM_GCONF_HTTP_PROXY_PORT)
+ #define KEY_GCONF_HTTP_PROXY_HOST (PATH_GCONF_GNOME_VFS "/" ITEM_GCONF_HTTP_PROXY_HOST)
+ 
+-#define ITEM_GCONF_USE_HTTP_PROXY "use-http-proxy"
++#define ITEM_GCONF_USE_HTTP_PROXY "use_http_proxy"
+ #define KEY_GCONF_USE_HTTP_PROXY (PATH_GCONF_GNOME_VFS "/" ITEM_GCONF_USE_HTTP_PROXY)
+ 
+-#define KEY_GCONF_HTTP_AUTH_USER (PATH_GCONF_GNOME_VFS "/" "http-proxy-authorization-user")
+-#define KEY_GCONF_HTTP_AUTH_PW (PATH_GCONF_GNOME_VFS "/" "http-proxy-authorization-password")
+-#define KEY_GCONF_HTTP_USE_AUTH (PATH_GCONF_GNOME_VFS "/" "use-http-proxy-authorization")
++#define KEY_GCONF_HTTP_AUTH_USER (PATH_GCONF_GNOME_VFS "/" "authentication_user")
++#define KEY_GCONF_HTTP_AUTH_PW (PATH_GCONF_GNOME_VFS "/" "authentication_password")
++#define KEY_GCONF_HTTP_USE_AUTH (PATH_GCONF_GNOME_VFS "/" "use_authentication")
+ 
+ 
+ /* Some status code validation macros.  */
+--- gnome-vfs-1.0.5/modules/ftp-method.c.proxy	2001-08-06 23:02:04.000000000 +0200
++++ gnome-vfs-1.0.5/modules/ftp-method.c	2002-09-12 18:27:20.000000000 +0200
+@@ -76,8 +76,8 @@
+ #define IS_400(X) ((X) >= 400 && (X) < 500)
+ #define IS_500(X) ((X) >= 500 && (X) < 600)
+ 
+-static const char PROXY_KEY[] = "/system/gnome-vfs/http-proxy";
+-static const char USE_PROXY_KEY[] = "/system/gnome-vfs/use-http-proxy";
++static const char PROXY_KEY[] = "/system/http_proxy/host";
++static const char USE_PROXY_KEY[] = "/system/http_proxy/use_http_proxy";
+ 
+ 
+ static GnomeVFSResult do_open	         (GnomeVFSMethod               *method,
+--- gnome-vfs-1.0.5/modules/cdda-method.c.proxy	2001-07-16 20:22:27.000000000 +0200
++++ gnome-vfs-1.0.5/modules/cdda-method.c	2002-09-12 18:27:20.000000000 +0200
+@@ -99,9 +99,9 @@
+ 						 long 				bytes);
+ 
+ 
+-static const char PROXY_HOST_KEY[] = "/apps/nautilus/preferences/http-proxy-host";
+-static const char PROXY_PORT_KEY[] = "/apps/nautilus/preferenceshttp-proxy-port";
+-static const char USE_PROXY_KEY[] = "/apps/nautilus/preferencesuse-http-proxy";
++static const char PROXY_HOST_KEY[] = "/system/http_proxy/host";
++static const char PROXY_PORT_KEY[] = "/system/http_proxy/port";
++static const char USE_PROXY_KEY[] = "/system/http_proxy/use_http_proxy";
+ 
+ static CDDAContext *
+ cdda_context_new (cdrom_drive *drive, GnomeVFSURI *uri)
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-1.0.5-r3 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-1.0.5-r3
new file mode 100644
index 000000000000..be580ead0c89
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-1.0.5-r3
@@ -0,0 +1 @@
+MD5 75df5354fe84ee66953ec54bf2989588 gnome-vfs-1.0.5.tar.gz 1048954
diff --git a/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild b/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild
new file mode 100644
index 000000000000..ced130585d81
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild,v 1.1 2003/01/02 01:42:19 azarah Exp $
+
+IUSE="ssl nls"
+
+inherit eutils libtool
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="GNOME Virtual File System."
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/1.0/${P}.tar.gz"
+HOMEPAGE="http://www.gnome.org/"
+
+SLOT="1"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+RDEPEND="( =gnome-base/gconf-1.0* )	
+	>=gnome-base/gnome-libs-1.4.1.2
+	>=gnome-base/gnome-mime-data-1.0.1
+	>=sys-apps/bzip2-1.0.2
+	ssl? ( dev-libs/openssl )"
+
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.8.0
+	>=dev-util/intltool-0.11
+	>=gnome-base/gnome-common-1.2.4
+	nls? ( sys-devel/gettext )"
+# gnome-common is for m4 macros needed for patches ...
+
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Add missing macros for charset conversion
+	epatch ${FILESDIR}/1.0/${P}-codeset.patch
+	# Use GNOME2 Gconf keys for proxy settings
+	epatch ${FILESDIR}/1.0/${P}-proxy.patch
+
+	# Fix a rare segfault with gnome-mime-data-2.0.1.  Weird one really ...
+	# <azarah@gentoo.org> (2 Jan 2003).
+	epatch ${FILESDIR}/1.0/${P}-fix-segfault.patch
+
+	autoheader
+	aclocal -I /usr/share/aclocal/gnome-macros
+	autoconf
+}
+
+src_compile() {
+	local myconf=""
+	
+	elibtoolize
+	
+	use nls || {
+		myconf="${myconf} --disable-nls"
+		mkdir intl
+		touch intl/libgettext.h
+	}
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+
+	dodoc AUTHORS COPYING* ChangeLog NEWS README
+}