Version bump, security bug #281545

(Portage version: 2.1.6.13/cvs/Linux i686)

5 files changed, 10 insertions, 228 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 2b29550676b2..51549f6c0b48 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.111 2009/08/13 21:22:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.112 2009/08/18 21:01:12 tester Exp $
+
+*pidgin-2.5.9 (18 Aug 2009)
+
+  18 Aug 2009; Olivier Crête <tester@gentoo.org>
+  -files/pidgin-2.5.4-icq.patch, -files/pidgin-2.5.5-msnm.patch,
+  -pidgin-2.5.6.ebuild, -pidgin-2.5.7.ebuild, +pidgin-2.5.9.ebuild:
+  Version bump, security bug #281545
 
   13 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> pidgin-2.5.6.ebuild,
   pidgin-2.5.7.ebuild, pidgin-2.5.8.ebuild:
diff --git a/net-im/pidgin/files/pidgin-2.5.4-icq.patch b/net-im/pidgin/files/pidgin-2.5.4-icq.patch
deleted file mode 100644
index 77f128059df1..000000000000
--- a/net-im/pidgin/files/pidgin-2.5.4-icq.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- pidgin-2.5.4/libpurple/protocols/oscar/flap_connection.c.orig	2009-01-23 00:09:41.000000000 +0500
-+++ pidgin-2.5.4/libpurple/protocols/oscar/flap_connection.c	2009-01-23 16:12:00.000000000 +0500
-@@ -1052,10 +1052,27 @@
- 	byte_stream_destroy(&bs);
- }
- 
-+guint16
-+generate_flap_sequence()
-+{
-+	guint32 n = g_random_int(), s = 0, i;
-+	for (i = n; i >>= 3; s += i);
-+	return (((0 - s) ^ (guint)n) & 7 ^ n) + 3;
-+}
-+
- void
- flap_connection_send(FlapConnection *conn, FlapFrame *frame)
- {
--	frame->seqnum = ++(conn->seqnum_out);
-+	if (frame->channel == 0x01)
-+	{
-+		frame->seqnum = generate_flap_sequence();
-+		conn->seqnum_out = frame->seqnum;
-+	} else
-+		frame->seqnum = ++(conn->seqnum_out);
-+
-+	purple_debug_info("oscar", "Sent FLAP seqid=%d\n",
-+			frame->seqnum);
-+
- 	sendframe_flap(conn, frame);
- 	flap_frame_destroy(frame);
- }
diff --git a/net-im/pidgin/files/pidgin-2.5.5-msnm.patch b/net-im/pidgin/files/pidgin-2.5.5-msnm.patch
deleted file mode 100644
index 6510c9dc7705..000000000000
--- a/net-im/pidgin/files/pidgin-2.5.5-msnm.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#
-# patch "libpurple/protocols/msn/soap.c"
-#  from [a6c9a90fd13661ea0885013a22674f89da8657db]
-#    to [c2484b6578c251aa8081f269eafd5f7198ae13f2]
-#
-============================================================
---- pidgin-2.5.5/libpurple/protocols/msn/soap.c	a6c9a90fd13661ea0885013a22674f89da8657db
-+++ pidgin-2.5.5/libpurple/protocols/msn/soap.c	c2484b6578c251aa8081f269eafd5f7198ae13f2
-@@ -667,6 +667,7 @@ msn_soap_connection_run(gpointer data)
- 			conn->handled_len = 0;
- 			conn->current_request = req;
- 
-+			purple_input_remove(conn->event_handle);
- 			conn->event_handle = purple_input_add(conn->ssl->fd,
- 				PURPLE_INPUT_WRITE, msn_soap_write_cb, conn);
- 			if (!msn_soap_write_cb_internal(conn, conn->ssl->fd, PURPLE_INPUT_WRITE, TRUE)) {
diff --git a/net-im/pidgin/pidgin-2.5.7.ebuild b/net-im/pidgin/pidgin-2.5.7.ebuild
deleted file mode 100644
index 883e8bd6a341..000000000000
--- a/net-im/pidgin/pidgin-2.5.7.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.5.7.ebuild,v 1.3 2009/08/13 21:22:46 ssuominen Exp $
-
-EAPI=2
-
-inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bonjour dbus debug doc eds gadu gnutls +gstreamer meanwhile"
-IUSE="${IUSE} networkmanager nls perl silc tcl tk spell qq gadu"
-IUSE="${IUSE} +gtk sasl ncurses groupwise prediction zephyr" # mono"
-
-RDEPEND="
-	bonjour? ( net-dns/avahi )
-	dbus? ( >=dev-libs/dbus-glib-0.71
-		>=dev-python/dbus-python-0.71
-		>=sys-apps/dbus-0.90
-		>=dev-lang/python-2.4 )
-	gtk? (
-		spell? ( >=app-text/gtkspell-2.0.2 )
-		>=x11-libs/gtk+-2.0
-		>=x11-libs/startup-notification-0.5
-		x11-libs/libXScrnSaver
-		eds? ( gnome-extra/evolution-data-server ) 	)
-	>=dev-libs/glib-2.0
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		=media-libs/gst-plugins-good-0.10* )
-	perl? ( >=dev-lang/perl-5.8.2-r1 )
-	gadu?  ( net-libs/libgadu[-ssl] )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( >=dev-libs/nss-3.11 )
-	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
-	zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1[krb4] )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	dev-libs/libxml2
-	networkmanager? ( net-misc/networkmanager )
-	prediction? ( =dev-db/sqlite-3* )
-	ncurses? ( sys-libs/ncurses[unicode] )"
-	# Mono support crashes pidgin
-	#mono? ( dev-lang/mono )"
-
-DEPEND="$RDEPEND
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-util/pkgconfig
-	gtk? ( x11-proto/scrnsaverproto )
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
-
-# List of plugins
-#   app-accessibility/pidgin-festival
-#   net-im/librvp
-#   x11-plugins/guifications
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgin-libnotify
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-
-pkg_setup() {
-	if ! use gtk && ! use ncurses ; then
-		einfo
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-		einfo
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.5.4-icq.patch
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i "${S}/po/Makefile.in.in" || die "sed failed"
-}
-
-src_configure() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-
-	local myconf
-
-	if use gadu; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
-			myconf="${myconf} --with-gadu-includes=."
-			myconf="${myconf} --with-gadu-libs=."
-	fi
-
-	if use silc; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},silc"
-	fi
-
-	if use qq; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},qq"
-	fi
-
-	if use meanwhile; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},sametime"
-	fi
-
-	if use bonjour; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},bonjour"
-	fi
-
-	if use groupwise; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},novell"
-	fi
-
-	if use zephyr; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},zephyr"
-	fi
-
-	if use gnutls ; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf="${myconf} --enable-nss=no --enable-gnutls=yes"
-		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
-		myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)"
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf="${myconf} --enable-gnutls=no --enable-nss=yes"
-	fi
-
-	econf \
-		$(use_enable ncurses consoleui) \
-		$(use_enable nls) \
-		$(use_enable perl) \
-		$(use_enable gtk gtkui) \
-		$(use_enable gtk startup-notification) \
-		$(use_enable gtk screensaver) \
-		$(use_enable gtk sm) \
-		$(use_enable tcl) \
-		$(use_enable spell gtkspell) \
-		$(use_enable tk) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable meanwhile) \
-		$(use_enable eds gevolution) \
-		$(use_enable gstreamer) \
-		$(use_enable sasl cyrus-sasl ) \
-		$(use_enable doc doxygen) \
-		$(use_enable prediction cap) \
-		$(use_enable networkmanager nm) \
-		$(use_with zephyr krb4) \
-		$(use_enable bonjour avahi) \
-		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
-		--disable-mono \
-		--x-includes=/usr/include/X11 \
-		${myconf} || die "Configuration failed"
-		#$(use_enable mono) \
-}
-
-src_install() {
-	gnome2_src_install
-	use perl && fixlocalpod
-	dodoc AUTHORS HACKING INSTALL NEWS README ChangeLog
-}
diff --git a/net-im/pidgin/pidgin-2.5.6.ebuild b/net-im/pidgin/pidgin-2.5.9.ebuild
index 5eb6cd44a9f8..15b5756281bd 100644
--- a/net-im/pidgin/pidgin-2.5.6.ebuild
+++ b/net-im/pidgin/pidgin-2.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.5.6.ebuild,v 1.7 2009/08/13 21:22:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.5.9.ebuild,v 1.1 2009/08/18 21:01:12 tester Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="bonjour dbus debug doc eds gadu gnutls +gstreamer meanwhile"
 IUSE="${IUSE} networkmanager nls perl silc tcl tk spell qq gadu"
 IUSE="${IUSE} +gtk sasl ncurses groupwise prediction zephyr" # mono"
@@ -83,10 +83,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.5.4-icq.patch
-}
-
 src_configure() {
 	# Stabilize things, for your own good
 	strip-flags