Added two patches (security and fixes compiling on alpha). Readded ~alpha so

(Portage version: 2.0.51.19)

5 files changed, 54 insertions, 14 deletions

diff --git a/net-mail/mailutils/ChangeLog b/net-mail/mailutils/ChangeLog
index c4e52952dc04..a095b67b57b5 100644
--- a/net-mail/mailutils/ChangeLog
+++ b/net-mail/mailutils/ChangeLog
@@ -1,6 +1,11 @@
 # 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.18 2005/05/26 16:33:24 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.19 2005/05/27 13:07:08 ferdy Exp $
+
+  27 May 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/mailutils-SQLinjection.patch, +files/mailutils-getline.diff,
+  mailutils-0.6-r1.ebuild:
+  Added two patches (security and fixes compiling on alpha). Readded ~alpha so
 
   26 May 2005; Fernando J. Pereda <ferdy@gentoo.org> ChangeLog:
   added security patches backported from 0.6.90, wrt #94053. Dropped ~alpha
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index f58dfdb36ca5..ca90ee5f8024 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b885f8d8ea2622ce2741fcdc7de48b5e mailutils-0.6-r1.ebuild 2774
+MD5 cabc498ceecb3bb83ea97d4119144715 mailutils-0.6-r1.ebuild 2866
 MD5 fdcfd9dc8b9341a8045bacfc82436191 ChangeLog 2512
 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 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFClfptViELBEf1JB0RAikzAJ9V6E2fElIN/SUQLoECMEiqq8A8/gCaArDe
-kcsJttFKPB6y5PJufLnJ9Fc=
-=Elei
------END PGP SIGNATURE-----
diff --git a/net-mail/mailutils/files/mailutils-SQLinjection.patch b/net-mail/mailutils/files/mailutils-SQLinjection.patch
new file mode 100644
index 000000000000..c87b6bf6ac31
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-SQLinjection.patch
@@ -0,0 +1,20 @@
+--- auth/sql.c.orig	2005-03-08 14:24:11.000000000 -0800
++++ auth/sql.c	2005-05-13 19:12:38.000000000 -0700
+@@ -74,7 +74,7 @@
+   
+   for (p = (const unsigned char *) ustr; *p; p++)
+     {
+-      if (strchr ("'\"", *p))
++      if (strchr ("'\"\\", *p))
+ 	len++;
+     }
+ 
+@@ -84,7 +84,7 @@
+ 
+   for (p = (const unsigned char *) ustr, q = str; *p; p++)
+     {
+-      if (strchr ("'\"", *p))
++      if (strchr ("'\"\\", *p))
+ 	*q++ = '\\';
+       *q++ = *p;
+     }
diff --git a/net-mail/mailutils/files/mailutils-getline.diff b/net-mail/mailutils/files/mailutils-getline.diff
new file mode 100644
index 000000000000..b957473f3025
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-getline.diff
@@ -0,0 +1,21 @@
+--- ./mailbox/getline.h.old	2005-01-01 16:39:25.619823831 +0100
++++ ./mailbox/getline.h	2005-01-01 16:28:47.798840941 +0100
+@@ -18,6 +18,7 @@
+ #ifndef _GETLINE_H_
+ # define _GETLINE_H_ 1
+ 
++# include <sys/types.h>
+ # include <stdio.h>
+ 
+ # ifndef PARAMS
+@@ -28,8 +29,8 @@
+ #  endif
+ # endif
+ 
+-extern int getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
++extern ssize_t getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
+ 
+-extern int getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
++extern ssize_t getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
+ 
+ #endif /* ! _GETLINE_H_ */
diff --git a/net-mail/mailutils/mailutils-0.6-r1.ebuild b/net-mail/mailutils/mailutils-0.6-r1.ebuild
index 182a156bbcb0..063b1c338c1a 100644
--- a/net-mail/mailutils/mailutils-0.6-r1.ebuild
+++ b/net-mail/mailutils/mailutils-0.6-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/net-mail/mailutils/mailutils-0.6-r1.ebuild,v 1.1 2005/05/26 16:31:37 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-0.6-r1.ebuild,v 1.2 2005/05/27 13:07:08 ferdy Exp $
 
 inherit eutils
 DESCRIPTION="A useful collection of mail servers, clients, and filters."
@@ -8,7 +8,7 @@ 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="~ppc ~sparc x86"
+KEYWORDS="~alpha ~ppc ~sparc x86"
 IUSE="mailwrapper nls pam mysql postgres gdbm"
 PROVIDE="virtual/mailx"
 DEPEND="!virtual/mailx
@@ -44,6 +44,8 @@ src_unpack() {
 	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
 }
 
 src_compile() {