Version bump and fix bug 308051

(Portage version: 2.1.7.17/cvs/Linux x86_64)

3 files changed, 93 insertions, 1 deletions

diff --git a/dev-libs/gmime/ChangeLog b/dev-libs/gmime/ChangeLog
index 5bb067677185..e80dced43beb 100644
--- a/dev-libs/gmime/ChangeLog
+++ b/dev-libs/gmime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/gmime
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.105 2010/02/14 23:50:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.106 2010/03/26 16:02:24 pacho Exp $
+
+*gmime-2.2.26 (26 Mar 2010)
+
+  26 Mar 2010; Pacho Ramos <pacho@gentoo.org> +gmime-2.2.26.ebuild,
+  +files/gmime-2.2.26-uuencode-buffer-overflow.patch:
+  Version bump to fix CVE-2010-0409 (bug 308051) and upstream bug #613653
 
 *gmime-2.4.15 (14 Feb 2010)
 *gmime-2.2.25 (14 Feb 2010)
diff --git a/dev-libs/gmime/files/gmime-2.2.26-uuencode-buffer-overflow.patch b/dev-libs/gmime/files/gmime-2.2.26-uuencode-buffer-overflow.patch
new file mode 100644
index 000000000000..960dc7c35658
--- /dev/null
+++ b/dev-libs/gmime/files/gmime-2.2.26-uuencode-buffer-overflow.patch
@@ -0,0 +1,12 @@
+diff -Naur gmime-2.2.23-pristine/gmime/gmime-utils.h gmime-2.2.23/gmime/gmime-utils.h
+--- gmime-2.2.23-pristine/gmime/gmime-utils.h	2008-06-12 06:29:28.000000000 -0600
++++ gmime-2.2.23/gmime/gmime-utils.h	2010-02-03 19:01:18.145483975 -0700
+@@ -106,7 +106,7 @@
+  * Returns the number of output bytes needed to uuencode an input
+  * buffer of size @x.
+  **/
+-#define GMIME_UUENCODE_LEN(x)      ((size_t) (((((x) + 2) / 45) * 62) + 62))
++#define GMIME_UUENCODE_LEN(x)      ((size_t) (((((x) + 2) / 45) * 62) + 64))
+ 
+ 
+ /**
diff --git a/dev-libs/gmime/gmime-2.2.26.ebuild b/dev-libs/gmime/gmime-2.2.26.ebuild
new file mode 100644
index 000000000000..abe848ab2cbd
--- /dev/null
+++ b/dev-libs/gmime/gmime-2.2.26.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.2.26.ebuild,v 1.1 2010/03/26 16:02:24 pacho Exp $
+
+inherit gnome2 eutils mono libtool autotools
+
+DESCRIPTION="Utilities for creating and parsing messages using MIME"
+#SRC_URI="http://spruce.sourceforge.net/${PN}/sources/v${PV%.*}/${P}.tar.gz"
+HOMEPAGE="http://spruce.sourceforge.net/gmime/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc mono"
+
+RDEPEND=">=dev-libs/glib-2
+	sys-libs/zlib
+	mono? (
+		dev-lang/mono
+		>=dev-dotnet/gtk-sharp-2.4.0 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/gtk-doc-am
+	doc? (
+		>=dev-util/gtk-doc-1.0
+		app-text/docbook-sgml-utils )
+	mono? ( dev-dotnet/gtk-sharp-gapi )"
+
+DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS PORTING README TODO doc/html/"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/gmime-2.2.23-sign-assembly.patch"
+
+	# Fix Buffer overflow by calculating the maximum number of output bytes generated
+	# by an uuencode operation, bug 308051
+	epatch "${FILESDIR}/gmime-2.2.26-uuencode-buffer-overflow.patch"
+
+	cp "${FILESDIR}/gmime-sharp.snk" mono/
+	if use doc ; then
+		#db2html should be docbook2html
+		sed -i -e 's:db2html:docbook2html -o gmime-tut:g' \
+			docs/tutorial/Makefile.am docs/tutorial/Makefile.in \
+			|| die "sed failed (1)"
+		# Fix doc targets (bug #97154)
+		sed -i -e 's!\<\(tmpl-build.stamp\): !\1 $(srcdir)/tmpl/*.sgml: !' \
+			gtk-doc.make docs/reference/Makefile.in || die "sed failed (3)"
+	fi
+
+	eautoreconf
+	elibtoolize
+}
+
+src_compile() {
+	econf $(use_enable mono) $(use_enable doc gtk-doc)
+	MONO_PATH="${S}" emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "installation failed"
+
+	if use doc ; then
+		# we don't use docinto/dodoc, because we don't want html doc gzipped
+		insinto /usr/share/doc/${PF}/tutorial
+		doins docs/tutorial/html/*
+	fi
+
+	# rename these two, so they don't conflict with app-arch/sharutils
+	# (bug #70392)	Ticho, 2004-11-10
+	mv "${D}/usr/bin/uuencode" "${D}/usr/bin/gmime-uuencode"
+	mv "${D}/usr/bin/uudecode" "${D}/usr/bin/gmime-uudecode"
+	mono_multilib_comply
+}