testing/exim: upgrade to 4.88

And cosmetic fixes in init-script and APKBUILD.

4 files changed, 32 insertions, 35 deletions

diff --git a/testing/exim/APKBUILD b/testing/exim/APKBUILD
index 1bf657ae47..c5f9d7cacd 100644
--- a/testing/exim/APKBUILD
+++ b/testing/exim/APKBUILD
@@ -3,8 +3,8 @@
 # Contributor: Jesse Young <jlyo@jlyo.org>
 # Maintainer: Jesse Young <jlyo@jlyo.org>
 pkgname=exim
-pkgver=4.87
-pkgrel=2
+pkgver=4.88
+pkgrel=0
 pkgdesc="A Message Transfer Agent"
 url="http://www.exim.org/"
 arch="all"
@@ -13,33 +13,37 @@ options="suid"
 depends="ca-certificates"
 pkgusers="exim"
 pkggroups="exim"
-depends_dev=""
-makedepends="bash gawk perl $depends_dev db-dev pcre-dev libressl-dev libspf2-dev mariadb-dev postgresql-dev sqlite-dev libidn-dev"
-install="exim.pre-install exim.post-upgrade"
-subpackages="$pkgname-cdb $pkgname-dbmdb $pkgname-dnsdb $pkgname-sqlite $pkgname-mysql $pkgname-postgresql $pkgname-utils $pkgname-scripts $pkgname-doc"
+makedepends="bash gawk perl $depends_dev db-dev pcre-dev libressl-dev libspf2-dev mariadb-dev
+	postgresql-dev sqlite-dev libidn-dev"
+install="exim.pre-install"
+subpackages="$pkgname-cdb $pkgname-dbmdb $pkgname-dnsdb $pkgname-sqlite $pkgname-mysql $pkgname-postgresql
+	$pkgname-utils $pkgname-scripts::noarch $pkgname-doc"
 source="ftp://ftp.exim.org/pub/exim/exim4/$pkgname-$pkgver.tar.bz2
 	exim.Makefile
 	exim.confd
 	exim.initd
 	exim.logrotate"
+builddir="$srcdir/$pkgname-$pkgver"
 
-_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$_builddir"
-	cp "$srcdir/$pkgname.Makefile" Local/Makefile
-	sed	-e 's/^LIBS = -lnsl/LIBS =/g' \
-		-e 's/^HAVE_ICONV=yes/#HAVE_ICONV=yes/' \
-		-i OS/Makefile-Linux
+	default_prepare || return 1
+
+	cd "$builddir"
+	cp "$srcdir"/$pkgname.Makefile Local/Makefile || return 1
+	sed -i \
+		-e 's/-lnsl//g' \
+		-e 's/^HAVE_ICONV.*$//' \
+		OS/Makefile-Linux
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	make makefile || return 1
 	make -j1 || return 1
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	install -m750 -D -g mail -d "$pkgdir"/etc/mail
 	make DESTDIR="$pkgdir" INSTALL_ARG="-no_symlink -no_chown exim" install || return 1
 	install -D -m644 doc/exim.8 "$pkgdir"/usr/share/man/man8/exim.8
@@ -62,8 +66,7 @@ package() {
 scripts() {
 	pkgdesc="exim scripts"
 	depends="exim perl"
-	arch="noarch"
-	cd "$_builddir"
+	cd "$builddir"
 	make	DESTDIR="$subpkgdir" \
 		INSTALL_ARG="exicyclog exim_checkaccess eximstats exiqgrep exigrep exinext exiqsumm exipick exiwhat convert4r3 convert4r4" \
 		install || return 1
@@ -73,7 +76,7 @@ scripts() {
 utils() {
 	pkgdesc="exim utils"
 	depends="exim"
-	cd "$_builddir"
+	cd "$builddir"
 	make	DESTDIR="$subpkgdir" \
 		INSTALL_ARG="exim_dbmbuild exim_dumpdb exim_tidydb exim_fixdb exim_lock" \
 		install || return 1
@@ -81,9 +84,9 @@ utils() {
 }
 
 _mv_ext() {
-	pkgdesc="$1 support for EXIM"
+	pkgdesc="EXIM extension: $1"
 	depends="$pkgname"
-	install -D -m755 "$_builddir"/build-Linux-*/lookups/$1.so "$subpkgdir"/usr/lib/$pkgname/$1.so
+	install -D -m755 "$builddir"/build-Linux-*/lookups/$1.so "$subpkgdir"/usr/lib/$pkgname/$1.so
 }
 
 sqlite() { _mv_ext sqlite; }
@@ -93,18 +96,18 @@ cdb() { _mv_ext cdb; }
 dbmdb() { _mv_ext dbmdb; }
 dnsdb() { _mv_ext dnsdb; }
 
-md5sums="2effc2bd47ad2dc010f655c11a1b1173  exim-4.87.tar.bz2
-85348d0fed6b35f5c0b4241023269a19  exim.Makefile
+md5sums="4cc10c910fd18bb9e299e98bc0a32ed2  exim-4.88.tar.bz2
+16fdac04fe6721d9fb099456a7713beb  exim.Makefile
 186f4491800be8c56ce39320f24d7264  exim.confd
-871a2839c3814412a820b79095cc2a4d  exim.initd
+dee893356b9fee4276acb018df1c5adf  exim.initd
 2eff3af519bdf8acf0292fffe89871a5  exim.logrotate"
-sha256sums="74691e0dff4d1b5d387e9c33c86f96a8f6d2adbc781c0dec9d2061a847b07dc9  exim-4.87.tar.bz2
-9afac834b73fe6cdf3b45efdb89428a790e2a2b68bdbaafecd8d9fcfbe2ef35d  exim.Makefile
+sha256sums="119d5fd7e31fc224e84dfa458fe182f200856bae7adf852a8287c242161f8a2d  exim-4.88.tar.bz2
+8a39c8bf1c6e1ac1beec02dfd3239836a5238440049502f5f80b38fa6158446e  exim.Makefile
 db711754c48dfb7e3810009a1c6ffa331625c9d74d00dc8fa8256d9fa2c353f0  exim.confd
-6dbdf67ab4dc82142c46901ed7ceed5fca09af037071630809929e1fb545b89e  exim.initd
+c7c994777204ec45e0efe791ff818970a819b08ca67ffb252f87323346e6d1b1  exim.initd
 b5a6d449cb1998beb44d4144ef97e66a98b46d164445989a6d624c80549f24bc  exim.logrotate"
-sha512sums="2b0d5c82133315c444e29abd182e0866482c904db1abe5ffe9a3008c2174f52eca850a433c069b4102874dc32bbe4af112beac94ffa154f1c06615c24deb47a4  exim-4.87.tar.bz2
-0a3d5908f397c34c21e8a82c8d5d5e02644f30e7323f1da7acce2ebe74918da5eefe04945a5a0f3edf21881d04d1bf1e470e6bac5b6de930a6b82a4e012ce7a5  exim.Makefile
+sha512sums="ea094bf703628c201de119fc5f09539475e52158e935f8f2a9e4138c4a1bfe885017145c3cc5e22aa9087b195091955c69385ebf1ea0baec64ed5c1b8e3b1caf  exim-4.88.tar.bz2
+58845ba0e4a9f8ac744e0810c0fd717c2be0dde0241cab3d2610145cd49f2589a9ac18bc18a0b177ee89dbdb651d61348adfede2b359a99bcc51f6e9aa2de985  exim.Makefile
 bb6f5ead067af19ace661cc92bcd428da97570aedd1f9dc5b61a34e7e3fb3e028be6c96d51df73353bdfcaf69a3ee053fb03d245f868d63ebf518aa96ec82d66  exim.confd
-cd7a27922d6cce59cf2dbedaab6f90159614cd6566b5d7ff7e232acf76a42b697709bb85981ffa88b60a7ee326bb88f1892f2405495ca228b4ec025885e65ed6  exim.initd
+3769e74a54566362bcdf57c45fbf7d130d7a7529fbc40befce431eef0387df117c71a5b57779c507e30d5b125913b5f26c9d16b17995521a1d94997be6dc3e02  exim.initd
 28e748693a6a72d9943fa9c342ff041fe650fa6977f468dee127e845e6c2a91872ce33fb6f5698838906bde3ed92de7a91cdb0349cedc40b806261867e8c06cb  exim.logrotate"
diff --git a/testing/exim/exim.Makefile b/testing/exim/exim.Makefile
index 68d21d8c7b..5db92ad80f 100644
--- a/testing/exim/exim.Makefile
+++ b/testing/exim/exim.Makefile
@@ -40,7 +40,6 @@ LDFLAGS += -lspf2
 EXPERIMENTAL_EVENT=yes
 EXPERIMENTAL_PROXY=yes
 EXPERIMENTAL_CERTNAMES=yes
-EXPERIMENTAL_DANE=yes
 EXPERIMENTAL_SOCKS=yes
 EXPERIMENTAL_INTERNATIONAL=yes
 LDFLAGS += -lidn
diff --git a/testing/exim/exim.initd b/testing/exim/exim.initd
index fd0d9bd3be..102dcb4963 100644
--- a/testing/exim/exim.initd
+++ b/testing/exim/exim.initd
@@ -21,7 +21,7 @@ start_pre() {
 }
 
 reload() {
-	ebegin "Reloading ${SVCNAME}"
+	ebegin "Reloading $RC_SVCNAME"
 	start-stop-daemon --signal HUP --pidfile $pidfile
 	eend $?
 }
diff --git a/testing/exim/exim.post-upgrade b/testing/exim/exim.post-upgrade
deleted file mode 100644
index f198f46579..0000000000
--- a/testing/exim/exim.post-upgrade
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-mv /etc/mail/exim.conf /etc/exim/ >/dev/null 2>&1
-
-exit 0