From 35824ecc4f2a4cbd8170e2e41681400855239b09 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 15 Jan 2020 02:44:58 +0000
Subject: system/mailx: Update for OpenSSL 1.1

---
 system/mailx/APKBUILD | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'system/mailx/APKBUILD')

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"
-- 
cgit v1.2.3-60-g2f50