Version bump and fix bug 308051

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

diff --git a/dev-libs/gmime/ChangeLog b/dev-libs/gmime/ChangeLog
index 5bb067677185edc15373d1a1636dcc5b766492fc..e80dced43beb21e72c5564c5cbacf68fad3dfbb3 100644 (file)
--- 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/Manifest b/dev-libs/gmime/Manifest
index ed56d6f94e4212bd364562fb8032c0d1ee6a601a..bd826e2b53c6974024ea0ec1917a736306e8388e 100644 (file)
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -2,21 +2,24 @@
 Hash: SHA1
 
 AUX gmime-2.2.23-sign-assembly.patch 1380 RMD160 11c26f8686e1ae226e3a69432d5168b260e0e036 SHA1 2a478724ac93d68f86b89fab33d9ea1304f936a0 SHA256 086c23ebb3b7c5f8e1e2133ab41fea623947cbbc790af25efb8e3d2e64111a8f
+AUX gmime-2.2.26-uuencode-buffer-overflow.patch 522 RMD160 9527fe525f78fd0e378e40ff61a44adde7d52669 SHA1 2bb41b87c2285af880de3d12b7582e5b0781da48 SHA256 4f8f79f32850ec7160542abd2a75722d01e45e57c12a61fb2a735cadc3ac26d3
 AUX gmime-sharp.snk 596 RMD160 62a475a0a29bc8823ddcd25211e417bd0ee26221 SHA1 106d8812445a6fcd52526b2bc1184249dda6f4b8 SHA256 f71eb61399bb038acc847298b74eee6c03a8773309dc5c10929ee4aa0aeb3948
 DIST gmime-2.2.24.tar.bz2 770572 RMD160 b2381b85093b51fb00d006ab465037502891e863 SHA1 315976bf2f8a79ab45e822a72d929352240f848a SHA256 16863692b6c92640a7c7ece5e4f0e510bb7114c1c7fe89da241d78d1eea530b4
 DIST gmime-2.2.25.tar.bz2 790770 RMD160 f78b576d30d9c47a42dc6a6ded571bed8111b7a7 SHA1 3184a447b300e93b00d672a7c3e698616b5c4893 SHA256 d31cff98b8518632bc9f5b1e4c503dfa9d647f1faae19d5cc2b54bdf4da7ec7a
+DIST gmime-2.2.26.tar.bz2 791090 RMD160 c69c620dbe55e5648e295c623ce2bbe3f7bfb050 SHA1 0f127789879cc6548242450d0b1f772155482344 SHA256 fb619afd17bff4e762582df12bceab6a07b8c7533ef929379e2d6205f1b9fdd5
 DIST gmime-2.4.15.tar.bz2 859146 RMD160 45825c3563591e0210815fcc919180114dc0d052 SHA1 b1f00a3bd4dde51c5c0fc8d0503440e21e91438a SHA256 a0a6c9413b057ab5d8a2a2902cbaa5b3a17871af3f94dc8431978c9e0e5f53e1
 DIST gmime-2.4.9.tar.bz2 837767 RMD160 78bea2b0443f5f9c4036ef6e712ef3d0d423659a SHA1 be7dcc89e0dbd409c491e06ba228df278627f378 SHA256 74ace088c6892da131fcc57f1ed4b5b802ac8f279aea1fed264b7f026af3b255
 EBUILD gmime-2.2.24.ebuild 2036 RMD160 64b97054cdee4ddeed47c65228a61b9cb91e825b SHA1 e791e29c985cd4c3410000f1233045829e4e0997 SHA256 c53a7039c764d173901cd46b3fd613c94c2a7b60028c83a29b0e8079f394eab7
 EBUILD gmime-2.2.25.ebuild 2041 RMD160 088ecf7d89eb91dee82882ef02aacd2da90bacea SHA1 4d26ff3b45ff6e4038fbcfe012da78d3b0471df7 SHA256 f06801ca59d0bb88ba2e4287eb5deee2c61d8ae36249103940bd2d23c210d41a
+EBUILD gmime-2.2.26.ebuild 2234 RMD160 09e0244a3669fd0bb58c5e9524b7cb3461ec802b SHA1 76d62840eee14b6a29c76add3a1c04a1549b703a SHA256 09082897dfe1dc23c72b86828a85f7f43380e7f49c687bfd647c88ee23776494
 EBUILD gmime-2.4.15.ebuild 2157 RMD160 6de93fbee4d5ba1d7e5e120cf533a8f14c826c77 SHA1 307227c4d2dfbc3107e63d2431d67c06e0cd0039 SHA256 c8d605a8be8c34bf24fa7a658e472cb215e5aad28ba332e1e123ef8d5c84acf5
 EBUILD gmime-2.4.9.ebuild 2145 RMD160 e5d52e4bf160196c838eb06cd1cab31d71859c97 SHA1 c0f7cd6dcd0ab8199eb2045457a801ae8686a775 SHA256 3222e42d3e2c9a7a361a407e7f870784a01a9adfc3b4211c314484df61c240c5
-MISC ChangeLog 15456 RMD160 9fb7569c6bb28f933ea17f11a6f42c26d21b363a SHA1 20b6f50c3aafbe745d6273610e1001ba5b93828a SHA256 e2685f7d28468d343954acbbf180761e4a4989d15a492e88a42ba074a81d4d7c
+MISC ChangeLog 15684 RMD160 0672bf8a6f1c6257b59be2bd11c387a391a4987f SHA1 fc1f7956f7617745ca5e71019510a8b85b94e620 SHA256 76c0d69fc93e87098724722ec4c51b3bfdacd424b3b6cb4d45f909df5ccd93cc
 MISC metadata.xml 180 RMD160 2aa394e2e4d9898608b2c58ce6db543d7677d3ae SHA1 82aae8bdb49fa61e2fcbb48de7c1f8e1342e8ae0 SHA256 e5c6804ed9ff8173cc88618d3443a09c85599a23c1eca85c5c6609b6de351f21
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt4jGMACgkQ1fmVwcYIWAZujACeI3ojJF5StSdk5J7+CFWk1mi2
-K7YAoI2PeJrMyMPdsk6SGCZY7pFZvtC1
-=X3S/
+iEYEARECAAYFAkus2pkACgkQCaWpQKGI+9TF9gCfVKtfHpskg7oaOAatejX9lT+z
+LacAn3GI0p87HtuKvDQFW9/wDeyq5O6J
+=eDiy
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..960dc7c
--- /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 (file)
index 0000000..abe848a
--- /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
+}