Remove unneeded patches

2 files changed, 0 insertions, 174 deletions

diff --git a/mutt-attach.patch b/mutt-attach.patch
deleted file mode 100644
index c926ca307dc9..000000000000
--- a/mutt-attach.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -ur a/globals.h b/globals.h
---- a/globals.h	2010-05-28 17:16:31.000000000 -0400
-+++ b/globals.h	2010-05-28 21:28:58.000000000 -0400
-@@ -34,6 +34,7 @@
- WHERE char *AliasFile;
- WHERE char *AliasFmt;
- WHERE char *AssumedCharset;
-+WHERE char *AttachKeyword;
- WHERE char *AttachSep;
- WHERE char *Attribution;
- WHERE char *AttachCharset;
-diff -ur a/init.h b/init.h
---- a/init.h	2010-05-28 17:11:18.000000000 -0400
-+++ b/init.h	2010-05-28 21:29:27.000000000 -0400
-@@ -83,6 +83,14 @@
- 
- struct option_t MuttVars[] = {
-   /*++*/
-+  { "abort_noattach", DT_QUAD, R_NONE, OPT_ATTACH, M_ASKYES },
-+  /*
-+  ** .pp
-+  ** If set to \fIyes\fP, when composing messages containing the word
-+  ** specified by $attach_keyword (default is "attach") and no attachments 
-+  ** are given, composition will be aborted. If set to \fIno\fP, composing
-+  ** messages as such will never be aborted.
-+  */ 
-   { "abort_nosubject",	DT_QUAD, R_NONE, OPT_SUBJECT, M_ASKYES },
-   /*
-   ** .pp
-@@ -241,6 +249,13 @@
-   ** .pp
-   ** For an explanation of ``soft-fill'', see the $$index_format documentation.
-   */
-+  { "attach_keyword",  DT_STR,  R_NONE, UL &AttachKeyword, UL "attach" },
-+  /*
-+  ** .pp
-+  ** If $abort_attach is not set to no, then the body of the message
-+  ** will be scanned for this keyword, and if found, you will be prompted
-+  ** if there are no attachments. This is case insensitive.
-+  */
-   { "attach_sep",	DT_STR,	 R_NONE, UL &AttachSep, UL "\n" },
-   /*
-   ** .pp
-diff -ur a/mutt.h b/mutt.h
---- a/mutt.h	2010-05-28 17:13:48.000000000 -0400
-+++ b/mutt.h	2010-05-28 21:29:44.000000000 -0400
-@@ -286,6 +286,8 @@
-   OPT_SUBJECT,
-   OPT_VERIFYSIG,      /* verify PGP signatures */
-     
-+  OPT_ATTACH, /* forgotten attachment detector */
-+
-   /* THIS MUST BE THE LAST VALUE. */
-   OPT_MAX
- };
-diff -ur a/send.c b/send.c
---- a/send.c	2010-05-28 21:42:58.000000000 -0400
-+++ b/send.c	2010-05-28 21:44:39.000000000 -0400
-@@ -1113,6 +1113,34 @@
- }
- 
- int
-+mutt_search_attach_keyword(char* filename)
-+{
-+  /* searches for the magic keyword "attach" within a file */
-+  int found = 0;
-+  char* inputline = malloc(1024);
-+  char* lowerKeyword = malloc(strlen(AttachKeyword)+1);
-+  FILE *attf = fopen(filename, "r");
-+  int i;
-+  for (i=0; i <= strlen(AttachKeyword); i++) {
-+    lowerKeyword[i] = tolower(AttachKeyword[i]);
-+  }
-+  while (!feof(attf)) {
-+    fgets(inputline, 1024, attf);
-+    for (i=0; i < strlen(inputline); i++) {
-+      inputline[i] = tolower(inputline[i]);
-+    }
-+    if (strstr(inputline, lowerKeyword)) {
-+        found = 1;
-+        break;
-+    }
-+  }
-+  free(inputline);
-+  free(lowerKeyword);
-+  fclose(attf);
-+  return found;
-+}
-+
-+int
- ci_send_message (int flags,		/* send mode */
- 		 HEADER *msg,		/* template to use for new message */
- 		 char *tempfile,	/* file specified by -i or -H */
-@@ -1605,6 +1633,21 @@
-     goto main_loop;
-   }
- 
-+  if (mutt_search_attach_keyword(msg->content->filename) && 
-+         !msg->content->next && 
-+         query_quadoption(OPT_ATTACH, _("No attachments, cancel sending?")) != M_NO)
-+  {
-+    /* if the abort is automatic, print an error message */
-+    if (quadoption (OPT_ATTACH) == M_YES) {
-+         char errorstr[512];
-+         if (snprintf(errorstr, 512, 
-+                       "Message contains magic keyword \"%s\", but no attachments. Not sending.", AttachKeyword)==-1)
-+               errorstr[511] = 0; // terminate if need be. our string shouldnt be this long.
-+      mutt_error _(errorstr);
-+    }
-+    goto main_loop;
-+  }
-+
-   if (msg->content->next)
-     msg->content = mutt_make_multipart (msg->content);
- 
diff --git a/simple-noconfig-proposal.patch b/simple-noconfig-proposal.patch
deleted file mode 100644
index d6f7bbe73e6d..000000000000
--- a/simple-noconfig-proposal.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-# HG changeset patch
-# User Kevin McCarthy <kevin@8t8.us>
-# Date 1383096352 25200
-#      Tue Oct 29 18:25:52 2013 -0700
-# Node ID e9a88e52c98a404bd2cb4fe48d341e1e50b054c0
-# Parent  1e935cab6f178deefd5f2b9ce5e10638aa64a0f4
-Add gpg signature name. (closes #3478)
-
-Some mail clients display "noname" for the gpg signature
-attachment.  This patch sets the mime name to "signature.asc".
-
-The patch is based on
-http://dev.mutt.org/trac/attachment/ticket/3478/gpg_signature_name.patch
-with the changes:
-  - removes the configuration options
-  - removes mime description
-
-diff --git a/crypt-gpgme.c b/crypt-gpgme.c
---- a/crypt-gpgme.c
-+++ b/crypt-gpgme.c
-@@ -913,16 +913,17 @@
-       t->encoding = ENCBASE64; 
-       t->use_disp = 1;
-       t->disposition = DISPATTACH;
-       t->d_filename = safe_strdup ("smime.p7s");
-     }
-   else
-     {
-       t->subtype = safe_strdup ("pgp-signature");
-+      mutt_set_parameter ("name", "signature.asc", &t->parameter);
-       t->use_disp = 0;
-       t->disposition = DISPNONE;
-       t->encoding = ENC7BIT;
-     }
-   t->filename = sigfile;
-   t->unlink = 1; /* ok to remove this file after sending. */
- 
-   return a;
-diff --git a/pgp.c b/pgp.c
---- a/pgp.c
-+++ b/pgp.c
-@@ -1122,16 +1122,17 @@
-   t = t->parts->next;
-   t->type = TYPEAPPLICATION;
-   t->subtype = safe_strdup ("pgp-signature");
-   t->filename = safe_strdup (sigfile);
-   t->use_disp = 0;
-   t->disposition = DISPNONE;
-   t->encoding = ENC7BIT;
-   t->unlink = 1; /* ok to remove this file after sending. */
-+  mutt_set_parameter ("name", "signature.asc", &t->parameter);
- 
-   return (a);
- }
- 
- static short is_numerical_keyid (const char *s)
- {
-   /* or should we require the "0x"? */
-   if (strncmp (s, "0x", 2) == 0)