Fix crash on second search (bug #353533 by Kai Wüstermann and fix by Alexandre Rostovtsev).

(Portage version: 2.1.9.39/cvs/Linux x86_64)

3 files changed, 255 insertions, 1 deletions

diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog
index 0409db53c8f2..7f31824f260c 100644
--- a/app-misc/beagle/ChangeLog
+++ b/app-misc/beagle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/beagle
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.124 2011/02/06 16:28:01 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.125 2011/02/15 11:07:27 pacho Exp $
+
+*beagle-0.3.9-r5 (15 Feb 2011)
+
+  15 Feb 2011; Pacho Ramos <pacho@gentoo.org> +beagle-0.3.9-r5.ebuild,
+  +files/beagle-0.3.9-UnixConnectionHandler-exceptions.patch:
+  Fix crash on second search (bug #353533 by Kai Wüstermann and fix by
+  Alexandre Rostovtsev).
 
   29 Jan 2011; Markos Chandras <hwoarang@gentoo.org> beagle-0.3.9-r4.ebuild:
   Stable on amd64 wrt bug #352808
diff --git a/app-misc/beagle/beagle-0.3.9-r5.ebuild b/app-misc/beagle/beagle-0.3.9-r5.ebuild
new file mode 100644
index 000000000000..1726ff7e6a9a
--- /dev/null
+++ b/app-misc/beagle/beagle-0.3.9-r5.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9-r5.ebuild,v 1.1 2011/02/15 11:07:27 pacho Exp $
+
+EAPI="3"
+
+inherit base gnome.org eutils mono mozextension autotools
+
+DESCRIPTION="Search tool that ransacks your personal information space to find whatever you're looking for"
+HOMEPAGE="http://www.beagle-project.org/"
+LICENSE="MIT Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="avahi chm debug doc eds firefox +galago gtk +pdf +inotify +ole thunderbird +google +xscreensaver"
+
+#See bug 248331 for blocker reason.
+RDEPEND="!!sci-libs/beagle
+	>dev-lang/mono-2.4
+	>=app-shells/bash-3.2
+	app-arch/zip
+	>=dev-db/sqlite-3.3.1
+	>=dev-dotnet/dbus-sharp-0.6.0
+	>=dev-dotnet/dbus-glib-sharp-0.4.1
+	>=dev-dotnet/taglib-sharp-2.0
+	gtk? (
+		x11-libs/libX11
+		>=gnome-base/librsvg-2.22.0
+		sys-devel/gettext
+		>=dev-dotnet/gtk-sharp-2.12.6
+		>=dev-dotnet/gconf-sharp-2.24.0
+		>=dev-dotnet/glade-sharp-2.12.6
+		>=dev-dotnet/gnome-sharp-2.24.0
+		>=dev-dotnet/gnomevfs-sharp-2.24.0
+		x11-misc/xdg-utils
+		>=x11-libs/gtk+-2.14.0
+		>=dev-libs/atk-1.22.0
+	)
+	eds? (
+		>=dev-dotnet/evolution-sharp-0.18.1
+		>=dev-dotnet/gconf-sharp-2.24.0
+		>=dev-dotnet/glib-sharp-2.12.6
+	)
+	ole? (
+		>=app-text/wv-1.2.3
+		>=dev-dotnet/gsf-sharp-0.8.1
+		>=app-office/gnumeric-1.4.3-r3
+	)
+
+	x11-misc/shared-mime-info
+	>=dev-dotnet/glib-sharp-2.12.6
+	dev-libs/gmime:2.4[mono]
+	chm? ( dev-libs/chmlib )
+	pdf? ( >=app-text/poppler-0.12.3-r3[utils] )
+	galago? ( >=dev-dotnet/galago-sharp-0.5.0 )
+	thunderbird? (
+			|| (
+				>=mail-client/thunderbird-1.5
+				>=mail-client/thunderbird-bin-1.5
+			)
+	)
+	firefox? (
+			|| (
+				>=www-client/firefox-1.5
+				>=www-client/firefox-bin-1.5
+			)
+	)
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	>=dev-libs/libbeagle-0.3.9
+	avahi?	( >=net-dns/avahi-0.6.10[mono] )"
+
+DEPEND="${RDEPEND}
+	doc? ( >=virtual/monodoc-1.2.4 )
+	dev-util/pkgconfig
+	xscreensaver? ( x11-proto/scrnsaverproto )
+	>=dev-util/intltool-0.35"
+
+pkg_setup() {
+	enewgroup beagleindex
+	enewuser beagleindex -1 -1 /var/lib/cache/beagle beagleindex
+	if use thunderbird
+	then
+		if ! use inotify
+		then
+			eerror "You have enabled the thunderbird use flag. This use-flag depends on the inotify use-flag."
+			eerror "Please enable the inotify use-flag also."
+			eerror "See http://bugs.gentoo.org/263781 for more information."
+			die "Please enable the inotify use-flag."
+		fi
+	fi
+}
+
+src_prepare() {
+	# Fix bugs.gnome.org/556243
+	sed -i	-e "s:libgnome-desktop-2.so.2:libgnome-desktop-2.so:" \
+		search/Beagle.Search.exe.config || die "gnome-desktop sed failed"
+
+	# Fix when using firefox 3.6
+	epatch "${FILESDIR}/${P}-firefox-3.6.patch"
+
+	# Fix building against gmime-2.4, bug #311499
+	epatch "${FILESDIR}/${P}-gmime24.patch"
+
+	# Remove bogus open check
+	epatch "${FILESDIR}/${P}-openfix.patch"
+
+	# Port to mono-2.6
+	epatch "${FILESDIR}/${P}-mono2.6.patch"
+
+	# Grow/shrink the number beagle-search results based on window size
+	epatch "${FILESDIR}/${P}-grow-shrink.patch"
+
+	# Update tileIndex when removing a tile
+	epatch "${FILESDIR}/${P}-update-tileindex.patch"
+
+	# Support mono-2.8, bug #341195
+	epatch "${FILESDIR}/${P}-mono2.8.patch"
+
+	# Fix crash on second search, bug #353533
+	epatch "${FILESDIR}/${P}-UnixConnectionHandler-exceptions.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_configure() {
+	econf 	--disable-static \
+		--disable-dependency-tracking \
+		--disable-epiphany-extension \
+		$(use_enable debug xml-dump) \
+		$(use_enable doc docs) \
+		$(use_enable thunderbird) \
+		$(use_enable eds evolution) \
+		$(use_enable gtk gui) \
+		$(use_enable ole gsf-sharp wv1) \
+		$(use_enable xscreensaver xss) \
+		$(use_enable inotify) \
+		$(use_enable avahi) \
+		$(use_enable google googlebackends)
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die "emake install failed."
+
+	dodoc AUTHORS NEWS README || die "dodoc failed"
+
+	declare MOZILLA_FIVE_HOME
+	if use firefox; then
+		xpi_unpack "${S}"/firefox-extension/beagle.xpi \
+		|| die "Unable to find Beagle Firefox Extension"
+		mv "${WORKDIR}"/beagle "${WORKDIR}"/firefox-beagle
+
+		if has_version '>=www-client/firefox-1.5'; then
+			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
+			xpi_install "${WORKDIR}"/firefox-beagle \
+			|| die "xpi install for firefox failed!"
+		fi
+		if has_version '>=www-client/firefox-bin-1.5'; then
+			MOZILLA_FIVE_HOME="/opt/firefox"
+			xpi_install "${WORKDIR}"/firefox-beagle \
+			|| die "xpi install for firefox-bin failed!"
+		fi
+	fi
+
+	if use thunderbird; then
+		xpi_unpack "${S}"/thunderbird-extension/beagle.xpi \
+		|| die "Unable to find Beagle Thunderbird Extension"
+		mv "${WORKDIR}"/beagle "${WORKDIR}"/thunderbird-beagle
+
+		if has_version '>=mail-client/thunderbird-1.5'; then
+			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
+			xpi_install "${WORKDIR}"/thunderbird-beagle \
+			|| die "xpi install for thunderbird failed!"
+		fi
+		if has_version '>=mail-client/thunderbird-bin-1.5'; then
+			MOZILLA_FIVE_HOME="/opt/thunderbird"
+			xpi_install "${WORKDIR}"/thunderbird-beagle \
+			|| die "xpi install for thunderbird-bin failed!"
+		fi
+	fi
+
+	sed -i -e 's/CRAWL_ENABLED="yes"/CRAWL_ENABLED="no"/' \
+		"${ED}"/etc/beagle/crawl-rules/crawl-*
+
+	insinto /etc/beagle/crawl-rules
+	doins "${FILESDIR}/crawl-portage"
+
+	keepdir "/usr/$(get_libdir)/beagle/Backends"
+	diropts -o beagleindex -g beagleindex
+	keepdir "/var/lib/cache/beagle/indexes"
+
+	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
+}
+
+pkg_postinst() {
+	elog "If available, Beagle greatly benefits from using certain operating"
+	elog "system features such as Extended Attributes and inotify."
+	elog
+	elog "If you want static queryables such as the portage tree and system"
+	elog "documentation you will need to edit the /etc/beagle/crawl-* files"
+	elog "and change CRAWL_ENABLE from 'no' to 'yes'."
+	elog
+	elog "For more info on how to create the optimal beagle environment, and"
+	elog "basic usage info, see the Gentoo page of the Beagle website:"
+	elog "http://www.beagle-project.org/Gentoo_Installation"
+}
diff --git a/app-misc/beagle/files/beagle-0.3.9-UnixConnectionHandler-exceptions.patch b/app-misc/beagle/files/beagle-0.3.9-UnixConnectionHandler-exceptions.patch
new file mode 100644
index 000000000000..ea63ddb2061f
--- /dev/null
+++ b/app-misc/beagle/files/beagle-0.3.9-UnixConnectionHandler-exceptions.patch
@@ -0,0 +1,42 @@
+From e4f2df4a6eedaf8038123f25b636580e4dfa04f3 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Mon, 14 Feb 2011 22:22:20 -0500
+Subject: [PATCH] Fix frequent beagled crashes under mono-2.8 (#641270)
+
+Beagled frequently crashes under mono-2.8 due to uncaught exceptions
+in UnixConnectionHandler.WatchCallback() (see Gnome bug #641270 and
+http://bugs.gentoo.org/show_bug.cgi?id=353533).
+These crashes have two origins.
+First, probably due to threading changes in mono, when WatchCallback()
+is called, client can be null, so we need to check for it.
+Second, presumably due to the exception policy changes in mono-2.8,
+client.GetStream().EndRead() legitimately - and fairly frequently -
+throws an IOException with Message "Not connected" and with a
+null InnerException (instead of a SocketException, as was the case
+under previous versions of mono); so we need to catch it.
+
+Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
+---
+ beagle/beagled/Server.cs |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/beagle/beagled/Server.cs b/beagle/beagled/Server.cs
+index 0892dd9..f2ad70f 100644
+--- a/beagle/beagled/Server.cs
++++ b/beagle/beagled/Server.cs
+@@ -462,9 +462,10 @@ namespace Beagle.Daemon {
+ 			int bytes_read = 0;
+ 
+ 			try {
+-				bytes_read = this.client.GetStream ().EndRead (ar);
++				if (this.client != null)
++					bytes_read = this.client.GetStream ().EndRead (ar);
+ 			} catch (IOException e) {
+-				if (! (e.InnerException is SocketException))
++				if (! (e.InnerException is SocketException) && e.Message != "Not connected")
+ 					throw e;
+ 			} catch (ObjectDisposedException) { }
+ 
+-- 
+1.7.4.1
+