summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/mailx/APKBUILD15
-rw-r--r--system/mailx/openssl-1.1.patch43
-rw-r--r--system/mailx/sendmail.patch24
3 files changed, 77 insertions, 5 deletions
diff --git a/system/mailx/APKBUILD b/system/mailx/APKBUILD
index 846c4a08b..81322941b 100644
--- a/system/mailx/APKBUILD
+++ b/system/mailx/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=mailx
pkgver=12.4
-pkgrel=1
+pkgrel=2
pkgdesc="Send and receive Internet mail"
url="http://heirloom.sourceforge.net/mailx.html"
arch="all"
@@ -14,16 +14,19 @@ subpackages="$pkgname-doc"
source="https://downloads.sourceforge.net/heirloom/$pkgname-$pkgver.tar.bz2
Mail
mailx-12.4-openssl.patch
- mailx-12.4-cve.patch"
+ mailx-12.4-cve.patch
+ openssl-1.1.patch
+ sendmail.patch
+ "
build() {
- make PREFIX="/usr" SYSCONFDIR="/etc" STRIP=":" SENDMAIL="/usr/sbin/sendmail" \
+ make PREFIX="/usr" SYSCONFDIR="/etc" STRIP=":" \
MAILSPOOL="/var/spool/mail"
}
package() {
make DESTDIR="$pkgdir" PREFIX="/usr" SYSCONFDIR="/etc" STRIP=":" \
- UCBINSTALL="`command -v install`" SENDMAIL="/usr/sbin/sendmail" \
+ UCBINSTALL="`command -v install`" \
MAILSPOOL="/var/spool/mail" install
install -m 755 "$srcdir"/Mail "$pkgdir"/usr/bin/Mail
}
@@ -31,4 +34,6 @@ package() {
sha512sums="a0e29972f552bd630ce1a14f70e61661815118520bcd4a00b6cad53f3270d3d08c835ff6982ba8800eb380a5b46f54eb6e60fb7533b5f41c916af45d29605af8 mailx-12.4.tar.bz2
8715bcdbcc5170f406df2a78dc9bac144c5d73eb90ba4832162cd3c5d72c938a32a86e622e64c7e786c05343a37d7b94245cc636511261d1d4f817def04087d2 Mail
a74f85b5a4a9f9cd9a38e244498a11394c42189bbd0601656b6ed56fa55bf596820ef2f995c6878d322a1eca135bd1b1822467c4086adb849c81d65229845663 mailx-12.4-openssl.patch
-1e77cd6ea251793ca48ae86b265580cd70fe33838b0b4e1f522af07f4f34bc909e1bab52dc0180516d44399c4227a54be7718c76ebbc4f886f372fdc5c19278f mailx-12.4-cve.patch"
+1e77cd6ea251793ca48ae86b265580cd70fe33838b0b4e1f522af07f4f34bc909e1bab52dc0180516d44399c4227a54be7718c76ebbc4f886f372fdc5c19278f mailx-12.4-cve.patch
+6b7cb06d13c6e213a403e6544fc73b1c3ea0a1dd96ef06ed3bb9f2b2519c1bc9a9e0510462c414ebe86a19e75dcdc1c634588036813136a16b7a3eccc24459e8 openssl-1.1.patch
+0e7b7ed38546081df301123907cc12e2cd4b4c411da7976a5035239eecd1f6741a3faefdf6fdf1ed1b57afc1e58a9f24b0b5f3f129d78b3dfa9f9e5beda7d9b4 sendmail.patch"
diff --git a/system/mailx/openssl-1.1.patch b/system/mailx/openssl-1.1.patch
new file mode 100644
index 000000000..0c41ff1d6
--- /dev/null
+++ b/system/mailx/openssl-1.1.patch
@@ -0,0 +1,43 @@
+Remove EGD support no longer present in 1.1.
+
+Remove SSLv3 support.
+
+--- mailx-12.4/openssl.c.old 2020-01-15 02:20:57.711188031 +0000
++++ mailx-12.4/openssl.c 2020-01-15 02:34:43.412879382 +0000
+@@ -130,15 +130,7 @@
+ char *cp;
+ int state = 0;
+
+- if ((cp = value("ssl-rand-egd")) != NULL) {
+- cp = expand(cp);
+- if (RAND_egd(cp) == -1) {
+- fprintf(stderr, catgets(catd, CATSET, 245,
+- "entropy daemon at \"%s\" not available\n"),
+- cp);
+- } else
+- state = 1;
+- } else if ((cp = value("ssl-rand-file")) != NULL) {
++ if ((cp = value("ssl-rand-file")) != NULL) {
+ cp = expand(cp);
+ if (RAND_load_file(cp, 1024) == -1) {
+ fprintf(stderr, catgets(catd, CATSET, 246,
+@@ -156,6 +148,8 @@
+ }
+ state = 1;
+ }
++ } else {
++ RAND_poll();
+ }
+ return state;
+ }
+@@ -211,9 +205,7 @@
+
+ cp = ssl_method_string(uhp);
+ if (cp != NULL) {
+- if (equal(cp, "ssl3"))
+- method = SSLv3_client_method();
+- else if (equal(cp, "tls1"))
++ if (equal(cp, "tls1"))
+ method = TLSv1_client_method();
+ else {
+ fprintf(stderr, catgets(catd, CATSET, 244,
diff --git a/system/mailx/sendmail.patch b/system/mailx/sendmail.patch
new file mode 100644
index 000000000..9be0fd0bd
--- /dev/null
+++ b/system/mailx/sendmail.patch
@@ -0,0 +1,24 @@
+This patch additionally fixes the manpage.
+
+--- mailx-12.4/Makefile.old 2008-07-28 22:33:38.000000000 +0000
++++ mailx-12.4/Makefile 2020-01-15 02:29:34.445930298 +0000
+@@ -13,7 +13,7 @@
+
+ MAILRC = $(SYSCONFDIR)/nail.rc
+ MAILSPOOL = /var/mail
+-SENDMAIL = /usr/lib/sendmail
++SENDMAIL = /usr/sbin/sendmail
+
+ DESTDIR =
+
+--- mailx-12.4/mailx.1.old 2020-01-15 02:20:57.711188031 +0000
++++ mailx-12.4/mailx.1 2020-01-15 02:29:50.274237107 +0000
+@@ -4907,7 +4907,7 @@
+ which just acts as a proxy.
+ .PP
+ \fIMailx\fR immediately contacts the SMTP server (or
+-.IR \%/usr/lib/sendmail )
++.IR \%/usr/sbin/sendmail )
+ even when operating in
+ .I disconnected
+ mode.