From 617495e4120e086d4ae0f0c77c71342e468811ac Mon Sep 17 00:00:00 2001
From: Valery Kartel <valery.kartel@gmail.com>
Date: Thu, 15 Jan 2015 14:40:08 +0200
Subject: testing/exim: update to 4.85

---
 testing/exim/APKBUILD   | 18 +++++++++---------
 testing/exim/exim.initd |  9 +++------
 2 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'testing')

diff --git a/testing/exim/APKBUILD b/testing/exim/APKBUILD
index 374e8b301d..9101b72cd8 100644
--- a/testing/exim/APKBUILD
+++ b/testing/exim/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Jesse Young <jlyo@jlyo.org>
 # Maintainer: Jesse Young <jlyo@jlyo.org>
 pkgname=exim
-pkgver=4.84
-pkgrel=3
+pkgver=4.85
+pkgrel=0
 pkgdesc="A Message Transfer Agent"
 url="http://www.exim.org/"
 arch="all"
@@ -14,7 +14,7 @@ pkggroups="mail"
 depends_dev="db-dev pcre-dev openssl-dev libspf2-dev mysql-dev postgresql-dev sqlite-dev"
 makedepends="bash gawk perl $depends_dev"
 install="exim.pre-install"
-subpackages="$pkgname-cdb  $pkgname-dnsdb $pkgname-passwd $pkgname-sqlite $pkgname-mysql $pkgname-postgresql $pkgname-utils $pkgname-scripts $pkgname-doc"
+subpackages="$pkgname-cdb $pkgname-dnsdb $pkgname-passwd $pkgname-sqlite $pkgname-mysql $pkgname-postgresql $pkgname-utils $pkgname-scripts $pkgname-doc"
 source="ftp://exim.inode.at/exim/exim4/$pkgname-$pkgver.tar.bz2
 	exim.Makefile
 	exim.confd
@@ -116,21 +116,21 @@ _inst_lookup() {
 	install -D -m755 "$_builddir"/build-Linux-*/lookups/$1.so "$subpkgdir"/usr/lib/exim/$1.so
 }
 
-md5sums="3d14522e604b687b9e515f5aa739b2c0  exim-4.84.tar.bz2
+md5sums="ebae28762b6f125726283dc9434e8709  exim-4.85.tar.bz2
 950c23ffa293dd50a50fc12664f62566  exim.Makefile
 f442b68d435598831bab8536ade071b8  exim.confd
-6ba3c29545484c152df7ac8656943891  exim.initd
+90299d636a780e7585796a4b4ad45858  exim.initd
 2aeee003b9526472608bdc4194fb95de  exim.logrotate
 a58ceadf9f3fa8b06bbadb01bc731dc8  exim.pre-install"
-sha256sums="78ea22be87fb6df880e7fd482f3bec9ef6ceca0c9dedd50f8a26cae0b38b9e9c  exim-4.84.tar.bz2
+sha256sums="13211f2bbc5400d095a9b4be075eb1347e0d98676fdfe4be8a3b4d56281daaa4  exim-4.85.tar.bz2
 43ec8f9f24017eec90225678dcc13181cb7831a403773eb92b7400d396d94077  exim.Makefile
 668f912565a59926957090c6143f669f0e9de2cf441507d3c05fcd046865b401  exim.confd
-46869c47ff928c5628113e4a76ea469e8202339305b781ada0e37dcf6cd5bf76  exim.initd
+4efe727a597a35a1f1e4e4731f769a9789d979a70ea916714d6bbae67151d42f  exim.initd
 71aa7865eea47bb65737cf65e01a73054f34d2feab23d5905619ca1c079041d6  exim.logrotate
 3470a7f2860b0c01549577edf446fc13cdcf3e10e1b52875eee666017227db03  exim.pre-install"
-sha512sums="3cd41af6d57e5f0377fc93367753eae6cb6bf835803e8608c44e1da5acefce1ed8886f4fe7536950de072bfed6e927afe1536c1e6466cf3121dd352b69a68039  exim-4.84.tar.bz2
+sha512sums="2c5846528ee98e4aff5dbabe49dfa5ba6753fa64154b9671a7849db8a17773917fe13bcb9e5f732c43d7479debfadd8012b8650823eb12504a6b1b28be456161  exim-4.85.tar.bz2
 2329ab156a663c33094f675fb50763123d4f92e402e55ae1d8c21394b14b25b2c05b6bce78dd6a59e623b355304a4523928ec00a6140acd8402712b6508952c8  exim.Makefile
 24bae5bba1b41e59247cd7089c3f9ffcc5f4b26c3da1b21f755724a7ee5c99a05e324437c965ae86170056cc63b9bcdc41f624a747ab31b887d69cff620f2155  exim.confd
-aeec8762d1dce4b09049e08d0c275ae475e639c4a3ad667c4208df36eba71c544311f5c175d7f481ea84213cf130da0a77a0e32d3ff7e933a7356deab8c4e850  exim.initd
+4ba91019a63cf35cad827ef9d77e0fca6453c88c7f834da3cf5a8e251b558f61ec74eb05ad25f1c8cbbbe78c11a09924fb2fa955b69816b3e61d2f32798a7467  exim.initd
 b5d197c7da4318d2040395fe7eb9046442604a695530fc861594d0cb38e6ad7f5e56ac1204639c18ac93a005f56ea3d8054ac5c823c54c4cc21fd77266080407  exim.logrotate
 6b6e85f392cd338602653b86f88daedf90a735e04f9bbcbac83df357ec881f436a74aedd91db21bd1e2e510eedea39587ae473efa7be9b75c6e2efe0472cf28d  exim.pre-install"
diff --git a/testing/exim/exim.initd b/testing/exim/exim.initd
index 3662ebee34..1ba07a6cbe 100644
--- a/testing/exim/exim.initd
+++ b/testing/exim/exim.initd
@@ -1,7 +1,4 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/files/exim.rc7,v 1.2 2011/08/16 16:51:36 idl0r Exp $
 
 extra_started_commands="reload"
 
@@ -13,18 +10,18 @@ depend() {
 
 start() {
 	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet --exec /usr/sbin/exim --pidfile /var/run/${SVCNAME}.pid -- ${EXIM_OPTS:--bd -q15m}
+	start-stop-daemon --start --quiet --exec /usr/sbin/${SVCNAME} --pidfile /var/run/${SVCNAME}.pid -- ${EXIM_OPTS:--bd -q15m}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid --name exim
+	start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid --name ${SVCNAME}
 	eend $?
 }
 
 reload() {
 	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --pidfile /var/run/${SVCNAME}.pid --name exim
+	start-stop-daemon --signal HUP --pidfile /var/run/${SVCNAME}.pid --name ${SVCNAME}
 	eend $?
 }
-- 
cgit v1.2.3