Gentoo Archives: gentoo-commits

From: Andrew Savchenko <bircoph@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/courier-imap/files/
Date: Sun, 12 Feb 2017 14:05:47
Message-Id: 1486907702.52fdf07995b87f9bfb481918043c6599484cd09a.bircoph@gentoo
1 commit: 52fdf07995b87f9bfb481918043c6599484cd09a
2 Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 12 13:00:14 2017 +0000
4 Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 12 13:55:02 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52fdf079
7
8 net-mail/courier-imap: fix bug 340175
9
10 Make init scripts POSIX compliant. Patch by Alec Moskvin <alecm at
11 gmx.com>, bug 340175.
12
13 Package-Manager: Portage-2.3.3, Repoman-2.3.1
14 Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
15
16 .../files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 | 10 +++++-----
17 .../courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6 | 8 ++++----
18 .../files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6 | 10 +++++-----
19 .../courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6 | 8 ++++----
20 4 files changed, 18 insertions(+), 18 deletions(-)
21
22 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
23 index 38f69b1f51..d903cd0161 100644
24 --- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
25 +++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
26 @@ -1,5 +1,5 @@
27 #!/sbin/openrc-run
28 -# Copyright 1999-2016 Gentoo Foundation
29 +# Copyright 1999-2017 Gentoo Foundation
30 # Distributed under the terms of the GNU General Public License v2
31 # $Id$
32
33 @@ -8,19 +8,19 @@ depend() {
34 use famd
35 }
36
37 -source /etc/courier-imap/imapd-ssl
38 +. /etc/courier-imap/imapd-ssl
39
40 checkconfig() {
41 - if [[ ! -e /etc/courier-imap/imapd-ssl ]] ; then
42 + if [ ! -e /etc/courier-imap/imapd-ssl ] ; then
43 eerror "You need an /etc/courier-imap/imapd-ssl file to run courier-imapd-ssl"
44 return 1
45 fi
46 - source /etc/courier-imap/imapd-ssl || {
47 + . /etc/courier-imap/imapd-ssl || {
48 eerror "There are syntax errors in /etc/courier-imap/imapd-ssl"
49 eerror "Please correct them before trying to start courier-imapd-ssl"
50 return 3
51 }
52 - if [[ ! -e "${TLS_CERTFILE}" ]] ; then
53 + if [ ! -e "${TLS_CERTFILE}" ] ; then
54 eerror "You need to create a SSL certificate to use IMAP over SSL"
55 eerror "Edit /etc/courier-imap/imapd.cnf, then run: mkimapdcert"
56 return 2
57
58 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
59 index 2c336d7b49..9ab0bf22a0 100644
60 --- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
61 +++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
62 @@ -1,5 +1,5 @@
63 #!/sbin/openrc-run
64 -# Copyright 1999-2016 Gentoo Foundation
65 +# Copyright 1999-2017 Gentoo Foundation
66 # Distributed under the terms of the GNU General Public License v2
67 # $Id$
68
69 @@ -8,14 +8,14 @@ depend() {
70 use famd
71 }
72
73 -source /etc/courier-imap/imapd
74 +. /etc/courier-imap/imapd
75
76 checkconfig() {
77 - if [[ ! -e /etc/courier-imap/imapd ]] ; then
78 + if [ ! -e /etc/courier-imap/imapd ] ; then
79 eerror "You need an /etc/courier-imap/imapd file to run courier-imapd"
80 return 1
81 fi
82 - source /etc/courier-imap/imapd || {
83 + . /etc/courier-imap/imapd || {
84 eerror "There are syntax errors in /etc/courier-imap/imapd"
85 eerror "Please correct them before trying to start courier-imapd"
86 return 2
87
88 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
89 index ba32da563a..46b5b425d9 100644
90 --- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
91 +++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
92 @@ -1,5 +1,5 @@
93 #!/sbin/openrc-run
94 -# Copyright 1999-2016 Gentoo Foundation
95 +# Copyright 1999-2017 Gentoo Foundation
96 # Distributed under the terms of the GNU General Public License v2
97 # $Id$
98
99 @@ -8,19 +8,19 @@ depend() {
100 use famd
101 }
102
103 -source /etc/courier-imap/pop3d-ssl
104 +. /etc/courier-imap/pop3d-ssl
105
106 checkconfig() {
107 - if [[ ! -e /etc/courier-imap/pop3d-ssl ]] ; then
108 + if [ ! -e /etc/courier-imap/pop3d-ssl ] ; then
109 eerror "You need an /etc/courier-imap/pop3d-ssl file to run courier-pop3d-ssl"
110 return 1
111 fi
112 - source /etc/courier-imap/pop3d-ssl || {
113 + . /etc/courier-imap/pop3d-ssl || {
114 eerror "There are syntax errors in /etc/courier-imap/pop3d-ssl"
115 eerror "Please correct them before trying to start courier-pop3d-ssl"
116 return 3
117 }
118 - if [[ ! -e "${TLS_CERTFILE}" ]] ; then
119 + if [ ! -e "${TLS_CERTFILE}" ] ; then
120 eerror "You need to create a SSL certificate to use POP3 over SSL"
121 eerror "Edit /etc/courier-imap/pop3d.cnf, then run: mkpop3dcert"
122 return 2
123
124 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
125 index 9a4ecf6049..dc6033c923 100644
126 --- a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
127 +++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
128 @@ -1,5 +1,5 @@
129 #!/sbin/openrc-run
130 -# Copyright 1999-2016 Gentoo Foundation
131 +# Copyright 1999-2017 Gentoo Foundation
132 # Distributed under the terms of the GNU General Public License v2
133 # $Id$
134
135 @@ -8,14 +8,14 @@ depend() {
136 use famd
137 }
138
139 -source /etc/courier-imap/pop3d
140 +. /etc/courier-imap/pop3d
141
142 checkconfig() {
143 - if [[ ! -e /etc/courier-imap/pop3d ]] ; then
144 + if [ ! -e /etc/courier-imap/pop3d ] ; then
145 eerror "You need an /etc/courier-imap/pop3d file to run courier-pop3d"
146 return 1
147 fi
148 - source /etc/courier-imap/pop3d || {
149 + . /etc/courier-imap/pop3d || {
150 eerror "There are syntax errors in /etc/courier-imap/pop3d"
151 eerror "Please correct them before trying to start courier-pop3d"
152 return 2