bucket_8F/mutt

   1 # Buildsheet autogenerated by ravenadm tool -- Do not edit.
   2
   3 NAMEBASE=               mutt
   4 VERSION=                1.14.2
   5 KEYWORDS=               mail
   6 VARIANTS=               standard
   7 SDESC[standard]=        Powerful mail client
   8 HOMEPAGE=               http://www.mutt.org/
   9 CONTACT=                Leonid_Bobrov[goleo@disroot.org]
  10
  11 DOWNLOAD_GROUPS=        main
  12 SITES[main]=            ftp://ftp.mutt.org/pub/mutt/
  13 DISTFILE[1]=            mutt-1.14.2.tar.gz:main
  14 DF_INDEX=               1
  15 SPKGS[standard]=        complete
  16                         primary
  17                         docs
  18                         nls
  19
  20 OPTIONS_AVAILABLE=      none
  21 OPTIONS_STANDARD=       none
  22
  23 BUILD_DEPENDS=          docbook-xsl:primary:standard
  24                         lynx:primary:standard
  25                         gdbm:primary:static
  26 BUILDRUN_DEPENDS=       cyrus-sasl:primary:standard
  27                         gettext:runtime:standard
  28                         libidn2:primary:standard
  29 RUN_DEPENDS=            mime-support:single:standard
  30
  31 USES=                   cpe ncurses perl shebangfix ssl zlib iconv:translit
  32
  33 LICENSE=                GPLv2+:primary
  34 LICENSE_TERMS=          primary:{{WRKSRC}}/COPYRIGHT
  35 LICENSE_FILE=           GPLv2+:stock
  36 LICENSE_SCHEME=         solo
  37
  38 FPC_EQUIVALENT=         mail/mutt
  39 SHEBANG_FILES=          contrib/smime_keys_test.pl
  40                         doc/gen-map-doc
  41                         smime_keys.pl
  42
  43 MUST_CONFIGURE=         gnu
  44 CONFIGURE_ARGS=         --disable-debug
  45                         --disable-flock
  46                         --enable-compressed
  47                         --enable-external_dotlock
  48                         --enable-fcntl
  49                         --disable-gpgme
  50                         --enable-hcache
  51                         --enable-imap
  52                         --enable-nls
  53                         --enable-pop
  54                         --enable-sidebar
  55                         --enable-smtp
  56                         --mandir={{MANPREFIX}}/man
  57                         --prefix={{PREFIX}}
  58                         --sysconfdir={{PREFIX}}/etc
  59                         --with-docdir={{PREFIX}}/share/doc/mutt
  60                         --with-curses
  61                         --with-gdbm
  62                         --with-idn2
  63                         --with-sasl={{LOCALBASE}}
  64                         --with-ssl
  65                         --with-libiconv-prefix={{LOCALBASE}}
  66                         --without-kyotocabinet
  67                         --without-tokyocabinet
  68                         --without-qdbm
  69
  70 CFLAGS=                 -I{{NCURSESINC}}
  71
  72 post-install:
  73         ${RM} ${STAGEDIR}${PREFIX}/etc/mime.types
  74
  75 [FILE:414:descriptions/desc.primary]
  76 Mutt is a small but very powerful text-based mail client for Unix-like
  77 operating systems. Features include support for multiple mailbox formats
  78 (including IMAP, POP3, mbox, MMDF, MH, Maildir), MIME/RFC2047, message
  79 threading, encryption and signing with PGP/GPG and S/MIME, and many
  80 operations can use regular expressions. It's highly customizable with
  81 many options for colours, key bindings, display formats etc.
  82
  83
  84 [FILE:97:distinfo]
  85 e22f700e8c57fbc41a642bfeeeed1adca06e6187887c39614a5c38d381a6ac31      5222938 mutt-1.14.2.tar.gz
  86
  87
  88 [FILE:288:manifests/plist.primary]
  89 @sample etc/Muttrc.sample
  90 bin/
  91  flea
  92  mutt
  93 @(,mail,2755) bin/mutt_dotlock
  94  mutt_pgpring
  95  muttbug
  96  pgpewrap
  97  smime_keys
  98 share/info/mutt.info
  99 share/man/man1/
 100  mutt.1.gz
 101  mutt_dotlock.1.gz
 102  mutt_pgpring.1.gz
 103  pgpewrap.1.gz
 104  smime_keys.1.gz
 105 share/man/man5/
 106  mbox.5.gz
 107  mmdf.5.gz
 108  muttrc.5.gz
 109
 110
 111 [FILE:1089:manifests/plist.nls]
 112 share/locale/bg/LC_MESSAGES/mutt.mo
 113 share/locale/ca/LC_MESSAGES/mutt.mo
 114 share/locale/cs/LC_MESSAGES/mutt.mo
 115 share/locale/da/LC_MESSAGES/mutt.mo
 116 share/locale/de/LC_MESSAGES/mutt.mo
 117 share/locale/el/LC_MESSAGES/mutt.mo
 118 share/locale/eo/LC_MESSAGES/mutt.mo
 119 share/locale/es/LC_MESSAGES/mutt.mo
 120 share/locale/et/LC_MESSAGES/mutt.mo
 121 share/locale/eu/LC_MESSAGES/mutt.mo
 122 share/locale/fi/LC_MESSAGES/mutt.mo
 123 share/locale/fr/LC_MESSAGES/mutt.mo
 124 share/locale/ga/LC_MESSAGES/mutt.mo
 125 share/locale/gl/LC_MESSAGES/mutt.mo
 126 share/locale/hu/LC_MESSAGES/mutt.mo
 127 share/locale/id/LC_MESSAGES/mutt.mo
 128 share/locale/it/LC_MESSAGES/mutt.mo
 129 share/locale/ja/LC_MESSAGES/mutt.mo
 130 share/locale/ko/LC_MESSAGES/mutt.mo
 131 share/locale/lt/LC_MESSAGES/mutt.mo
 132 share/locale/nl/LC_MESSAGES/mutt.mo
 133 share/locale/pl/LC_MESSAGES/mutt.mo
 134 share/locale/pt_BR/LC_MESSAGES/mutt.mo
 135 share/locale/ru/LC_MESSAGES/mutt.mo
 136 share/locale/sk/LC_MESSAGES/mutt.mo
 137 share/locale/sv/LC_MESSAGES/mutt.mo
 138 share/locale/tr/LC_MESSAGES/mutt.mo
 139 share/locale/uk/LC_MESSAGES/mutt.mo
 140 share/locale/zh_CN/LC_MESSAGES/mutt.mo
 141 share/locale/zh_TW/LC_MESSAGES/mutt.mo
 142
 143
 144 [FILE:1465:patches/patch-Makefile.in]
 145 --- Makefile.in.orig    2020-05-16 18:20:55 UTC
 146 +++ Makefile.in
 147 @@ -530,7 +530,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
 148  @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
 149  @BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_SUBDIR = autocrypt
 150  @BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_INCLUDES = -I$(top_srcdir)/autocrypt
 151 -SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR) $(AUTOCRYPT_SUBDIR)
 152 +SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) $(AUTOCRYPT_SUBDIR) . doc
 153  bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
 154  @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
 155  BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c version.h $(HCVERSION)
 156 @@ -1664,18 +1664,9 @@ install-exec-hook:
 157                 rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;                \
 158                 ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
 159         fi
 160 -       if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
 161 -               chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
 162 -               chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \
 163 -               { echo "Can't fix mutt_dotlock's permissions!  This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
 164 -       fi
 165
 166  install-data-local:
 167         $(MKDIR_P) $(DESTDIR)$(sysconfdir)
 168 -       $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist
 169 -       -if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
 170 -               $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
 171 -       fi
 172
 173  uninstall-local:
 174         for i in mime.types ; do \
 175
 176
 177 [FILE:2644:patches/patch-browser.c]
 178 --- browser.c.orig      2020-05-02 22:37:43 UTC
 179 +++ browser.c
 180 @@ -32,6 +32,7 @@
 181  #ifdef USE_IMAP
 182  #include "imap.h"
 183  #endif
 184 +#include "mx.h"
 185
 186  #include <stdlib.h>
 187  #include <dirent.h>
 188 @@ -86,6 +87,12 @@ static int browser_compare_subject (cons
 189    struct folder_file *pa = (struct folder_file *) a;
 190    struct folder_file *pb = (struct folder_file *) b;
 191
 192 +  /* Always keep '..' in first menu position */
 193 +  if (!strncmp(pa->display_name, "..", 2))
 194 +         return(-1);
 195 +  if (!strncmp(pb->display_name, "..", 2))
 196 +         return(1);
 197 +
 198    int r = mutt_strcoll (pa->display_name, pb->display_name);
 199
 200    return ((BrowserSort & SORT_REVERSE) ? -r : r);
 201 @@ -96,6 +103,12 @@ static int browser_compare_date (const v
 202    struct folder_file *pa = (struct folder_file *) a;
 203    struct folder_file *pb = (struct folder_file *) b;
 204
 205 +  /* Always keep '..' in first menu position */
 206 +  if (!strncmp(pa->display_name, "..", 2))
 207 +         return(-1);
 208 +  if (!strncmp(pb->display_name, "..", 2))
 209 +         return(1);
 210 +
 211    int r = pa->mtime - pb->mtime;
 212
 213    return ((BrowserSort & SORT_REVERSE) ? -r : r);
 214 @@ -106,6 +119,12 @@ static int browser_compare_size (const v
 215    struct folder_file *pa = (struct folder_file *) a;
 216    struct folder_file *pb = (struct folder_file *) b;
 217
 218 +  /* Always keep '..' in first menu position */
 219 +  if (!strncmp(pa->display_name, "..", 2))
 220 +         return(-1);
 221 +  if (!strncmp(pb->display_name, "..", 2))
 222 +         return(1);
 223 +
 224    int r = pa->size - pb->size;
 225
 226    return ((BrowserSort & SORT_REVERSE) ? -r : r);
 227 @@ -430,6 +449,21 @@ static void init_state (struct browser_s
 228      menu->data = state->entry;
 229  }
 230
 231 +static void check_maildir_times (BUFFY *buf, struct stat *st)
 232 +{
 233 +  char buffer[_POSIX_PATH_MAX + SHORT_STRING];
 234 +  struct stat s;
 235 +
 236 +  if(!buf || buf->magic != MUTT_MAILDIR)
 237 +    return;
 238 +
 239 +  snprintf (buffer, sizeof (buffer), "%s/tmp", mutt_b2s(buf->pathbuf));
 240 +  if (lstat (buffer, &s) != 0)
 241 +    return;
 242 +
 243 +  st->st_mtime = s.st_mtime;
 244 +}
 245 +
 246  static int examine_directory (MUTTMENU *menu, struct browser_state *state,
 247                               const char *d, const char *prefix)
 248  {
 249 @@ -496,6 +530,7 @@ static int examine_directory (MUTTMENU *
 250      tmp = Incoming;
 251      while (tmp && mutt_strcmp (mutt_b2s (full_path), mutt_b2s (tmp->pathbuf)))
 252        tmp = tmp->next;
 253 +    check_maildir_times (tmp, &s);
 254      if (tmp && Context && !tmp->nopoll &&
 255          !mutt_strcmp (tmp->realpath, Context->realpath))
 256      {
 257 @@ -579,6 +614,7 @@ static int examine_mailboxes (MUTTMENU *
 258         s.st_mtime = st2.st_mtime;
 259      }
 260
 261 +    check_maildir_times (tmp, &s);
 262      add_folder (menu, state, mutt_b2s (mailbox), mutt_b2s (tmp->pathbuf), &s, tmp);
 263    }
 264    while ((tmp = tmp->next));
 265
 266
 267 [FILE:422:patches/patch-commands.c]
 268 --- commands.c.orig     2020-05-16 18:17:48 UTC
 269 +++ commands.c
 270 @@ -302,7 +302,7 @@ int mutt_display_message (HEADER *cur)
 271      {
 272        if (cur->security & GOODSIGN)
 273        {
 274 -       if (!crypt_smime_verify_sender(cur))
 275 +       if (option(OPTSMIMENOSENDER) || !crypt_smime_verify_sender(cur))
 276           mutt_message ( _("S/MIME signature successfully verified."));
 277         else
 278           mutt_error ( _("S/MIME certificate owner does not match sender."));
 279
 280
 281 [FILE:521:patches/patch-contrib_Makefile.in]
 282 --- contrib/Makefile.in.orig    2020-05-16 18:20:55 UTC
 283 +++ contrib/Makefile.in
 284 @@ -279,7 +279,7 @@ top_build_prefix = @top_build_prefix@
 285  top_builddir = @top_builddir@
 286  top_srcdir = @top_srcdir@
 287  subdir = contrib
 288 -SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
 289 +SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
 290         sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
 291         sample.muttrc-compress sample.muttrc-starter \
 292         sample.vimrc-sidebar colors.default colors.linux smime.rc \
 293
 294
 295 [FILE:1299:patches/patch-doc_Makefile.in]
 296 --- doc/Makefile.in.orig        2020-05-16 18:20:55 UTC
 297 +++ doc/Makefile.in
 298 @@ -572,14 +572,7 @@ install-data-local: makedoc-all instdoc
 299             $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
 300           fi \
 301         done
 302 -       $(INSTALL) -m 644 $(srcdir)/Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
 303 -       -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
 304 -               mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
 305 -       elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
 306 -               mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
 307 -       elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
 308 -               $(INSTALL) -m 644 $(srcdir)/Muttrc $(DESTDIR)$(sysconfdir) ; \
 309 -       fi
 310 +       $(INSTALL) -m 644 $(srcdir)/Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample
 311         -if [ -f $(srcdir)/mutt.info ] ; then \
 312           $(MKDIR_P) $(DESTDIR)$(infodir) ; \
 313           $(INSTALL) -m 644 $(srcdir)/mutt.info $(DESTDIR)$(infodir) ; \
 314 @@ -615,9 +608,7 @@ uninstall-local:
 315
 316  check:
 317  manual.txt: manual.html
 318 -       -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
 319 -       LC_ALL=C w3m -dump manual.html > $@ || \
 320 -       LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
 321 +       -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@
 322
 323  Muttrc: stamp-doc-rc
 324
 325
 326
 327 [FILE:4313:patches/patch-hdrline.c]
 328 --- hdrline.c.orig      2020-05-02 22:37:43 UTC
 329 +++ hdrline.c
 330 @@ -248,6 +248,89 @@ static char *apply_subject_mods (ENVELOP
 331   * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
 332   * %Z = status flags   */
 333
 334 +static void
 335 +format_smartdate( char *buf, size_t max, struct tm *tm, smartdate_type type )
 336 +{
 337 +    char *strftime_fmt = NULL;
 338 +
 339 +    switch( type ) {
 340 +        case FUTURE:        /* Date in the future */
 341 +            strftime_fmt = "%d%h%y!";
 342 +            break;
 343 +        case SMARTTIME:     /* Today */
 344 +            strftime_fmt = "%I:%M %p";
 345 +            break;
 346 +        case YESTERDAY:     /* Yesterday */
 347 +            strncpy( buf, "Yesterday", max );
 348 +            break;
 349 +        case WEEKDAY:       /* Within the last 7 days */
 350 +            strftime_fmt = "%A";
 351 +            break;
 352 +        case STANDARD:      /* Within the last six months */
 353 +            strftime_fmt = "%h %d";
 354 +            break;
 355 +        case ANCIENT:       /* Older than 6 months */
 356 +            strftime_fmt = "%h %Y";
 357 +            break;
 358 +    }
 359 +
 360 +    if( strftime_fmt != NULL ) {
 361 +        strftime( buf, max, strftime_fmt, tm );
 362 +    }
 363 +}
 364 +
 365 +static void
 366 +smartdate( char *buf, size_t max, struct tm *tm )
 367 +{
 368 +    smartdate_type type = 0;
 369 +
 370 +    struct tm now;
 371 +
 372 +    time_t sse = mktime( tm );   /* Seconds since epoch */
 373 +    time_t sse_now = time(NULL); /* Seconds since epoch until now */
 374 +
 375 +    int dse = 0;            /* Days since epoch */
 376 +    int dse_now = 0;        /* Days since epoch until today */
 377 +
 378 +    /* Calculate the number of days since epoch */
 379 +    dse = sse / (60*60*24);
 380 +    dse_now = sse_now / (60*60*24);
 381 +
 382 +    /* Default display type */
 383 +    type = STANDARD;
 384 +
 385 +    /* Check if the date is in the future */
 386 +    if( dse > dse_now ) {
 387 +        type = FUTURE;
 388 +    }
 389 +    else {
 390 +        int diff = dse_now - dse;
 391 +        if( diff == 0 ) type = SMARTTIME;
 392 +        else if( diff == 1 ) type = YESTERDAY;
 393 +        else if( diff < 7 ) type = WEEKDAY;
 394 +        else if( diff > 215 ) type = ANCIENT;  /* Surely older than six
 395 +                                                  months */
 396 +        else if( diff > 180 ) {
 397 +            /*
 398 +             * Slightly heavy calculation to check if the date is more
 399 +             * than six months in the past.  This calculation uses
 400 +             * calendar months and not the exact number of days.  So,
 401 +             * January 31, 2003 would be considered more than six months
 402 +             * old whether today's date is August 1 or August 31, 2003
 403 +             */
 404 +            int monthdiff;
 405 +            localtime_r( &sse_now, &now );
 406 +            monthdiff = ( now.tm_mon - tm->tm_mon )
 407 +                + ( ( now.tm_year - tm->tm_year ) * 12 );
 408 +            if( monthdiff > 6 ) {
 409 +                type = ANCIENT;
 410 +            }
 411 +        }
 412 +    }
 413 +
 414 +    format_smartdate( buf, max, tm, type );
 415 +}
 416 +
 417  static const char *
 418  hdr_format_str (char *dest,
 419                 size_t destlen,
 420 @@ -344,6 +427,53 @@ hdr_format_str (char *dest,
 421        const char *cp;
 422        struct tm *tm;
 423        time_t T;
 424 +       int i = 0, invert = 0;
 425 +
 426 +       if (optional && (op == '[' || op == '(')) {
 427 +         char *is;
 428 +         T = time(NULL);
 429 +         T -= (op == '(') ? hdr->received : hdr->date_sent;
 430 +
 431 +         is = (char *)prefix;
 432 +         if( *is == '>' ) {
 433 +           invert = 1;
 434 +           ++is;
 435 +         }
 436 +
 437 +         while( *is && *is != '?' ) {
 438 +           int t = strtol (is, &is, 10);
 439 +           switch (*(is++)) {
 440 +             case '?':
 441 +               break;
 442 +             case 'y':
 443 +               t *= 365 * 24 * 60 * 60;
 444 +               break;
 445 +             case 'M':
 446 +               t *= 30 * 24 * 60 * 60;
 447 +               break;
 448 +             case 'w':
 449 +               t *= 7 * 24 * 60 * 60;
 450 +               break;
 451 +             case 'd':
 452 +               t *= 24 * 60 * 60;
 453 +               break;
 454 +             case 'h':
 455 +               t *= 60 * 60;
 456 +               break;
 457 +             case 'm':
 458 +               t *= 60;
 459 +               break;
 460 +           }
 461 +           i += t;
 462 +         }
 463 +
 464 +         if (i < 0)
 465 +           i *= -1;
 466 +
 467 +         if( (T > i || T < -1*i) ^ invert )
 468 +           optional = 0;
 469 +         break;
 470 +       }
 471
 472        p = dest;
 473
 474 @@ -421,7 +551,13 @@ hdr_format_str (char *dest,
 475
 476        if (!do_locales)
 477          setlocale (LC_TIME, "C");
 478 -      strftime (buf2, sizeof (buf2), dest, tm);
 479 +               /* Identify the non-strftime smartdate pattern (%@) */
 480 +               if( strncmp( dest, "%@", 2 ) == 0 ) {
 481 +                       smartdate( buf2, sizeof( buf2 ), tm );
 482 +               }
 483 +               else {
 484 +                       strftime (buf2, sizeof (buf2), dest, tm);
 485 +               }
 486        if (!do_locales)
 487          setlocale (LC_TIME, "");
 488
 489
 490
 491 [FILE:1222:patches/patch-init.h]
 492 --- init.h.orig 2020-05-16 18:17:48 UTC
 493 +++ init.h
 494 @@ -1141,6 +1141,11 @@ struct option_t MuttVars[] = {
 495    ** sent to both the list and your address, resulting in two copies
 496    ** of the same email for you.
 497    */
 498 +  { "force_base64",   DT_BOOL, R_NONE, {.l=OPTFORCEBASE64}, {.l=0} },
 499 +  /*
 500 +  ** .pp
 501 +  ** If you need to encode all text parts to base64, set this option.
 502 +  */
 503    { "force_name",      DT_BOOL, R_NONE, {.l=OPTFORCENAME}, {.l=0} },
 504    /*
 505    ** .pp
 506 @@ -3588,6 +3593,15 @@ struct option_t MuttVars[] = {
 507    ** to determine the key to use. It will ask you to supply a key, if it can't find one.
 508    ** (S/MIME only)
 509    */
 510 +  { "smime_dont_check_sender", DT_BOOL, R_NONE, {.l=OPTSMIMENOSENDER}, {.l=0} },
 511 +  /*
 512 +  ** .pp
 513 +  ** This flag controls wether you want the skip the check for the sender's
 514 +  ** email address against the email address stored in the certificate.
 515 +  ** This can be useful if most of your email senders use SMIMEv3 which no
 516 +  ** longer needs email-addresses as part of the certificates.
 517 +  ** It is not set by default.
 518 +  */
 519    { "smime_self_encrypt_as",   DT_SYN,  R_NONE, {.p="smime_default_key"}, {.p=0} },
 520    { "smime_default_key",               DT_STR,  R_NONE, {.p=&SmimeDefaultKey}, {.p=0} },
 521    /*
 522
 523
 524 [FILE:926:patches/patch-mutt.h]
 525 --- mutt.h.orig 2020-05-16 18:17:48 UTC
 526 +++ mutt.h
 527 @@ -165,6 +165,16 @@ typedef enum
 528    MUTT_WRITE_HEADER_MIME
 529  } mutt_write_header_mode;
 530
 531 +/* flags for SmartDate */
 532 +typedef enum {
 533 +    FUTURE      = 1,
 534 +    SMARTTIME   = 2,
 535 +    YESTERDAY   = 3,
 536 +    WEEKDAY     = 4,
 537 +    STANDARD    = 5,
 538 +    ANCIENT     = 6
 539 +} smartdate_type;
 540 +
 541  /* types for mutt_add_hook() */
 542  #define MUTT_FOLDERHOOK  1
 543  #define MUTT_MBOXHOOK    (1<<1)
 544 @@ -232,6 +242,7 @@ enum
 545    MUTT_EXPIRED,
 546    MUTT_SUPERSEDED,
 547    MUTT_TRASH,
 548 +  MUTT_THREADCOMPLETE,
 549
 550    /* actions for mutt_pattern_comp/mutt_pattern_exec */
 551    MUTT_AND,
 552 @@ -415,6 +426,7 @@ enum
 553    OPTFCCCLEAR,
 554    OPTFLAGSAFE,
 555    OPTFOLLOWUPTO,
 556 +  OPTFORCEBASE64,
 557    OPTFORCENAME,
 558    OPTFORWDECODE,
 559    OPTFORWQUOTE,
 560 @@ -583,6 +595,7 @@ enum
 561    OPTSMIMEISDEFAULT,
 562    OPTSMIMESELFENCRYPT,
 563    OPTASKCERTLABEL,
 564 +  OPTSMIMENOSENDER,
 565    OPTSDEFAULTDECRYPTKEY,
 566    OPTPGPIGNORESUB,
 567    OPTPGPCHECKEXIT,
 568
 569
 570 [FILE:2656:patches/patch-muttlib.c]
 571 --- muttlib.c.orig      2020-05-16 18:17:48 UTC
 572 +++ muttlib.c
 573 @@ -930,16 +930,15 @@ void _mutt_buffer_mktemp (BUFFER *buf, c
 574  void _mutt_mktemp (char *s, size_t slen, const char *prefix, const char *suffix,
 575                     const char *src, int line)
 576  {
 577 -  size_t n = snprintf (s, slen, "%s/%s-%s-%d-%d-%ld%ld%s%s",
 578 -                       NONULL (Tempdir), NONULL (prefix), NONULL (Hostname),
 579 -                       (int) getuid (), (int) getpid (), random (), random (),
 580 -                       suffix ? "." : "", NONULL (suffix));
 581 +  size_t n = snprintf (s, slen, "%s/mutt-%s-XXXXXXXX", NONULL (Tempdir), NONULL (Hostname));
 582    if (n >= slen)
 583      dprint (1, (debugfile, "%s:%d: ERROR: insufficient buffer space to hold temporary filename! slen=%zu but need %zu\n",
 584                  src, line, slen, n));
 585 -  dprint (3, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));
 586 -  if (unlink (s) && errno != ENOENT)
 587 -    dprint (1, (debugfile, "%s:%d: ERROR: unlink(\"%s\"): %s (errno %d)\n", src, line, s, strerror (errno), errno));
 588 +  if (mktemp (s)) {
 589 +    dprint (3, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));
 590 +  } else {
 591 +    dprint (1, (debugfile, "%s:%d: ERROR: mktemp(\"%s\"): %s (errno %d)\n", src, line, s, strerror (errno), errno));
 592 +  }
 593  }
 594
 595  /* these characters must be escaped in regular expressions */
 596 @@ -1667,7 +1666,16 @@ void mutt_FormatString (char *dest,              /*
 597        if (*src == '?')
 598        {
 599         flags |= MUTT_FORMAT_OPTIONAL;
 600 -       src++;
 601 +       ch = *(++src); /* save the character to switch on */
 602 +       cp = prefix;
 603 +       ++src;
 604 +       count = 0;
 605 +       while (count < sizeof (prefix) && *src != '?')
 606 +       {
 607 +         *cp++ = *src++;
 608 +         count++;
 609 +       }
 610 +       *cp = 0;
 611        }
 612        else
 613        {
 614 @@ -1683,12 +1691,12 @@ void mutt_FormatString (char *dest,             /*
 615           count++;
 616         }
 617         *cp = 0;
 618 -      }
 619
 620 -      if (!*src)
 621 -       break; /* bad format */
 622 +       if (!*src)
 623 +         break; /* bad format */
 624
 625 -      ch = *src++; /* save the character to switch on */
 626 +       ch = *src++; /* save the character to switch on */
 627 +      }
 628
 629        if (flags & MUTT_FORMAT_OPTIONAL)
 630        {
 631 @@ -1701,6 +1709,12 @@ void mutt_FormatString (char *dest,              /*
 632         count = 0;
 633          while (count < sizeof (ifstring) && *src && *src != '?' && *src != '&')
 634         {
 635 +         if (*src == '\\')
 636 +         {
 637 +           src++;
 638 +           if (!*src)
 639 +             break;
 640 +         }
 641            *cp++ = *src++;
 642           count++;
 643         }
 644 @@ -1713,7 +1727,13 @@ void mutt_FormatString (char *dest,              /*
 645         count = 0;
 646         while (count < sizeof (elsestring) && *src && *src != '?')
 647         {
 648 -         *cp++ = *src++;
 649 +         if (*src == '\\')
 650 +         {
 651 +           src++;
 652 +           if (!*src)
 653 +             break;
 654 +         }
 655 +          *cp++ = *src++;
 656           count++;
 657         }
 658         *cp = 0;
 659
 660
 661 [FILE:954:patches/patch-pattern.c]
 662 --- pattern.c.orig      2020-05-16 18:17:48 UTC
 663 +++ pattern.c
 664 @@ -57,6 +57,7 @@ static const struct pattern_flags
 665  }
 666  Flags[] =
 667  {
 668 +  { 'a', MUTT_THREADCOMPLETE,  0,              NULL },
 669    { 'A', MUTT_ALL,                     0,              NULL },
 670    { 'b', MUTT_BODY,  MUTT_FULL_MSG|MUTT_SEND_MODE_SEARCH, eat_regexp },
 671    { 'B', MUTT_WHOLE_MSG,  MUTT_FULL_MSG|MUTT_SEND_MODE_SEARCH, eat_regexp },
 672 @@ -1493,6 +1494,16 @@ mutt_pattern_exec (struct pattern_t *pat
 673        else
 674          result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc);
 675        return (pat->not ^ result);
 676 +    case MUTT_THREADCOMPLETE:
 677 +      { static pattern_t tmp;
 678 +        static short pattern_set = 0;
 679 +        if(! pattern_set) {
 680 +          memset (&tmp, 0, sizeof (tmp));
 681 +          tmp.op = MUTT_TAG;
 682 +          pattern_set = 1;
 683 +        }
 684 +        return (pat->not ^ (h->env && match_threadcomplete(&tmp, flags, ctx, h->thread, 1, 1, 1, 1)));
 685 +      }
 686      case MUTT_SUBSCRIBED_LIST:
 687        if (cache)
 688        {
 689
 690
 691 [FILE:721:patches/patch-sendlib.c]
 692 --- sendlib.c.orig      2020-05-02 22:37:43 UTC
 693 +++ sendlib.c
 694 @@ -1219,7 +1219,9 @@ static void mutt_set_encoding (BODY *b,
 695    if (b->type == TYPETEXT)
 696    {
 697      char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b);
 698 -    if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) || info->linemax > 990 || (info->from && option (OPTENCODEFROM)))
 699 +    if (option (OPTFORCEBASE64))
 700 +      b->encoding = ENCBASE64;
 701 +    else if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) || info->linemax > 990 || (info->from && option (OPTENCODEFROM)))
 702        b->encoding = ENCQUOTEDPRINTABLE;
 703      else if (info->hibin)
 704        b->encoding = option (OPTALLOW8BIT) ? ENC8BIT : ENCQUOTEDPRINTABLE;
 705