From da35507d98214f7d77401cf30df3ae0a8f638851 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Mon, 17 Oct 2016 02:40:41 +0000 Subject: - Update to 1.7.1 - Move some vars around to make portlint happy - Use MUTT_LITE instead of LITE - Fetch deepif and date-contitional from remote locations - Reword COMMENT - Bring back remote patch versions incase mutt version and patch versions arn't in sync - Remove date_conditional patch pulled in remotely - Add two new sidebar samples - convert patch-* patches to makepatch patches - Greeting patch 1.7.1 now PATCHFILE - make makesum will pull all optional dist/patchfiles PR: 213431 Submitted by: maintainer (dereks lifeofadishwasher com) --- mail/mutt/files/patch-muttlib.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 mail/mutt/files/patch-muttlib.c (limited to 'mail/mutt/files/patch-muttlib.c') diff --git a/mail/mutt/files/patch-muttlib.c b/mail/mutt/files/patch-muttlib.c new file mode 100644 index 000000000000..3ff48049efb4 --- /dev/null +++ b/mail/mutt/files/patch-muttlib.c @@ -0,0 +1,25 @@ +--- muttlib.c.orig 2016-10-08 19:35:50 UTC ++++ muttlib.c +@@ -779,16 +779,15 @@ void mutt_merge_envelopes(ENVELOPE* base + void _mutt_mktemp (char *s, size_t slen, const char *prefix, const char *suffix, + const char *src, int line) + { +- size_t n = snprintf (s, slen, "%s/%s-%s-%d-%d-%ld%ld%s%s", +- NONULL (Tempdir), NONULL (prefix), NONULL (Hostname), +- (int) getuid (), (int) getpid (), random (), random (), +- suffix ? "." : "", NONULL (suffix)); ++ size_t n = snprintf (s, slen, "%s/mutt-%s-XXXXXXXX", NONULL (Tempdir), NONULL (Hostname)); + if (n >= slen) + dprint (1, (debugfile, "%s:%d: ERROR: insufficient buffer space to hold temporary filename! slen=%zu but need %zu\n", + src, line, slen, n)); +- dprint (3, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s)); +- if (unlink (s) && errno != ENOENT) +- dprint (1, (debugfile, "%s:%d: ERROR: unlink(\"%s\"): %s (errno %d)\n", src, line, s, strerror (errno), errno)); ++ if (mktemp (s)) { ++ dprint (3, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s)); ++ } else { ++ dprint (1, (debugfile, "%s:%d: ERROR: mktemp(\"%s\"): %s (errno %d)\n", src, line, s, strerror (errno), errno)); ++ } + } + + void mutt_free_alias (ALIAS **p) -- cgit v1.2.3