From f04ecaec2cf72e6da93937e26aec853742487765 Mon Sep 17 00:00:00 2001 From: Olivier Crête Date: Mon, 31 Aug 2009 16:09:30 +0000 Subject: Fix security bug #283324, importing patch from 2.6.1. Remove old version (Portage version: 2.1.6.13/cvs/Linux x86_64) --- net-im/pidgin/ChangeLog | 8 +- .../pidgin/files/pidgin-2.5.9-xmpp-old-ssl.patch | 21 +++ net-im/pidgin/pidgin-2.5.8.ebuild | 167 -------------------- net-im/pidgin/pidgin-2.5.9-r1.ebuild | 171 +++++++++++++++++++++ 4 files changed, 199 insertions(+), 168 deletions(-) create mode 100644 net-im/pidgin/files/pidgin-2.5.9-xmpp-old-ssl.patch delete mode 100644 net-im/pidgin/pidgin-2.5.8.ebuild create mode 100644 net-im/pidgin/pidgin-2.5.9-r1.ebuild (limited to 'net-im') diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog index 5884828561c6..5fa23e6ad0fb 100644 --- a/net-im/pidgin/ChangeLog +++ b/net-im/pidgin/ChangeLog @@ -1,6 +1,12 @@ # 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.124 2009/08/30 23:33:15 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.125 2009/08/31 16:09:30 tester Exp $ + +*pidgin-2.5.9-r1 (31 Aug 2009) + + 31 Aug 2009; Olivier Crête -pidgin-2.5.8.ebuild, + +pidgin-2.5.9-r1.ebuild, +files/pidgin-2.5.9-xmpp-old-ssl.patch: + Fix security bug #283324, importing patch from 2.6.1. Remove old version 30 Aug 2009; Brent Baude pidgin-2.5.9.ebuild: Marking pidgin-2.5.9 ppc64 for bug 281545 diff --git a/net-im/pidgin/files/pidgin-2.5.9-xmpp-old-ssl.patch b/net-im/pidgin/files/pidgin-2.5.9-xmpp-old-ssl.patch new file mode 100644 index 000000000000..ac3db77c26a8 --- /dev/null +++ b/net-im/pidgin/files/pidgin-2.5.9-xmpp-old-ssl.patch @@ -0,0 +1,21 @@ +--- libpurple/protocols/jabber/auth.c.orig 2009-06-25 19:25:47.000000000 -0400 ++++ libpurple/protocols/jabber/auth.c 2009-08-31 12:01:12.000000000 -0400 +@@ -691,6 +691,18 @@ + JabberIq *iq; + xmlnode *query, *username; + ++ /* We can end up here without encryption if the server doesn't support ++ * and we're not using old-style SSL. If the user ++ * is requiring SSL/TLS, we need to enforce it. ++ */ ++ if (!js->gsc && ++ purple_account_get_bool(purple_connection_get_account(js->gc), "require_tls", FALSE)) { ++ purple_connection_error_reason (js->gc, ++ PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR, ++ _("You require encryption, but it is not available on this server.")); ++ return; ++ } ++ + #ifdef HAVE_CYRUS_SASL + /* If we have Cyrus SASL, then passwords will have been set + * to OPTIONAL for this protocol. So, we need to do our own diff --git a/net-im/pidgin/pidgin-2.5.8.ebuild b/net-im/pidgin/pidgin-2.5.8.ebuild deleted file mode 100644 index 69c93f875e8f..000000000000 --- a/net-im/pidgin/pidgin-2.5.8.ebuild +++ /dev/null @@ -1,167 +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.8.ebuild,v 1.9 2009/08/21 21:45:22 tester 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 - dev-util/intltool - 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_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.9-r1.ebuild b/net-im/pidgin/pidgin-2.5.9-r1.ebuild new file mode 100644 index 000000000000..6cc63823b513 --- /dev/null +++ b/net-im/pidgin/pidgin-2.5.9-r1.ebuild @@ -0,0 +1,171 @@ +# 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.9-r1.ebuild,v 1.1 2009/08/31 16:09:30 tester 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 + dev-util/intltool + 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}/pidgin-2.5.9-xmpp-old-ssl.patch" +} + +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 +} -- cgit v1.2.3-65-gdbad