summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2009-06-20 10:41:05 +0000
committerFabian Groffen <grobian@gentoo.org>2009-06-20 10:41:05 +0000
commitde478ef242874197218df6ec9bb72df36001d5a4 (patch)
tree9a8ec4fde118fc790401d26950ec1a0ee881c3a1 /mail-client/mutt
parentUpdate getline-rename.patch (#270452). Migrate to EAPI 2. (diff)
downloadgentoo-2-de478ef242874197218df6ec9bb72df36001d5a4.tar.gz
gentoo-2-de478ef242874197218df6ec9bb72df36001d5a4.tar.bz2
gentoo-2-de478ef242874197218df6ec9bb72df36001d5a4.zip
Drop old
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'mail-client/mutt')
-rw-r--r--mail-client/mutt/Manifest6
-rw-r--r--mail-client/mutt/files/mutt-1.5.11-fix-smime.patch11
-rw-r--r--mail-client/mutt/files/mutt-1.5.11-imap-browse.patch38
-rw-r--r--mail-client/mutt/files/mutt-1.5.11-sasl.patch23
-rw-r--r--mail-client/mutt/files/mutt-1.5.12-fix-pop-c.patch20
-rw-r--r--mail-client/mutt/files/mutt-1.5.13-paranoid-temp-file.patch100
-rw-r--r--mail-client/mutt/files/mutt-1.5.13-sasl.patch74
7 files changed, 0 insertions, 272 deletions
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index d37244238be3..22162ababf15 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,11 +1,5 @@
AUX Muttrc 667 RMD160 0405e73c6a4122869ce9a9bd408068d316740b71 SHA1 e30c96e6f21a30fe576abcb3be65a34accf4e11f SHA256 932940db69c951caaa87a17ee98a8e2262aeadf1e978f6d671b642184c5d545f
AUX Muttrc.mbox 486 RMD160 0f692c9d3a7591f3a0611529616aa94a5c62a641 SHA1 9e231303fe9fb2fe80542115ceefb972c7b11d5a SHA256 10b251f88ccc5d4c95c96ab17b6ab6a30a16d6590ab896a60037f869fc4d44a0
-AUX mutt-1.5.11-fix-smime.patch 314 RMD160 5163d4e3ef2110cf558e30d5a444aaf6e46cfae4 SHA1 3083961a2876e24fd720288741b52682a3f38ffa SHA256 67e580a4bd41fe33b6c9410dfa18147e6450ff82ab2a5f9c7db5ddec420e2ba6
-AUX mutt-1.5.11-imap-browse.patch 1099 RMD160 3b1506bd187cc9f09d552562ce08dfb0c2fe9f87 SHA1 8a93623ac9da2026af203ac03bf945da3623a502 SHA256 93f9c0c850a0b58dd9e34952abadb1d75671e8ac4db07ccac118d22a6a35d2a9
-AUX mutt-1.5.11-sasl.patch 777 RMD160 1f92c9b611811e05a9e092e566e6d43202703655 SHA1 dcca8cb949c6cb9ee35cf4e2fbac82062fac2316 SHA256 374cd8c7cc5ab01c20b5fa3527d2d7c007291a7cc6555722b41b57fbea56044f
-AUX mutt-1.5.12-fix-pop-c.patch 753 RMD160 5d4566b5a22d2077e81b8a091f2749a3abd5f289 SHA1 ac3f520b33c2dfebf17d0445f87c81602d4615d8 SHA256 1d1c21865a1aae258eb1991a153b75f99f22e9272a4d0b74478cd65f943f7a2a
-AUX mutt-1.5.13-paranoid-temp-file.patch 2211 RMD160 a29336f375954984eee1698dfd39152ea22fc9b5 SHA1 5d0766c46fde9f0f67a8a15eafb3bcf090451d3a SHA256 8252cf15f44f220995bddd35bbedc1323c58915f0c6898c2ba95baca01bce4e2
-AUX mutt-1.5.13-sasl.patch 2468 RMD160 7c0ee6795f8b7a11059f3802b098735897cf7cf2 SHA1 0914414d61face0ca19d44819dac96d03480b8f7 SHA256 f2a646a227dc768d93dba54b7c02d7ea4e0d4c1641f03d3878870821d38e4e50
AUX mutt-1.5.15-parallel-make.patch 946 RMD160 80c9bfa187c784d650f5850469021f94547c897e SHA1 5b8b9e2d3bc8e36b8a95fc3bc79f5bfe50ec5008 SHA256 d4b6abc9f43989a6c7a22f3fbaafd4ffa524ad516c4cb5b8cfe884985cce74f6
AUX mutt-1.5.16-parallel-make.patch 936 RMD160 f6a216d9ff06ae55d9569e05632b60332cf49ebe SHA1 0a9b98b37987ffa10039424bb6f5849a08dbb168 SHA256 3ecc199b83f6fa747d342694d8ffacf0aedd4590e0d9943c9b6004c31cbdb931
AUX mutt-1.5.19-libgnutls-test-15c662a95b91.patch 9187 RMD160 b5d981c5aeb66f9fc1212c74884bfd91914a97c7 SHA1 76cdfe28610aa68eec2506aeab53324de9dbf57e SHA256 7fe0edbfb2ee862bfef0fd3c53e19cf589a908c52299206db72c1c701e7fb6c8
diff --git a/mail-client/mutt/files/mutt-1.5.11-fix-smime.patch b/mail-client/mutt/files/mutt-1.5.11-fix-smime.patch
deleted file mode 100644
index b91fdccc9a02..000000000000
--- a/mail-client/mutt/files/mutt-1.5.11-fix-smime.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r3.43 -r3.44
---- mutt/smime.c 2005/09/17 20:46:11 3.43
-+++ mutt/smime.c 2005/10/05 19:20:22 3.44
-@@ -1989,7 +1989,6 @@
-
- if ((p = smime_ask_for_key (_("Sign as: "), NULL, 0)))
- {
-- p[mutt_strlen (p)-1] = '\0';
- mutt_str_replace (&SmimeDefaultKey, p);
-
- msg->security |= SIGN;
diff --git a/mail-client/mutt/files/mutt-1.5.11-imap-browse.patch b/mail-client/mutt/files/mutt-1.5.11-imap-browse.patch
deleted file mode 100644
index b396e28e6fec..000000000000
--- a/mail-client/mutt/files/mutt-1.5.11-imap-browse.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 850d4a6b78730344ad7bb1d2a04cfcd35def3fec
-Author: brendan <brendan>
-Date: Mon Jun 19 18:14:03 2006 +0000
-
- From: TAKAHASHI Tamotsu <tamo@momonga-linux.org>
-
- Fix browse_get_namespace() which could overflow ns[LONG_STRING].
- (Possible remote vulnerability)
-
-diff --git a/imap/browse.c b/imap/browse.c
-index bc2d036..43463ba 100644
---- a/imap/browse.c
-+++ b/imap/browse.c
-@@ -505,7 +505,7 @@ static int browse_get_namespace (IMAP_DA
- if (*s == '\"')
- {
- s++;
-- while (*s && *s != '\"')
-+ while (*s && *s != '\"' && n < sizeof (ns) - 1)
- {
- if (*s == '\\')
- s++;
-@@ -516,12 +516,14 @@ static int browse_get_namespace (IMAP_DA
- s++;
- }
- else
-- while (*s && !ISSPACE (*s))
-+ while (*s && !ISSPACE (*s) && n < sizeof (ns) - 1)
- {
- ns[n++] = *s;
- s++;
- }
- ns[n] = '\0';
-+ if (n == sizeof (ns) - 1)
-+ dprint (1, (debugfile, "browse_get_namespace: too long: [%s]\n", ns));
- /* delim? */
- s = imap_next_word (s);
- /* delimiter is meaningless if namespace is "". Why does
diff --git a/mail-client/mutt/files/mutt-1.5.11-sasl.patch b/mail-client/mutt/files/mutt-1.5.11-sasl.patch
deleted file mode 100644
index 526784653f61..000000000000
--- a/mail-client/mutt/files/mutt-1.5.11-sasl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.in.old 2005-09-19 22:07:56.000000000 +0200
-+++ configure.in 2005-09-19 22:09:00.000000000 +0200
-@@ -600,14 +600,14 @@
- AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes)
-
- AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl[=PFX]], [Use Cyrus SASL 2 network security library]),
-- [
-- if test "$need_socket" != "yes"
-- then
-- AC_MSG_ERROR([SASL support is only useful with POP or IMAP support])
-- fi
--
-+ [
- if test "$with_sasl" != "no"
- then
-+ if test "$need_socket" != "yes"
-+ then
-+ AC_MSG_ERROR([SASL support is only useful with POP or IMAP support])
-+ fi
-+
- if test "$with_sasl" != "yes"
- then
- CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
diff --git a/mail-client/mutt/files/mutt-1.5.12-fix-pop-c.patch b/mail-client/mutt/files/mutt-1.5.12-fix-pop-c.patch
deleted file mode 100644
index c0bb0a487a3b..000000000000
--- a/mail-client/mutt/files/mutt-1.5.12-fix-pop-c.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: brendan <brendan>
-Date: Wed, 19 Jul 2006 23:29:54 +0000 (+0000)
-Subject: From: Rocco Rutte <pdmef@gmx.net>
-X-Git-Url: http://dev.mutt.org/cgi-bin/gitweb.cgi?p=mutt/.git;a=commitdiff;h=4734283f3a1f3209453f275710313673352fc288
-
- From: Rocco Rutte <pdmef@gmx.net>
-
- Fix linking for body cache without IMAP support.
----
-
---- a/configure.in
-+++ b/configure.in
-@@ -500,6 +500,7 @@ AC_ARG_ENABLE(pop, AC_HELP_STRING([--en
- [ if test x$enableval = xyes ; then
- AC_DEFINE(USE_POP,1,[ Define if you want support for the POP3 protocol. ])
- MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pop.o pop_lib.o pop_auth.o"
-+ need_pop="yes"
- need_socket="yes"
- need_md5="yes"
- fi
diff --git a/mail-client/mutt/files/mutt-1.5.13-paranoid-temp-file.patch b/mail-client/mutt/files/mutt-1.5.13-paranoid-temp-file.patch
deleted file mode 100644
index 56ed1c23bb77..000000000000
--- a/mail-client/mutt/files/mutt-1.5.13-paranoid-temp-file.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-commit f8c42c6286f3077fc8762ba2c8323026b736a3e8
-Author: roessler <roessler>
-Date: Mon Oct 9 13:39:38 2006 +0000
-
- From: Thomas Roessler <roessler@does-not-exist.org>
-
- Even more paranoid temporary file creation.
-
-diff --git a/lib.c b/lib.c
-index aac0742..d672a8a 100644
---- a/lib.c
-+++ b/lib.c
-@@ -481,14 +481,85 @@ int safe_rename (const char *src, const
- return 0;
- }
-
-+/* Create a temporary directory next to a file name */
-+
-+int mutt_mkwrapdir (const char *path, char *newfile, size_t nflen,
-+ char *newdir, size_t ndlen)
-+{
-+ const char *basename;
-+ char parent[_POSIX_PATH_MAX];
-+ char *p;
-+ int rv;
-+
-+ strfcpy (parent, NONULL (path), sizeof (parent));
-+
-+ if ((p = strrchr (parent, '/')))
-+ {
-+ *p = '\0';
-+ basename = p + 1;
-+ }
-+ else
-+ {
-+ strfcpy (parent, ".", sizeof (parent));
-+ basename = path;
-+ }
-+
-+ do
-+ {
-+ snprintf (newdir, ndlen, "%s/%s", parent, ".muttXXXXXX");
-+ mktemp (newdir);
-+ }
-+ while ((rv = mkdir (newdir, 0700)) == -1 && errno == EEXIST);
-+
-+ if (rv == -1)
-+ return -1;
-+
-+ snprintf (newfile, nflen, "%s/%s", newdir, NONULL(basename));
-+ return 0;
-+}
-+
-+int mutt_put_file_in_place (const char *path, const char *safe_file, const char *safe_dir)
-+{
-+ int rv;
-+
-+ rv = safe_rename (safe_file, path);
-+ unlink (safe_file);
-+ rmdir (safe_dir);
-+ return rv;
-+}
-+
- int safe_open (const char *path, int flags)
- {
- struct stat osb, nsb;
- int fd;
-
-- if ((fd = open (path, flags, 0600)) < 0)
-- return fd;
-+ if (flags & O_EXCL)
-+ {
-+ char safe_file[_POSIX_PATH_MAX];
-+ char safe_dir[_POSIX_PATH_MAX];
-
-+ if (mutt_mkwrapdir (path, safe_file, sizeof (safe_file),
-+ safe_dir, sizeof (safe_dir)) == -1)
-+ return -1;
-+
-+ if ((fd = open (safe_file, flags, 0600)) < 0)
-+ {
-+ rmdir (safe_dir);
-+ return fd;
-+ }
-+
-+ if (mutt_put_file_in_place (path, safe_file, safe_dir) == -1)
-+ {
-+ close (fd);
-+ return -1;
-+ }
-+ }
-+ else
-+ {
-+ if ((fd = open (path, flags, 0600)) < 0)
-+ return fd;
-+ }
-+
- /* make sure the file is not symlink */
- if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 ||
- compare_stat(&osb, &nsb) == -1)
diff --git a/mail-client/mutt/files/mutt-1.5.13-sasl.patch b/mail-client/mutt/files/mutt-1.5.13-sasl.patch
deleted file mode 100644
index 7cefa2ee1a85..000000000000
--- a/mail-client/mutt/files/mutt-1.5.13-sasl.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-
-# HG changeset patch
-# User Brendan Cully <brendan@kublai.com>
-# Date 1157736633 0
-# Node ID 4b8ef24b823e8295d58f599cb1d7014270dec064
-# Parent 6fd5fb51a9dc102a1b39dcda26201c60215ee954
-Don't send protocol garbage to sasl_decode64 during POP authentication.
-Also enable SASL plaintext: $foo_authenticators is a more general solution.
-
---- a/mutt_sasl.c Fri Sep 08 15:45:57 2006 +0000
-+++ b/mutt_sasl.c Fri Sep 08 17:30:33 2006 +0000
-@@ -221,15 +221,10 @@ int mutt_sasl_client_new (CONNECTION* co
- return -1;
- }
-
-- /* set security properties. We use NOPLAINTEXT globally, since we can
-- * just fall back to LOGIN in the IMAP case anyway. If that doesn't
-- * work for POP, we can make it a flag or move this code into
-- * imap/auth_sasl.c */
- memset (&secprops, 0, sizeof (secprops));
- /* Work around a casting bug in the SASL krb4 module */
- secprops.max_ssf = 0x7fff;
- secprops.maxbufsize = M_SASL_MAXBUF;
-- secprops.security_flags |= SASL_SEC_NOPLAINTEXT;
- if (sasl_setprop (*saslconn, SASL_SEC_PROPS, &secprops) != SASL_OK)
- {
- dprint (1, (debugfile,
---- a/pop_auth.c Fri Sep 08 15:45:57 2006 +0000
-+++ b/pop_auth.c Fri Sep 08 17:30:33 2006 +0000
-@@ -46,8 +46,7 @@ static pop_auth_res_t pop_auth_sasl (POP
- char inbuf[LONG_STRING];
- const char* mech;
- const char *pc = NULL;
-- unsigned int len, olen;
-- unsigned char client_start;
-+ unsigned int len, olen, client_start;
-
- if (mutt_sasl_client_new (pop_data->conn, &saslconn) < 0)
- {
-@@ -74,7 +73,7 @@ static pop_auth_res_t pop_auth_sasl (POP
- return POP_A_UNAVAIL;
- }
-
-- client_start = (olen > 0);
-+ client_start = olen;
-
- mutt_message _("Authenticating (SASL)...");
-
-@@ -93,11 +92,11 @@ static pop_auth_res_t pop_auth_sasl (POP
- return POP_A_SOCKET;
- }
-
-- if (rc != SASL_CONTINUE)
-+ if (!client_start && rc != SASL_CONTINUE)
- break;
-
- if (!mutt_strncmp (inbuf, "+ ", 2)
-- && sasl_decode64 (inbuf, strlen (inbuf), buf, LONG_STRING-1, &len) != SASL_OK)
-+ && sasl_decode64 (inbuf+2, strlen (inbuf+2), buf, LONG_STRING-1, &len) != SASL_OK)
- {
- dprint (1, (debugfile, "pop_auth_sasl: error base64-decoding server response.\n"));
- goto bail;
-@@ -112,7 +111,10 @@ static pop_auth_res_t pop_auth_sasl (POP
- mutt_sasl_interact (interaction);
- }
- else
-+ {
-+ olen = client_start;
- client_start = 0;
-+ }
-
- if (rc != SASL_CONTINUE && (olen == 0 || rc != SASL_OK))
- break;
-