Changed /var/run to /run in service files to avoid using symlinks with systemd

12 files changed, 43 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 224c6eb27cf8..6c1c661271f8 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.78.2
-	pkgrel = 3
+	pkgver = 0.78.3
+	pkgrel = 1
 	url = http://courier-mta.org
 	install = courier-mta.install
 	arch = i686
@@ -34,7 +34,14 @@ pkgbase = courier-mta
 	conflicts = ucspi-tcp
 	options = !libtool
 	options = !staticlibs
-	source = http://downloads.sourceforge.net/project/courier/courier/0.78.2/courier-0.78.2.tar.bz2
+	backup = etc/courier/aliases/system
+	backup = etc/courier/smtpaccess/default
+	backup = etc/courier/webadmin/password
+	backup = etc/courier/imapd.cnf
+	backup = etc/courier/esmtpd.cnf
+	backup = etc/courier/pop3d.conf
+	backup = etc/courier/esmtpauthclient
+	source = http://downloads.sourceforge.net/project/courier/courier/0.78.3/courier-0.78.3.tar.bz2
 	source = courier-imapd.service
 	source = courier-imapd-ssl.service
 	source = courier-pop3d.service
@@ -48,19 +55,19 @@ pkgbase = courier-mta
 	source = webmaild.service
 	source = courier-courierfilter.service
 	source = courier-mta.conf
-	sha1sums = 65d7e3c7217874e0343ce0f78fd39361a8d7e0b9
-	sha1sums = 160f270d8214ac39adc0d1618bc981c59f080adf
-	sha1sums = 71d07d57d3c211abf267be140ffb074ac2492448
-	sha1sums = 6b06348e019e8883bcac314169e920f156ed1fa4
-	sha1sums = 3c6e285fb83aaecab274ea313619cc7a6bf09e05
-	sha1sums = 74462efddede8262ec047eb21edada596d38732d
-	sha1sums = e06cdb4014cb4c953dcedf6319eb31cc72a0c867
-	sha1sums = 315a26f6c74a9a1bbf9fdc1329095a15db0b5fc6
-	sha1sums = d768b9759a2bca407cf225771c49a83428db2a2c
+	sha1sums = 2c4a553462fd982855a1223cd05028c3ccd99779
+	sha1sums = 9feaa269795a85c1464c104d9268fb266ad1a666
+	sha1sums = 0344ac948b189cae73d86f4565e40847c44772c9
+	sha1sums = 920bd35afc0bf6e6ba5cf7b309210be4d2c76e18
+	sha1sums = 47c289e743d1d513b7181e04bc8cb222ba7d7119
+	sha1sums = 0c57caa214c3e4da976162e08fd4f575f2976d94
+	sha1sums = 6cb5d9a472ff374089b0046362db899ffa4379a2
+	sha1sums = 86a07e4deddca5c1b3d17d2bd59074781a93711a
+	sha1sums = 20e07d4995d6028ef0a99333b31cc53d202ee6e9
 	sha1sums = feb094c689a0c37c68f3b0c7e2b88eb5d572209f
 	sha1sums = 7c6e687d1cefe3139274b39c659351a503a3adb3
-	sha1sums = 94703b7bb090754e78710df42f658407a5c0a798
-	sha1sums = 2c9a51fac9adb1bfb71a9d2b00e417dba4a0c249
+	sha1sums = ecd2a51d62c038cff16558e6377c09f94f201146
+	sha1sums = 24d07f37ba5150b08f68dc73c0a5e53ae50ee9d5
 	sha1sums = ba376789c8c5db6a709d2c4657b5bcf090417221
 
 pkgname = courier-mta
diff --git a/PKGBUILD b/PKGBUILD
index 831e092f03fb..d20b7c17b4a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 # Go read http://www.courier-mta.org/install.html b4 running or building courier
 
 pkgname=courier-mta
-pkgver=0.78.2
-pkgrel=3
+pkgver=0.78.3
+pkgrel=1
 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -36,19 +36,19 @@ source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/couri
 	webmaild.service
 	courier-courierfilter.service
 	courier-mta.conf)
-sha1sums=('65d7e3c7217874e0343ce0f78fd39361a8d7e0b9'
-          '160f270d8214ac39adc0d1618bc981c59f080adf'
-          '71d07d57d3c211abf267be140ffb074ac2492448'
-          '6b06348e019e8883bcac314169e920f156ed1fa4'
-          '3c6e285fb83aaecab274ea313619cc7a6bf09e05'
-          '74462efddede8262ec047eb21edada596d38732d'
-          'e06cdb4014cb4c953dcedf6319eb31cc72a0c867'
-          '315a26f6c74a9a1bbf9fdc1329095a15db0b5fc6'
-          'd768b9759a2bca407cf225771c49a83428db2a2c'
+sha1sums=('2c4a553462fd982855a1223cd05028c3ccd99779'
+          '9feaa269795a85c1464c104d9268fb266ad1a666'
+          '0344ac948b189cae73d86f4565e40847c44772c9'
+          '920bd35afc0bf6e6ba5cf7b309210be4d2c76e18'
+          '47c289e743d1d513b7181e04bc8cb222ba7d7119'
+          '0c57caa214c3e4da976162e08fd4f575f2976d94'
+          '6cb5d9a472ff374089b0046362db899ffa4379a2'
+          '86a07e4deddca5c1b3d17d2bd59074781a93711a'
+          '20e07d4995d6028ef0a99333b31cc53d202ee6e9'
           'feb094c689a0c37c68f3b0c7e2b88eb5d572209f'
           '7c6e687d1cefe3139274b39c659351a503a3adb3'
-          '94703b7bb090754e78710df42f658407a5c0a798'
-          '2c9a51fac9adb1bfb71a9d2b00e417dba4a0c249'
+          'ecd2a51d62c038cff16558e6377c09f94f201146'
+          '24d07f37ba5150b08f68dc73c0a5e53ae50ee9d5'
           'ba376789c8c5db6a709d2c4657b5bcf090417221')
 
 build() {
diff --git a/courier-courierfilter.service b/courier-courierfilter.service
index 7132e6bc4328..44dda8483d61 100644
--- a/courier-courierfilter.service
+++ b/courier-courierfilter.service
@@ -3,10 +3,9 @@ Description=Courier filter Daemon
 
 [Service]
 Type=forking
-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
+PIDFile=/run/courier/courierfilter.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/courier-esmtpd-msa.service b/courier-esmtpd-msa.service
index 6e92ee0689bb..46206c3b85cd 100644
--- a/courier-esmtpd-msa.service
+++ b/courier-esmtpd-msa.service
@@ -5,10 +5,9 @@ After=authdaemond.service
 
 [Service]
 Type=forking
-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
+PIDFile=/run/courier/esmtpd-msa.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/courier-esmtpd-ssl.service b/courier-esmtpd-ssl.service
index b24d5903974e..6f43f2377873 100644
--- a/courier-esmtpd-ssl.service
+++ b/courier-esmtpd-ssl.service
@@ -3,13 +3,11 @@ Description=Courier ESMTP Daemon
 Requires=authdaemond.service
 After=authdaemond.service courier-courierfilter.service
 
-
 [Service]
 Type=forking
-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
+PIDFile=/run/courier/esmtpd-ssl.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/courier-esmtpd.service b/courier-esmtpd.service
index 968a42fb21c6..812a8cc306b9 100644
--- a/courier-esmtpd.service
+++ b/courier-esmtpd.service
@@ -5,10 +5,9 @@ After=authdaemond.service courier-courierfilter.service
 
 [Service]
 Type=forking
-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
+PIDFile=/run/courier/esmtpd.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/courier-imapd-ssl.service b/courier-imapd-ssl.service
index 75dbf62ff40a..f6f219c4009d 100644
--- a/courier-imapd-ssl.service
+++ b/courier-imapd-ssl.service
@@ -5,10 +5,9 @@ After=authdaemond.service
 
 [Service]
 Type=forking
-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
+PIDFile=/run/courier/imapd-ssl.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/courier-imapd.service b/courier-imapd.service
index af01f2b4a0df..d132b987d847 100644
--- a/courier-imapd.service
+++ b/courier-imapd.service
@@ -5,10 +5,9 @@ After=authdaemond.service
 
 [Service]
 Type=forking
-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
+PIDFile=/run/courier/imapd.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/courier-pop3d-ssl.service b/courier-pop3d-ssl.service
index b0723b7588e1..b1915304a5b7 100644
--- a/courier-pop3d-ssl.service
+++ b/courier-pop3d-ssl.service
@@ -5,10 +5,9 @@ After=authdaemond.service
 
 [Service]
 Type=forking
-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
+PIDFile=/run/courier/pop3d-ssl.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/courier-pop3d.service b/courier-pop3d.service
index 815da6801207..28f0b9bf4f59 100644
--- a/courier-pop3d.service
+++ b/courier-pop3d.service
@@ -5,10 +5,9 @@ After=authdaemond.service
 
 [Service]
 Type=forking
-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
+PIDFile=/run/courier/pop3d.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/courier.service b/courier.service
index 5b75e0be1a5e..5df43a68c97e 100644
--- a/courier.service
+++ b/courier.service
@@ -5,7 +5,6 @@ After=authdaemond.service
 
 [Service]
 Type=forking
-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 77fd755b5ba6..9412e4d92610 100644
--- a/webmaild.service
+++ b/webmaild.service
@@ -5,10 +5,9 @@ After=authdaemond.service
 
 [Service]
 Type=forking
-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
+PIDFile=/run/courier/webmaild.pid
 
 [Install]
 WantedBy=multi-user.target