summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/mailx
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/mailx')
-rw-r--r--meta/recipes-extended/mailx/files/0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch59
-rw-r--r--meta/recipes-extended/mailx/files/0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch41
-rw-r--r--meta/recipes-extended/mailx/files/0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch25
-rw-r--r--meta/recipes-extended/mailx/files/0011-outof-Introduce-expandaddr-flag.patch71
-rw-r--r--meta/recipes-extended/mailx/files/0012-unpack-Disable-option-processing-for-email-addresses.patch79
-rw-r--r--meta/recipes-extended/mailx/files/0013-fio.c-Unconditionally-require-wordexp-support.patch113
-rw-r--r--meta/recipes-extended/mailx/files/0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch31
-rw-r--r--meta/recipes-extended/mailx/files/0015-usr-sbin-sendmail.patch38
-rw-r--r--meta/recipes-extended/mailx/files/explicitly.disable.krb5.support.patch46
-rw-r--r--meta/recipes-extended/mailx/mailx_12.5-5.bb53
10 files changed, 0 insertions, 556 deletions
diff --git a/meta/recipes-extended/mailx/files/0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch b/meta/recipes-extended/mailx/files/0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch
deleted file mode 100644
index 77da33321d..0000000000
--- a/meta/recipes-extended/mailx/files/0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1From: Luk Claes <luk@debian.org>
2Date: Sat, 4 Jul 2009 10:54:53 +0200
3Subject: Don't reuse weak symbol optopt to fix FTBFS on mips*
4
5This patch is taken from
6ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.debian.tar.xz
7
8Upstream-Status: Inappropriate [upstream is dead]
9---
10 getopt.c | 10 +++++-----
11 1 file changed, 5 insertions(+), 5 deletions(-)
12
13diff --git a/getopt.c b/getopt.c
14index 83ce628..82e983c 100644
15--- a/getopt.c
16+++ b/getopt.c
17@@ -43,7 +43,7 @@ typedef int ssize_t;
18 char *optarg;
19 int optind = 1;
20 int opterr = 1;
21-int optopt;
22+int optoptc;
23
24 static void
25 error(const char *s, int c)
26@@ -69,7 +69,7 @@ error(const char *s, int c)
27 *bp++ = *s++;
28 while (*msg)
29 *bp++ = *msg++;
30- *bp++ = optopt;
31+ *bp++ = optoptc;
32 *bp++ = '\n';
33 write(2, buf, bp - buf);
34 ac_free(buf);
35@@ -101,13 +101,13 @@ getopt(int argc, char *const argv[], const char *optstring)
36 }
37 curp = &argv[optind][1];
38 }
39- optopt = curp[0] & 0377;
40+ optoptc = curp[0] & 0377;
41 while (optstring[0]) {
42 if (optstring[0] == ':') {
43 optstring++;
44 continue;
45 }
46- if ((optstring[0] & 0377) == optopt) {
47+ if ((optstring[0] & 0377) == optoptc) {
48 if (optstring[1] == ':') {
49 if (curp[1] != '\0') {
50 optarg = (char *)&curp[1];
51@@ -127,7 +127,7 @@ getopt(int argc, char *const argv[], const char *optstring)
52 optind++;
53 optarg = 0;
54 }
55- return optopt;
56+ return optoptc;
57 }
58 optstring++;
59 }
diff --git a/meta/recipes-extended/mailx/files/0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch b/meta/recipes-extended/mailx/files/0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch
deleted file mode 100644
index 6bad433ea6..0000000000
--- a/meta/recipes-extended/mailx/files/0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From: Hilko Bengen <bengen@debian.org>
2Date: Wed, 27 Apr 2011 00:18:42 +0200
3Subject: Patched out SSL2 support since it is no longer supported by OpenSSL.
4
5This patch is taken from
6ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.debian.tar.xz
7
8Upstream-Status: Inappropriate [upstream is dead]
9---
10 mailx.1 | 2 +-
11 openssl.c | 4 +---
12 2 files changed, 2 insertions(+), 4 deletions(-)
13
14diff --git a/mailx.1 b/mailx.1
15index 417ea04..a02e430 100644
16--- a/mailx.1
17+++ b/mailx.1
18@@ -3575,7 +3575,7 @@ Only applicable if SSL/TLS support is built using OpenSSL.
19 .TP
20 .B ssl-method
21 Selects a SSL/TLS protocol version;
22-valid values are `ssl2', `ssl3', and `tls1'.
23+valid values are `ssl3', and `tls1'.
24 If unset, the method is selected automatically,
25 if possible.
26 .TP
27diff --git a/openssl.c b/openssl.c
28index b4e33fc..44fe4e5 100644
29--- a/openssl.c
30+++ b/openssl.c
31@@ -216,9 +216,7 @@ ssl_select_method(const char *uhp)
32
33 cp = ssl_method_string(uhp);
34 if (cp != NULL) {
35- if (equal(cp, "ssl2"))
36- method = SSLv2_client_method();
37- else if (equal(cp, "ssl3"))
38+ if (equal(cp, "ssl3"))
39 method = SSLv3_client_method();
40 else if (equal(cp, "tls1"))
41 method = TLSv1_client_method();
diff --git a/meta/recipes-extended/mailx/files/0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch b/meta/recipes-extended/mailx/files/0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch
deleted file mode 100644
index 13b73ae593..0000000000
--- a/meta/recipes-extended/mailx/files/0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From: Hilko Bengen <bengen@debian.org>
2Date: Sat, 14 Apr 2012 20:22:43 +0200
3Subject: Fixed Lintian warning (warning: macro `N' not defined)
4
5This patch is taken from
6ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.debian.tar.xz
7
8Upstream-Status: Inappropriate [upstream is dead]
9---
10 mailx.1 | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/mailx.1 b/mailx.1
14index a02e430..b0723bd 100644
15--- a/mailx.1
16+++ b/mailx.1
17@@ -3781,7 +3781,7 @@ you could examine the first message by giving the command:
18 .sp
19 .fi
20 which might cause
21-.N mailx
22+.I mailx
23 to respond with, for example:
24 .nf
25 .sp
diff --git a/meta/recipes-extended/mailx/files/0011-outof-Introduce-expandaddr-flag.patch b/meta/recipes-extended/mailx/files/0011-outof-Introduce-expandaddr-flag.patch
deleted file mode 100644
index 13b955c4b5..0000000000
--- a/meta/recipes-extended/mailx/files/0011-outof-Introduce-expandaddr-flag.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1From 9984ae5cb0ea0d61df1612b06952a61323c083d9 Mon Sep 17 00:00:00 2001
2From: Florian Weimer <fweimer@redhat.com>
3Date: Mon, 17 Nov 2014 11:13:38 +0100
4Subject: [PATCH 1/4] outof: Introduce expandaddr flag
5
6Document that address expansion is disabled unless the expandaddr
7binary option is set.
8
9This has been assigned CVE-2014-7844 for BSD mailx, but it is not
10a vulnerability in Heirloom mailx because this feature was documented.
11
12This patch is taken from
13ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.debian.tar.xz
14
15Upstream-Status: Inappropriate [upstream is dead]
16CVE: CVE-2014-7844
17---
18 mailx.1 | 14 ++++++++++++++
19 names.c | 3 +++
20 2 files changed, 17 insertions(+)
21
22diff --git a/mailx.1 b/mailx.1
23index 70a7859..22a171b 100644
24--- a/mailx.1
25+++ b/mailx.1
26@@ -656,6 +656,14 @@ but any reply returned to the machine
27 will have the system wide alias expanded
28 as all mail goes through sendmail.
29 .SS "Recipient address specifications"
30+If the
31+.I expandaddr
32+option is not set (the default), recipient addresses must be names of
33+local mailboxes or Internet mail addresses.
34+.PP
35+If the
36+.I expandaddr
37+option is set, the following rules apply:
38 When an address is used to name a recipient
39 (in any of To, Cc, or Bcc),
40 names of local mail folders
41@@ -2391,6 +2399,12 @@ and exits immediately.
42 If this option is set,
43 \fImailx\fR starts even with an empty mailbox.
44 .TP
45+.B expandaddr
46+Causes
47+.I mailx
48+to expand message recipient addresses, as explained in the section,
49+Recipient address specifications.
50+.TP
51 .B flipr
52 Exchanges the
53 .I Respond
54diff --git a/names.c b/names.c
55index 66e976b..c69560f 100644
56--- a/names.c
57+++ b/names.c
58@@ -268,6 +268,9 @@ outof(struct name *names, FILE *fo, struct header *hp)
59 FILE *fout, *fin;
60 int ispipe;
61
62+ if (value("expandaddr") == NULL)
63+ return names;
64+
65 top = names;
66 np = names;
67 time(&now);
68--
691.9.3
70
71
diff --git a/meta/recipes-extended/mailx/files/0012-unpack-Disable-option-processing-for-email-addresses.patch b/meta/recipes-extended/mailx/files/0012-unpack-Disable-option-processing-for-email-addresses.patch
deleted file mode 100644
index 8cdbfd8b03..0000000000
--- a/meta/recipes-extended/mailx/files/0012-unpack-Disable-option-processing-for-email-addresses.patch
+++ /dev/null
@@ -1,79 +0,0 @@
1From e34e2ac67b80497080ebecccec40c3b61456167d Mon Sep 17 00:00:00 2001
2From: Florian Weimer <fweimer@redhat.com>
3Date: Mon, 17 Nov 2014 11:14:06 +0100
4Subject: [PATCH 2/4] unpack: Disable option processing for email addresses
5 when calling sendmail
6
7This patch is taken from
8ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.debian.tar.xz
9
10Upstream-Status: Inappropriate [upstream is dead]
11---
12 extern.h | 2 +-
13 names.c | 8 ++++++--
14 sendout.c | 2 +-
15 3 files changed, 8 insertions(+), 4 deletions(-)
16
17diff --git a/extern.h b/extern.h
18index 6b85ba0..8873fe8 100644
19--- a/extern.h
20+++ b/extern.h
21@@ -396,7 +396,7 @@ struct name *outof(struct name *names, FILE *fo, struct header *hp);
22 int is_fileaddr(char *name);
23 struct name *usermap(struct name *names);
24 struct name *cat(struct name *n1, struct name *n2);
25-char **unpack(struct name *np);
26+char **unpack(struct name *smopts, struct name *np);
27 struct name *elide(struct name *names);
28 int count(struct name *np);
29 struct name *delete_alternates(struct name *np);
30diff --git a/names.c b/names.c
31index c69560f..45bbaed 100644
32--- a/names.c
33+++ b/names.c
34@@ -549,7 +549,7 @@ cat(struct name *n1, struct name *n2)
35 * Return an error if the name list won't fit.
36 */
37 char **
38-unpack(struct name *np)
39+unpack(struct name *smopts, struct name *np)
40 {
41 char **ap, **top;
42 struct name *n;
43@@ -564,7 +564,7 @@ unpack(struct name *np)
44 * the terminating 0 pointer. Additional spots may be needed
45 * to pass along -f to the host mailer.
46 */
47- extra = 2;
48+ extra = 3 + count(smopts);
49 extra++;
50 metoo = value("metoo") != NULL;
51 if (metoo)
52@@ -581,6 +581,10 @@ unpack(struct name *np)
53 *ap++ = "-m";
54 if (verbose)
55 *ap++ = "-v";
56+ for (; smopts != NULL; smopts = smopts->n_flink)
57+ if ((smopts->n_type & GDEL) == 0)
58+ *ap++ = smopts->n_name;
59+ *ap++ = "--";
60 for (; n != NULL; n = n->n_flink)
61 if ((n->n_type & GDEL) == 0)
62 *ap++ = n->n_name;
63diff --git a/sendout.c b/sendout.c
64index 7b7f2eb..c52f15d 100644
65--- a/sendout.c
66+++ b/sendout.c
67@@ -835,7 +835,7 @@ start_mta(struct name *to, struct name *mailargs, FILE *input,
68 #endif /* HAVE_SOCKETS */
69
70 if ((smtp = value("smtp")) == NULL) {
71- args = unpack(cat(mailargs, to));
72+ args = unpack(mailargs, to);
73 if (debug || value("debug")) {
74 printf(catgets(catd, CATSET, 181,
75 "Sendmail arguments:"));
76--
771.9.3
78
79
diff --git a/meta/recipes-extended/mailx/files/0013-fio.c-Unconditionally-require-wordexp-support.patch b/meta/recipes-extended/mailx/files/0013-fio.c-Unconditionally-require-wordexp-support.patch
deleted file mode 100644
index 5558d8639f..0000000000
--- a/meta/recipes-extended/mailx/files/0013-fio.c-Unconditionally-require-wordexp-support.patch
+++ /dev/null
@@ -1,113 +0,0 @@
1From 2bae8ecf04ec2ba6bb9f0af5b80485dd0edb427d Mon Sep 17 00:00:00 2001
2From: Florian Weimer <fweimer@redhat.com>
3Date: Mon, 17 Nov 2014 12:48:25 +0100
4Subject: [PATCH 3/4] fio.c: Unconditionally require wordexp support
5
6This patch is taken from
7ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.debian.tar.xz
8
9Upstream-Status: Inappropriate [upstream is dead]
10---
11 fio.c | 67 +++++--------------------------------------------------------------
12 1 file changed, 5 insertions(+), 62 deletions(-)
13
14diff --git a/fio.c b/fio.c
15index 65e8f10..1529236 100644
16--- a/fio.c
17+++ b/fio.c
18@@ -43,12 +43,15 @@ static char sccsid[] = "@(#)fio.c 2.76 (gritter) 9/16/09";
19 #endif /* not lint */
20
21 #include "rcv.h"
22+
23+#ifndef HAVE_WORDEXP
24+#error wordexp support is required
25+#endif
26+
27 #include <sys/stat.h>
28 #include <sys/file.h>
29 #include <sys/wait.h>
30-#ifdef HAVE_WORDEXP
31 #include <wordexp.h>
32-#endif /* HAVE_WORDEXP */
33 #include <unistd.h>
34
35 #if defined (USE_NSS)
36@@ -481,7 +484,6 @@ next:
37 static char *
38 globname(char *name)
39 {
40-#ifdef HAVE_WORDEXP
41 wordexp_t we;
42 char *cp;
43 sigset_t nset;
44@@ -527,65 +529,6 @@ globname(char *name)
45 }
46 wordfree(&we);
47 return cp;
48-#else /* !HAVE_WORDEXP */
49- char xname[PATHSIZE];
50- char cmdbuf[PATHSIZE]; /* also used for file names */
51- int pid, l;
52- char *cp, *shell;
53- int pivec[2];
54- extern int wait_status;
55- struct stat sbuf;
56-
57- if (pipe(pivec) < 0) {
58- perror("pipe");
59- return name;
60- }
61- snprintf(cmdbuf, sizeof cmdbuf, "echo %s", name);
62- if ((shell = value("SHELL")) == NULL)
63- shell = SHELL;
64- pid = start_command(shell, 0, -1, pivec[1], "-c", cmdbuf, NULL);
65- if (pid < 0) {
66- close(pivec[0]);
67- close(pivec[1]);
68- return NULL;
69- }
70- close(pivec[1]);
71-again:
72- l = read(pivec[0], xname, sizeof xname);
73- if (l < 0) {
74- if (errno == EINTR)
75- goto again;
76- perror("read");
77- close(pivec[0]);
78- return NULL;
79- }
80- close(pivec[0]);
81- if (wait_child(pid) < 0 && WTERMSIG(wait_status) != SIGPIPE) {
82- fprintf(stderr, catgets(catd, CATSET, 81,
83- "\"%s\": Expansion failed.\n"), name);
84- return NULL;
85- }
86- if (l == 0) {
87- fprintf(stderr, catgets(catd, CATSET, 82,
88- "\"%s\": No match.\n"), name);
89- return NULL;
90- }
91- if (l == sizeof xname) {
92- fprintf(stderr, catgets(catd, CATSET, 83,
93- "\"%s\": Expansion buffer overflow.\n"), name);
94- return NULL;
95- }
96- xname[l] = 0;
97- for (cp = &xname[l-1]; *cp == '\n' && cp > xname; cp--)
98- ;
99- cp[1] = '\0';
100- if (strchr(xname, ' ') && stat(xname, &sbuf) < 0) {
101- fprintf(stderr, catgets(catd, CATSET, 84,
102- "\"%s\": Ambiguous.\n"), name);
103- return NULL;
104- }
105- return savestr(xname);
106-#endif /* !HAVE_WORDEXP */
107 }
108
109 /*
110--
1111.9.3
112
113
diff --git a/meta/recipes-extended/mailx/files/0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch b/meta/recipes-extended/mailx/files/0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch
deleted file mode 100644
index ae14b8acfe..0000000000
--- a/meta/recipes-extended/mailx/files/0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 73fefa0c1ac70043ec84f2d8b8f9f683213f168d Mon Sep 17 00:00:00 2001
2From: Florian Weimer <fweimer@redhat.com>
3Date: Mon, 17 Nov 2014 13:11:32 +0100
4Subject: [PATCH 4/4] globname: Invoke wordexp with WRDE_NOCMD (CVE-2004-2771)
5
6This patch is taken from
7ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.debian.tar.xz
8
9Upstream-Status: Inappropriate [upstream is dead]
10CVE: CVE-2004-2771
11---
12 fio.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/fio.c b/fio.c
16index 1529236..774a204 100644
17--- a/fio.c
18+++ b/fio.c
19@@ -497,7 +497,7 @@ globname(char *name)
20 sigemptyset(&nset);
21 sigaddset(&nset, SIGCHLD);
22 sigprocmask(SIG_BLOCK, &nset, NULL);
23- i = wordexp(name, &we, 0);
24+ i = wordexp(name, &we, WRDE_NOCMD);
25 sigprocmask(SIG_UNBLOCK, &nset, NULL);
26 switch (i) {
27 case 0:
28--
291.9.3
30
31
diff --git a/meta/recipes-extended/mailx/files/0015-usr-sbin-sendmail.patch b/meta/recipes-extended/mailx/files/0015-usr-sbin-sendmail.patch
deleted file mode 100644
index 2b5991425b..0000000000
--- a/meta/recipes-extended/mailx/files/0015-usr-sbin-sendmail.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Description: Sendmail is at /usr/sbin/sendmail
2 As per Debian Policy ยง11.6
3Author: Ryan Kavanagh <rak@debian.org>
4Origin: Debian
5Forwarded: no
6---
7This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
8Index: heirloom-mailx-12.5/Makefile
9===================================================================
10This patch is taken from
11ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.debian.tar.xz
12
13Upstream-Status: Inappropriate [upstream is dead]
14
15--- heirloom-mailx-12.5.orig/Makefile 2011-04-26 17:23:22.000000000 -0400
16+++ heirloom-mailx-12.5/Makefile 2015-01-27 13:20:04.733542801 -0500
17@@ -13,7 +13,7 @@
18
19 MAILRC = $(SYSCONFDIR)/nail.rc
20 MAILSPOOL = /var/mail
21-SENDMAIL = /usr/lib/sendmail
22+SENDMAIL = /usr/sbin/sendmail
23
24 DESTDIR =
25
26Index: heirloom-mailx-12.5/mailx.1
27===================================================================
28--- heirloom-mailx-12.5.orig/mailx.1 2015-01-27 13:18:49.000000000 -0500
29+++ heirloom-mailx-12.5/mailx.1 2015-01-27 13:20:32.382336867 -0500
30@@ -4922,7 +4922,7 @@
31 which just acts as a proxy.
32 .PP
33 \fIMailx\fR immediately contacts the SMTP server (or
34-.IR \%/usr/lib/sendmail )
35+.IR \%/usr/sbin/sendmail )
36 even when operating in
37 .I disconnected
38 mode.
diff --git a/meta/recipes-extended/mailx/files/explicitly.disable.krb5.support.patch b/meta/recipes-extended/mailx/files/explicitly.disable.krb5.support.patch
deleted file mode 100644
index b74fd0472e..0000000000
--- a/meta/recipes-extended/mailx/files/explicitly.disable.krb5.support.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1krb5 support is autodetected from sysroot making builds undeterministic
2feel free to improve this to support explicitly enabling/disabling it
3
4Upstream-Status: Pending
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7
8--- a/makeconfig 2013-07-21 15:06:11.177792334 +0200
9+++ b/makeconfig 2013-07-21 15:07:20.028793994 +0200
10@@ -424,36 +424,6 @@
11 }
12 !
13
14-<$tmp2.c link_check gssapi 'for GSSAPI in libgss' \
15- '#define USE_GSSAPI' '-lgss' ||
16- <$tmp2.c link_check gssapi 'for GSSAPI in libgssapi_krb5' \
17- '#define USE_GSSAPI' '-lgssapi_krb5' ||
18- link_check gssapi 'for GSSAPI in libgssapi_krb5, old-style' \
19- '#define USE_GSSAPI
20-#define GSSAPI_OLD_STYLE' '-lgssapi_krb5' <<\! || \
21- link_check gssapi 'for GSSAPI in libgssapi' \
22- '#define USE_GSSAPI
23-#define GSSAPI_REG_INCLUDE' '-lgssapi' <<\%
24-#include <gssapi/gssapi.h>
25-#include <gssapi/gssapi_generic.h>
26-
27-int main(void)
28-{
29- gss_import_name(0, 0, gss_nt_service_name, 0);
30- gss_init_sec_context(0,0,0,0,0,0,0,0,0,0,0,0,0);
31- return 0;
32-}
33-!
34-#include <gssapi.h>
35-
36-int main(void)
37-{
38- gss_import_name(0, 0, GSS_C_NT_HOSTBASED_SERVICE, 0);
39- gss_init_sec_context(0,0,0,0,0,0,0,0,0,0,0,0,0);
40- return 0;
41-}
42-%
43-
44 cat >$tmp2.c <<\!
45 #include "config.h"
46 #ifdef HAVE_NL_LANGINFO
diff --git a/meta/recipes-extended/mailx/mailx_12.5-5.bb b/meta/recipes-extended/mailx/mailx_12.5-5.bb
deleted file mode 100644
index 9dd710a718..0000000000
--- a/meta/recipes-extended/mailx/mailx_12.5-5.bb
+++ /dev/null
@@ -1,53 +0,0 @@
1SUMMARY = "mailx is the traditional command-line-mode mail user agent"
2
3DESCRIPTION = "Mailx is derived from Berkeley Mail and is intended provide the \
4functionality of the POSIX mailx command with additional support \
5for MIME, IMAP, POP3, SMTP, and S/MIME."
6
7HOMEPAGE = "http://heirloom.sourceforge.net/mailx.html"
8SECTION = "console/network"
9LICENSE = "BSD & MPL-1"
10LIC_FILES_CHKSUM = "file://COPYING;md5=4202a0a62910cf94f7af8a3436a2a2dd"
11
12DEPENDS = "openssl"
13
14SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/h/heirloom-mailx/heirloom-mailx_12.5.orig.tar.gz;name=archive \
15 file://0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch \
16 file://0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch \
17 file://0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch \
18 file://0011-outof-Introduce-expandaddr-flag.patch \
19 file://0012-unpack-Disable-option-processing-for-email-addresses.patch \
20 file://0013-fio.c-Unconditionally-require-wordexp-support.patch \
21 file://0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch \
22 file://0015-usr-sbin-sendmail.patch \
23 file://explicitly.disable.krb5.support.patch \
24 "
25
26SRC_URI[archive.md5sum] = "29a6033ef1412824d02eb9d9213cb1f2"
27SRC_URI[archive.sha256sum] = "015ba4209135867f37a0245d22235a392b8bbed956913286b887c2e2a9a421ad"
28
29# for this package we're mostly interested in tracking debian patches,
30# and not in the upstream version where all development has effectively stopped
31UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/h/heirloom-mailx/"
32UPSTREAM_CHECK_REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)"
33
34S = "${WORKDIR}/heirloom-mailx-12.5"
35
36inherit autotools-brokensep
37
38CFLAGS_append = " -D_BSD_SOURCE -DDEBIAN -I${S}/EXT"
39
40# "STRIP=true" means that 'true' command will be used to 'strip' files which will achieve the effect of not stripping them
41# mailx's Makefile doesn't allow a more straightforward way to avoid stripping
42EXTRA_OEMAKE = "SENDMAIL=${sbindir}/sendmail IPv6=-DHAVE_IPv6_FUNCS PREFIX=/usr UCBINSTALL=/usr/bin/install STRIP=true"
43
44# The makeconfig can't run parallelly, otherwise the checking results
45# might be incorrect and lead to errors:
46# fio.c:56:17: fatal error: ssl.h: No such file or directory
47# #include <ssl.h>
48PARALLEL_MAKE = ""
49
50# Causes gcc to get stuck and eat all available memory in qemuarm builds
51# http://errors.yoctoproject.org/Errors/Details/20488/
52ARM_INSTRUCTION_SET_armv4 = "arm"
53ARM_INSTRUCTION_SET_armv5 = "arm"