<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/38e2003b288d11b0bafa59860efe2f05d6d8c4c9">https://github.com/macports/macports-ports/commit/38e2003b288d11b0bafa59860efe2f05d6d8c4c9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 38e2003b288d11b0bafa59860efe2f05d6d8c4c9
</span>Author: Chih-Hsuan Yen <yan12125@gmail.com>
AuthorDate: Tue Sep 10 07:05:58 2019 +0800
<span style='display:block; white-space:pre;color:#404040;'> mailx: removed in favor of s-nail
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58990
</span>---
mail/mailx/Portfile | 58 +--------
...patch-0001-outof-Introduce-expandaddr-flag.diff | 67 -----------
...able-option-processing-for-email-addresses.diff | 77 ------------
..._c-Unconditionally-require-wordexp-support.diff | 111 ------------------
...nvoke-wordexp-with-WRDE_NOCMD-CVE-2004-277.diff | 28 -----
mail/mailx/files/patch-Makefile | 39 -------
mail/mailx/files/patch-junk.c | 20 ----
mail/mailx/files/patch-maildir.c | 29 -----
mail/mailx/files/patch-makeconfig | 28 -----
mail/mailx/files/patch-openssl.c | 129 ---------------------
10 files changed, 6 insertions(+), 580 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/mailx/Portfile b/mail/mailx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 875a570..7cb24c0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/mailx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/mailx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,56 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name mailx
<span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by s-nail
</span> version 12.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 7
</span> categories mail
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license {BSD-old BSD}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Heirloom mailx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Mailx is derived from Berkeley Mail and is intended provide the \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- functionality of the POSIX mailx command with additional support for MIME, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IMAP, POP3, SMTP, and S/MIME. It provides enhanced features for \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- interactive use, such as caching and disconnected operation for IMAP, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message threading, scoring, and filtering. It is also usable as a mail \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- batch language, both for sending and receiving mail.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://heirloom.sourceforge.net/mailx.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/heirloom/heirloom-mailx/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 0c93759e34200eb56a0e7c464680a54a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 b1e105adf9d36269daf317dedf68b6e4cca404a7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8244d04d0a0058fdbe9867ca503c7cda8d580154
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:kerberos5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libiconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-junk.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-maildir.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-makeconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-openssl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# CVE-2004-2771, CVE-2014-7844
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://seclists.org/oss-sec/2014/q4/1066
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-0001-outof-Introduce-expandaddr-flag.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-0002-unpack-Disable-option-processing-for-email-addresses.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-0003-fio_c-Unconditionally-require-wordexp-support.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-0004-globname-Invoke-wordexp-with-WRDE_NOCMD-CVE-2004-277.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PREFIX__|${prefix}|" "${worksrcpath}/Makefile"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__DESTROOT__|${destroot}|" "${worksrcpath}/Makefile"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__CC__|${configure.cc}|" "${worksrcpath}/Makefile"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__CFLAGS__|${configure.cflags} [get_canonical_archflags cc]|" "${worksrcpath}/Makefile"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__LDFLAGS__|${configure.ldflags} [get_canonical_archflags ld]|" "${worksrcpath}/Makefile"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd /bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args makeconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_args
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove after 2020-09-10
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/mailx/files/patch-0001-outof-Introduce-expandaddr-flag.diff b/mail/mailx/files/patch-0001-outof-Introduce-expandaddr-flag.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8ebeae3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/mailx/files/patch-0001-outof-Introduce-expandaddr-flag.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,67 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream: http://seclists.org/oss-sec/2014/q4/1066
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>->From 9984ae5cb0ea0d61df1612b06952a61323c083d9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Florian Weimer <fweimer () redhat com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 17 Nov 2014 11:13:38 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/4] outof: Introduce expandaddr flag
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Document that address expansion is disabled unless the expandaddr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-binary option is set.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This has been assigned CVE-2014-7844 for BSD mailx, but it is not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-a vulnerability in Heirloom mailx because this feature was documented.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mailx.1 | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- names.c | 3 +++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 17 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/mailx.1 b/mailx.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 70a7859..22a171b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mailx.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mailx.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -656,6 +656,14 @@ but any reply returned to the machine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- will have the system wide alias expanded
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as all mail goes through sendmail.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .SS "Recipient address specifications"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+If the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.I expandaddr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option is not set (the default), recipient addresses must be names of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+local mailboxes or Internet mail addresses.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.PP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+If the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.I expandaddr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option is set, the following rules apply:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- When an address is used to name a recipient
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (in any of To, Cc, or Bcc),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- names of local mail folders
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2391,6 +2399,12 @@ and exits immediately.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- If this option is set,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \fImailx\fR starts even with an empty mailbox.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .TP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.B expandaddr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Causes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.I mailx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+to expand message recipient addresses, as explained in the section,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Recipient address specifications.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.TP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .B flipr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Exchanges the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .I Respond
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/names.c b/names.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 66e976b..c69560f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- names.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ names.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -268,6 +268,9 @@ outof(struct name *names, FILE *fo, struct header *hp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FILE *fout, *fin;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int ispipe;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (value("expandaddr") == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return names;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- top = names;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- np = names;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- time(&now);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-1.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/mailx/files/patch-0002-unpack-Disable-option-processing-for-email-addresses.diff b/mail/mailx/files/patch-0002-unpack-Disable-option-processing-for-email-addresses.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f001c46..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/mailx/files/patch-0002-unpack-Disable-option-processing-for-email-addresses.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,77 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-upstream: http://seclists.org/oss-sec/2014/q4/1066
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>->From e34e2ac67b80497080ebecccec40c3b61456167d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Florian Weimer <fweimer () redhat com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 17 Nov 2014 11:14:06 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/4] unpack: Disable option processing for email addresses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- when calling sendmail
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern.h | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- names.c | 8 ++++++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sendout.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 8 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/extern.h b/extern.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6b85ba0..8873fe8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- extern.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ extern.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -396,7 +396,7 @@ struct name *outof(struct name *names, FILE *fo, struct header *hp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int is_fileaddr(char *name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct name *usermap(struct name *names);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct name *cat(struct name *n1, struct name *n2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--char **unpack(struct name *np);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+char **unpack(struct name *smopts, struct name *np);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct name *elide(struct name *names);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int count(struct name *np);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct name *delete_alternates(struct name *np);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/names.c b/names.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c69560f..45bbaed 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- names.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ names.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -549,7 +549,7 @@ cat(struct name *n1, struct name *n2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Return an error if the name list won't fit.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char **
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--unpack(struct name *np)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+unpack(struct name *smopts, struct name *np)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char **ap, **top;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct name *n;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -564,7 +564,7 @@ unpack(struct name *np)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * the terminating 0 pointer. Additional spots may be needed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * to pass along -f to the host mailer.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- extra = 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extra = 3 + count(smopts);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extra++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- metoo = value("metoo") != NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (metoo)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -581,6 +581,10 @@ unpack(struct name *np)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *ap++ = "-m";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (verbose)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *ap++ = "-v";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (; smopts != NULL; smopts = smopts->n_flink)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((smopts->n_type & GDEL) == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *ap++ = smopts->n_name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *ap++ = "--";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (; n != NULL; n = n->n_flink)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((n->n_type & GDEL) == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *ap++ = n->n_name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/sendout.c b/sendout.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7b7f2eb..c52f15d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- sendout.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ sendout.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -835,7 +835,7 @@ start_mta(struct name *to, struct name *mailargs, FILE *input,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* HAVE_SOCKETS */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((smtp = value("smtp")) == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- args = unpack(cat(mailargs, to));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ args = unpack(mailargs, to);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (debug || value("debug")) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf(catgets(catd, CATSET, 181,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Sendmail arguments:"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-1.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/mailx/files/patch-0003-fio_c-Unconditionally-require-wordexp-support.diff b/mail/mailx/files/patch-0003-fio_c-Unconditionally-require-wordexp-support.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bc1e869..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/mailx/files/patch-0003-fio_c-Unconditionally-require-wordexp-support.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,111 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream: http://seclists.org/oss-sec/2014/q4/1066
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>->From 2bae8ecf04ec2ba6bb9f0af5b80485dd0edb427d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Florian Weimer <fweimer () redhat com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 17 Nov 2014 12:48:25 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3/4] fio.c: Unconditionally require wordexp support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fio.c | 67 +++++--------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 5 insertions(+), 62 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/fio.c b/fio.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 65e8f10..1529236 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- fio.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fio.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,12 +43,15 @@ static char sccsid[] = "@(#)fio.c 2.76 (gritter) 9/16/09";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* not lint */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "rcv.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef HAVE_WORDEXP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#error wordexp support is required
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/file.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/wait.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_WORDEXP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <wordexp.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* HAVE_WORDEXP */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined (USE_NSS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -481,7 +484,6 @@ next:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static char *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- globname(char *name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_WORDEXP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wordexp_t we;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *cp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sigset_t nset;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -527,65 +529,6 @@ globname(char *name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wordfree(&we);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return cp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else /* !HAVE_WORDEXP */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char xname[PATHSIZE];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char cmdbuf[PATHSIZE]; /* also used for file names */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int pid, l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char *cp, *shell;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int pivec[2];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- extern int wait_status;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct stat sbuf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (pipe(pivec) < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- perror("pipe");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- snprintf(cmdbuf, sizeof cmdbuf, "echo %s", name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((shell = value("SHELL")) == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- shell = SHELL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pid = start_command(shell, 0, -1, pivec[1], "-c", cmdbuf, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (pid < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- close(pivec[0]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- close(pivec[1]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- close(pivec[1]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--again:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- l = read(pivec[0], xname, sizeof xname);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (l < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (errno == EINTR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- goto again;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- perror("read");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- close(pivec[0]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- close(pivec[0]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (wait_child(pid) < 0 && WTERMSIG(wait_status) != SIGPIPE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fprintf(stderr, catgets(catd, CATSET, 81,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "\"%s\": Expansion failed.\n"), name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (l == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fprintf(stderr, catgets(catd, CATSET, 82,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "\"%s\": No match.\n"), name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (l == sizeof xname) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fprintf(stderr, catgets(catd, CATSET, 83,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "\"%s\": Expansion buffer overflow.\n"), name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- xname[l] = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (cp = &xname[l-1]; *cp == '\n' && cp > xname; cp--)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp[1] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (strchr(xname, ' ') && stat(xname, &sbuf) < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fprintf(stderr, catgets(catd, CATSET, 84,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "\"%s\": Ambiguous.\n"), name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return savestr(xname);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !HAVE_WORDEXP */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-1.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/mailx/files/patch-0004-globname-Invoke-wordexp-with-WRDE_NOCMD-CVE-2004-277.diff b/mail/mailx/files/patch-0004-globname-Invoke-wordexp-with-WRDE_NOCMD-CVE-2004-277.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a2722c1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/mailx/files/patch-0004-globname-Invoke-wordexp-with-WRDE_NOCMD-CVE-2004-277.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream: http://seclists.org/oss-sec/2014/q4/1066
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>->From 73fefa0c1ac70043ec84f2d8b8f9f683213f168d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Florian Weimer <fweimer () redhat com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 17 Nov 2014 13:11:32 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 4/4] globname: Invoke wordexp with WRDE_NOCMD (CVE-2004-2771)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fio.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/fio.c b/fio.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1529236..774a204 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- fio.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fio.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -497,7 +497,7 @@ globname(char *name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sigemptyset(&nset);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sigaddset(&nset, SIGCHLD);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sigprocmask(SIG_BLOCK, &nset, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- i = wordexp(name, &we, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i = wordexp(name, &we, WRDE_NOCMD);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sigprocmask(SIG_UNBLOCK, &nset, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (i) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 0:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-1.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/mailx/files/patch-Makefile b/mail/mailx/files/patch-Makefile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 428629c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/mailx/files/patch-Makefile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2008-07-28 15:33:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2009-03-20 22:43:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,27 +6,28 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See the file INSTALL if you need help.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PREFIX = /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PREFIX = __PREFIX__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BINDIR = $(PREFIX)/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MANDIR = $(PREFIX)/share/man
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SYSCONFDIR = /etc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYSCONFDIR = $(PREFIX)/etc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAILRC = $(SYSCONFDIR)/nail.rc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAILSPOOL = /var/mail
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SENDMAIL = /usr/lib/sendmail
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SENDMAIL = /usr/sbin/sendmail
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DESTDIR =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DESTDIR = __DESTROOT__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--UCBINSTALL = /usr/ucb/install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+UCBINSTALL = /usr/bin/install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Define compiler, preprocessor, and linker flags here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note that some Linux/glibc versions need -D_GNU_SOURCE in CPPFLAGS, or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # wcwidth() will not be available and multibyte characters will not be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # displayed correctly.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#CFLAGS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CC = __CC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS = __CFLAGS__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #CPPFLAGS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#LDFLAGS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#WARN = -Wall -Wno-parentheses -Werror
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS = __LDFLAGS__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+WARN = -Wall -Wno-parentheses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Some RedHat versions need INCLUDES = -I/usr/kerberos/include to compile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # with OpenSSL, or to compile with GSSAPI authentication included. In the
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/mailx/files/patch-junk.c b/mail/mailx/files/patch-junk.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 079ba8d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/mailx/files/patch-junk.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- junk.c.orig 2009-03-20 22:50:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ junk.c 2009-03-20 22:50:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1033,7 +1033,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- float a = 1, b = 1, r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (verbose)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fprintf(stderr, "Examining message %d\n", m - &message[0] + 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fprintf(stderr, "Examining message %d\n", (int)(m - &message[0] + 1));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < BEST; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- best[i].dist = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- best[i].prob = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1061,7 +1061,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r = a+b > 0 ? a / (a+b) : 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (verbose)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stderr, "Junk probability of message %d: %g\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m - &message[0] + 1, r);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (int)(m - &message[0] + 1), r);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (r > THR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m->m_flag |= MJUNK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/mailx/files/patch-maildir.c b/mail/mailx/files/patch-maildir.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f2de90a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/mailx/files/patch-maildir.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- maildir.c.orig 2009-03-20 22:51:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ maildir.c 2009-03-20 22:52:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -336,7 +336,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((fp = Fopen(m->m_maildir_file, "r")) == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stderr, "Cannot read \"%s/%s\" for message %d\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- name, m->m_maildir_file, m - &message[0] + 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ name, m->m_maildir_file, (int)(m - &message[0] + 1));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m->m_flag |= MHIDDEN;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -443,7 +443,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stderr, "Cannot delete file \"%s/%s\" "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "for message %d.\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mailname, m->m_maildir_file,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m - &message[0] + 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (int)(m - &message[0] + 1));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gotcha++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -492,7 +492,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "message %d not touched.\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mailname, m->m_maildir_file,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mailname, new,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m - &message[0] + 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (int)(m - &message[0] + 1));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (unlink(m->m_maildir_file) < 0)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/mailx/files/patch-makeconfig b/mail/mailx/files/patch-makeconfig
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 944c4e4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/mailx/files/patch-makeconfig
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- makeconfig 2007/04/14 15:26:00 1.14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makeconfig 2009/05/26 21:04:15 1.15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -393,6 +393,25 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test x$have_openssl = xyes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ compile_check stack_of 'for STACK_OF()' '#define HAVE_STACK_OF' <<\!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <openssl/ssl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <openssl/err.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <openssl/x509v3.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <openssl/x509.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <openssl/rand.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int main(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ STACK_OF(GENERAL_NAME) *gens = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ printf("%p", gens); /* to make it used */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SSLv23_client_method();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PEM_read_PrivateKey(0, 0, 0, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >$tmp2.c <<\!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gssapi/gssapi.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/mailx/files/patch-openssl.c b/mail/mailx/files/patch-openssl.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 36875a5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/mailx/files/patch-openssl.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,129 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- openssl.c.orig 2016-03-26 22:41:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ openssl.c 2016-03-26 22:42:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -101,12 +101,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int ssl_rand_init(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void ssl_init(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int ssl_verify_cb(int success, X509_STORE_CTX *store);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static SSL_METHOD *ssl_select_method(const char *uhp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static const SSL_METHOD *ssl_select_method(const char *uhp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void ssl_load_verifications(struct sock *sp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void ssl_certificate(struct sock *sp, const char *uhp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static enum okay ssl_check_host(const char *server, struct sock *sp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STACK_OF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static int smime_verify(struct message *m, int n, STACK_OF(X509) *chain,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ X509_STORE *store);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int smime_verify(struct message *m, int n, STACK *chain,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- X509_STORE *store);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static EVP_CIPHER *smime_cipher(const char *name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int ssl_password_cb(char *buf, int size, int rwflag, void *userdata);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static FILE *smime_sign_cert(const char *xname, const char *xname2, int warn);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -203,17 +208,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static SSL_METHOD *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static const SSL_METHOD *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ssl_select_method(const char *uhp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SSL_METHOD *method;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const SSL_METHOD *method;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *cp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp = ssl_method_string(uhp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (cp != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (equal(cp, "ssl2"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- method = SSLv2_client_method();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else if (equal(cp, "ssl3"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (equal(cp, "ssl3"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- method = SSLv3_client_method();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (equal(cp, "tls1"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- method = TLSv1_client_method();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -308,7 +311,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- X509 *cert;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- X509_NAME *subj;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char data[256];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STACK_OF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ STACK_OF(GENERAL_NAME) *gens;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*GENERAL_NAMES*/STACK *gens;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GENERAL_NAME *gen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -357,7 +364,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ssl_init();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ssl_set_vrfy_level(uhp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((sp->s_ctx = SSL_CTX_new(ssl_select_method(uhp))) == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((sp->s_ctx =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SSL_CTX_new((SSL_METHOD *)ssl_select_method(uhp))) == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ssl_gen_err(catgets(catd, CATSET, 261, "SSL_CTX_new() failed"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return STOP;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -496,7 +504,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STACK_OF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+smime_verify(struct message *m, int n, STACK_OF(X509) *chain, X509_STORE *store)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- smime_verify(struct message *m, int n, STACK *chain, X509_STORE *store)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct message *x;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *cp, *sender, *to, *cc, *cnttype;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -505,7 +517,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- off_t size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BIO *fb, *pb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKCS7 *pkcs7;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STACK_OF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ STACK_OF(X509) *certs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ STACK_OF(GENERAL_NAME) *gens;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STACK *certs, *gens;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- X509 *cert;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- X509_NAME *subj;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char data[LINESIZE];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -614,7 +631,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int *msgvec = vp, *ip;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int ec = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STACK_OF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ STACK_OF(X509) *chain = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STACK *chain = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- X509_STORE *store;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *ca_dir, *ca_file;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -687,7 +708,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- X509 *cert;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKCS7 *pkcs7;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BIO *bb, *yb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STACK_OF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ STACK_OF(X509) *certs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STACK *certs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EVP_CIPHER *cipher;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- certfile = expand((char *)certfile);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -950,9 +975,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- off_t size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BIO *fb, *pb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKCS7 *pkcs7;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_STACK_OF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ STACK_OF(X509) *certs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ STACK_OF(X509) *chain = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STACK *certs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- X509 *cert;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STACK *chain = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ X509 *cert;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enum okay ok = OKAY;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message_number = n;
</span></pre><pre style='margin:0'>
</pre>