Sat Aug 27 23:14:39 UTC 2011

10 files changed, 21 insertions, 22 deletions

diff --git a/community/courier-mta/PKGBUILD b/community/courier-mta/PKGBUILD
index ced394074..7b4722108 100644
--- a/community/courier-mta/PKGBUILD
+++ b/community/courier-mta/PKGBUILD
@@ -6,10 +6,9 @@
 # -----------  NOTE TO ALL USERS ------------
 # Go read http://www.courier-mta.org/install.html b4 running or building courier
 
-
 pkgname=courier-mta
 pkgver=0.66.3
-pkgrel=1
+pkgrel=3
 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -22,9 +21,9 @@ backup=('etc/courier/imapd.cnf' 'etc/courier/pop3d.cnf' \
         'etc/courier/webadmin/password' 'etc/courier/esmtpauthclient' \
         'etc/conf.d/courier-mta')
 url="http://courier-mta.org"
-depends=('courier-authlib>=0.63.0' 'fam' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates')
+depends=('courier-authlib>=0.63.0' 'gamin' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates')
 optdepends=('libldap')
-makedepends=('apache>=2.2.9-3' 'pam>=1.0.1-2' 'expect' 'gnupg' 'libldap' 'fam')
+makedepends=('apache>=2.2.9-3' 'pam>=1.0.1-2' 'expect' 'gnupg' 'libldap' 'gamin')
 provides=('smtp-server' 'smtp-forwarder' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop')
 conflicts=('courier-imap' 'smtp-forwarder' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp')
 options=('!libtool')
@@ -41,16 +40,16 @@ source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/couri
         pop3d-ssl.rc.d
         webmaild.rc.d)
 md5sums=('3b28f14afe3db09b74b4845323c3e982'
-         'bc2bdbc2f5c95cee8304f98a3b3a4895'
-         'e140f320968e57cfe459cd7a3b4017e0'
+         '9055ba622efd37603186ce1f37277224'
+         '5cbeb5c323706058e545f74ad7752ebe'
          'f3ff70b40c7a1f7a017e8c4cc4d92f4f'
-         '799ddd56ff6c9cff132e8c771dde23d9'
-         'c3b634ea6a671b660bf6a660cef57138'
-         'd7c951a7e55674778077d5123ec41006'
-         'dabac9fa0e46872049c02ef6bf83b1f0'
-         '6e9e176eb966759a1f2e3838fccf4e3c'
-         '5c0ddedca1cf2298182dbbb461c189bf'
-         'ec5c0383d617c1f4877ebba9a9727ef4')
+         'caabce8c7b66296b602316aa5af5d4c5'
+         '1c8b1b66ebafa4ff09ffc0106a9dc82c'
+         'd0cc5eab5d3e0ec33dadd0392421f63e'
+         '5873a96aa149edda281730010fb4db34'
+         'faa09e06a5dc41ee89ab1f8fa6886b63'
+         '520501daa66c0a94f2e9844ce4919a09'
+         '33a93f400c3e87bcd207295b7d7333ca')
 
 # MIGRATION NOTE:
 # In 2012, support for courier-mta.conf.d and courier-mta.rc.d will be removed.
diff --git a/community/courier-mta/courier-mta.rc.d b/community/courier-mta/courier-mta.rc.d
index 6c5fbc914..416946a5a 100644
--- a/community/courier-mta/courier-mta.rc.d
+++ b/community/courier-mta/courier-mta.rc.d
@@ -18,7 +18,7 @@ case "$1" in
       /etc/rc.d/authdaemond start
       sleep ${AUTO_AUTHDAEMON_LAG}
     fi
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-mta/courier.rc.d b/community/courier-mta/courier.rc.d
index 7c321d452..7c581a24a 100644
--- a/community/courier-mta/courier.rc.d
+++ b/community/courier-mta/courier.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
     
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-mta/esmtpd-ssl.rc.d b/community/courier-mta/esmtpd-ssl.rc.d
index 78001332f..2a13be03f 100644
--- a/community/courier-mta/esmtpd-ssl.rc.d
+++ b/community/courier-mta/esmtpd-ssl.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
     
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-mta/esmtpd.rc.d b/community/courier-mta/esmtpd.rc.d
index 951aa3e6e..dbaa9d680 100644
--- a/community/courier-mta/esmtpd.rc.d
+++ b/community/courier-mta/esmtpd.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
     
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-mta/imapd-ssl.rc.d b/community/courier-mta/imapd-ssl.rc.d
index 7b21fda76..3dc74cfdf 100644
--- a/community/courier-mta/imapd-ssl.rc.d
+++ b/community/courier-mta/imapd-ssl.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
     
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-mta/imapd.rc.d b/community/courier-mta/imapd.rc.d
index 7a8bff410..8bce59f6c 100644
--- a/community/courier-mta/imapd.rc.d
+++ b/community/courier-mta/imapd.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
     
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-mta/pop3d-ssl.rc.d b/community/courier-mta/pop3d-ssl.rc.d
index 730c6edbf..6e7ae4e12 100644
--- a/community/courier-mta/pop3d-ssl.rc.d
+++ b/community/courier-mta/pop3d-ssl.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
     
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-mta/pop3d.rc.d b/community/courier-mta/pop3d.rc.d
index 6ec1d82b6..25f8379ba 100644
--- a/community/courier-mta/pop3d.rc.d
+++ b/community/courier-mta/pop3d.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
     
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-mta/webmaild.rc.d b/community/courier-mta/webmaild.rc.d
index 2337e3ce8..835cc2bf0 100644
--- a/community/courier-mta/webmaild.rc.d
+++ b/community/courier-mta/webmaild.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
     
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1