commit: 52fdf07995b87f9bfb481918043c6599484cd09a
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 13:00:14 2017 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 13:55:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52fdf079
net-mail/courier-imap: fix bug 340175
Make init scripts POSIX compliant. Patch by Alec Moskvin <alecm at
gmx.com>, bug 340175.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
.../files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 | 10 +++++-----
.../courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6 | 8 ++++----
.../files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6 | 10 +++++-----
.../courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6 | 8 ++++----
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
index 38f69b1f51..d903cd0161 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,19 +8,19 @@ depend() {
use famd
}
-source /etc/courier-imap/imapd-ssl
+. /etc/courier-imap/imapd-ssl
checkconfig() {
- if [[ ! -e /etc/courier-imap/imapd-ssl ]] ; then
+ if [ ! -e /etc/courier-imap/imapd-ssl ] ; then
eerror "You need an /etc/courier-imap/imapd-ssl file to run
courier-imapd-ssl"
return 1
fi
- source /etc/courier-imap/imapd-ssl || {
+ . /etc/courier-imap/imapd-ssl || {
eerror "There are syntax errors in /etc/courier-imap/imapd-ssl"
eerror "Please correct them before trying to start
courier-imapd-ssl"
return 3
}
- if [[ ! -e "${TLS_CERTFILE}" ]] ; then
+ if [ ! -e "${TLS_CERTFILE}" ] ; then
eerror "You need to create a SSL certificate to use IMAP over
SSL"
eerror "Edit /etc/courier-imap/imapd.cnf, then run: mkimapdcert"
return 2
diff --git
a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
index 2c336d7b49..9ab0bf22a0 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,14 +8,14 @@ depend() {
use famd
}
-source /etc/courier-imap/imapd
+. /etc/courier-imap/imapd
checkconfig() {
- if [[ ! -e /etc/courier-imap/imapd ]] ; then
+ if [ ! -e /etc/courier-imap/imapd ] ; then
eerror "You need an /etc/courier-imap/imapd file to run
courier-imapd"
return 1
fi
- source /etc/courier-imap/imapd || {
+ . /etc/courier-imap/imapd || {
eerror "There are syntax errors in /etc/courier-imap/imapd"
eerror "Please correct them before trying to start
courier-imapd"
return 2
diff --git
a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
index ba32da563a..46b5b425d9 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,19 +8,19 @@ depend() {
use famd
}
-source /etc/courier-imap/pop3d-ssl
+. /etc/courier-imap/pop3d-ssl
checkconfig() {
- if [[ ! -e /etc/courier-imap/pop3d-ssl ]] ; then
+ if [ ! -e /etc/courier-imap/pop3d-ssl ] ; then
eerror "You need an /etc/courier-imap/pop3d-ssl file to run
courier-pop3d-ssl"
return 1
fi
- source /etc/courier-imap/pop3d-ssl || {
+ . /etc/courier-imap/pop3d-ssl || {
eerror "There are syntax errors in /etc/courier-imap/pop3d-ssl"
eerror "Please correct them before trying to start
courier-pop3d-ssl"
return 3
}
- if [[ ! -e "${TLS_CERTFILE}" ]] ; then
+ if [ ! -e "${TLS_CERTFILE}" ] ; then
eerror "You need to create a SSL certificate to use POP3 over
SSL"
eerror "Edit /etc/courier-imap/pop3d.cnf, then run: mkpop3dcert"
return 2
diff --git
a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
index 9a4ecf6049..dc6033c923 100644
--- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,14 +8,14 @@ depend() {
use famd
}
-source /etc/courier-imap/pop3d
+. /etc/courier-imap/pop3d
checkconfig() {
- if [[ ! -e /etc/courier-imap/pop3d ]] ; then
+ if [ ! -e /etc/courier-imap/pop3d ] ; then
eerror "You need an /etc/courier-imap/pop3d file to run
courier-pop3d"
return 1
fi
- source /etc/courier-imap/pop3d || {
+ . /etc/courier-imap/pop3d || {
eerror "There are syntax errors in /etc/courier-imap/pop3d"
eerror "Please correct them before trying to start
courier-pop3d"
return 2
