Sat Nov 10 01:23:30 PST 2012

5 files changed, 14 insertions, 12 deletions

diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD
index 390e6f6f5..665ec24e3 100644
--- a/community/dbmail/PKGBUILD
+++ b/community/dbmail/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 77106 2012-10-05 10:14:22Z spupykin $
+# $Id: PKGBUILD 79626 2012-11-09 09:24:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com>
 
 pkgname=dbmail
 pkgver=3.0.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Fast and scalable sql based mail services"
 arch=('i686' 'x86_64')
 depends=('gmime24' 'libzdb' 'mhash' 'libevent')
@@ -19,8 +19,6 @@ url="http://www.dbmail.org"
 license=('GPL')
 options=('!libtool' 'zipman')
 backup=(etc/conf.d/dbmail)
-conflicts=('dbmail')
-provides=('dbmail')
 source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz
 	dbmail.conf.d
 	dbmail.rc.d
@@ -31,10 +29,10 @@ source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz
 md5sums=('eb32235abffdf967253ee9d004e0e4a9'
          'e7f72bc360decdb2475266391ad12329'
          '30774513fb016b9da08e9cf6f2a0b8e7'
-         '845b8bfe40864c366f7ab69768d1faa2'
-         '81a59222a43ae89f59299fe798b8e072'
-         '2e9a9a56ae56218142a115bff3f9a272'
-         'd1fb94edb272d2a717af1944ecfd7fce')
+         '84efa46eaac66057c4eb131d9bc27fa8'
+         '19560277f6a56d1f3f2fdb02315dcf0f'
+         '89a0f793737eaf36291409f8c840891e'
+         'dd1b5b2c542f55d9d934a58a36d0513d')
 
 build() {
   cd $srcdir/dbmail-${pkgver/_/-}/
diff --git a/community/dbmail/dbmail-imapd.service b/community/dbmail/dbmail-imapd.service
index 110bbbdc4..e67e0c4e8 100644
--- a/community/dbmail/dbmail-imapd.service
+++ b/community/dbmail/dbmail-imapd.service
@@ -4,7 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/dbmail-imapd
+PIDFile=/var/run/dbmail/dbmail-imapd.pid
+ExecStart=/usr/sbin/dbmail-imapd -p /var/run/dbmail/dbmail-imapd.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-lmtpd.service b/community/dbmail/dbmail-lmtpd.service
index e531b2e3e..2a059a15c 100644
--- a/community/dbmail/dbmail-lmtpd.service
+++ b/community/dbmail/dbmail-lmtpd.service
@@ -4,7 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/dbmail-lmtpd
+PIDFile=/var/run/dbmail/dbmail-lmtpd.pid
+ExecStart=/usr/sbin/dbmail-lmtpd -p /var/run/dbmail/dbmail-lmtpd.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-pop3d.service b/community/dbmail/dbmail-pop3d.service
index eacef4459..907f43b2b 100644
--- a/community/dbmail/dbmail-pop3d.service
+++ b/community/dbmail/dbmail-pop3d.service
@@ -4,7 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/dbmail-pop3d
+PIDFile=/var/run/dbmail/dbmail-pop3d.pid
+ExecStart=/usr/sbin/dbmail-pop3d -p /var/run/dbmail/dbmail-pop3d.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-timsieved.service b/community/dbmail/dbmail-timsieved.service
index 847b69580..7f34bacec 100644
--- a/community/dbmail/dbmail-timsieved.service
+++ b/community/dbmail/dbmail-timsieved.service
@@ -4,7 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/dbmail-timsieved
+PIDFile=/var/run/dbmail/dbmail-timsieved.pid
+ExecStart=/usr/sbin/dbmail-timsieved -p /var/run/dbmail/dbmail-timsieved.pid
 
 [Install]
 WantedBy=multi-user.target