- updated to 1.11.0

[packages/mutt.git] / mutt-home_etc.patch

diff --git a/mutt-home_etc.patch b/mutt-home_etc.patch
index 885e1b10090feef5974506b4c253f004c0418c6b..9c24e2358fa23073943bb84d2f676e4d3b3d66c7 100644 (file)
--- a/mutt-home_etc.patch
+++ b/mutt-home_etc.patch
@@ -1,6 +1,6 @@
-diff -Nur mutt-1.5.11.orig/configure.in mutt-1.5.11/configure.in
---- mutt-1.5.11.orig/configure.in      2006-05-11 23:23:13.000000000 +0200
-+++ mutt-1.5.11/configure.in   2006-05-12 00:58:13.000000000 +0200
+diff -Nur mutt-1.5.11.orig/configure.ac mutt-1.5.11/configure.ac
+--- mutt-1.5.11.orig/configure.ac      2006-05-11 23:23:13.000000000 +0200
++++ mutt-1.5.11/configure.ac   2006-05-12 00:58:13.000000000 +0200
 @@ -816,6 +816,32 @@
  fi])
  dnl -- end cache --
@@ -39,8 +39,8 @@ diff -Nur mutt-1.5.11.orig/doc/mutt.man mutt-1.5.11/doc/mutt.man
 +++ mutt-1.5.11/doc/mutt.man   2006-05-12 00:58:13.000000000 +0200
 @@ -122,6 +122,8 @@
  .IP "MAILDIR"
- Full path of the user's spool mailbox.  Commonly used when the spool
- mailbox is a 
+ Full path of the user's spool mailbox if MAIL is unset.  Commonly used when the spool
+ mailbox is a
 +.IP "HOME_ETC"
 +Path to alternative configuration directory.
  .B maildir (5)
@@ -107,7 +107,7 @@ diff -Nur mutt-1.5.11.orig/init.c mutt-1.5.11/init.c
    }
  
    Tempdir = safe_strdup ((p = getenv ("TMPDIR")) ? p : "/tmp");
-@@ -2415,13 +2434,13 @@
+@@ -2981,15 +2981,15 @@
    
    if (!Muttrc)
    {
@@ -122,7 +122,10 @@ diff -Nur mutt-1.5.11.orig/init.c mutt-1.5.11/init.c
      if (access(buffer, F_OK) == -1)
 -      snprintf (buffer, sizeof (buffer), "%s/.mutt/muttrc", NONULL(Homedir));
 +      snprintf (buffer, sizeof (buffer), "%s/.mutt/muttrc", NONULL(H_CFDIR));
-     
+     if (access(buffer, F_OK) == -1) /* default to .muttrc for alias_file */
+-      snprintf (buffer, sizeof(buffer), "%s/.muttrc", NONULL(Homedir));
++      snprintf (buffer, sizeof(buffer), "%s/.muttrc", NONULL(H_CFDIR));
+ 
      default_rc = 1;
      Muttrc = safe_strdup (buffer);
 @@ -2526,10 +2545,10 @@
@@ -170,9 +173,9 @@ diff -Nur mutt-1.5.11.orig/mutt_ssl.c mutt-1.5.11/mutt_ssl.c
 +# define H_CFDIR Homedir
 +#endif
 +
- typedef struct _sslsockdata
- {
-   SSL_CTX *ctx;
+ /* keep a handle on accepted certificates in case we want to
+  * open up another connection to the same server in this session */
+ static STACK_OF(X509) *SslSessionCerts = NULL;
 @@ -162,7 +169,7 @@
      /* load entropy from egd sockets */
  #ifdef HAVE_RAND_EGD