Version bump by security for untrusted search path vulnerability (CVE-2005-4790, bug #199841). Cleaning up old patches.

(Portage version: 2.1.4_rc10)

9 files changed, 63 insertions, 178 deletions

diff --git a/net-news/blam/ChangeLog b/net-news/blam/ChangeLog
index 2b582cbc7b1a..5399911eac30 100644
--- a/net-news/blam/ChangeLog
+++ b/net-news/blam/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-news/blam
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/blam/ChangeLog,v 1.41 2007/01/27 13:10:47 armin76 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/blam/ChangeLog,v 1.42 2008/01/08 02:40:46 rbu Exp $
+
+*blam-1.8.4 (08 Jan 2008)
+
+  08 Jan 2008; Robert Buchholz <rbu@gentoo.org>
+  -files/blam-1.6.0-gecko-fix.diff,
+  -files/blam-1.6.1-mono-1.1.7-compat.diff,
+  -files/blam-1.6.1-mono-1.1.7-compat-v2.diff,
+  -files/blam-1.8.2-64-bit-int.diff, -files/blam-1.8.2-mono-1.1.17-fix.diff,
+  -files/blam-1.8.2-seamonkey.patch, +blam-1.8.4.ebuild:
+  Version bump by security for untrusted search path vulnerability
+  (CVE-2005-4790, bug #199841). Cleaning up old patches.
 
   27 Jan 2007; Raúl Porcel <armin76@gentoo.org> -blam-1.6.1-r2.ebuild,
   -blam-1.8.0.ebuild, -blam-1.8.2-r2.ebuild:
diff --git a/net-news/blam/blam-1.8.4.ebuild b/net-news/blam/blam-1.8.4.ebuild
new file mode 100644
index 000000000000..4ac90eee3e29
--- /dev/null
+++ b/net-news/blam/blam-1.8.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/blam/blam-1.8.4.ebuild,v 1.1 2008/01/08 02:40:46 rbu Exp $
+
+inherit mono eutils autotools
+
+DESCRIPTION="A RSS aggregator written in C#"
+HOMEPAGE="http://www.cmartin.tk/blam.html"
+SRC_URI="http://www.cmartin.tk/blam/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/mono-1.1.17
+		>=dev-dotnet/gtk-sharp-2.8.2
+		>=dev-dotnet/gconf-sharp-2.8.2
+		>=dev-dotnet/glade-sharp-2.8.2
+		>=dev-dotnet/gecko-sharp-0.11-r1
+		>=gnome-base/libgnomeui-2.2
+		>=gnome-base/gconf-2.4"
+DEPEND="${RDEPEND}
+		sys-devel/gettext
+		>=dev-util/pkgconfig-0.19
+		>=dev-util/intltool-0.25"
+
+# Disable parallel builds
+MAKEOPTS="$MAKEOPTS -j1"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if [[ "$(get_libdir)" != "lib" ]] ; then
+		sed -i -e 's:$(prefix)/lib/blam:$(libdir)/blam:' \
+			-e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
+			"${S}"/{,lib,libblam,src}/Makefile.{in,am} "${S}"/blam.in || die
+	fi
+
+	eautomake
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+}
diff --git a/net-news/blam/files/blam-1.6.0-gecko-fix.diff b/net-news/blam/files/blam-1.6.0-gecko-fix.diff
deleted file mode 100644
index a12350274359..000000000000
--- a/net-news/blam/files/blam-1.6.0-gecko-fix.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -aur blam-1.6.0/libblam/blam-gecko-utils.cpp blam-1.6.0-gecko-fix/libblam/blam-gecko-utils.cpp
---- blam-1.6.0/libblam/blam-gecko-utils.cpp	2004-10-23 10:10:52.000000000 -0400
-+++ blam-1.6.0-gecko-fix/libblam/blam-gecko-utils.cpp	2004-10-25 10:43:04.752486280 -0400
-@@ -31,11 +31,8 @@
- #include <nsEmbedString.h>
- #include <nsIPrefService.h>
- #include <nsIServiceManager.h>
--#include <nsIWindowWatcher.h>
--#include <nsIIOService.h>
- #include <nsISupportsPrimitives.h>
- #include <nsILocalFile.h>
--#include <nsIURI.h>
- 
- #if defined (HAVE_CHROME_NSICHROMEREGISTRYSEA_H)
- #include <chrome/nsIChromeRegistrySea.h>
diff --git a/net-news/blam/files/blam-1.6.1-mono-1.1.7-compat-v2.diff b/net-news/blam/files/blam-1.6.1-mono-1.1.7-compat-v2.diff
deleted file mode 100644
index e91b041ed103..000000000000
--- a/net-news/blam/files/blam-1.6.1-mono-1.1.7-compat-v2.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -aur blam-1.6.1-orig/src/FeedUpdater.cs blam-1.6.1/src/FeedUpdater.cs
---- blam-1.6.1-orig/src/FeedUpdater.cs	2004-10-20 20:21:46.000000000 -0400
-+++ blam-1.6.1/src/FeedUpdater.cs	2005-05-07 11:23:01.000000000 -0400
-@@ -22,9 +22,14 @@
- 		string lastModified;
- 		string eTag;
- 
--		WebRequest req = WebRequest.Create(channel.Url);
--		req.Headers.Add("If-Modified-Since", channel.LastModified);
--		req.Headers.Add("If-None-Match", channel.ETag);
-+		HttpWebRequest req = (HttpWebRequest) WebRequest.Create(channel.Url);
-+		if (channel.LastModified != "") {
-+			req.IfModifiedSince = DateTime.Parse(channel.LastModified);
-+		}
-+
-+		if (channel.ETag != "") {
-+			req.Headers.Add("If-None-Match", channel.ETag);
-+		}
- 	
- 		req.Timeout = 20000;
- 		WebResponse res = null;
diff --git a/net-news/blam/files/blam-1.6.1-mono-1.1.7-compat.diff b/net-news/blam/files/blam-1.6.1-mono-1.1.7-compat.diff
deleted file mode 100644
index 4bd31bb9f9e2..000000000000
--- a/net-news/blam/files/blam-1.6.1-mono-1.1.7-compat.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -aur blam-1.6.1-orig/src/FeedUpdater.cs blam-1.6.1/src/FeedUpdater.cs
---- blam-1.6.1-orig/src/FeedUpdater.cs	2004-10-20 20:21:46.000000000 -0400
-+++ blam-1.6.1/src/FeedUpdater.cs	2005-05-05 20:49:17.000000000 -0400
-@@ -22,8 +22,8 @@
- 		string lastModified;
- 		string eTag;
- 
--		WebRequest req = WebRequest.Create(channel.Url);
--		req.Headers.Add("If-Modified-Since", channel.LastModified);
-+		HttpWebRequest req = (HttpWebRequest) WebRequest.Create(channel.Url);
-+		req.IfModifiedSince = DateTime.Parse(channel.LastModified);
- 		req.Headers.Add("If-None-Match", channel.ETag);
- 	
- 		req.Timeout = 20000;
diff --git a/net-news/blam/files/blam-1.8.2-64-bit-int.diff b/net-news/blam/files/blam-1.8.2-64-bit-int.diff
deleted file mode 100644
index cc019e89bd9e..000000000000
--- a/net-news/blam/files/blam-1.8.2-64-bit-int.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN blam-1.8.2.orig/src/egg-sharp.cs blam-1.8.2/src/egg-sharp.cs
---- blam-1.8.2.orig/src/egg-sharp.cs	2005-12-05 15:02:00.000000000 +0000
-+++ blam-1.8.2/src/egg-sharp.cs	2005-12-05 15:02:50.000000000 +0000
-@@ -168,7 +168,7 @@
- 	[StructLayout(LayoutKind.Sequential)]
- 	internal struct XClientMessageEvent {
- 		internal XEventName     type;
--		internal int            serial;
-+		internal IntPtr         serial;
- 		internal bool           send_event;
- 		internal IntPtr         display;
- 		internal IntPtr         window;
diff --git a/net-news/blam/files/blam-1.8.2-mono-1.1.17-fix.diff b/net-news/blam/files/blam-1.8.2-mono-1.1.17-fix.diff
deleted file mode 100644
index a515829b62ed..000000000000
--- a/net-news/blam/files/blam-1.8.2-mono-1.1.17-fix.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -aur --exclude=Makefile.in --exclude=Makefile blam-1.8.2-orig/src/Application.cs blam-1.8.2/src/Application.cs
---- blam-1.8.2-orig/src/Application.cs	2005-06-19 04:27:08.000000000 -0700
-+++ blam-1.8.2/src/Application.cs	2006-10-28 08:06:41.000000000 -0700
-@@ -371,6 +371,11 @@
- 	    }
- 	}
- 
-+	public void OnDeleteEvent (object obj, DeleteEventArgs args)
-+	{
-+		QuitActivated (null, null);
-+	}
-+
- 	public void QuitActivated(object obj, EventArgs args)
- 	{
- 	    SaveWindowState();
-Only in blam-1.8.2/src/: Defines.cs
-diff -aur --exclude=Makefile.in --exclude=Makefile blam-1.8.2-orig/src/Dialogs.cs blam-1.8.2/src/Dialogs.cs
---- blam-1.8.2-orig/src/Dialogs.cs	2005-06-19 04:29:31.000000000 -0700
-+++ blam-1.8.2/src/Dialogs.cs	2006-10-28 08:09:02.000000000 -0700
-@@ -45,7 +45,7 @@
- 	    about.Hide();
- 	}
- 	
--	public void OnDelete(object obj, EventArgs args)
-+	public void OnDelete(object obj, DeleteEventArgs args)
- 	{
- 	    aboutBox = null;
- 	}
-Only in blam-1.8.2/src/: blam.exe
-Only in blam-1.8.2/src/: blam.exe.mdb
-diff -aur --exclude=Makefile.in --exclude=Makefile blam-1.8.2-orig/src/blam.glade blam-1.8.2/src/blam.glade
---- blam-1.8.2-orig/src/blam.glade	2004-10-23 06:00:02.000000000 -0700
-+++ blam-1.8.2/src/blam.glade	2006-10-28 08:11:42.000000000 -0700
-@@ -19,7 +19,7 @@
-   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-   <signal name="key_press_event" handler="MainWindowKeyPressed" last_modification_time="Thu, 08 Jan 2004 16:30:13 GMT"/>
--  <signal name="delete_event" handler="QuitActivated" last_modification_time="Sun, 11 Jan 2004 00:01:56 GMT"/>
-+  <signal name="delete_event" handler="OnDeleteEvent" last_modification_time="Sun, 11 Jan 2004 00:01:56 GMT"/>
- 
-   <child>
-     <widget class="GtkVBox" id="vbox1">
diff --git a/net-news/blam/files/blam-1.8.2-seamonkey.patch b/net-news/blam/files/blam-1.8.2-seamonkey.patch
deleted file mode 100644
index 841eaaef6adf..000000000000
--- a/net-news/blam/files/blam-1.8.2-seamonkey.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Daniel Drake <dsd@gentoo.org>
-
-http://bugzilla.gnome.org/show_bug.cgi?id=346566
-
-Index: blam-1.8.2/configure.in
-===================================================================
---- blam-1.8.2.orig/configure.in
-+++ blam-1.8.2/configure.in
-@@ -70,7 +70,7 @@ AC_MSG_CHECKING([which mozilla to use])
- 
- MOZILLA=
- AC_ARG_WITH([mozilla],
--	AC_HELP_STRING([--with-mozilla@<:@=mozilla|firefox|thunderbird@:>@],
-+	AC_HELP_STRING([--with-mozilla@<:@=mozilla|seamonkey|firefox|thunderbird@:>@],
- 		       [Whether to use mozilla, firefox or thunderbird gtkmozembed (default: mozilla)]),
- 	[MOZILLA="$withval"])
- 
-@@ -78,6 +78,8 @@ dnl try to autodetect: if mozilla exists
- if test "x$MOZILLA" = "x"; then
-   if pkg-config --exists mozilla-gtkmozembed; then
-     MOZILLA=mozilla
-+  elif pkg-config --exists seamonkey-gtkmozembed; then
-+    MOZILLA=seamonkey
-   elif pkg-config --exists firefox-gtkmozembed; then
-     MOZILLA=firefox
-   elif pkg-config --exists thunderbird-gtkmozembed; then
-@@ -85,7 +87,7 @@ if test "x$MOZILLA" = "x"; then
-   else
-     AC_MSG_ERROR([no mozilla installation found])
-   fi
--elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x$with_mozilla" != "xthunderbird"; then
-+elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x$with_mozilla" != "xthunderbird" -a "x$with_mozilla" != "xseamonkey"; then
-   AC_MSG_ERROR([unknown mozilla name ($MOZILLA)])
- fi
- 
-@@ -95,6 +97,7 @@ AC_MSG_RESULT([$MOZILLA])
- 
- case "$MOZILLA" in
- mozilla) min_version=1.7 flavour=mozilla ;;
-+seamonkey) min_version=1.0 flavour=mozilla ;;
- firefox) min_version=0.10 flavour=toolkit ;;
- thunderbird) min_version=0.8 flavour=toolkit ;;
- esac
-@@ -205,6 +208,12 @@ dnl changed from nsIXULChromeRegistry in
- AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/chrome/nsIChromeRegistrySea.h],
- 	[AC_DEFINE([HAVE_CHROME_NSICHROMEREGISTRYSEA_H], [1], [Define if nsIChromeRegistrySea.h exists])])
- 
-+
-+dnl do_GetService moved here in recent mozilla code
-+
-+AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/xpcom/nsServiceManagerUtils.h],
-+		[AC_DEFINE([HAVE_XPCOM_NSSERVICEMANAGERUTILS_H], [1], [Define if nsServiceManagerUtils.h exists])])
-+
- MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
- AC_SUBST(MOZILLA_WARN_CXXFLAGS)
- 
-Index: blam-1.8.2/libblam/blam-gecko-utils.cpp
-===================================================================
---- blam-1.8.2.orig/libblam/blam-gecko-utils.cpp
-+++ blam-1.8.2/libblam/blam-gecko-utils.cpp
-@@ -29,6 +29,11 @@
- #include <nsEmbedString.h>
- #include <nsIPrefService.h>
- #include <nsIServiceManager.h>
-+#include <nsCOMPtr.h>
-+
-+#if defined(HAVE_XPCOM_NSSERVICEMANAGERUTILS_H)
-+#include <nsServiceManagerUtils.h>
-+#endif
- 
- #if defined (HAVE_CHROME_NSICHROMEREGISTRYSEA_H)
- #include <chrome/nsIChromeRegistrySea.h>
diff --git a/net-news/blam/files/digest-blam-1.8.4 b/net-news/blam/files/digest-blam-1.8.4
new file mode 100644
index 000000000000..398631951b96
--- /dev/null
+++ b/net-news/blam/files/digest-blam-1.8.4
@@ -0,0 +1,3 @@
+MD5 0dab8064061cee73c51b8954b10e83e6 blam-1.8.4.tar.gz 636444
+RMD160 ce7162da9869c22b12321564b7f0bbf3e7e1449c blam-1.8.4.tar.gz 636444
+SHA256 544de2b443fdd1aa5693e6c04479b83837e759d3c9c684171b4117627c0effc3 blam-1.8.4.tar.gz 636444