9 files changed, 32 insertions, 24 deletions
diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD
index 6078bb543..ab4fadc71 100644
--- a/community/dbmail/PKGBUILD
+++ b/community/dbmail/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90653 2013-05-13 14:20:23Z spupykin $
+# $Id: PKGBUILD 91488 2013-05-23 10:12:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com>
 
 pkgname=dbmail
 pkgver=3.0.2
-pkgrel=10
+pkgrel=11
 pkgdesc="Fast and scalable sql based mail services"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gmime24' 'libzdb' 'mhash' 'libevent')
@@ -31,19 +31,19 @@ source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz
 	dbmail-timsieved.xinetd)
 md5sums=('eb32235abffdf967253ee9d004e0e4a9'
          'c4b5793c5422b62a675d4c66ff7e9300'
-         '84efa46eaac66057c4eb131d9bc27fa8'
-         '19560277f6a56d1f3f2fdb02315dcf0f'
-         '89a0f793737eaf36291409f8c840891e'
-         'dd1b5b2c542f55d9d934a58a36d0513d'
-         '8fa791f2e4d107ba461453c054359477'
-         '069cd4285c4b2ec95dfdcebc2cfee387'
-         '44f87ce81e786fcee501daa17e55412a'
-         'a66927cb94d4f26428211e3ad2d540c8')
+         '5a6297cb03c8d0b424f978ea1d7402de'
+         '070db88538af9833f003f4cb516d337b'
+         '422f0399f97a780b7cab84443e8f429a'
+         '15c7d367d4242aebac5f87649a2250aa'
+         '890de13361afbdf4fed12d6d7eb53e66'
+         '961593658cd596297d03d25eb9c9e98f'
+         '4cb764894abd3914802e90602bf90a0c'
+         'e78dc86355f9aaf24590bc7c6611162f')
 
 build() {
   cd $srcdir/dbmail-${pkgver/_/-}/
-
-  [ -f Makefile ] || ./configure --prefix=/usr --with-ldap --with-sieve
+  [ -f Makefile ] || ./configure --prefix=/usr --sbindir=/usr/bin \
+    --with-ldap --with-sieve
   make
 }
 
diff --git a/community/dbmail/dbmail-imapd.service b/community/dbmail/dbmail-imapd.service
index e67e0c4e8..bc3319fd0 100644
--- a/community/dbmail/dbmail-imapd.service
+++ b/community/dbmail/dbmail-imapd.service
@@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-PIDFile=/var/run/dbmail/dbmail-imapd.pid
-ExecStart=/usr/sbin/dbmail-imapd -p /var/run/dbmail/dbmail-imapd.pid
+PIDFile=/run/dbmail/dbmail-imapd.pid
+ExecStart=/usr/bin/dbmail-imapd -p /run/dbmail/dbmail-imapd.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-imapd.xinetd b/community/dbmail/dbmail-imapd.xinetd
index eee3635df..20f7d607d 100644
--- a/community/dbmail/dbmail-imapd.xinetd
+++ b/community/dbmail/dbmail-imapd.xinetd
@@ -3,9 +3,11 @@ service imap
       socket_type     = stream
       wait            = no
       user            = nobody
-      server          = /usr/sbin/dbmail-imapd
+      server          = /usr/bin/dbmail-imapd
       protocol        = tcp
       server_args     = -n
       log_on_failure  += USERID
       disable         = yes
+#      env             = EVENT_NOEPOLL=yes
+#      instances       = 200
 }
diff --git a/community/dbmail/dbmail-lmtpd.service b/community/dbmail/dbmail-lmtpd.service
index 2a059a15c..570ba1ec7 100644
--- a/community/dbmail/dbmail-lmtpd.service
+++ b/community/dbmail/dbmail-lmtpd.service
@@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-PIDFile=/var/run/dbmail/dbmail-lmtpd.pid
-ExecStart=/usr/sbin/dbmail-lmtpd -p /var/run/dbmail/dbmail-lmtpd.pid
+PIDFile=/run/dbmail/dbmail-lmtpd.pid
+ExecStart=/usr/bin/dbmail-lmtpd -p /run/dbmail/dbmail-lmtpd.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-lmtpd.xinetd b/community/dbmail/dbmail-lmtpd.xinetd
index 63365fee4..0a0e05620 100644
--- a/community/dbmail/dbmail-lmtpd.xinetd
+++ b/community/dbmail/dbmail-lmtpd.xinetd
@@ -5,7 +5,7 @@ service lmtp
       socket_type     = stream
       wait            = no
       user            = nobody
-      server          = /usr/sbin/dbmail-lmtpd
+      server          = /usr/bin/dbmail-lmtpd
       protocol        = tcp
       server_args     = -n
       log_on_failure  += USERID
diff --git a/community/dbmail/dbmail-pop3d.service b/community/dbmail/dbmail-pop3d.service
index 907f43b2b..edfa2570a 100644
--- a/community/dbmail/dbmail-pop3d.service
+++ b/community/dbmail/dbmail-pop3d.service
@@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-PIDFile=/var/run/dbmail/dbmail-pop3d.pid
-ExecStart=/usr/sbin/dbmail-pop3d -p /var/run/dbmail/dbmail-pop3d.pid
+PIDFile=/run/dbmail/dbmail-pop3d.pid
+ExecStart=/usr/bin/dbmail-pop3d -p /run/dbmail/dbmail-pop3d.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-pop3d.xinetd b/community/dbmail/dbmail-pop3d.xinetd
index 6c5b06735..f073aca8b 100644
--- a/community/dbmail/dbmail-pop3d.xinetd
+++ b/community/dbmail/dbmail-pop3d.xinetd
@@ -3,9 +3,11 @@ service pop3
       socket_type     = stream
       wait            = no
       user            = nobody
-      server          = /usr/sbin/dbmail-pop3d
+      server          = /usr/bin/dbmail-pop3d
       protocol        = tcp
       server_args     = -n
       log_on_failure  += USERID
       disable         = yes
+#      env             = EVENT_NOEPOLL=yes
+#      instances       = 200
 }
diff --git a/community/dbmail/dbmail-timsieved.service b/community/dbmail/dbmail-timsieved.service
index 7f34bacec..32623e038 100644
--- a/community/dbmail/dbmail-timsieved.service
+++ b/community/dbmail/dbmail-timsieved.service
@@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-PIDFile=/var/run/dbmail/dbmail-timsieved.pid
-ExecStart=/usr/sbin/dbmail-timsieved -p /var/run/dbmail/dbmail-timsieved.pid
+PIDFile=/run/dbmail/dbmail-timsieved.pid
+ExecStart=/usr/bin/dbmail-timsieved -p /run/dbmail/dbmail-timsieved.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-timsieved.xinetd b/community/dbmail/dbmail-timsieved.xinetd
index 77ed27c31..69f6dd66b 100644
--- a/community/dbmail/dbmail-timsieved.xinetd
+++ b/community/dbmail/dbmail-timsieved.xinetd
@@ -1,11 +1,15 @@
 service sieve
 {
+#      port            = 2000
+#      type            = UNLISTED
       socket_type     = stream
       wait            = no
       user            = nobody
-      server          = /usr/sbin/dbmail-timsieved
+      server          = /usr/bin/dbmail-timsieved
       protocol        = tcp
       server_args     = -n
       log_on_failure  += USERID
       disable         = yes
+#      env             = EVENT_NOEPOLL=yes
+#      instances       = 200
 }