Applied security patch wrt bug #105458. Stable on x86

Package-Manager: portage-2.0.51.22-r2

5 files changed, 123 insertions, 6 deletions

diff --git a/net-mail/mailutils/ChangeLog b/net-mail/mailutils/ChangeLog
index a095b67b57b5..556e9c27c01e 100644
--- a/net-mail/mailutils/ChangeLog
+++ b/net-mail/mailutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/mailutils
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.19 2005/05/27 13:07:08 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.20 2005/09/10 22:52:10 ferdy Exp $
+
+*mailutils-0.6-r2 (10 Sep 2005)
+
+  10 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/mailutils-0.6-imap4d-format-string.patch, +mailutils-0.6-r2.ebuild:
+  Applied security patch wrt bug #105458. Stable on x86
 
   27 May 2005; Fernando J. Pereda <ferdy@gentoo.org>
   +files/mailutils-SQLinjection.patch, +files/mailutils-getline.diff,
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 40ea6098e1cf..abc75c268d0b 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,21 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 057feffe63a8e1cd4bf1037c253b01be mailutils-0.6-r2.ebuild 2917
 MD5 b028952dbebe3a7b80cc666722796a81 mailutils-0.6-r1.ebuild 2865
-MD5 0cf1f752d08bb6ea7f66221f7d57e274 ChangeLog 2742
+MD5 e6ab5f57e4ef526f19d2b0f5e0e0bd9f ChangeLog 2962
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 5506f2c85d65395b8e6ebd712e308303 files/mailutils-IDEF0954-IDEF0955.patch 1952
 MD5 57cb849f954ba9a185a41751d998d0fd files/mailutils-0.6-mh-Makefile.in.patch 536
+MD5 0c8c39e5340273b1e8ad95f0c3c886e9 files/mailutils-0.6-imap4d-format-string.patch 469
 MD5 eb67c156401bde48c7d5a23a0bd960df files/mail.rc 271
 MD5 b173bd200556cc8df892bc4654ec5368 files/mailutils-SQLinjection.patch 460
 MD5 c78624e9d37cb3a280aea7281b6bae45 files/mailutils-IDEF0956.patch 524
 MD5 d3019ee356eb19b3ef156ba338b92873 files/mailutils-getline.diff 667
 MD5 47773bdea3fdc18d485aadf3e41ca9c9 files/mailutils-IDEF0957.patch 590
 MD5 ac9d32bbb54e8d1d2ea52039bea81c29 files/digest-mailutils-0.6-r1 67
+MD5 ac9d32bbb54e8d1d2ea52039bea81c29 files/digest-mailutils-0.6-r2 67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFClxuXViELBEf1JB0RAt6HAJ90wS+vkzGxZzU7W5SQSK00YecUQwCeJCgw
-wk8ktXI05TB6b6gFqxrW9lU=
-=6X3W
+iD8DBQFDI2OtViELBEf1JB0RAp+pAJ9jrwzxlHMSqd0/njqlVhra+DtVOgCfYw73
+4YKK9Fe20teHQfwEb9hPA/w=
+=qaHA
 -----END PGP SIGNATURE-----
diff --git a/net-mail/mailutils/files/digest-mailutils-0.6-r2 b/net-mail/mailutils/files/digest-mailutils-0.6-r2
new file mode 100644
index 000000000000..f0e8fdbea34f
--- /dev/null
+++ b/net-mail/mailutils/files/digest-mailutils-0.6-r2
@@ -0,0 +1 @@
+MD5 13e38442893a24f16798e4b5f634ba7d mailutils-0.6.tar.bz2 2025327
diff --git a/net-mail/mailutils/files/mailutils-0.6-imap4d-format-string.patch b/net-mail/mailutils/files/mailutils-0.6-imap4d-format-string.patch
new file mode 100644
index 000000000000..070d4b43b4e7
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-0.6-imap4d-format-string.patch
@@ -0,0 +1,12 @@
+diff -pur mailutils-0.6-orig/imap4d/search.c mailutils-0.6/imap4d/search.c
+--- mailutils-0.6-orig/imap4d/search.c	2005-09-09 11:00:44.000000000 +0300
++++ mailutils-0.6/imap4d/search.c	2005-09-09 11:02:05.000000000 +0300
+@@ -195,7 +195,7 @@ imap4d_search (struct imap4d_command *co
+   char buffer[64];
+   
+   rc = imap4d_search0 (arg, 0, buffer, sizeof buffer);
+-  return util_finish (command, rc, buffer);
++  return util_finish (command, rc, "%s", buffer);
+ }
+   
+ int
diff --git a/net-mail/mailutils/mailutils-0.6-r2.ebuild b/net-mail/mailutils/mailutils-0.6-r2.ebuild
new file mode 100644
index 000000000000..a99ddfbe01d8
--- /dev/null
+++ b/net-mail/mailutils/mailutils-0.6-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-0.6-r2.ebuild,v 1.1 2005/09/10 22:52:10 ferdy Exp $
+
+inherit eutils
+DESCRIPTION="A useful collection of mail servers, clients, and filters."
+HOMEPAGE="http://www.gnu.org/software/mailutils/mailutils.html"
+SRC_URI="http://ftp.gnu.org/gnu/mailutils/${P}.tar.bz2"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~ppc ~sparc x86"
+IUSE="mailwrapper nls pam mysql postgres gdbm"
+PROVIDE="virtual/mailx"
+DEPEND="!virtual/mailx
+	!mail-client/nmh
+	!mail-client/elm
+	dev-util/guile
+	gdbm? ( sys-libs/gdbm )
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql )
+	nls? ( sys-devel/gettext )
+	virtual/mta"
+
+pkg_setup() {
+	# Default to MySQL if USE="mysql postgres', bug #58162.
+	if use mysql && use postgres; then
+		echo
+		ewarn "You have both 'mysql' and 'postgres' in your USE flags."
+		ewarn "Portage will build this package with MySQL support."
+		echo
+		ewarn "If this is not what you want; please hit Control-C now;"
+		ewarn "change you USE flags then emerge this package again."
+		echo
+		ewarn "Waiting 30 seconds before continuing..."
+		ewarn "(Control-C to abort)..."
+		epause 30
+	fi
+}
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-mh-Makefile.in.patch
+	epatch ${FILESDIR}/${PN}-IDEF0954-IDEF0955.patch
+	epatch ${FILESDIR}/${PN}-IDEF0956.patch
+	epatch ${FILESDIR}/${PN}-IDEF0957.patch
+	epatch ${FILESDIR}/${PN}-getline.diff
+	epatch ${FILESDIR}/${PN}-SQLinjection.patch
+	epatch ${FILESDIR}/${P}-imap4d-format-string.patch
+}
+
+src_compile() {
+
+	local myconf="--localstatedir=/var --sharedstatedir=/var --enable-mh-utils"
+
+	# bug in autoconf logic treats both --with and --without as set,
+	# so we cannot do use_with
+	# use mysql && myconf="${myconf} --with-mysql"
+	# use postgres && myconf="${myconf} --with-postgres"
+	if use mysql && use postgres; then
+		einfo "build with MySQL support."
+		myconf="${myconf} --with-mysql"
+	elif use mysql; then
+		einfo "build with MySQL support."
+		myconf="${myconf} --with-mysql"
+	elif use postgres; then
+		einfo "build with PotsgreSQL support."
+		myconf="${myconf} --with-postgres"
+	fi
+
+	# do not disable-sendmail for postfix user w/o mailwrapper, bug #44249.
+	mymta=$(best_version virtual/mta)
+	mymta=${mymta%-[0-9]*}
+	mymta=${mymta##*\/}
+	if ! use mailwrapper && [ "$mymta" == "postfix" ]; then
+		myconf="${myconf} --enable-sendmail"
+		einfo "My MTA is: $mymta"
+		einfo "enable-sendmail"
+	else
+		myconf="${myconf} --disable-sendmail"
+		einfo "My MTA is: $mymta"
+		einfo "disable-sendmail"
+	fi
+
+	myconf="${myconf} $(use_enable nls) $(use_enable pam) $(use_enable gdbm)"
+	econf ${myconf} || die "configure failed"
+	emake || die "compile failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	# mail.rc stolen from mailx, resolve bug #37302.
+	insinto /etc
+	doins "${FILESDIR}/mail.rc"
+}