Fix for sec bug #102051

Package-Manager: portage-2.0.51.22-r2

4 files changed, 258 insertions, 1 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index bcc53ee140b4..ff82c69c5236 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.88 2005/08/21 04:14:00 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.89 2005/08/21 19:52:01 allanonjl Exp $
+
+*evolution-2.2.3-r3 (21 Aug 2005)
+
+  21 Aug 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/evolution.formatstring.patch, +evolution-2.2.3-r3.ebuild:
+  Fix for sec bug #102051
 
 *evolution-2.3.7-r1 (20 Aug 2005)
 
diff --git a/mail-client/evolution/evolution-2.2.3-r3.ebuild b/mail-client/evolution/evolution-2.2.3-r3.ebuild
new file mode 100644
index 000000000000..bda65b8dafd3
--- /dev/null
+++ b/mail-client/evolution/evolution-2.2.3-r3.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.2.3-r3.ebuild,v 1.1 2005/08/21 19:52:01 allanonjl Exp $
+
+inherit eutils flag-o-matic alternatives gnome2
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="crypt dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono mozilla nntp pda spell ssl static"
+
+# Top stanza are ximian deps
+# Pango dependency required to avoid font rendering problems
+RDEPEND=">=gnome-extra/libgtkhtml-3.6.2
+	>=gnome-extra/gal-2.4.2
+	>=gnome-extra/evolution-data-server-1.2.2
+	>=net-libs/libsoup-2.2
+	>=dev-libs/glib-2
+	>=dev-libs/libxml2-2
+	>=x11-libs/pango-1.8.1
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	>=gnome-base/gnome-vfs-2.4
+	>=gnome-base/libbonoboui-2.4.2
+	>=gnome-base/libgnomecanvas-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2
+	>=x11-themes/gnome-icon-theme-1.2
+	dev-libs/atk
+	>=gnome-base/orbit-2.9.8
+	mail-filter/spamassassin
+	pda? ( >=app-pda/gnome-pilot-2
+		>=app-pda/gnome-pilot-conduits-2 )
+	spell? ( >=app-text/gnome-spell-1.0.5 )
+	crypt? ( >=app-crypt/gnupg-1.2.2 )
+	ssl? ( mozilla? ( www-client/mozilla )
+		!mozilla? ( >=dev-libs/nspr-4.4.1
+			>=dev-libs/nss-3.9.2 ) )
+	ldap? ( >=net-nds/openldap-2 )
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )
+	gstreamer? ( =media-libs/gstreamer-0.8*
+		=media-libs/gst-plugins-0.8* )
+	dbus? ( <sys-apps/dbus-0.30 )
+	mono? ( >=dev-lang/mono-1 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.30
+	sys-devel/gettext
+	sys-devel/bison
+	app-text/scrollkeeper
+	doc? ( >=dev-util/gtk-doc-0.6 )"
+
+USE_DESTDIR="1"
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+ELTCONF="--reverse-deps"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix potential crash in the DBUS notification plugin. See bug #95917.
+	epatch ${FILESDIR}/${P}-mail_notify.patch
+	# Fix display of credits. See bug #98491.
+	epatch ${FILESDIR}/${P}-credits.patch
+	# Accept the list of plugins separated by commas instead of spaces.
+	epatch ${FILESDIR}/${P}-configure_plugins.patch
+	# Fix for linking problems, #85013 and #92682
+	epatch ${FILESDIR}/${P}-linking-fix.patch
+	# Fix for sec bug #102051
+	epatch ${FILESDIR}/evolution.formatstring.patch
+
+	einfo "Running automake/autoconf"
+	automake || die "Automake failed"
+	autoconf || die "Autoconf failed"
+}
+
+src_compile() {
+	local myconf="--disable-default-binary --without-kde-applnk-path \
+	$(use_enable static) $(use_enable ssl nss) $(use_enable ssl smime) \
+	$(use_enable ipv6) $(use_enable mono) $(use_enable nntp) \
+	$(use_enable pda pilot-conduits) $(use_with ldap openldap) \
+	$(use_with kerberos krb5 /usr)"
+
+	use ldap && myconf="${myconf} $(use_with static static-ldap)"
+
+	if use krb4 && ! built_with_use virtual/krb5 krb4; then
+		ewarn
+		ewarn "In order to add kerberos 4 support, you have to emerge"
+		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
+		ewarn
+		ewarn "Skipping for now."
+		ewarn
+		myconf="${myconf} --without-krb4"
+	else
+		myconf="${myconf} $(use_with krb4 krb4 /usr)"
+	fi
+
+	# problems with -O3 on gcc-3.3.1
+	replace-flags -O3 -O2
+
+	if [ "${ARCH}" = "hppa" ]; then
+		append-flags "-fPIC -ffunction-sections"
+		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
+	fi
+
+	# Use Mozilla's NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
+	# Use standalone NSS/NSPR if only 'ssl' in USE
+	# Openssl support doesn't work and has been disabled in cvs
+	# SSL support has almost entirely moved to e-d-s,
+	# keep an eye on it in rev-bumps (HAVE_SSL)
+	# <obz@gentoo.org>
+
+	if use ssl ; then
+		if  use mozilla ; then
+			NSS_LIB=/usr/$(get_libdir)/mozilla
+			NSPR_LIB=/usr/$(get_libdir)/mozilla
+			NSS_INC=/usr/$(get_libdir)/mozilla/include/nss
+			NSPR_INC=/usr/$(get_libdir)/mozilla/include/nspr
+		else
+			NSS_LIB=/usr/$(get_libdir)/nss
+			NSPR_LIB=/usr/$(get_libdir)/nspr
+			NSS_INC=/usr/include/nss
+			NSPR_INC=/usr/include/nspr
+		fi
+
+		myconf="${myconf} --enable-nss=yes \
+			--with-nspr-includes=${NSPR_INC} \
+			--with-nspr-libs=${NSPR_LIB} \
+			--with-nss-includes=${NSS_INC} \
+			--with-nss-libs=${NSS_LIB}"
+	else
+		myconf="${myconf} --without-nspr-libs --without-nspr-includes \
+		--without-nss-libs --without-nss-includes"
+	fi
+
+	# Plug-ins to install. Normally we would want something similar to
+	# --enable-plugins=all (plugins_base + plugins_standard), except for some
+	# special cases.
+	local plugins="calendar-file calendar-http calendar-weather \
+	groupwise-account-setup itip-formatter plugin-manager send-options \
+	shared-folder groupwise-send-options exchange-account-setup \
+	groupwise-status-tracking default-source addressbook-file \
+	addressbook-groupwise startup-wizard bbdb subject-thread save-attachments \
+	prefer-plain save-calendar select-one-source copy-tool mail-to-task \
+	folder-unsubscribe mark-calendar-offline mailing-list-actions"
+
+	# The special cases
+	use gstreamer && plugins="${plugins} audio-inline"
+	use dbus && plugins="${plugins} new-mail-notify"
+
+	local pluginlist=""
+	for p in $plugins; do
+		[ "x$pluginlist" != "x" ] && pluginlist="${pluginlist},"
+		pluginlist="${pluginlist}${p}"
+	done
+
+	myconf="${myconf} --enable-plugins=${pluginlist}"
+
+	G2CONF="${G2CONF} ${myconf}"
+
+	gnome2_src_compile
+}
+
+src_install() {
+
+	# work around #92920 FIXME
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
+
+}
+
+pkg_postinst() {
+
+	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
+	gnome2_gconf_install ${GCONFFILEPATH}
+	einfo "To change the default browser if you are not using GNOME, do:"
+	einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
+	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
+	einfo ""
+	einfo "Replace 'mozilla %s' with which ever browser you use."
+
+}
diff --git a/mail-client/evolution/files/digest-evolution-2.2.3-r3 b/mail-client/evolution/files/digest-evolution-2.2.3-r3
new file mode 100644
index 000000000000..1991cc8b56f8
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-2.2.3-r3
@@ -0,0 +1 @@
+MD5 1e01511c78b2dd0dcb8cf83521c167af evolution-2.2.3.tar.bz2 10435908
diff --git a/mail-client/evolution/files/evolution.formatstring.patch b/mail-client/evolution/files/evolution.formatstring.patch
new file mode 100644
index 000000000000..30c3f6eb6aa7
--- /dev/null
+++ b/mail-client/evolution/files/evolution.formatstring.patch
@@ -0,0 +1,62 @@
+--- calendar/gui/e-cal-component-preview.c.old	2004-04-18 20:01:19.000000000 +0200
++++ calendar/gui/e-cal-component-preview.c	2005-08-02 11:44:49.000000000 +0200
+@@ -285,7 +285,7 @@ write_html (GtkHTMLStream *stream, ECal 
+ 					str = g_string_append_c (str, text.value[i]);
+ 			}
+ 
+-			gtk_html_stream_printf (stream, str->str);
++			gtk_html_stream_printf (stream, "%s", str->str);
+ 			g_string_free (str, TRUE);
+ 		}
+ 
+--- addressbook/gui/widgets/eab-contact-display.c.old	2005-02-14 17:09:03.000000000 +0100
++++ addressbook/gui/widgets/eab-contact-display.c	2005-08-02 13:38:21.000000000 +0200
+@@ -338,7 +338,7 @@ render_contact (GtkHTMLStream *html_stre
+ 	accum_attribute (accum, contact, _("Yahoo"), E_CONTACT_IM_YAHOO_HOME_1, YAHOO_ICON, 0);
+ 
+ 	if (accum->len > 0)
+-		gtk_html_stream_printf (html_stream, accum->str);
++		gtk_html_stream_printf (html_stream, "%s", accum->str);
+ 
+ 	end_block (html_stream);
+ 
+@@ -353,7 +353,7 @@ render_contact (GtkHTMLStream *html_stre
+ 
+ 	if (accum->len > 0) {
+ 		start_block (html_stream, _("work"));
+-		gtk_html_stream_printf (html_stream, accum->str);
++		gtk_html_stream_printf (html_stream, "%s", accum->str);
+ 		end_block (html_stream);
+ 	}
+ 
+@@ -368,7 +368,7 @@ render_contact (GtkHTMLStream *html_stre
+ 
+ 	if (accum->len > 0) {
+ 		start_block (html_stream, _("personal"));
+-		gtk_html_stream_printf (html_stream, accum->str);
++		gtk_html_stream_printf (html_stream, "%s", accum->str);
+ 		end_block (html_stream);
+ 	}
+ 
+--- calendar/gui/e-calendar-view.c.old	2005-02-14 17:09:04.000000000 +0100
++++ calendar/gui/e-calendar-view.c	2005-08-02 14:12:47.000000000 +0200
+@@ -1074,7 +1074,7 @@ on_save_as (GtkWidget *widget, gpointer 
+ 		return;
+ 	}
+ 	
+-	fprintf (file, ical_string);
++	fprintf (file, "%s", ical_string);
+ 	g_free (ical_string);
+ 	fclose (file);
+ 
+--- calendar/gui/e-calendar-table.c.old	2004-09-24 17:49:27.000000000 +0200
++++ calendar/gui/e-calendar-table.c	2005-08-02 14:15:12.000000000 +0200
+@@ -1212,7 +1212,7 @@ e_calendar_table_on_save_as (GtkWidget *
+ 		return;
+ 	}
+ 	
+-	fprintf (file, ical_string);
++	fprintf (file, "%s", ical_string);
+ 	g_free (ical_string);
+ 	fclose (file);
+ }