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)

10 files changed, 20 insertions, 152 deletions

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