Update to 8.15.2-5. Minor sasl fixes.

5 files changed, 47 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 870b4fd48ee9..54941e23ff90 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sendmail
 	pkgdesc = The sendmail MTA
 	pkgver = 8.15.2
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.sendmail.org
 	arch = x86_64
 	license = Sendmail License
@@ -17,21 +17,25 @@ pkgbase = sendmail
 	backup = etc/mail/sendmail.cf
 	source = https://ftp.sendmail.org/sendmail.8.15.2.tar.gz
 	source = site.config.m4
+	source = sendmail-8.14.8-sasl2-in-etc.patch
 	source = sendmail-8.15.2-smtp-session-reuse-fix.patch
 	source = sendmail-8.15.2-openssl-1.1.0-fix.patch
 	source = sendmail-8.15.2-openssl-1.1.0-ecdhe-fix.patch
 	source = sendmail.conf
+	source = sasl2.conf
 	source = sendmail.sysusers
 	source = sendmail.tmpfiles
 	source = sendmail.service
 	source = sm-client.service
 	sha256sums = 24f94b5fd76705f15897a78932a5f2439a32b1a2fdc35769bb1a5f5d9b4db439
 	sha256sums = 01c281630074be308139295836d38faee3d49656b8271df1d3f42e8506b3d751
+	sha256sums = 03169f8983d200adf2422677bd4adce3b5887f33724778f16d7f58506eac0e05
 	sha256sums = bc5a0de6c5434d8d46467f93d07b2bb5c7acd62f9dbce2490e0005d21b673250
 	sha256sums = 9991dd85428778cec0c2030bf49e6ddf6d3db6026c651f858d72891973537b0e
 	sha256sums = 746d8ae8dea54cb2599c02181c2ea28ab15b26ba5e1e3b0f9cfe907a0e7a1d22
 	sha256sums = 39730f2be66bb1f1e6bc7fff61911db632ecf4b891d348df525abe2020274580
-	sha256sums = 40ee2d98af98e6a094c42934f10aa7cb0d62fa38184e447a65b45f317e741b5e
+	sha256sums = 9b4d2d141191f6c9a18538f7acf65243cceb26359f88b64c92c1c4e8407398f0
+	sha256sums = 95531a87d42e30742ca71f7d7197403eb9d703a407a50c9fda1f909ed21e1010
 	sha256sums = 4b5168dea0196a9a03e5a0b54a8354cec7563973705db35a22f451bcedcd388f
 	sha256sums = 380edeb289dfdfc5b0d4ea38df3a0fd35e6f83eeee76254ec7b3506eadfb674f
 	sha256sums = ecbd0a27e868d73d87fcfec292c19ea9479d0a8e9783788596d9add5e012218f
diff --git a/PKGBUILD b/PKGBUILD
index 88ba4718f0c1..765aedaac57d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname="sendmail"
 pkgver=8.15.2
-pkgrel=4
+pkgrel=5
 pkgdesc="The sendmail MTA"
 url="http://www.sendmail.org"
 arch=('x86_64')
@@ -19,10 +19,12 @@ backup=('etc/conf.d/sendmail'
         'etc/mail/sendmail.cf')
 source=("https://ftp.sendmail.org/${pkgname}.${pkgver}.tar.gz"
         'site.config.m4'
+        'sendmail-8.14.8-sasl2-in-etc.patch'
         'sendmail-8.15.2-smtp-session-reuse-fix.patch'
         'sendmail-8.15.2-openssl-1.1.0-fix.patch'
         'sendmail-8.15.2-openssl-1.1.0-ecdhe-fix.patch'
         'sendmail.conf'
+        'sasl2.conf'
         'sendmail.sysusers'
         'sendmail.tmpfiles'
         'sendmail.service'
@@ -30,11 +32,13 @@ source=("https://ftp.sendmail.org/${pkgname}.${pkgver}.tar.gz"
 depends=('db' 'cyrus-sasl')
 sha256sums=('24f94b5fd76705f15897a78932a5f2439a32b1a2fdc35769bb1a5f5d9b4db439'
             '01c281630074be308139295836d38faee3d49656b8271df1d3f42e8506b3d751'
+            '03169f8983d200adf2422677bd4adce3b5887f33724778f16d7f58506eac0e05'
             'bc5a0de6c5434d8d46467f93d07b2bb5c7acd62f9dbce2490e0005d21b673250'
             '9991dd85428778cec0c2030bf49e6ddf6d3db6026c651f858d72891973537b0e'
             '746d8ae8dea54cb2599c02181c2ea28ab15b26ba5e1e3b0f9cfe907a0e7a1d22'
             '39730f2be66bb1f1e6bc7fff61911db632ecf4b891d348df525abe2020274580'
-            '40ee2d98af98e6a094c42934f10aa7cb0d62fa38184e447a65b45f317e741b5e'
+            '9b4d2d141191f6c9a18538f7acf65243cceb26359f88b64c92c1c4e8407398f0'
+            '95531a87d42e30742ca71f7d7197403eb9d703a407a50c9fda1f909ed21e1010'
             '4b5168dea0196a9a03e5a0b54a8354cec7563973705db35a22f451bcedcd388f'
             '380edeb289dfdfc5b0d4ea38df3a0fd35e6f83eeee76254ec7b3506eadfb674f'
             'ecbd0a27e868d73d87fcfec292c19ea9479d0a8e9783788596d9add5e012218f')
@@ -42,6 +46,7 @@ sha256sums=('24f94b5fd76705f15897a78932a5f2439a32b1a2fdc35769bb1a5f5d9b4db439'
 prepare() {
     # patches picked from Fedora
     cd "${srcdir}/${pkgname}-${pkgver}"
+    patch -p1 < "${srcdir}"/sendmail-8.14.8-sasl2-in-etc.patch
     patch -p1 < "${srcdir}"/sendmail-8.15.2-smtp-session-reuse-fix.patch
     patch -p1 < "${srcdir}"/sendmail-8.15.2-openssl-1.1.0-fix.patch
     patch -p1 < "${srcdir}"/sendmail-8.15.2-openssl-1.1.0-ecdhe-fix.patch
@@ -71,6 +76,7 @@ package() {
 
     cd "${srcdir}"
     install -Dm644 sendmail.conf "${pkgdir}"/etc/conf.d/sendmail
+    install -Dm644 sasl2.conf "${pkgdir}"/etc/sasl2/Sendmail.conf
     install -Dm644 -t "${pkgdir}"/usr/lib/systemd/system {sendmail,sm-client}.service
     install -Dm644 sendmail.sysusers "${pkgdir}"/usr/lib/sysusers.d/sendmail.conf
     install -Dm644 sendmail.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/sendmail.conf
diff --git a/sasl2.conf b/sasl2.conf
new file mode 100644
index 000000000000..74ef83f21261
--- /dev/null
+++ b/sasl2.conf
@@ -0,0 +1 @@
+pwcheck_method:saslauthd
diff --git a/sendmail-8.14.8-sasl2-in-etc.patch b/sendmail-8.14.8-sasl2-in-etc.patch
new file mode 100644
index 000000000000..fe8f353f3725
--- /dev/null
+++ b/sendmail-8.14.8-sasl2-in-etc.patch
@@ -0,0 +1,31 @@
+diff --git a/sendmail/usersmtp.c b/sendmail/usersmtp.c
+index c217ffa..e4dadd3 100644
+--- a/sendmail/usersmtp.c
++++ b/sendmail/usersmtp.c
+@@ -1331,9 +1331,7 @@ safesaslfile(context, file)
+ {
+ 	long sff;
+ 	int r;
+-#if SASL <= 10515
+ 	size_t len;
+-#endif /* SASL <= 10515 */
+ 	char *p;
+ 
+ 	if (file == NULL || *file == '\0')
+@@ -1369,9 +1367,16 @@ safesaslfile(context, file)
+ #endif /* SASL <= 10515 */
+ 
+ 	p = (char *) file;
++	len = strlen(p);
+ 	if ((r = safefile(p, RunAsUid, RunAsGid, RunAsUserName, sff,
+ 			  S_IRUSR, NULL)) == 0)
+ 		return SASL_OK;
++#if SASL > 10515
++	/* Expect /usr/lib/sasl2/Sendmail.conf to be missing - config now in /etc/sasl2 */
++	if (type == SASL_VRFY_CONF && r == ENOENT &&
++            len >= 8 && strncmp(p, "/usr/lib", 8) == 0)
++		return SASL_CONTINUE;
++#endif /* SASL > 10515 */
+ 	if (LogLevel > (r != ENOENT ? 8 : 10))
+ 		sm_syslog(LOG_WARNING, NOQID, "error: safesasl(%s) failed: %s",
+ 			  p, sm_errstring(r));
diff --git a/sendmail.sysusers b/sendmail.sysusers
index 16bcfa50803c..8029274c46d0 100644
--- a/sendmail.sysusers
+++ b/sendmail.sysusers
@@ -1,2 +1,2 @@
 g smmsp 25
-u smmsp 150:25 "sendmail user" /var/spool/mail /bin/false
+u smmsp 150:25 "sendmail user" /var/spool/mail