Update to sendmail 8.17.1

4 files changed, 20 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ad6c4ff3eb45..e56cbec554e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sendmail
 	pkgdesc = A general purpose internetwork email routing MTA
-	pkgver = 8.16.1
+	pkgver = 8.17.1
 	pkgrel = 1
 	url = http://www.sendmail.org
 	arch = x86_64
@@ -18,18 +18,18 @@ pkgbase = sendmail
 	backup = etc/mail/aliases
 	backup = etc/mail/sendmail.cf
 	backup = etc/sasl2/Sendmail.conf
-	source = https://ftp.sendmail.org/sendmail.8.16.1.tar.gz
+	source = https://ftp.sendmail.org/sendmail.8.17.1.tar.gz
 	source = site.config.m4
-	source = sendmail-8.14.8-sasl2-in-etc.patch
+	source = sendmail-8.17.1-sasl2-in-etc.patch
 	source = sendmail.conf
 	source = sasl2.conf
 	source = sendmail.sysusers
 	source = sendmail.tmpfiles
 	source = sendmail.service
 	source = sm-client.service
-	sha256sums = 7886d5dc4b436b86175f32b5b9c7305c80787749847e2909bf99123ecc4e64ba
-	sha256sums = 3e744a9ac002c9a3a347785788038f34d8fc09fb10a104f2d7d126b72cdde948
-	sha256sums = aac157c4751087638c255e5c2ac3b119f9a0a45e836c864acfffcfa147b444cb
+	sha256sums = 04bc76b6c886e6d111be7fd8daa32b8ce00128a288b6b52e067bc29f3854a6e6
+	sha256sums = c71683c251630352c7328dc4e842a6622734310795616333667d1c4d5de38106
+	sha256sums = 5817c00908ddd1512e4edc48e42646a728f0940271781272372cb11b7be9d039
 	sha256sums = 39730f2be66bb1f1e6bc7fff61911db632ecf4b891d348df525abe2020274580
 	sha256sums = 9b4d2d141191f6c9a18538f7acf65243cceb26359f88b64c92c1c4e8407398f0
 	sha256sums = 95531a87d42e30742ca71f7d7197403eb9d703a407a50c9fda1f909ed21e1010
@@ -38,4 +38,3 @@ pkgbase = sendmail
 	sha256sums = c934a46aabe61526687f46d34aa0406d886d982aa10a57980a59464e24538d95
 
 pkgname = sendmail
-
diff --git a/PKGBUILD b/PKGBUILD
index 528e0dba7745..92a57b9b0002 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: doze_worm <shuimao@gmail.com> the original port.
 
 pkgname=sendmail
-pkgver=8.16.1
+pkgver=8.17.1
 pkgrel=1
 pkgdesc="A general purpose internetwork email routing MTA"
 url="http://www.sendmail.org"
@@ -20,7 +20,7 @@ backup=('etc/conf.d/sendmail'
         'etc/sasl2/Sendmail.conf')
 source=("https://ftp.sendmail.org/${pkgname}.${pkgver}.tar.gz"
         'site.config.m4'
-        'sendmail-8.14.8-sasl2-in-etc.patch'
+        'sendmail-8.17.1-sasl2-in-etc.patch'
         'sendmail.conf'
         'sasl2.conf'
         'sendmail.sysusers'
@@ -28,9 +28,9 @@ source=("https://ftp.sendmail.org/${pkgname}.${pkgver}.tar.gz"
         'sendmail.service'
         'sm-client.service')
 depends=('db' 'cyrus-sasl')
-sha256sums=('7886d5dc4b436b86175f32b5b9c7305c80787749847e2909bf99123ecc4e64ba'
-            '3e744a9ac002c9a3a347785788038f34d8fc09fb10a104f2d7d126b72cdde948'
-            'aac157c4751087638c255e5c2ac3b119f9a0a45e836c864acfffcfa147b444cb'
+sha256sums=('04bc76b6c886e6d111be7fd8daa32b8ce00128a288b6b52e067bc29f3854a6e6'
+            'c71683c251630352c7328dc4e842a6622734310795616333667d1c4d5de38106'
+            '5817c00908ddd1512e4edc48e42646a728f0940271781272372cb11b7be9d039'
             '39730f2be66bb1f1e6bc7fff61911db632ecf4b891d348df525abe2020274580'
             '9b4d2d141191f6c9a18538f7acf65243cceb26359f88b64c92c1c4e8407398f0'
             '95531a87d42e30742ca71f7d7197403eb9d703a407a50c9fda1f909ed21e1010'
@@ -41,7 +41,7 @@ sha256sums=('7886d5dc4b436b86175f32b5b9c7305c80787749847e2909bf99123ecc4e64ba'
 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.17.1-sasl2-in-etc.patch
     sed -i -e 's/CFGRP=bin/CFGRP=root/g' cf/cf/Makefile
     install -m644 -t devtools/Site "${srcdir}"/site.config.m4
 }
diff --git a/sendmail-8.14.8-sasl2-in-etc.patch b/sendmail-8.17.1-sasl2-in-etc.patch
index 64657bf76b7d..5b18c9965897 100644
--- a/sendmail-8.14.8-sasl2-in-etc.patch
+++ b/sendmail-8.17.1-sasl2-in-etc.patch
@@ -1,19 +1,19 @@
 diff --git a/sendmail/usersmtp.c b/sendmail/usersmtp.c
-index c217ffa..e4dadd3 100644
+index 5fe0791..2417558 100644
 --- a/sendmail/usersmtp.c
 +++ b/sendmail/usersmtp.c
-@@ -1346,9 +1346,7 @@ safesaslfile(context, file)
+@@ -1374,9 +1374,7 @@ safesaslfile(context, file)
  {
  	long sff;
  	int r;
--#if SASL <= 10515
+-# if SASL <= 10515
  	size_t len;
--#endif
+-# endif
  	char *p;
  
- 	if (file == NULL || *file == '\0')
-@@ -1386,9 +1384,16 @@ safesaslfile(context, file)
- #endif /* SASL <= 10515 */
+ 	if (SM_IS_EMPTY(file))
+@@ -1414,9 +1414,16 @@ safesaslfile(context, file)
+ # endif /* SASL <= 10515 */
  
  	p = (char *) file;
 +	len = strlen(p);
diff --git a/site.config.m4 b/site.config.m4
index ac920691e17b..5ec3688bc8d6 100644
--- a/site.config.m4
+++ b/site.config.m4
@@ -13,6 +13,6 @@ define(`confEBINDIR', `/usr/bin')
 define(`confMBINDIR', `/usr/bin')
 define(`confSBINDIR', `/usr/bin')
 define(`confMANROOT', `/usr/share/man/man')
-APPENDDEF(`confENVDEF', `-DNETINET6 -DHAS_GETHOSTBYNAME2 -D_FFR_MILTER_CHECK_REJECTIONS_TOO')
+APPENDDEF(`confENVDEF', `-DNETINET6 -DHAS_GETHOSTBYNAME2 -DHASFLOCK -D_FFR_MILTER_CHECK_REJECTIONS_TOO')
 APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS -DSASL=2 -DDANE -DTLS_EC=2 -D_FFR_TLS_USE_CERTIFICATE_CHAIN_FILE')
 APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto -lresolv -lsasl2')