Update to 8.15.2

4 files changed, 83 insertions, 120 deletions

diff --git a/.AURINFO b/.AURINFO
deleted file mode 100644
index 0c87ea1ee066..000000000000
--- a/.AURINFO
+++ /dev/null
@@ -1,26 +0,0 @@
-pkgbase = sendmail
-	pkgdesc = The sendmail MTA
-	pkgver = 8.14.9
-	pkgrel = 1
-	url = http://www.sendmail.org
-	install = sendmail.install
-	arch = i686
-	arch = x86_64
-	license = Sendmail License
-	depends = db
-	depends = cyrus-sasl
-	provides = sendmail=8.14
-	conflicts = msmtp-mta
-	conflicts = postfix
-	conflicts = exim
-	conflicts = opensmtpd
-	source = ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.14.9.tar.gz
-	source = sendmail.service
-	source = sendmail.conf
-	source = sm-client.service
-	backup = etc/conf.d/sendmail
-	backup = etc/mail/aliases
-	backup = etc/mail/sendmail.cf
-
-pkgname = sendmail
-
diff --git a/.SRCINFO b/.SRCINFO
index 5e7818c27211..dc8c5448a60d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sendmail
 	pkgdesc = The sendmail MTA
-	pkgver = 8.14.9
+	pkgver = 8.15.2
 	pkgrel = 1
 	url = http://www.sendmail.org
 	install = sendmail.install
@@ -9,7 +9,7 @@ pkgbase = sendmail
 	license = Sendmail License
 	depends = db
 	depends = cyrus-sasl
-	provides = sendmail=8.14
+	provides = sendmail=8.15
 	conflicts = msmtp-mta
 	conflicts = postfix
 	conflicts = exim
@@ -17,15 +17,11 @@ pkgbase = sendmail
 	backup = etc/conf.d/sendmail
 	backup = etc/mail/aliases
 	backup = etc/mail/sendmail.cf
-	source = ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.14.9.tar.gz
+	source = ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.15.2.tar.gz
 	source = sendmail.service
 	source = sendmail.conf
 	source = sm-client.service
-	md5sums = 6a3bdceffa592316f830be289a4bd783
-	md5sums = a11b2aabaa97305431220c38c486081c
-	md5sums = 4b60270921f77772d1ba941d831b732d
-	md5sums = 3c95e29825ea97fc425e2e1ac42d1f22
-	sha256sums = f5a497151abd8f341cca0736c3f9bd703d574d93146b2989689dff6d7a445d75
+	sha256sums = 24f94b5fd76705f15897a78932a5f2439a32b1a2fdc35769bb1a5f5d9b4db439
 	sha256sums = 380edeb289dfdfc5b0d4ea38df3a0fd35e6f83eeee76254ec7b3506eadfb674f
 	sha256sums = 39730f2be66bb1f1e6bc7fff61911db632ecf4b891d348df525abe2020274580
 	sha256sums = ecbd0a27e868d73d87fcfec292c19ea9479d0a8e9783788596d9add5e012218f
diff --git a/PKGBUILD b/PKGBUILD
index 97d09dc2da8b..538153fe4639 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,79 +1,71 @@
-# Maintainer chrisl echo archlinux@c2h0r1i2s4t5o6p7h8e9r-l3u4n1a.com|sed 's/[0-9]//g'
-# Maintainer mazieres
-# Contributor doze_worm <shuimao@gmail.com> the original port.
+# Maintainer: Vlad M. <vlad@arhclinux.net>
+# Contributor: chrisl echo archlinux@c2h0r1i2s4t5o6p7h8e9r-l3u4n1a.com|sed 's/[0-9]//g'
+# Contributor: mazieres
+# Contributor: doze_worm <shuimao@gmail.com> the original port.
 
 pkgname="sendmail"
-pkgver=8.14.9
+pkgver=8.15.2
 pkgrel=1
 pkgdesc="The sendmail MTA"
+url="http://www.sendmail.org"
 arch=('i686' 'x86_64')
 license=('Sendmail License')
-provides=('sendmail=8.14')
-conflicts=(
-'msmtp-mta'
-'postfix'
-'exim'
-'opensmtpd'
-)
-backup=(
-'etc/conf.d/sendmail' 
-'etc/mail/aliases' 
-'etc/mail/sendmail.cf'
-)
-source=("ftp://ftp.sendmail.org/pub/sendmail/${pkgname}.${pkgver}.tar.gz"
-"sendmail.service"
-"sendmail.conf"
-"sm-client.service"
-)
-url="http://www.sendmail.org"
-depends=('db' 'cyrus-sasl')
-md5sums=('6a3bdceffa592316f830be289a4bd783'
-'a11b2aabaa97305431220c38c486081c'
-'4b60270921f77772d1ba941d831b732d'
-'3c95e29825ea97fc425e2e1ac42d1f22')
-sha256sums=('f5a497151abd8f341cca0736c3f9bd703d574d93146b2989689dff6d7a445d75'
-'380edeb289dfdfc5b0d4ea38df3a0fd35e6f83eeee76254ec7b3506eadfb674f'
-'39730f2be66bb1f1e6bc7fff61911db632ecf4b891d348df525abe2020274580'
-'ecbd0a27e868d73d87fcfec292c19ea9479d0a8e9783788596d9add5e012218f')
-
+provides=('sendmail=8.15')
+conflicts=('msmtp-mta'
+           'postfix'
+           'exim'
+           'opensmtpd')
+backup=('etc/conf.d/sendmail'
+        'etc/mail/aliases'
+         'etc/mail/sendmail.cf')
+source=("ftp://ftp.sendmail.org/pub/${pkgname}/${pkgname}.${pkgver}.tar.gz"
+        'sendmail.service'
+        'sendmail.conf'
+        'sm-client.service')
+depends=('db'
+         'cyrus-sasl')
+sha256sums=('24f94b5fd76705f15897a78932a5f2439a32b1a2fdc35769bb1a5f5d9b4db439'
+            '380edeb289dfdfc5b0d4ea38df3a0fd35e6f83eeee76254ec7b3506eadfb674f'
+            '39730f2be66bb1f1e6bc7fff61911db632ecf4b891d348df525abe2020274580'
+            'ecbd0a27e868d73d87fcfec292c19ea9479d0a8e9783788596d9add5e012218f')
 install="${pkgname}.install"
 
 build(){
-    cd "$srcdir/${pkgname}-${pkgver}" || return 1
-	 # Add support for SASL2
-	 chmod +w devtools/OS/Linux
-	 echo -e "define(\`confSTDIO_TYPE', \`portable')\nAPPENDDEF(\`conf_sendmail_ENVDEF', \`-DSTARTTLS')\nAPPENDDEF(\`conf_sendmail_LIBS', \`-lssl -lcrypto')\n">>devtools/OS/Linux
-	 echo "APPENDDEF(\`conf_sendmail_ENVDEF', \`-DNETINET6 -DSASL=2')" >>devtools/OS/Linux
-	 echo "APPENDDEF(\`conf_sendmail_LIBS', \`-lresolv -lsasl2')" >>devtools/OS/Linux
-	 echo "APPENDDEF(\`confLIBS', \`-ldb')" >>devtools/OS/Linux
-	 echo "APPENDDEF(\`confMAPDEF', \`-DNEWDB')" >>devtools/OS/Linux
+  cd "$srcdir/${pkgname}-${pkgver}" || return 1
+  # Add support for SASL2
+  chmod +w devtools/OS/Linux
+  echo -e "define(\`confSTDIO_TYPE', \`portable')\nAPPENDDEF(\`conf_sendmail_ENVDEF', \`-DSTARTTLS')\nAPPENDDEF(\`conf_sendmail_LIBS', \`-lssl -lcrypto')\n">>devtools/OS/Linux
+  echo "APPENDDEF(\`conf_sendmail_ENVDEF', \`-DNETINET6 -DSASL=2')" >>devtools/OS/Linux
+  echo "APPENDDEF(\`conf_sendmail_LIBS', \`-lresolv -lsasl2')" >>devtools/OS/Linux
+  echo "APPENDDEF(\`confLIBS', \`-ldb')" >>devtools/OS/Linux
+  echo "APPENDDEF(\`confMAPDEF', \`-DNEWDB')" >>devtools/OS/Linux
 
-	 sed -i -e '58 s/^/dnl /' -e '59 s/^/dnl /' sendmail/Makefile.m4 # Sendmail expects user and group smmsp to exists before make install, this line prevent errors from that
-    ./Build || return 1
-	 sed -i -e '449 s/-o [^}]*}[^}]*}//' -e '449 s/-m .{GBINMODE}/-m 755/' obj.*/sendmail/Makefile # Sendmail expects user and group smmsp to exists before make install, this line prevent errors from that
-    GROFF_NO_SGR=1 make -C doc/op op.txt op.ps
+  sed -i -e '58 s/^/dnl /' -e '59 s/^/dnl /' sendmail/Makefile.m4 # Sendmail expects user and group smmsp to exists before make install, this line prevent errors from that
+  ./Build || return 1
+  sed -i -e '449 s/-o [^}]*}[^}]*}//' -e '449 s/-m .{GBINMODE}/-m 755/' obj.*/sendmail/Makefile # Sendmail expects user and group smmsp to exists before make install, this line prevent errors from that
+  GROFF_NO_SGR=1 make -C doc/op op.txt op.ps
 }
 
 package(){
-	mkdir -p $pkgdir/etc/conf.d/
-	mkdir -p $pkgdir/usr/{bin,sbin,share/man,share/doc/sendmail,/lib/systemd/system} \
-		$pkgdir/usr/man/man{1,5,8} $pkgdir/var/spool/mqueue \
-	    || return 1
-	cp sendmail.service sm-client.service $pkgdir/usr/lib/systemd/system
-	cp sendmail.conf $pkgdir/etc/conf.d/sendmail
-	cd "$srcdir/${pkgname}-${pkgver}" || return 1
-	make install DESTDIR="$pkgdir" || return 1
-	make -C mail.local force-install DESTDIR="$pkgdir" || return 1
-	make -C rmail force-install DESTDIR="$pkgdir" || return 1
-	mv $pkgdir/usr/man/* $pkgdir/usr/share/man/
-	rmdir $pkgdir/usr/man
-	cp -r cf $pkgdir/usr/share/sendmail-cf
-	cp sendmail/aliases $pkgdir/etc/mail/aliases
-	cp cf/cf/generic-linux.cf $pkgdir/etc/mail/sendmail.cf
-	cp doc/op/op.{ps,txt} $pkgdir/usr/share/doc/sendmail/
-	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	find $pkgdir -user bin -print | xargs chown root
-	find $pkgdir -group bin -print | xargs chgrp root
-    mv $pkgdir/usr/sbin/* $pkgdir/usr/bin/
-    rmdir $pkgdir/usr/sbin
+  mkdir -p $pkgdir/etc/conf.d/
+  mkdir -p $pkgdir/usr/{bin,sbin,share/man,share/doc/sendmail,/lib/systemd/system} \
+    $pkgdir/usr/man/man{1,5,8} $pkgdir/var/spool/mqueue \
+    || return 1
+  cp sendmail.service sm-client.service $pkgdir/usr/lib/systemd/system
+  cp sendmail.conf $pkgdir/etc/conf.d/sendmail
+  cd "$srcdir/${pkgname}-${pkgver}" || return 1
+  make install DESTDIR="$pkgdir" || return 1
+  make -C mail.local force-install DESTDIR="$pkgdir" || return 1
+  make -C rmail force-install DESTDIR="$pkgdir" || return 1
+  mv $pkgdir/usr/man/* $pkgdir/usr/share/man/
+  rmdir $pkgdir/usr/man
+  cp -r cf $pkgdir/usr/share/sendmail-cf
+  cp sendmail/aliases $pkgdir/etc/mail/aliases
+  cp cf/cf/generic-linux.cf $pkgdir/etc/mail/sendmail.cf
+  cp doc/op/op.{ps,txt} $pkgdir/usr/share/doc/sendmail/
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  find $pkgdir -user bin -print | xargs chown root
+  find $pkgdir -group bin -print | xargs chgrp root
+  mv $pkgdir/usr/sbin/* $pkgdir/usr/bin/
+  rmdir $pkgdir/usr/sbin
 }
diff --git a/sendmail.install b/sendmail.install
index 0c7fb25f9cd0..866adb934edf 100644
--- a/sendmail.install
+++ b/sendmail.install
@@ -1,29 +1,30 @@
 post_install() {
-		  if grep -q "^smmsp:" /etc/group &> /dev/null ; then
-					 groupmod -g 25 -n smmsp smmsp &> /dev/null
-		  else
-					 groupadd -g 25 smmsp &> /dev/null
-		  fi
+  if grep -q "^smmsp:" /etc/group &> /dev/null ; then
+    groupmod -g 25 -n smmsp smmsp &> /dev/null
+  else
+    groupadd -g 25 smmsp &> /dev/null
+  fi
 
-		  if grep -q "^smmsp:" /etc/passwd 2> /dev/null ; then
-					 usermod -s /bin/false -c "sendmail user" -d /var/spool/mail -u 150 -g smmsp smmsp &> /dev/null
-		  else
-					 useradd -s /bin/false -c "sendmail user" -d /var/spool/mail -u 150 -g smmsp -r smmsp &> /dev/null
-		  fi 
-		  chown smmsp:smmsp /var/spool/clientmqueue
-		  chown root:smmsp /usr/bin/sendmail
-		  chmod 2555 /usr/bin/sendmail
+  if grep -q "^smmsp:" /etc/passwd 2> /dev/null ; then
+    usermod -s /bin/false -c "sendmail user" -d /var/spool/mail -u 150 -g smmsp smmsp &> /dev/null
+  else
+    useradd -s /bin/false -c "sendmail user" -d /var/spool/mail -u 150 -g smmsp -r smmsp &> /dev/null
+  fi
+  chown smmsp:smmsp /var/spool/clientmqueue
+  chown root:smmsp /usr/bin/sendmail
+  chmod 2555 /usr/bin/sendmail
 }
+
 post_upgrade() {
-		  post_install $1
+  post_install $1
 }
 
 pre_remove() {
-		  systemctl stop sendmail|| :
-		  systemctl stop sm-client|| :
-		  killall sendmail || /bin/true
-		  userdel smmsp &> /dev/null
-		  rm -f /etc/mail/aliases.db || /bin/true
-		  groupdel smmsp &> /dev/null || /bin/true
-		  rmdir --ignore-fail-on-non-empty /var/spool/mqueue &> /dev/null || /bin/true
+  systemctl stop sendmail|| :
+  systemctl stop sm-client|| :
+  killall sendmail || /bin/true
+  userdel smmsp &> /dev/null
+  rm -f /etc/mail/aliases.db || /bin/true
+  groupdel smmsp &> /dev/null || /bin/true
+  rmdir --ignore-fail-on-non-empty /var/spool/mqueue &> /dev/null || /bin/true
 }