summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO22
-rw-r--r--PKGBUILD27
-rw-r--r--courier-courierfilter.service1
-rw-r--r--courier-esmtpd-msa.service1
-rw-r--r--courier-esmtpd-ssl.service1
-rw-r--r--courier-esmtpd.service1
-rw-r--r--courier-imapd-ssl.service1
-rw-r--r--courier-imapd.service1
-rw-r--r--courier-pop3d-ssl.service1
-rw-r--r--courier-pop3d.service1
-rw-r--r--courier.service1
-rw-r--r--webmaild.service1
12 files changed, 36 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fd56175605a9..64212d8d2e5c 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 = 1.1.5
- pkgrel = 1
+ pkgrel = 2
url = http://courier-mta.org
install = courier-mta.install
arch = i686
@@ -57,18 +57,18 @@ pkgbase = courier-mta
source = courier-courierfilter.service
source = courier-mta.conf
sha1sums = e79c4529138ccdbe4c58530f4d13ccd8597faa5d
- sha1sums = 9feaa269795a85c1464c104d9268fb266ad1a666
- sha1sums = 0344ac948b189cae73d86f4565e40847c44772c9
- sha1sums = 920bd35afc0bf6e6ba5cf7b309210be4d2c76e18
- sha1sums = 47c289e743d1d513b7181e04bc8cb222ba7d7119
- sha1sums = 0c57caa214c3e4da976162e08fd4f575f2976d94
- sha1sums = 6cb5d9a472ff374089b0046362db899ffa4379a2
- sha1sums = 86a07e4deddca5c1b3d17d2bd59074781a93711a
- sha1sums = 20e07d4995d6028ef0a99333b31cc53d202ee6e9
+ sha1sums = 68012617edb5d82a99245bd7a7e319d88580e110
+ sha1sums = 8400fc2538aebbb68933eac3c4d82b4303c61315
+ sha1sums = c52f436744307d3777a852cfaa85b4ff6345f4a4
+ sha1sums = 54ebc3276a51d8a3c28d1cfcd537df913f0d014a
+ sha1sums = 4e4206c214efd344a31e49b66a227f62c0a3b258
+ sha1sums = 54a120ea0db0162d841588725502a2587d47c6a2
+ sha1sums = 9f380f4f80672cd70d5bdeed4d6a1ee9f24c5729
+ sha1sums = 5227755a96f373121f2d94895a0753285d79a5d6
sha1sums = feb094c689a0c37c68f3b0c7e2b88eb5d572209f
sha1sums = 7c6e687d1cefe3139274b39c659351a503a3adb3
- sha1sums = 7f4dd31cab51636983966d7c97df5e384b0ca3c1
- sha1sums = 24d07f37ba5150b08f68dc73c0a5e53ae50ee9d5
+ sha1sums = 1b382c3d952c1734adc9e7dd1ea52f9127bddf49
+ sha1sums = 94bff6926f312a015ce4156d4d9b62fca45b41b1
sha1sums = ba376789c8c5db6a709d2c4657b5bcf090417221
pkgname = courier-mta
diff --git a/PKGBUILD b/PKGBUILD
index ed920edca72c..e51f12e54927 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
pkgname=courier-mta
pkgver=1.1.5
-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,18 +40,18 @@ source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/couri
courier-courierfilter.service
courier-mta.conf)
sha1sums=('e79c4529138ccdbe4c58530f4d13ccd8597faa5d'
- '9feaa269795a85c1464c104d9268fb266ad1a666'
- '0344ac948b189cae73d86f4565e40847c44772c9'
- '920bd35afc0bf6e6ba5cf7b309210be4d2c76e18'
- '47c289e743d1d513b7181e04bc8cb222ba7d7119'
- '0c57caa214c3e4da976162e08fd4f575f2976d94'
- '6cb5d9a472ff374089b0046362db899ffa4379a2'
- '86a07e4deddca5c1b3d17d2bd59074781a93711a'
- '20e07d4995d6028ef0a99333b31cc53d202ee6e9'
+ '68012617edb5d82a99245bd7a7e319d88580e110'
+ '8400fc2538aebbb68933eac3c4d82b4303c61315'
+ 'c52f436744307d3777a852cfaa85b4ff6345f4a4'
+ '54ebc3276a51d8a3c28d1cfcd537df913f0d014a'
+ '4e4206c214efd344a31e49b66a227f62c0a3b258'
+ '54a120ea0db0162d841588725502a2587d47c6a2'
+ '9f380f4f80672cd70d5bdeed4d6a1ee9f24c5729'
+ '5227755a96f373121f2d94895a0753285d79a5d6'
'feb094c689a0c37c68f3b0c7e2b88eb5d572209f'
'7c6e687d1cefe3139274b39c659351a503a3adb3'
- '7f4dd31cab51636983966d7c97df5e384b0ca3c1'
- '24d07f37ba5150b08f68dc73c0a5e53ae50ee9d5'
+ '1b382c3d952c1734adc9e7dd1ea52f9127bddf49'
+ '94bff6926f312a015ce4156d4d9b62fca45b41b1'
'ba376789c8c5db6a709d2c4657b5bcf090417221')
build() {
@@ -125,7 +125,10 @@ package() {
# install the imapd binary as /usr/lib/courier/courierimapd and modify usr/share scripts.
# courier-mta by default installs usr/bin/imapd as the binary, usr/share/imapd as script file and usr/sbin/imapd as link to /usr/share/imapd
- # hence the binary gets overwritten by the link because Arch bin and sbin are same location
+ # because Arch bin and sbin are same location the binary would be overwritten by the link
install -m 755 "${srcdir}/courier-${pkgver}/courier/imapd" "${pkgdir}/usr/lib/courier/courierimapd"
sed -i 's/\/usr\/bin\/imapd/\/usr\/lib\/courier\/courierimapd/' "${pkgdir}/usr/share/imapd" "${pkgdir}/usr/share/imapd-ssl"
+
+ # patch just for ths version - in anticipation of it being added to official courier release shortly.
+ sed -i '76 a restart)\n\t/usr/bin/courierlogger -pid=$SSLPIDFILE -restart\n\t;;' "${pkgdir}/usr/share/imapd-ssl"
}
diff --git a/courier-courierfilter.service b/courier-courierfilter.service
index 44dda8483d61..e5672becda0e 100644
--- a/courier-courierfilter.service
+++ b/courier-courierfilter.service
@@ -5,6 +5,7 @@ Description=Courier filter Daemon
Type=forking
ExecStart=/usr/sbin/courierfilter start
ExecStop=/usr/sbin/courierfilter stop
+ExecReload=/usr/sbin/courierfilter restart
PIDFile=/run/courier/courierfilter.pid
[Install]
diff --git a/courier-esmtpd-msa.service b/courier-esmtpd-msa.service
index 46206c3b85cd..9497004569cb 100644
--- a/courier-esmtpd-msa.service
+++ b/courier-esmtpd-msa.service
@@ -7,6 +7,7 @@ After=authdaemond.service
Type=forking
ExecStart=/usr/sbin/esmtpd-msa start
ExecStop=/usr/sbin/esmtpd-msa stop
+ExecReload=/usr/sbin/esmtpd-msa restart
PIDFile=/run/courier/esmtpd-msa.pid
[Install]
diff --git a/courier-esmtpd-ssl.service b/courier-esmtpd-ssl.service
index 6f43f2377873..1f49a177e892 100644
--- a/courier-esmtpd-ssl.service
+++ b/courier-esmtpd-ssl.service
@@ -7,6 +7,7 @@ After=authdaemond.service courier-courierfilter.service
Type=forking
ExecStart=/usr/sbin/esmtpd-ssl start
ExecStop=/usr/sbin/esmtpd-ssl stop
+ExecReload=/usr/sbin/esmtpd-ssl restart
PIDFile=/run/courier/esmtpd-ssl.pid
[Install]
diff --git a/courier-esmtpd.service b/courier-esmtpd.service
index 812a8cc306b9..7eaf2b7c5f68 100644
--- a/courier-esmtpd.service
+++ b/courier-esmtpd.service
@@ -7,6 +7,7 @@ After=authdaemond.service courier-courierfilter.service
Type=forking
ExecStart=/usr/sbin/esmtpd start
ExecStop=/usr/sbin/esmtpd stop
+ExecReload=/usr/sbin/esmtpd restart
PIDFile=/run/courier/esmtpd.pid
[Install]
diff --git a/courier-imapd-ssl.service b/courier-imapd-ssl.service
index f6f219c4009d..febb49de7dca 100644
--- a/courier-imapd-ssl.service
+++ b/courier-imapd-ssl.service
@@ -7,6 +7,7 @@ After=authdaemond.service
Type=forking
ExecStart=/usr/sbin/imapd-ssl start
ExecStop=/usr/sbin/imapd-ssl stop
+ExecReload=/usr/sbin/imapd-ssl restart
PIDFile=/run/courier/imapd-ssl.pid
[Install]
diff --git a/courier-imapd.service b/courier-imapd.service
index d132b987d847..9edd5831f122 100644
--- a/courier-imapd.service
+++ b/courier-imapd.service
@@ -7,6 +7,7 @@ After=authdaemond.service
Type=forking
ExecStart=/usr/sbin/imapd start
ExecStop=/usr/sbin/imapd stop
+ExecReload=/usr/sbin/imapd restart
PIDFile=/run/courier/imapd.pid
[Install]
diff --git a/courier-pop3d-ssl.service b/courier-pop3d-ssl.service
index b1915304a5b7..157788c78695 100644
--- a/courier-pop3d-ssl.service
+++ b/courier-pop3d-ssl.service
@@ -7,6 +7,7 @@ After=authdaemond.service
Type=forking
ExecStart=/usr/sbin/pop3d-ssl start
ExecStop=/usr/sbin/pop3d-ssl stop
+ExecReload=/usr/sbin/pop3d-ssl restart
PIDFile=/run/courier/pop3d-ssl.pid
[Install]
diff --git a/courier-pop3d.service b/courier-pop3d.service
index 28f0b9bf4f59..5daf22d981e0 100644
--- a/courier-pop3d.service
+++ b/courier-pop3d.service
@@ -7,6 +7,7 @@ After=authdaemond.service
Type=forking
ExecStart=/usr/sbin/pop3d start
ExecStop=/usr/sbin/pop3d stop
+ExecReload=/usr/sbin/pop3d restart
PIDFile=/run/courier/pop3d.pid
[Install]
diff --git a/courier.service b/courier.service
index 5df43a68c97e..9bf8465ca3b1 100644
--- a/courier.service
+++ b/courier.service
@@ -7,6 +7,7 @@ After=authdaemond.service
Type=forking
ExecStart=/usr/sbin/courier start
ExecStop=/usr/sbin/courier stop
+ExecReload=/usr/sbin/courier restart
[Install]
WantedBy=multi-user.target
diff --git a/webmaild.service b/webmaild.service
index 7b80e1ed6372..f7300076f65d 100644
--- a/webmaild.service
+++ b/webmaild.service
@@ -7,6 +7,7 @@ After=authdaemond.service
Type=forking
ExecStart=/usr/sbin/webmaild start
ExecStop=/usr/sbin/webmaild stop
+ExecReload=/usr/sbin/webmaild reload
PIDFile=/run/courier/sqwebmaild.pid
[Install]