Patch to fix sec. bug #97595.

(Portage version: 2.0.51.22-r1)

6 files changed, 103 insertions, 14 deletions

diff --git a/mail-client/elmo/ChangeLog b/mail-client/elmo/ChangeLog
index 74eb4b7b1267..9025c91d9222 100644
--- a/mail-client/elmo/ChangeLog
+++ b/mail-client/elmo/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/elmo
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/elmo/ChangeLog,v 1.16 2005/05/26 13:28:39 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/elmo/ChangeLog,v 1.17 2005/07/21 14:38:12 ticho Exp $
+
+*elmo-1.3.2-r2 (21 Jul 2005)
+
+  21 Jul 2005; Andrej Kacian <ticho@gentoo.org>
+  +files/elmo-1.3.2-stats.patch, elmo-1.3.2-r1.ebuild,
+  +elmo-1.3.2-r2.ebuild:
+  Patched sources to use mkstemp() for stats file creation in /tmp instead of
+  fixed filename. Security bug #97595, by Romang <zataz at zataz.net>. Also
+  broke einfo message into two lines.
 
   26 May 2005; Fernando J. Pereda <ferdy@gentoo.org> elmo-1.3.2-r1.ebuild:
   alpha stable
diff --git a/mail-client/elmo/Manifest b/mail-client/elmo/Manifest
index d909a4492189..6fadc5727713 100644
--- a/mail-client/elmo/Manifest
+++ b/mail-client/elmo/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 020d411bf6a8baefd9357f6da39e22e0 elmo-1.3.2-r1.ebuild 1226
+MD5 fb08c786e465993da37f4adcd820d6e9 elmo-1.3.2-r2.ebuild 1199
+MD5 72db44edb64a30e65c072edee80601d3 elmo-1.3.2-r1.ebuild 1235
 MD5 42a20b4de76fa4af37174e7eec5a7357 ChangeLog 2678
 MD5 6f02c7ca1840e1d899cf15f645456f7f metadata.xml 165
+MD5 189bbebbc02998206d1bff70a3bdcbb1 files/elmo-1.3.2-stats.patch 1074
 MD5 ae516ca333aa45e8df3b9964414f04ff files/digest-elmo-1.3.2-r1 62
+MD5 ae516ca333aa45e8df3b9964414f04ff files/digest-elmo-1.3.2-r2 62
 MD5 030a20e67a5eb594c5aa4216043285d0 files/configure.in.patch 1991
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFClc8eViELBEf1JB0RAnqYAJoCTo2aHnGIoEMBTCBkq7KTjOT3/QCeJhQN
-a2m+IeRevwrn9acjFhg86uQ=
-=PpHt
------END PGP SIGNATURE-----
diff --git a/mail-client/elmo/elmo-1.3.2-r1.ebuild b/mail-client/elmo/elmo-1.3.2-r1.ebuild
index 220d02e6831c..13650f3f7c10 100644
--- a/mail-client/elmo/elmo-1.3.2-r1.ebuild
+++ b/mail-client/elmo/elmo-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/elmo/elmo-1.3.2-r1.ebuild,v 1.7 2005/05/26 13:28:39 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/elmo/elmo-1.3.2-r1.ebuild,v 1.8 2005/07/21 14:38:12 ticho Exp $
 
 inherit eutils
 
@@ -45,5 +45,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "If you compiled elmo with GCC 3.4 and experience run-time problems, please consider recompiling with GCC 3.3."
+	einfo "If you compiled elmo with GCC 3.4 and experience run-time problems, please"
+	einfo "consider recompiling with GCC 3.3."
 }
diff --git a/mail-client/elmo/elmo-1.3.2-r2.ebuild b/mail-client/elmo/elmo-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..019366eb06e6
--- /dev/null
+++ b/mail-client/elmo/elmo-1.3.2-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/elmo/elmo-1.3.2-r2.ebuild,v 1.1 2005/07/21 14:38:12 ticho Exp $
+
+inherit eutils
+
+IUSE="crypt nls ssl"
+
+DESCRIPTION="Elmo: console email client"
+HOMEPAGE="http://elmo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="~alpha ~x86"
+SLOT="0"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	nls? ( sys-devel/gettext )
+	crypt? ( >=app-crypt/gpgme-0.9.0 )"
+
+src_compile() {
+	local myconf
+
+	epatch ${FILESDIR}/configure.in.patch || die "epatch failed"
+	epatch ${FILESDIR}/${P}-stats.patch || die "epatch failed"
+
+	ebegin "Rebuilding configure"
+		autoconf || die "autoconf failed"
+	eend $?
+
+	use ssl && myconf="--with-openssl=/usr"
+
+	econf ${myconf} \
+			$(use_enable nls) \
+			$(use_with crypt gpgme) || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc ABOUT-NLS ADVOCACY AUTHORS BUGS ChangeLog INSTALL NEWS \
+		THANKS TODO
+	cd doc
+	dodoc README.txt sample.{,pl.}elmorc tutorial{,.gpg}
+}
+
+pkg_postinst() {
+	einfo "If you compiled elmo with GCC 3.4 and experience run-time problems, please"
+	einfo "consider recompiling with GCC 3.3."
+}
diff --git a/mail-client/elmo/files/digest-elmo-1.3.2-r2 b/mail-client/elmo/files/digest-elmo-1.3.2-r2
new file mode 100644
index 000000000000..2dc7a81a7515
--- /dev/null
+++ b/mail-client/elmo/files/digest-elmo-1.3.2-r2
@@ -0,0 +1 @@
+MD5 bc3836a276b092fde8555e42532d4bc8 elmo-1.3.2.tar.gz 536768
diff --git a/mail-client/elmo/files/elmo-1.3.2-stats.patch b/mail-client/elmo/files/elmo-1.3.2-stats.patch
new file mode 100644
index 000000000000..f434324cf115
--- /dev/null
+++ b/mail-client/elmo/files/elmo-1.3.2-stats.patch
@@ -0,0 +1,34 @@
+diff -ur elmo-1.3.2.orig/src/stats.c elmo-1.3.2/src/stats.c
+--- elmo-1.3.2.orig/src/stats.c	2004-04-29 10:06:10.000000000 +0200
++++ elmo-1.3.2/src/stats.c	2005-07-21 16:19:27.000000000 +0200
+@@ -24,6 +24,7 @@
+  ****************************************************************************/
+ 
+ #include <errno.h>
++#include <stdlib.h>
+ 
+ #include "stats.h"
+ #include "wrapbox.h"
+@@ -181,7 +182,8 @@
+ void
+ stats_dump (void)
+ {
+-        int            i;
++        int            i, fd;
++        char          template[] = "/tmp/elmostatsXXXXXX";
+         FILE          *fp;
+         mail_t        *mail;
+         struct estats  stats;
+@@ -200,9 +202,10 @@
+                         process_mail (& stats, mail);
+         }
+ 
+-        fp = fopen ("/tmp/elmostats", "w");
++        fd = mkstemp(template);
++        fp = fdopen (fd, "w");
+         if (fp == NULL){
+-                error_ (errno, _("couldn't open %s"), "/tmp/elmostats");
++                error_ (errno, _("couldn't open %s"), template);
+                 destroy_stats (& stats);
+                 return;
+         }