Fix Unit Files

12 files changed, 35 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0be000201bcc..4a42ea78a9dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = courier-mta
 	pkgdesc = IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig
 	pkgver = 0.75.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://courier-mta.org
 	install = courier-mta.install
 	arch = i686
@@ -61,16 +61,16 @@ pkgbase = courier-mta
 	source = courier-courierfilter.service
 	source = courier-imapd.conf
 	sha1sums = 6e6f279530bcca09090cd9f6a47003a7421ba3ef
-	sha1sums = 5e7f4bc751663069c773ec39bb2761c6bd506a95
-	sha1sums = f68f7c96abd83a78405227fa6dee20cefc8f6119
-	sha1sums = 6a4617b334661ff6e1c83f5d2f83f467d59718d0
-	sha1sums = b7e0b0acb7ddb5f2874d33635497d33609eed40a
-	sha1sums = b9029eb07cb18768d66d6741d7bdf1a59878ef9c
-	sha1sums = af64a07a0ce852277556829129dcc3b3f7a6dfbe
-	sha1sums = d5918e95df3009091684597e38fbffd19a5786fe
-	sha1sums = d306d91b0e5f85d455683ce073282257fd89542f
-	sha1sums = 262aea3a0436db6aff6a2b2c89fb7bb6a0b91f4b
-	sha1sums = 997d34d07af2446f6283b183517cf3e2543c5f4a
+	sha1sums = 160f270d8214ac39adc0d1618bc981c59f080adf
+	sha1sums = 71d07d57d3c211abf267be140ffb074ac2492448
+	sha1sums = 6b06348e019e8883bcac314169e920f156ed1fa4
+	sha1sums = 3c6e285fb83aaecab274ea313619cc7a6bf09e05
+	sha1sums = 74462efddede8262ec047eb21edada596d38732d
+	sha1sums = e06cdb4014cb4c953dcedf6319eb31cc72a0c867
+	sha1sums = 315a26f6c74a9a1bbf9fdc1329095a15db0b5fc6
+	sha1sums = d768b9759a2bca407cf225771c49a83428db2a2c
+	sha1sums = 94703b7bb090754e78710df42f658407a5c0a798
+	sha1sums = 2c9a51fac9adb1bfb71a9d2b00e417dba4a0c249
 	sha1sums = 72b81e3d330486e2e53ba11b498332a7bc7ea37e
 
 pkgname = courier-mta
diff --git a/PKGBUILD b/PKGBUILD
index 7aa73ce57e4e..9f561ed05920 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=courier-mta
 pkgver=0.75.0
-pkgrel=1
+pkgrel=2
 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -40,16 +40,16 @@ source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/couri
 	courier-courierfilter.service
 	courier-imapd.conf)
 sha1sums=('6e6f279530bcca09090cd9f6a47003a7421ba3ef'
-	    '5e7f4bc751663069c773ec39bb2761c6bd506a95'
-	    'f68f7c96abd83a78405227fa6dee20cefc8f6119'
-	    '6a4617b334661ff6e1c83f5d2f83f467d59718d0'
-	    'b7e0b0acb7ddb5f2874d33635497d33609eed40a'
-	    'b9029eb07cb18768d66d6741d7bdf1a59878ef9c'
-	    'af64a07a0ce852277556829129dcc3b3f7a6dfbe'
-	    'd5918e95df3009091684597e38fbffd19a5786fe'
-	    'd306d91b0e5f85d455683ce073282257fd89542f'
-	    '262aea3a0436db6aff6a2b2c89fb7bb6a0b91f4b'
-	    '997d34d07af2446f6283b183517cf3e2543c5f4a'
+	    '160f270d8214ac39adc0d1618bc981c59f080adf'
+	    '71d07d57d3c211abf267be140ffb074ac2492448'
+	    '6b06348e019e8883bcac314169e920f156ed1fa4'
+	    '3c6e285fb83aaecab274ea313619cc7a6bf09e05'
+	    '74462efddede8262ec047eb21edada596d38732d'
+	    'e06cdb4014cb4c953dcedf6319eb31cc72a0c867'
+	    '315a26f6c74a9a1bbf9fdc1329095a15db0b5fc6'
+	    'd768b9759a2bca407cf225771c49a83428db2a2c'
+	    '94703b7bb090754e78710df42f658407a5c0a798'
+	    '2c9a51fac9adb1bfb71a9d2b00e417dba4a0c249'
 	    '72b81e3d330486e2e53ba11b498332a7bc7ea37e')
 
 build() {
@@ -131,7 +131,7 @@ package() {
    chown -R courier:courier ${pkgdir}/usr/lib/courier/modules
    rm -r ${pkgdir}/var/run
    #chown -R courier:courier ${pkgdir}/var/run/courier
-   chown root:root ${pkgdir}/usr/{.,bin,lib,share}
+   chown -R root:root ${pkgdir}/usr/{.,bin,lib,share}
 
   # Recent fixes concerning imapd-binary, see https://aur.archlinux.org/packages/courier-mta/
   install -m 755 "${srcdir}/courier-${pkgver}/courier/imapd" "${pkgdir}/usr/lib/courier/courierimapd"
diff --git a/courier-courierfilter.service b/courier-courierfilter.service
index bbbdcde9dd54..7132e6bc4328 100644
--- a/courier-courierfilter.service
+++ b/courier-courierfilter.service
@@ -3,7 +3,7 @@ Description=Courier filter Daemon
 
 [Service]
 Type=forking
-ExecStartPre=[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier
+ExecStartPre=/usr/bin/sh -c "[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier"
 ExecStart=/usr/sbin/courierfilter start
 ExecStop=/usr/sbin/courierfilter stop
 PIDFile=/var/run/courier/courierfilter.pid
diff --git a/courier-esmtpd-msa.service b/courier-esmtpd-msa.service
index 3f01eb574c17..6e92ee0689bb 100644
--- a/courier-esmtpd-msa.service
+++ b/courier-esmtpd-msa.service
@@ -5,7 +5,7 @@ After=authdaemond.service
 
 [Service]
 Type=forking
-ExecStartPre=[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier
+ExecStartPre=/usr/bin/sh -c "[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier"
 ExecStart=/usr/sbin/esmtpd-msa start
 ExecStop=/usr/sbin/esmtpd-msa stop
 PIDFile=/var/run/courier/esmtpd-msa.pid
diff --git a/courier-esmtpd-ssl.service b/courier-esmtpd-ssl.service
index f0ffb04a675a..b24d5903974e 100644
--- a/courier-esmtpd-ssl.service
+++ b/courier-esmtpd-ssl.service
@@ -1,12 +1,12 @@
 [Unit]
 Description=Courier ESMTP Daemon
 Requires=authdaemond.service
-After=authdaemond.service, courier-courierfilter.service
+After=authdaemond.service courier-courierfilter.service
 
 
 [Service]
 Type=forking
-ExecStartPre=[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier
+ExecStartPre=/usr/bin/sh -c "[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier"
 ExecStart=/usr/sbin/esmtpd-ssl start
 ExecStop=/usr/sbin/esmtpd-ssl stop
 PIDFile=/var/run/courier/esmtpd-ssl.pid
diff --git a/courier-esmtpd.service b/courier-esmtpd.service
index c085b6b205b9..968a42fb21c6 100644
--- a/courier-esmtpd.service
+++ b/courier-esmtpd.service
@@ -1,11 +1,11 @@
 [Unit]
 Description=Courier ESMTP Daemon
 Requires=authdaemond.service
-After=authdaemond.service, courier-courierfilter.service
+After=authdaemond.service courier-courierfilter.service
 
 [Service]
 Type=forking
-ExecStartPre=[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier
+ExecStartPre=/usr/bin/sh -c "[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier"
 ExecStart=/usr/sbin/esmtpd start
 ExecStop=/usr/sbin/esmtpd stop
 PIDFile=/var/run/courier/esmtpd.pid
diff --git a/courier-imapd-ssl.service b/courier-imapd-ssl.service
index 94223d32ecb6..75dbf62ff40a 100644
--- a/courier-imapd-ssl.service
+++ b/courier-imapd-ssl.service
@@ -5,7 +5,7 @@ After=authdaemond.service
 
 [Service]
 Type=forking
-ExecStartPre=[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier
+ExecStartPre=/usr/bin/sh -c "[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier"
 ExecStart=/usr/sbin/imapd-ssl start
 ExecStop=/usr/sbin/imapd-ssl stop
 PIDFile=/var/run/courier/imapd-ssl.pid
diff --git a/courier-imapd.service b/courier-imapd.service
index 85f694408de9..af01f2b4a0df 100644
--- a/courier-imapd.service
+++ b/courier-imapd.service
@@ -5,7 +5,7 @@ After=authdaemond.service
 
 [Service]
 Type=forking
-ExecStartPre=[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier
+ExecStartPre=/usr/bin/sh -c "[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier"
 ExecStart=/usr/sbin/imapd start
 ExecStop=/usr/sbin/imapd stop
 PIDFile=/var/run/courier/imapd.pid
diff --git a/courier-pop3d-ssl.service b/courier-pop3d-ssl.service
index aa018c4b4af1..b0723b7588e1 100644
--- a/courier-pop3d-ssl.service
+++ b/courier-pop3d-ssl.service
@@ -5,7 +5,7 @@ After=authdaemond.service
 
 [Service]
 Type=forking
-ExecStartPre=[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier
+ExecStartPre=/usr/bin/sh -c "[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier"
 ExecStart=/usr/sbin/pop3d-ssl start
 ExecStop=/usr/sbin/pop3d-ssl stop
 PIDFile=/var/run/courier/pop3d-ssl.pid
diff --git a/courier-pop3d.service b/courier-pop3d.service
index 5f8cf5efd83d..815da6801207 100644
--- a/courier-pop3d.service
+++ b/courier-pop3d.service
@@ -5,7 +5,7 @@ After=authdaemond.service
 
 [Service]
 Type=forking
-ExecStartPre=[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier
+ExecStartPre=/usr/bin/sh -c "[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier"
 ExecStart=/usr/sbin/pop3d start
 ExecStop=/usr/sbin/pop3d stop
 PIDFile=/var/run/courier/pop3d.pid
diff --git a/courier.service b/courier.service
index 2192b2f56932..5b75e0be1a5e 100644
--- a/courier.service
+++ b/courier.service
@@ -5,7 +5,7 @@ After=authdaemond.service
 
 [Service]
 Type=forking
-ExecStartPre=[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier
+ExecStartPre=/usr/bin/sh -c "[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier"
 ExecStart=/usr/sbin/courier start
 ExecStop=/usr/sbin/courier stop
 
diff --git a/webmaild.service b/webmaild.service
index ca3939d29a8d..77fd755b5ba6 100644
--- a/webmaild.service
+++ b/webmaild.service
@@ -5,7 +5,7 @@ After=authdaemond.service
 
 [Service]
 Type=forking
-ExecStartPre=[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier
+ExecStartPre=/usr/bin/sh -c "[ -d /var/run/courier ] || mkdir -p /var/run/courier && chown courier:courier /var/run/courier"
 ExecStart=/usr/sbin/webmaild start
 ExecStop=/usr/sbin/webmaild stop
 PIDFile=/var/run/courier/webmaild.pid