Added a patch to fix the security hole on beagle-status fixes bug #128136. Removed older and affected versions.

(Portage version: 2.1_pre7-r2)

18 files changed, 54 insertions, 764 deletions

diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog
index 9c74c8095edd..20758dde7edd 100644
--- a/app-misc/beagle/ChangeLog
+++ b/app-misc/beagle/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-misc/beagle
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.18 2006/03/25 03:56:49 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.19 2006/03/30 18:52:59 metalgod Exp $
+
+*beagle-0.2.3-r1 (30 Mar 2006)
+
+  30 Mar 2006; Luis Medinas <metalgod@gentoo.org>
+  -files/beagle-0.1.1-null-task-source.patch,
+  -files/beagle-0.1.1-uri-serialization.patch,
+  -files/beagle-0.2.1-noguisettings.patch,
+  +files/beagle-0.2.3-CVE-2006-1296.patch, -beagle-0.1.1.ebuild,
+  -beagle-0.1.2.ebuild, -beagle-0.2.1.ebuild, -beagle-0.2.1-r1.ebuild,
+  -beagle-0.2.2.1.ebuild, -beagle-0.2.3.ebuild, +beagle-0.2.3-r1.ebuild:
+  Added a patch to fix the security hole on beagle-status fixes bug #128136.
+  Removed older and affected versions.
 
   25 Mar 2006; Joseph Jezak <josejx@gentoo.org> beagle-0.2.2.1.ebuild,
   beagle-0.2.3.ebuild:
diff --git a/app-misc/beagle/Manifest b/app-misc/beagle/Manifest
index 8b7e26986367..e0afd7127af7 100644
--- a/app-misc/beagle/Manifest
+++ b/app-misc/beagle/Manifest
@@ -1,18 +1,24 @@
 MD5 c2aafc2e07a824a03ec84a8d392a44c1 ChangeLog 3101
-MD5 76fc6dcf5b9e19be1671056ac3189cff beagle-0.1.1.ebuild 3099
-MD5 6c9eeb1d3f0468b7745e166a4b7ff023 beagle-0.1.2.ebuild 2942
-MD5 bb3f90d420d3c65ef44abc33fa63ea46 beagle-0.2.1-r1.ebuild 3295
-MD5 a4d0d4e12a5c95d16915000787ccfdcd beagle-0.2.1.ebuild 3247
-MD5 7949ab2cf0c443523000b6f2e606abd3 beagle-0.2.2.1.ebuild 3089
+RMD160 faef2436d83e2fbba3a9321d67db4ad6466bb310 ChangeLog 3101
+SHA256 4e2d0664127e3c01d734b0c96effa18def0fa08e1e520cd114a83db3d9bdb294 ChangeLog 3101
+MD5 68bc2b532dd626f6c1e8d31b3f004d24 beagle-0.2.3-r1.ebuild 3133
+RMD160 a880598d625edb6957501a205e101cd3f1bf639c beagle-0.2.3-r1.ebuild 3133
+SHA256 067986f12b67caa1f8ed7e7e24a8dbcf0eee86e41ece58244447e41379eeafc2 beagle-0.2.3-r1.ebuild 3133
 MD5 035bfe54a5a2feb53324ea017272b9e6 beagle-0.2.3.ebuild 3087
-MD5 3375984ea7d16737cd465bae6ed3d928 files/beagle-0.1.1-null-task-source.patch 1347
-MD5 9c5c2f0ad3f959022b402ddba4dc671d files/beagle-0.1.1-uri-serialization.patch 2704
+RMD160 4893b3e490f2ddd0c6775b8b2b39766089da5a95 beagle-0.2.3.ebuild 3087
+SHA256 02cc13429e85711c25741e258597256a697989ada7432887cfc85614c632f2f4 beagle-0.2.3.ebuild 3087
 MD5 a8b3c0c4bcd3f1cd8572a271b142f3b5 files/beagle-0.2.1-multilib.patch 637
-MD5 4f027450fce7089b8233d682db4a3069 files/beagle-0.2.1-noguisettings.patch 897
-MD5 4840546d3689482f55c682ef01d4807b files/digest-beagle-0.1.1 66
-MD5 804bc08b17b5cd22cad5ceb7d6d45e9b files/digest-beagle-0.1.2 66
-MD5 28eeb69b044b7177e490c82774c03fc7 files/digest-beagle-0.2.1 244
-MD5 28eeb69b044b7177e490c82774c03fc7 files/digest-beagle-0.2.1-r1 244
-MD5 4584ba03bef906143737d8bf17542e00 files/digest-beagle-0.2.2.1 250
+RMD160 af87aa1d85dd0bdbf44f02a23914274d0420d2db files/beagle-0.2.1-multilib.patch 637
+SHA256 86867f480d7a0155aa5d6cc317c3d3483f45bb0751726c6c6ca5c839721f9062 files/beagle-0.2.1-multilib.patch 637
+MD5 75e9563024dda8df69aad86c615ae52a files/beagle-0.2.3-CVE-2006-1296.patch 474
+RMD160 8a997db07dc28d519212e5fe0a995a065a29971b files/beagle-0.2.3-CVE-2006-1296.patch 474
+SHA256 23e88f3ad291fd923cf9b346ca7cdcfedd975a9156683a36fa660f2a3d3852e1 files/beagle-0.2.3-CVE-2006-1296.patch 474
 MD5 61cf8ee79bc77bbf9093a7565d4a3454 files/digest-beagle-0.2.3 244
+RMD160 e71c7ab57f0fa065302d460c2059307ff93c831c files/digest-beagle-0.2.3 244
+SHA256 ba59a434d430c770e1bafd469dd29265b9302e2196032a0f67142b2ec78b0d8f files/digest-beagle-0.2.3 244
+MD5 61cf8ee79bc77bbf9093a7565d4a3454 files/digest-beagle-0.2.3-r1 244
+RMD160 e71c7ab57f0fa065302d460c2059307ff93c831c files/digest-beagle-0.2.3-r1 244
+SHA256 ba59a434d430c770e1bafd469dd29265b9302e2196032a0f67142b2ec78b0d8f files/digest-beagle-0.2.3-r1 244
 MD5 8c88e9a257d221daea17b7175a7f7947 metadata.xml 314
+RMD160 e3e5e79de0549124c4693d22e1a5c35a13510e87 metadata.xml 314
+SHA256 1a2e1ce6af1bd26a8f0a16c348c39be963f09c5c4986b66c3622f32c4e4f367e metadata.xml 314
diff --git a/app-misc/beagle/beagle-0.1.1.ebuild b/app-misc/beagle/beagle-0.1.1.ebuild
deleted file mode 100644
index c593da76538e..000000000000
--- a/app-misc/beagle/beagle-0.1.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.1.1.ebuild,v 1.6 2005/11/06 18:16:47 blubb Exp $
-
-inherit gnome.org eutils mono
-
-DESCRIPTION="Beagle is a 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="~x86"
-IUSE="spreadsheet pdf webservices wv chm debug"
-
-RDEPEND=">=dev-lang/mono-1.1.9.1
-	app-shells/bash
-	app-arch/zip
-	sys-devel/gettext
-	=dev-db/sqlite-2*
-	=gnome-base/gnome-vfs-2*
-	=gnome-base/libgnome-2*
-	>=www-client/mozilla-1.6
-	>=x11-libs/gtk+-2.6
-	>=dev-libs/glib-2.6
-	>=dev-dotnet/gtk-sharp-2.3
-	>=dev-dotnet/glade-sharp-2.3
-	>=dev-dotnet/gecko-sharp-0.11
-	>=dev-dotnet/gnome-sharp-2.3
-	>=dev-dotnet/gconf-sharp-2.3
-	>=dev-libs/gmime-2.1.16
-	>=dev-libs/atk-1.2.4
-	>=media-libs/libexif-0.6.0
-	>=dev-libs/libxml2-2.6.19
-	wv? ( =app-text/wv-1.0.3-r1 )
-	chm? ( app-doc/chmlib )
-	pdf? ( app-text/xpdf )
-	spreadsheet? ( >=app-office/gnumeric-1.4.3-r3 )
-	|| ( (
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )
-	virtual/x11 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	|| ( (
-		x11-proto/xproto
-		x11-proto/scrnsaverproto )
-	virtual/x11 )"
-
-pkg_setup() {
-	if built_with_use dev-libs/gmime mono
-	then
-		einfo "Mono support enabled in dev-libs/gmime, I will continue..."
-	else
-		eerror "Please rebuild dev-libs/gmime, with mono support enabled!"
-		eerror "Try USE=\"mono\" emerge dev-libs/gmime,"
-		eerror "or add \"mono\" to your USE string in /etc/make.conf and"
-		eerror "emerge dev-libs/gmime."
-		die "Mono USE flag must be enabled in dev-libs/gmime"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# To prevent excessive revdep-rebuild, gentoo's libexif is sticking to
-	# soversion 10 for now.
-	sed -i -e 's/EXIF_SOVERSION=12/EXIF_SOVERSION=10/' configure.in
-
-	# Don't log so much
-	! use debug && sed -i -e \
-		's/defaultLevel = LogLevel.Debug/defaultLevel = LogLevel.Info/' \
-		Util/Logger.cs
-
-	# Fix an indexing crasher
-	epatch ${FILESDIR}/${P}-null-task-source.patch
-
-	# Fix handling of filenames
-	epatch ${FILESDIR}/${P}-uri-serialization.patch
-
-	# We aren't compatible with wv-1.2.0 yet
-	sed -i -e 's/wv-1.0/wv-1.0 < 1.2.0/g' configure
-}
-
-src_compile() {
-	econf $(use_enable webservices) \
-		--enable-libbeagle \
-		--disable-evolution-sharp \
-		|| die "configure failed"
-	emake -j1 || die "Make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed!"
-
-	dodir /usr/share/beagle
-	insinto /usr/share/beagle
-	doins mozilla-extension/beagle.xpi
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-}
-
-pkg_postinst () {
-	einfo "If available, Beagle greatly benefits from using certain operating"
-	einfo "system features such as Extended Attributes and inotify."
-	echo
-	einfo "For more info on how to create the optimal beagle environment, and"
-	einfo "basic usage info, see the Gentoo page of the Beagle website:"
-	einfo " http://www.beagle-project.org/Gentoo_Installation"
-}
-
diff --git a/app-misc/beagle/beagle-0.1.2.ebuild b/app-misc/beagle/beagle-0.1.2.ebuild
deleted file mode 100644
index 3d0fe859ce22..000000000000
--- a/app-misc/beagle/beagle-0.1.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.1.2.ebuild,v 1.6 2006/01/09 22:30:05 mr_bones_ Exp $
-
-inherit gnome.org eutils mono
-
-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="~ppc ~x86"
-IUSE="spreadsheet pdf webservices chm debug"
-
-RDEPEND=">=dev-lang/mono-1.1.10
-	app-shells/bash
-	app-arch/zip
-	sys-devel/gettext
-	=dev-db/sqlite-2*
-	=gnome-base/gnome-vfs-2*
-	=gnome-base/libgnome-2*
-	>=www-client/mozilla-1.6
-	>=x11-libs/gtk+-2.6
-	>=dev-libs/glib-2.6
-	>=dev-dotnet/gtk-sharp-2.3
-	>=dev-dotnet/glade-sharp-2.3
-	>=dev-dotnet/gecko-sharp-0.11
-	>=dev-dotnet/gnome-sharp-2.3
-	>=dev-dotnet/gnomevfs-sharp-2.3
-	>=dev-dotnet/gconf-sharp-2.3
-	>=dev-libs/gmime-2.1.16
-	>=dev-libs/atk-1.2.4
-	>=media-libs/libexif-0.6.0
-	>=dev-libs/libxml2-2.6.19
-	chm? ( app-doc/chmlib )
-	pdf? ( app-text/xpdf )
-	spreadsheet? ( >=app-office/gnumeric-1.4.3-r3 )
-	|| ( ( x11-libs/libX11
-		x11-libs/libXScrnSaver
-		x11-libs/libXt )
-	virtual/x11 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	|| ( (	x11-proto/xproto
-		x11-proto/scrnsaverproto )
-	virtual/x11 )"
-
-EXTRA_EMAKE="-j1"
-
-pkg_setup() {
-	if built_with_use dev-libs/gmime mono
-	then
-		einfo "Mono support enabled in dev-libs/gmime, I will continue..."
-	else
-		eerror "Please rebuild dev-libs/gmime, with mono support enabled!"
-		eerror "Try USE=\"mono\" emerge dev-libs/gmime,"
-		eerror "or add \"mono\" to your USE string in /etc/make.conf and"
-		eerror "emerge dev-libs/gmime."
-		die "Mono USE flag must be enabled in dev-libs/gmime"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# To prevent excessive revdep-rebuild, gentoo's libexif is sticking to
-	# soversion 10 for now.
-	sed -i -e 's/EXIF_SOVERSION=12/EXIF_SOVERSION=10/' configure.in
-
-	# Multilib fix
-	sed -i -e 's:prefix mono`/lib:libdir mono`:' \
-		${S}/{configure.in,configure} || die "sed failed"
-
-	# Don't log so much
-	! use debug && sed -i -e \
-		's/defaultLevel = LogLevel.Debug/defaultLevel = LogLevel.Info/' \
-		Util/Logger.cs
-}
-
-src_compile() {
-	econf $(use_enable webservices) \
-		--enable-libbeagle \
-		--disable-evolution-sharp \
-		|| die "configure failed"
-	emake -j1 || die "Make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed!"
-
-	dodir /usr/share/beagle
-	insinto /usr/share/beagle
-	doins mozilla-extension/beagle.xpi
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-}
-
-pkg_postinst() {
-	einfo "If available, Beagle greatly benefits from using certain operating"
-	einfo "system features such as Extended Attributes and inotify."
-	echo
-	einfo "For more info on how to create the optimal beagle environment, and"
-	einfo "basic usage info, see the Gentoo page of the Beagle website:"
-	einfo " http://www.beagle-project.org/Gentoo_Installation"
-}
diff --git a/app-misc/beagle/beagle-0.2.1-r1.ebuild b/app-misc/beagle/beagle-0.2.1-r1.ebuild
deleted file mode 100644
index f16a3084db54..000000000000
--- a/app-misc/beagle/beagle-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.2.1-r1.ebuild,v 1.1 2006/03/04 16:16:59 metalgod Exp $
-
-inherit gnome.org eutils autotools mono
-
-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="~x86"
-IUSE="debug evo gtk ole pdf python"
-
-RDEPEND="
-	>=dev-lang/mono-1.1.10
-	app-shells/bash
-	app-arch/zip
-	sys-devel/gettext
-	>=x11-libs/gtk+-2.6.0
-	>=dev-libs/atk-1.2.4
-	>=dev-libs/gmime-2.1.19
-	>=dev-dotnet/gtk-sharp-2.8
-	>=gnome-base/librsvg-2.0
-	>=media-libs/libexif-0.6.0
-	>=dev-libs/libxml2-2.6.19
-
-	||		( 	>=dev-db/sqlite-3.3.1
-				=dev-db/sqlite-2* )
-
-	||	(	(	x11-libs/libX11
-				x11-libs/libXScrnSaver
-				x11-libs/libXt )
-		virtual/x11 )
-
-	gtk?	(	>=dev-dotnet/gconf-sharp-2.8
-				>=dev-dotnet/glade-sharp-2.8
-				>=dev-dotnet/gnome-sharp-2.8
-				>=dev-dotnet/gnome-sharp-2.8 )
-
-	python? (	>=dev-lang/python-2.3
-				>=dev-python/pygtk-2.6 )
-
-	evo?	(	>=dev-dotnet/evolution-sharp-0.10.2
-				>=dev-dotnet/gconf-sharp-2.3 )
-
-	ole?	(	app-text/wv
-				>=dev-dotnet/gsf-sharp-0.6
-				>=app-office/gnumeric-1.4.3-r3 )
-"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	|| ( (	x11-proto/xproto
-		x11-proto/scrnsaverproto )
-	virtual/x11 )"
-
-pkg_setup() {
-	if built_with_use dev-libs/gmime mono
-	then
-		einfo "Mono support enabled in dev-libs/gmime, I will continue..."
-	else
-		eerror "Please rebuild dev-libs/gmime, with mono support enabled!"
-		eerror "Try USE=\"mono\" emerge dev-libs/gmime,"
-		eerror "or add \"mono\" to your USE string in /etc/make.conf and"
-		eerror "emerge dev-libs/gmime."
-		die "Mono USE flag must be enabled in dev-libs/gmime"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# To prevent excessive revdep-rebuild, gentoo's libexif is sticking to
-	# soversion 10 for now.
-	sed -i -e 's/EXIF_SOVERSION=12/EXIF_SOVERSION=10/' configure.in
-
-	# Multilib fix
-	sed -i -e 's:prefix mono`/lib:libdir mono`:' \
-		${S}/configure.in || die "sed failed"
-
-	# Sqlite configure check fix
-	sed -i -e 's/SQLITE, sqlite3/SQLITE3, sqlite3/' configure.in
-
-	# Sqlite version fix
-	sed -i -e 's/sqlite3 >= 3.3.1/sqlite3 >= 3.3/' configure.in
-
-	# Don't log so much
-	! use debug && sed -i -e \
-		's/defaultLevel = LogLevel.Debug/defaultLevel = LogLevel.Info/' \
-		Util/Logger.cs
-
-	epatch ${FILESDIR}/${P}-multilib.patch
-	epatch ${FILESDIR}/${P}-noguisettings.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable evo evolution) \
-		$(use_enable gtk gui) \
-		$(use_enable python ) \
-		--enable-libbeagle \
-		|| die "configure failed"
-	emake || die "Make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed!"
-
-	dodir /usr/share/beagle
-	insinto /usr/share/beagle
-	doins mozilla-extension/beagle.xpi
-
-	dodoc AUTHORS INSTALL NEWS README
-}
-
-pkg_postinst() {
-	einfo "If available, Beagle greatly benefits from using certain operating"
-	einfo "system features such as Extended Attributes and inotify."
-	echo
-	einfo "For more info on how to create the optimal beagle environment, and"
-	einfo "basic usage info, see the Gentoo page of the Beagle website:"
-	einfo " http://www.beagle-project.org/Gentoo_Installation"
-}
-
diff --git a/app-misc/beagle/beagle-0.2.1.ebuild b/app-misc/beagle/beagle-0.2.1.ebuild
deleted file mode 100644
index 3feb449a8fa6..000000000000
--- a/app-misc/beagle/beagle-0.2.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.2.1.ebuild,v 1.4 2006/02/26 20:04:46 metalgod Exp $
-
-inherit gnome.org eutils autotools mono
-
-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="~x86"
-IUSE="debug evo gtk ole pdf python"
-
-RDEPEND="
-	>=dev-lang/mono-1.1.10
-	app-shells/bash
-	app-arch/zip
-	sys-devel/gettext
-	>=x11-libs/gtk+-2.6.0
-	>=dev-libs/atk-1.2.4
-	>=dev-libs/gmime-2.1.19
-	>=dev-dotnet/gtk-sharp-2.8
-	>=gnome-base/librsvg-2.0
-	>=media-libs/libexif-0.6.0
-	>=dev-libs/libxml2-2.6.19
-
-	||		( 	>=dev-db/sqlite-3.3.1
-				=dev-db/sqlite-2* )
-
-	||	(	(	x11-libs/libX11
-				x11-libs/libXScrnSaver
-				x11-libs/libXt )
-		virtual/x11 )
-
-	gtk?	(	>=dev-dotnet/gconf-sharp-2.8
-				>=dev-dotnet/glade-sharp-2.8
-				>=dev-dotnet/gnome-sharp-2.8
-				>=dev-dotnet/gnome-sharp-2.8 )
-
-	python? (	>=dev-lang/python-2.3
-				>=dev-python/pygtk-2.6 )
-
-	evo?	(	>=dev-dotnet/evolution-sharp-0.10.2
-				>=dev-dotnet/gconf-sharp-2.3 )
-
-	ole?	(	app-text/wv
-				>=dev-dotnet/gsf-sharp-0.6
-				>=app-office/gnumeric-1.4.3-r3 )
-"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	|| ( (	x11-proto/xproto
-		x11-proto/scrnsaverproto )
-	virtual/x11 )"
-
-pkg_setup() {
-	if built_with_use dev-libs/gmime mono
-	then
-		einfo "Mono support enabled in dev-libs/gmime, I will continue..."
-	else
-		eerror "Please rebuild dev-libs/gmime, with mono support enabled!"
-		eerror "Try USE=\"mono\" emerge dev-libs/gmime,"
-		eerror "or add \"mono\" to your USE string in /etc/make.conf and"
-		eerror "emerge dev-libs/gmime."
-		die "Mono USE flag must be enabled in dev-libs/gmime"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# To prevent excessive revdep-rebuild, gentoo's libexif is sticking to
-	# soversion 10 for now.
-	sed -i -e 's/EXIF_SOVERSION=12/EXIF_SOVERSION=10/' configure.in
-
-	# Multilib fix
-	sed -i -e 's:prefix mono`/lib:libdir mono`:' \
-		${S}/configure.in || die "sed failed"
-
-	# Sqlite configure check fix
-	sed -i -e 's/SQLITE, sqlite3/SQLITE3, sqlite3/' configure.in
-
-	# Sqlite version fix
-	sed -i -e 's/sqlite3 >= 3.3.1/sqlite3 >= 3.3/' configure.in
-
-	# Don't log so much
-	! use debug && sed -i -e \
-		's/defaultLevel = LogLevel.Debug/defaultLevel = LogLevel.Info/' \
-		Util/Logger.cs
-
-	epatch ${FILESDIR}/${P}-multilib.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable evo evolution) \
-		$(use_enable gtk gui) \
-		$(use_enable python ) \
-		--enable-libbeagle \
-		|| die "configure failed"
-	emake || die "Make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed!"
-
-	dodir /usr/share/beagle
-	insinto /usr/share/beagle
-	doins mozilla-extension/beagle.xpi
-
-	dodoc AUTHORS INSTALL NEWS README
-}
-
-pkg_postinst() {
-	einfo "If available, Beagle greatly benefits from using certain operating"
-	einfo "system features such as Extended Attributes and inotify."
-	echo
-	einfo "For more info on how to create the optimal beagle environment, and"
-	einfo "basic usage info, see the Gentoo page of the Beagle website:"
-	einfo " http://www.beagle-project.org/Gentoo_Installation"
-}
-
diff --git a/app-misc/beagle/beagle-0.2.2.1.ebuild b/app-misc/beagle/beagle-0.2.3-r1.ebuild
index 290f07d9bed1..7c5f58a8feab 100644
--- a/app-misc/beagle/beagle-0.2.2.1.ebuild
+++ b/app-misc/beagle/beagle-0.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.2.2.1.ebuild,v 1.3 2006/03/25 03:56:49 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.2.3-r1.ebuild,v 1.1 2006/03/30 18:52:59 metalgod Exp $
 
 inherit gnome.org eutils autotools mono
 
@@ -86,6 +86,7 @@ src_unpack() {
 		Util/Logger.cs
 
 	epatch ${FILESDIR}/${PN}-0.2.1-multilib.patch
+	epatch ${FILESDIR}/${P}-CVE-2006-1296.patch
 
 	eautoreconf
 }
diff --git a/app-misc/beagle/beagle-0.2.3.ebuild b/app-misc/beagle/beagle-0.2.3.ebuild
deleted file mode 100644
index 94a7125a7b44..000000000000
--- a/app-misc/beagle/beagle-0.2.3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.2.3.ebuild,v 1.3 2006/03/25 03:56:49 josejx Exp $
-
-inherit gnome.org eutils autotools mono
-
-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="debug evo gtk ole pdf python"
-
-RDEPEND="
-	>=dev-lang/mono-1.1.10
-	app-shells/bash
-	app-arch/zip
-	sys-devel/gettext
-	>=x11-libs/gtk+-2.6.0
-	>=dev-libs/atk-1.2.4
-	>=dev-libs/gmime-2.1.19
-	>=dev-dotnet/gtk-sharp-2.8
-	>=gnome-base/librsvg-2.0
-	>=media-libs/libexif-0.6.0
-	>=dev-libs/libxml2-2.6.19
-
-	||		( 	>=dev-db/sqlite-3.3.1
-				=dev-db/sqlite-2* )
-
-	||	(	(	x11-libs/libX11
-				x11-libs/libXScrnSaver
-				x11-libs/libXt )
-		virtual/x11 )
-
-	gtk?	(	>=dev-dotnet/gconf-sharp-2.8
-				>=dev-dotnet/glade-sharp-2.8
-				>=dev-dotnet/gnome-sharp-2.8
-				>=dev-dotnet/gnome-sharp-2.8 )
-
-	python? (	>=dev-lang/python-2.3
-				>=dev-python/pygtk-2.6 )
-
-	evo?	(	>=dev-dotnet/evolution-sharp-0.10.2
-				>=dev-dotnet/gconf-sharp-2.3 )
-
-	ole?	(	app-text/wv
-				>=dev-dotnet/gsf-sharp-0.6
-				>=app-office/gnumeric-1.4.3-r3 )
-"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	|| ( (	x11-proto/xproto
-		x11-proto/scrnsaverproto )
-	virtual/x11 )"
-
-pkg_setup() {
-	if built_with_use dev-libs/gmime mono
-	then
-		einfo "Mono support enabled in dev-libs/gmime, I will continue..."
-	else
-		eerror "Please rebuild dev-libs/gmime, with mono support enabled!"
-		eerror "Try USE=\"mono\" emerge dev-libs/gmime,"
-		eerror "or add \"mono\" to your USE string in /etc/make.conf and"
-		eerror "emerge dev-libs/gmime."
-		die "Mono USE flag must be enabled in dev-libs/gmime"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# To prevent excessive revdep-rebuild, gentoo's libexif is sticking to
-	# soversion 10 for now.
-	sed -i -e 's/EXIF_SOVERSION=12/EXIF_SOVERSION=10/' configure.in
-
-	# Multilib fix
-	sed -i -e 's:prefix mono`/lib:libdir mono`:' \
-		${S}/configure.in || die "sed failed"
-
-	# Don't log so much
-	! use debug && sed -i -e \
-		's/defaultLevel = LogLevel.Debug/defaultLevel = LogLevel.Info/' \
-		Util/Logger.cs
-
-	epatch ${FILESDIR}/${PN}-0.2.1-multilib.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable evo evolution) \
-		$(use_enable gtk gui) \
-		$(use_enable python ) \
-		--enable-libbeagle \
-		|| die "configure failed"
-	emake || die "Make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed!"
-
-	dodir /usr/share/beagle
-	insinto /usr/share/beagle
-	doins mozilla-extension/beagle.xpi
-
-	dodoc AUTHORS INSTALL NEWS README
-}
-
-pkg_postinst() {
-	einfo "If available, Beagle greatly benefits from using certain operating"
-	einfo "system features such as Extended Attributes and inotify."
-	echo
-	einfo "For more info on how to create the optimal beagle environment, and"
-	einfo "basic usage info, see the Gentoo page of the Beagle website:"
-	einfo " http://www.beagle-project.org/Gentoo_Installation"
-}
-
diff --git a/app-misc/beagle/files/beagle-0.1.1-null-task-source.patch b/app-misc/beagle/files/beagle-0.1.1-null-task-source.patch
deleted file mode 100644
index 2e742dcd7611..000000000000
--- a/app-misc/beagle/files/beagle-0.1.1-null-task-source.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- beagled/KopeteQueryable/KopeteQueryable.cs	29 Aug 2005 05:34:06 -0000	1.3
-+++ beagled/KopeteQueryable/KopeteQueryable.cs	6 Oct 2005 12:40:52 -0000	1.4
-@@ -74,8 +74,9 @@ namespace Beagle.Daemon.KopeteQueryable 
- 
- 			if (!Inotify.Enabled) {
- 				Scheduler.Task task = Scheduler.TaskFromHook (new Scheduler.TaskHook (CrawlHook));
--                                task.Tag = "Crawling ~/.kopete/logs to find new logfiles";
--                                ThisScheduler.Add (task);
-+				task.Tag = "Crawling ~/.kopete/logs to find new logfiles";
-+				task.Source = this;
-+				ThisScheduler.Add (task);
- 			}
- 
- 			stopwatch.Stop ();
---- beagled/IndexSynchronization.cs	13 Jul 2005 16:28:40 -0000	1.1
-+++ beagled/IndexSynchronization.cs	6 Oct 2005 15:51:45 -0000
-@@ -68,12 +68,14 @@ namespace Beagle.Daemon {
- 			task.Tag = "Synchronize Indexes";
- 			task.Priority = Scheduler.Priority.Delayed;
- 			task.TriggerTime = DateTime.Now.AddMinutes (sync_interval_in_minutes);
-+			task.Source = synchronization_lock;
- 			Scheduler.Global.Add (task);
- 
- 			// Set up the shutdown synchronization task
- 			task = Scheduler.TaskFromHook (new Scheduler.TaskHook (ShutdownHook));
- 			task.Tag = "Synchronize Indexes on Shutdown";
- 			task.Priority = Scheduler.Priority.Shutdown;
-+			task.Source = synchronization_lock;
- 			Scheduler.Global.Add (task);
- 		}
- 
diff --git a/app-misc/beagle/files/beagle-0.1.1-uri-serialization.patch b/app-misc/beagle/files/beagle-0.1.1-uri-serialization.patch
deleted file mode 100644
index 181c6e734e86..000000000000
--- a/app-misc/beagle/files/beagle-0.1.1-uri-serialization.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- beagle-0.1.1/Util/UriFu.cs.orig	2005-10-24 14:13:05.000000000 +0100
-+++ beagle-0.1.1/Util/UriFu.cs	2005-10-24 14:13:18.000000000 +0100
-@@ -42,58 +42,35 @@ namespace Beagle.Util {
- 
- 		static public Uri UriStringToUri (string path)
- 		{
--			// Decode our pre-encoded 'odd' characters into their real values
--			int i = 0, pos = 0;
--			while ((i = path.IndexOf ('%', pos)) != -1) {
--				pos = i;
--				char unescaped = UriFu.HexUnescape (path, ref pos);
--				if (unescaped < '!' || unescaped > '~') {
--					path = path.Remove (i, 3);
--					path = path.Insert (i, new String(unescaped, 1));
--					pos -= 2;
--				}
--			}
--		
--			// Paths from the file:// indexer need (re)quoting. For example,
--			// valid characters such as @ need to be converted to their hex
--			// values.
--			if (path.StartsWith ("file://")) {
--				// Remove the file:// prefix
--				path = path.Substring (7);
--
--				return PathToFileUri (path);
--			}
--			
--			// Currently, no other protocols need extra processing
-+			// Our current hackery attempts to serialize Uri strings in
-+			// escaped and constructable form, so we don't require any
-+			// extra processing on deserialization right now.
- 			return new Uri (path, true);
- 		}
- 
- 		static public String UriToSerializableString (Uri uri)
- 		{
- 			int i;
--			string ret;
-+			string path;
- 			StringBuilder builder = new StringBuilder ();
--			
--			// The ToString() of a file:// URI is not always representative of
--			// what it was constructed from. For example, it will return a
--			// # (which was inputted as %23) as %23, whereas the more standard
--			// behaviour for other escaped-characters is to return them as
--			// their actual character. (e.g. %40 gets returned as @)
--			// On the other hand, the LocalPath of a file:// URI does seem to
--			// return the literal # so we use that instead.
-+
- 			if (uri.IsFile)
--				ret = Uri.UriSchemeFile + Uri.SchemeDelimiter + uri.LocalPath;
-+				path = Uri.UriSchemeFile + Uri.SchemeDelimiter
-+					+ StringFu.HexEscape (uri.LocalPath);
- 			else
--				ret = uri.ToString ();
-+				path = uri.ToString ();
- 
- 			// XmlSerializer is happy to serialize 'odd' characters, but doesn't
- 			// like to deserialize them. So we encode all 'odd' characters now.
--			for (i = 0; i < ret.Length; i++)
--				if ((ret [i] < '!') || (ret [i] > '~' && ret [i] < 256))
--					builder.Append (Uri.HexEscape (ret [i]));
-+			for (i = 0; i < path.Length; i++)
-+				if ((path [i] < '!') || (path [i] > '~' && path [i] < 256))
-+					builder.Append (Uri.HexEscape (path [i]));
- 				else
--					builder.Append (ret [i]);
-+					builder.Append (path [i]);
- 
-+			if (uri.IsFile)
-+				builder.Append (uri.Fragment);
-+			
- 			return builder.ToString ();
- 		}
- 
diff --git a/app-misc/beagle/files/beagle-0.2.1-noguisettings.patch b/app-misc/beagle/files/beagle-0.2.1-noguisettings.patch
deleted file mode 100644
index 9fabf46ffaa1..000000000000
--- a/app-misc/beagle/files/beagle-0.2.1-noguisettings.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-http://bugs.gentoo.org/124192
-
-Index: tools/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/beagle/tools/Makefile.am,v
-retrieving revision 1.68
-diff -u -B -p -r1.68 Makefile.am
---- tools/Makefile.am	15 Feb 2006 21:06:01 -0000	1.68
-+++ tools/Makefile.am	2 Mar 2006 13:29:55 -0000
-@@ -3,9 +3,6 @@
- 
- CSC = mcs -debug -nowarn:0169
- 
--applicationsdir = $(datadir)/applications
--applications_DATA = beagle-settings.desktop
--
- LOCAL_ASSEMBLIES =			\
- 	../Util/Util.dll		\
- 	../BeagleClient/Beagle.dll
-@@ -167,12 +164,13 @@ man_MANS = 			\
- 
- @INTLTOOL_DESKTOP_RULE@
- 
-+if ENABLE_GUI
- desktop_in_files = beagle-settings.desktop.in
- desktop_files = $(desktop_in_files:.desktop.in=.desktop)
--desktop_h_files = $(desktop_in_files:.in=.in.h)
- 
- desktopdir = $(datadir)/applications
- desktop_DATA = $(desktop_files)
-+endif
- 
- all: $(TARGETS) $(WRAPPERS)
- 
diff --git a/app-misc/beagle/files/beagle-0.2.3-CVE-2006-1296.patch b/app-misc/beagle/files/beagle-0.2.3-CVE-2006-1296.patch
new file mode 100644
index 000000000000..656345d25c96
--- /dev/null
+++ b/app-misc/beagle/files/beagle-0.2.3-CVE-2006-1296.patch
@@ -0,0 +1,20 @@
+--- tools/beagle-status.orig	2006-03-30 19:28:02.499463328 +0000
++++ tools/beagle-status	2006-03-30 19:31:22.306088104 +0000
+@@ -1,15 +1,4 @@
+ #!/bin/sh
+ 
+-if [ -x "./beagle-info" ]; then
+-    CMD="./beagle-info"
+-else
+-    CMD="beagle-info"
+-fi
+-
+-while [ 1 ]; do
+-    str=`$CMD --status | head -n 20`
+-    clear
+-    echo "$str"
+-    # beagle-info causes a CPU spike, keep the hammering low
+-    sleep 5
+-done
++#to avoid the security hole
++watch -n 5 beagle-info --status
diff --git a/app-misc/beagle/files/digest-beagle-0.1.1 b/app-misc/beagle/files/digest-beagle-0.1.1
deleted file mode 100644
index 0502b41f4e14..000000000000
--- a/app-misc/beagle/files/digest-beagle-0.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e788ed11077e576797a0793631f2fe8b beagle-0.1.1.tar.bz2 1178163
diff --git a/app-misc/beagle/files/digest-beagle-0.1.2 b/app-misc/beagle/files/digest-beagle-0.1.2
deleted file mode 100644
index c52c28b0c7a3..000000000000
--- a/app-misc/beagle/files/digest-beagle-0.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 944553979659ed21a68bba307126126a beagle-0.1.2.tar.bz2 1208113
diff --git a/app-misc/beagle/files/digest-beagle-0.2.1 b/app-misc/beagle/files/digest-beagle-0.2.1
deleted file mode 100644
index 1db69e2d5499..000000000000
--- a/app-misc/beagle/files/digest-beagle-0.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 325ed91dc66fb6be060d0a5f4c8f56dd beagle-0.2.1.tar.bz2 1289109
-RMD160 e6df93f74b8481a2a4e1b5a01d79bdfe206fb618 beagle-0.2.1.tar.bz2 1289109
-SHA256 46e1bc5b93046f89d4ea825a106d5f99e76792aff9376e1e92c8699b1a06e125 beagle-0.2.1.tar.bz2 1289109
diff --git a/app-misc/beagle/files/digest-beagle-0.2.1-r1 b/app-misc/beagle/files/digest-beagle-0.2.1-r1
deleted file mode 100644
index 1db69e2d5499..000000000000
--- a/app-misc/beagle/files/digest-beagle-0.2.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 325ed91dc66fb6be060d0a5f4c8f56dd beagle-0.2.1.tar.bz2 1289109
-RMD160 e6df93f74b8481a2a4e1b5a01d79bdfe206fb618 beagle-0.2.1.tar.bz2 1289109
-SHA256 46e1bc5b93046f89d4ea825a106d5f99e76792aff9376e1e92c8699b1a06e125 beagle-0.2.1.tar.bz2 1289109
diff --git a/app-misc/beagle/files/digest-beagle-0.2.2.1 b/app-misc/beagle/files/digest-beagle-0.2.2.1
deleted file mode 100644
index 48aa0c1b8920..000000000000
--- a/app-misc/beagle/files/digest-beagle-0.2.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4d153ebc1c72a4d8f05562d387877abb beagle-0.2.2.1.tar.bz2 1324915
-RMD160 a5faa250373b3d7bdfd79eb41b14afff3c711c9b beagle-0.2.2.1.tar.bz2 1324915
-SHA256 0bd39bb0f12baf72eeaac7dab78212d7c9ed57f6e4afa6be02b9f6a243a32595 beagle-0.2.2.1.tar.bz2 1324915
diff --git a/app-misc/beagle/files/digest-beagle-0.2.3 b/app-misc/beagle/files/digest-beagle-0.2.3-r1
index ee054ff477ff..ee054ff477ff 100644
--- a/app-misc/beagle/files/digest-beagle-0.2.3
+++ b/app-misc/beagle/files/digest-beagle-0.2.3-r1