Sync with gentoo-x86

4 files changed, 50 insertions, 6 deletions

diff --git a/mail-client/alpine/ChangeLog b/mail-client/alpine/ChangeLog
new file mode 100644
index 0000000..ad986e7
--- /dev/null
+++ b/mail-client/alpine/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for mail-client/alpine
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/alpine/ChangeLog,v 1.1 2009/04/24 07:54:58 tove Exp $
+
+*alpine-2.00 (24 Apr 2009)
+
+  24 Apr 2009; Torsten Veller <tove@gentoo.org> +files/2.00-lpam.patch,
+  +files/CVE-2008-5514.patch, +metadata.xml, +alpine-2.00.ebuild:
+  Initial commit. Thanks to Sascha Lucas et al. in bug #176904
+
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index 62f3bf1..c0e9ca7 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.00-lpam.patch 295 RMD160 f3b34a9179529f4c25086559d57dc19d828356f1 SHA1 1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3 SHA256 22c354937019693cfc03a8864a36c30579fd98475b729e089f83ec125e4225ad
+AUX CVE-2008-5514.patch 634 RMD160 ca159f967e2e973390dce3cab2768a09e1da50cf SHA1 bc61d76a237ff42b00b3f60f2e6fc5c45e261dbb SHA256 07fd3dd2ffdfe9e2c952603b9aae099d1250bc89373de3e1a5009ec5d251346b
 DIST alpine-2.00-chappa-26-all.patch.gz 179066 RMD160 c109c463da0f6736474d6c114468bb524dca35ad SHA1 5d646dc9075d0f47cfb3ae2a66dd4ad3103f66f4 SHA256 a14b3cc49a0f7eef6459488687b2a15ff5318f5db8586a47aca04c5bce08aea5
 DIST alpine-2.00.tar.bz2 5222673 RMD160 9e67704b23b3973d8b878e65ad9e6f5026c10d13 SHA1 dcbd3c5419954f484ccf706feaba31ce48cdebc4 SHA256 c85db8405af90375ba2440c85b7952d80996154e9916b83acca558dc82e0a2a6
-EBUILD alpine-2.00.ebuild 3677 RMD160 808daba3715655f6270bcd4457e93d959e69964e SHA1 ec893b554e644a69e945665e38d14e46e4d7d816 SHA256 ef0bc56e660506c10c0c0fa1ace68219f2a6e93a23cde71bb565b7b2de9c20b8
+EBUILD alpine-2.00.ebuild 3835 RMD160 2b1a52d4b5c0fbfb9ba0dfba12b1a31103ae5947 SHA1 17ec392caefabb177321baaeb3da9b10ae5edc05 SHA256 a495a9187c2fececc9cda91c877e92f31727ebccc9ef2f4c781c6170f73e46cc
+MISC ChangeLog 437 RMD160 2bcbfe6a7eb2644c7ece32de0035d8ca52219c97 SHA1 d197cc9a89ca6cd6cabefd201bc6d19ad3953429 SHA256 f5f8f59e36256d23a4182d38d2a4997168b3c5b4c041cac2a441000b6771a66f
 MISC metadata.xml 857 RMD160 e83569fa133c11d8d2c99eb6c5ebe893be94b7c9 SHA1 a4c1ea58f11c8f725355bb870413b1a0389ea9ed SHA256 e1f4da684f1c311d40958e0652c9ae652129e7cf2eea12ba35eff332098e5fbc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAknxcGEACgkQV3J2n04EauwoGgCfVEw3OUCfLg2HISoSJFeUjp3+
+HnwAoL1wXFlOiLfmaRAReh0yy3edHg+z
+=BSDp
+-----END PGP SIGNATURE-----
diff --git a/mail-client/alpine/alpine-2.00.ebuild b/mail-client/alpine/alpine-2.00.ebuild
index 9511648..1965b35 100644
--- a/mail-client/alpine/alpine-2.00.ebuild
+++ b/mail-client/alpine/alpine-2.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/alpine/alpine-2.00.ebuild,v 1.1 2009/04/24 07:54:58 tove Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/alpine/${P}.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86"
 IUSE="+chappa doc ipv6 kerberos ldap nls onlyalpine passfile smime spell ssl threads topal"
 
 DEPEND="virtual/pam
@@ -66,13 +66,15 @@ src_prepare() {
 	use topal && epatch /usr/share/topal/patches/${P}.patch
 
 	epatch "${FILESDIR}"/2.00-lpam.patch
+	cd "${S}/imap/src/c-client"
+	epatch "${FILESDIR}"/CVE-2008-5514.patch
 }
 
 src_configure() {
 	local myconf="--without-tcl
-		 --with-system-pinerc=/etc/pine.conf
-		 --with-system-fixed-pinerc=/etc/pine.conf.fixed
-		 --with-ssl-certs-dir=/etc/ssl/certs"
+		--with-system-pinerc=/etc/pine.conf
+		--with-system-fixed-pinerc=/etc/pine.conf.fixed
+		--with-ssl-certs-dir=/etc/ssl/certs"
 		# fixme
 		#   --with-system-mail-directory=DIR?
 	econf $(use_with ssl) \
diff --git a/mail-client/alpine/files/CVE-2008-5514.patch b/mail-client/alpine/files/CVE-2008-5514.patch
new file mode 100644
index 0000000..594bea0
--- /dev/null
+++ b/mail-client/alpine/files/CVE-2008-5514.patch
@@ -0,0 +1,20 @@
+--- alpine-2.00/imap/src/c-client/rfc822.c
++++ alpine-2.00/imap/src/c-client/rfc822.c
+@@ -1351,6 +1351,7 @@
+ 
+ static long rfc822_output_char (RFC822BUFFER *buf,int c)
+ {
++  if ((buf->cur == buf->end) && !rfc822_output_flush (buf)) return NIL;
+   *buf->cur++ = c;		/* add character, soutr buffer if full */
+   return (buf->cur == buf->end) ? rfc822_output_flush (buf) : LONGT;
+ }
+@@ -1374,7 +1375,8 @@
+       len -= i;
+     }
+ 				/* soutr buffer now if full */
+-    if (len && !rfc822_output_flush (buf)) return NIL;
++    if ((len || (buf->cur == buf->end)) && !rfc822_output_flush (buf))
++      return NIL;
+   }
+   return LONGT;
+ }