Update to 8.17.2

3 files changed, 7 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db507898b283..feb1d30de901 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sendmail
 	pkgdesc = A general purpose internetwork email routing MTA
-	pkgver = 8.17.1
-	pkgrel = 4
+	pkgver = 8.17.2
+	pkgrel = 1
 	url = http://www.sendmail.org
 	arch = x86_64
 	license = custom:sendmail
@@ -18,20 +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.17.1.tar.gz
+	source = https://ftp.sendmail.org/sendmail.8.17.2.tar.gz
 	source = site.config.m4
 	source = sendmail-8.17.1-sasl2-in-etc.patch
-	source = sendmail-8.17.1-cyrus-sasl-2.1.28-fix.patch
 	source = sendmail.conf
 	source = sasl2.conf
 	source = sendmail.sysusers
 	source = sendmail.tmpfiles
 	source = sendmail.service
 	source = sm-client.service
-	sha256sums = 04bc76b6c886e6d111be7fd8daa32b8ce00128a288b6b52e067bc29f3854a6e6
+	sha256sums = 90f5ae74c35a84808861933ba094201b901b70c6b2903684dcf39bdae8a5a1a2
 	sha256sums = c71683c251630352c7328dc4e842a6622734310795616333667d1c4d5de38106
 	sha256sums = 5817c00908ddd1512e4edc48e42646a728f0940271781272372cb11b7be9d039
-	sha256sums = b59224af82ca5eba3aca14da7be6cc3314b05cf62068a17a2ec7ae5855accead
 	sha256sums = 39730f2be66bb1f1e6bc7fff61911db632ecf4b891d348df525abe2020274580
 	sha256sums = 9b4d2d141191f6c9a18538f7acf65243cceb26359f88b64c92c1c4e8407398f0
 	sha256sums = 95531a87d42e30742ca71f7d7197403eb9d703a407a50c9fda1f909ed21e1010
diff --git a/PKGBUILD b/PKGBUILD
index 8926d6f1f492..28cc9751f409 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 # Contributor: doze_worm <shuimao@gmail.com> the original port.
 
 pkgname=sendmail
-pkgver=8.17.1
-pkgrel=4
+pkgver=8.17.2
+pkgrel=1
 pkgdesc="A general purpose internetwork email routing MTA"
 url="http://www.sendmail.org"
 arch=('x86_64')
@@ -22,7 +22,6 @@ backup=('etc/conf.d/sendmail'
 source=("https://ftp.sendmail.org/${pkgname}.${pkgver}.tar.gz"
         'site.config.m4'
         'sendmail-8.17.1-sasl2-in-etc.patch'
-        'sendmail-8.17.1-cyrus-sasl-2.1.28-fix.patch'
         'sendmail.conf'
         'sasl2.conf'
         'sendmail.sysusers'
@@ -30,10 +29,9 @@ source=("https://ftp.sendmail.org/${pkgname}.${pkgver}.tar.gz"
         'sendmail.service'
         'sm-client.service')
 depends=('db' 'cyrus-sasl')
-sha256sums=('04bc76b6c886e6d111be7fd8daa32b8ce00128a288b6b52e067bc29f3854a6e6'
+sha256sums=('90f5ae74c35a84808861933ba094201b901b70c6b2903684dcf39bdae8a5a1a2'
             'c71683c251630352c7328dc4e842a6622734310795616333667d1c4d5de38106'
             '5817c00908ddd1512e4edc48e42646a728f0940271781272372cb11b7be9d039'
-            'b59224af82ca5eba3aca14da7be6cc3314b05cf62068a17a2ec7ae5855accead'
             '39730f2be66bb1f1e6bc7fff61911db632ecf4b891d348df525abe2020274580'
             '9b4d2d141191f6c9a18538f7acf65243cceb26359f88b64c92c1c4e8407398f0'
             '95531a87d42e30742ca71f7d7197403eb9d703a407a50c9fda1f909ed21e1010'
@@ -45,7 +43,6 @@ prepare() {
     # patches picked from Fedora
     cd "${srcdir}/${pkgname}-${pkgver}"
     patch -p1 < "${srcdir}"/sendmail-8.17.1-sasl2-in-etc.patch
-    patch -p1 < "${srcdir}"/sendmail-8.17.1-cyrus-sasl-2.1.28-fix.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.17.1-cyrus-sasl-2.1.28-fix.patch b/sendmail-8.17.1-cyrus-sasl-2.1.28-fix.patch
deleted file mode 100644
index 3fb5b765c506..000000000000
--- a/sendmail-8.17.1-cyrus-sasl-2.1.28-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/sendmail/sendmail.h b/sendmail/sendmail.h
-index 9e34dd9..e020d6e 100644
---- a/sendmail/sendmail.h
-+++ b/sendmail/sendmail.h
-@@ -756,7 +756,7 @@ extern bool	filesys_free __P((long));
- # define SASL_IS_AUTH	2		/* authenticated */
- 
- /* SASL options */
--# define SASL_AUTH_AUTH	0x1000		/* use auth= only if authenticated */
-+# define SASL_AUTH_AUTH	0x10000		/* use auth= only if authenticated */
- # if SASL >= 20101
- #  define SASL_SEC_MASK	SASL_SEC_MAXIMUM /* mask for SASL_SEC_* values: sasl.h */
- # else /* SASL >= 20101 */
-@@ -771,6 +771,9 @@ extern bool	filesys_free __P((long));
- #  endif /* SASL_SEC_NOPLAINTEXT & SASL_SEC_MASK) == 0 ... */
- # endif /* SASL >= 20101 */
- # define MAXOUTLEN 8192	/* length of output buffer, should be 2^n */
-+# if (SASL_AUTH_AUTH & SASL_SEC_MASK) != 0
-+#  ERROR "change SASL_AUTH_AUTH notify sendmail.org!"
-+# endif
- 
- /* functions */
- extern char	*intersect __P((char *, char *, SM_RPOOL_T *));