Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in mail-client/squirrelmail: ChangeLog squirrelmail-1.4.13-r1.ebuild squirrelmail-1.4.10a-r2.ebuild squirrelmail-1.5.1-r7.ebuild
Date: Sun, 02 Nov 2008 06:08:15
Message-Id: E1KwW8B-0007X1-MC@stork.gentoo.org
1 jmbsvicetto 08/11/02 06:08:11
2
3 Modified: ChangeLog squirrelmail-1.4.13-r1.ebuild
4 squirrelmail-1.4.10a-r2.ebuild
5 squirrelmail-1.5.1-r7.ebuild
6 Log:
7 Quoted a few vars.
8 (Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64)
9
10 Revision Changes Path
11 1.125 mail-client/squirrelmail/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/squirrelmail/ChangeLog?rev=1.125&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/squirrelmail/ChangeLog?rev=1.125&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/squirrelmail/ChangeLog?r1=1.124&r2=1.125
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v
20 retrieving revision 1.124
21 retrieving revision 1.125
22 diff -u -r1.124 -r1.125
23 --- ChangeLog 2 Nov 2008 05:59:00 -0000 1.124
24 +++ ChangeLog 2 Nov 2008 06:08:11 -0000 1.125
25 @@ -1,6 +1,11 @@
26 # ChangeLog for mail-client/squirrelmail
27 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.124 2008/11/02 05:59:00 jmbsvicetto Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.125 2008/11/02 06:08:11 jmbsvicetto Exp $
30 +
31 + 02 Nov 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
32 + squirrelmail-1.4.10a-r2.ebuild, squirrelmail-1.4.13-r1.ebuild,
33 + squirrelmail-1.5.1-r7.ebuild:
34 + Quoted some vars.
35
36 02 Nov 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
37 metadata.xml:
38
39
40
41 1.2 mail-client/squirrelmail/squirrelmail-1.4.13-r1.ebuild
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.13-r1.ebuild?rev=1.2&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.13-r1.ebuild?rev=1.2&content-type=text/plain
45 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.13-r1.ebuild?r1=1.1&r2=1.2
46
47 Index: squirrelmail-1.4.13-r1.ebuild
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.13-r1.ebuild,v
50 retrieving revision 1.1
51 retrieving revision 1.2
52 diff -u -r1.1 -r1.2
53 --- squirrelmail-1.4.13-r1.ebuild 12 Jan 2008 02:40:39 -0000 1.1
54 +++ squirrelmail-1.4.13-r1.ebuild 2 Nov 2008 06:08:11 -0000 1.2
55 @@ -1,6 +1,6 @@
56 # Copyright 1999-2008 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.13-r1.ebuild,v 1.1 2008/01/12 02:40:39 eradicator Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.13-r1.ebuild,v 1.2 2008/11/02 06:08:11 jmbsvicetto Exp $
60
61 IUSE="ldap spell ssl filter mysql postgres nls"
62
63 @@ -53,14 +53,14 @@
64 unpack ${MY_P}.tar.bz2
65 unpack squirrelmail-decode-${DECODING_VER}.tar.bz2
66
67 - cd ${S}
68 + cd "${S}"
69
70 mv config/config_default.php config/config.php
71
72 sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" config/config.php
73
74 # Now do the plugins
75 - cd ${S}/plugins
76 + cd "${S}"/plugins
77
78 sed -i 's:/usr/games/fortune:/usr/bin/fortune:g' fortune/setup.php || die "Unable to fix fortunes plugin."
79
80 @@ -76,7 +76,7 @@
81
82 use ldap &&
83 unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz &&
84 - epatch ${FILESDIR}/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch &&
85 + epatch "${FILESDIR}/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch" &&
86 mv ldapuserdata/config_sample.php ldapuserdata/config.php
87
88 use ssl &&
89 @@ -86,7 +86,7 @@
90 mv show_ssl_link/config.php.sample show_ssl_link/config.php
91
92 use nls &&
93 - cd ${S} &&
94 + cd "${S}" &&
95 unpack all_locales-${LOCALES_VER}.tar.bz2
96 }
97
98 @@ -159,9 +159,9 @@
99
100 # Copy the app's main files
101 einfo "Installing squirrelmail files."
102 - cp -r . ${D}${MY_HTDOCSDIR}
103 + cp -r . "${D}${MY_HTDOCSDIR}"
104
105 - cp ${WORKDIR}/squirrelmail-decode-${DECODING_VER}/*/*.php ${D}${MY_HTDOCSDIR}/functions/decode
106 + cp "${WORKDIR}/squirrelmail-decode-${DECODING_VER}/*/*.php" "${D}${MY_HTDOCSDIR}/functions/decode"
107
108 # Identify the configuration files that this app uses
109 local configs="config/config.php config/config_local.php plugins/retrieveuserdata/config.php"
110 @@ -189,7 +189,7 @@
111 done
112
113 # add the post-installation instructions
114 - webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
115 + webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
116
117 # all done
118 #
119
120
121
122 1.9 mail-client/squirrelmail/squirrelmail-1.4.10a-r2.ebuild
123
124 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.10a-r2.ebuild?rev=1.9&view=markup
125 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.10a-r2.ebuild?rev=1.9&content-type=text/plain
126 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.10a-r2.ebuild?r1=1.8&r2=1.9
127
128 Index: squirrelmail-1.4.10a-r2.ebuild
129 ===================================================================
130 RCS file: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.10a-r2.ebuild,v
131 retrieving revision 1.8
132 retrieving revision 1.9
133 diff -u -r1.8 -r1.9
134 --- squirrelmail-1.4.10a-r2.ebuild 10 Jan 2008 17:06:36 -0000 1.8
135 +++ squirrelmail-1.4.10a-r2.ebuild 2 Nov 2008 06:08:11 -0000 1.9
136 @@ -1,6 +1,6 @@
137 # Copyright 1999-2008 Gentoo Foundation
138 # Distributed under the terms of the GNU General Public License v2
139 -# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.10a-r2.ebuild,v 1.8 2008/01/10 17:06:36 alonbl Exp $
140 +# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.10a-r2.ebuild,v 1.9 2008/11/02 06:08:11 jmbsvicetto Exp $
141
142 IUSE="crypt ldap spell ssl filter mysql postgres nls"
143
144 @@ -56,14 +56,14 @@
145 unpack ${MY_P}.tar.bz2
146 unpack squirrelmail-decode-${DECODING_VER}.tar.bz2
147
148 - cd ${S}
149 + cd "${S}"
150
151 mv config/config_default.php config/config.php
152
153 sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" config/config.php
154
155 # Now do the plugins
156 - cd ${S}/plugins
157 + cd "${S}"/plugins
158
159 sed -i 's:/usr/games/fortune:/usr/bin/fortune:g' fortune/setup.php || die "Unable to fix fortunes plugin."
160
161 @@ -82,7 +82,7 @@
162
163 use ldap &&
164 unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz &&
165 - epatch ${FILESDIR}/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch &&
166 + epatch "${FILESDIR}/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch" &&
167 mv ldapuserdata/config_sample.php ldapuserdata/config.php
168
169 use ssl &&
170 @@ -92,11 +92,11 @@
171 mv show_ssl_link/config.php.sample show_ssl_link/config.php
172
173 use nls &&
174 - cd ${S} &&
175 + cd "${S}" &&
176 unpack all_locales-${LOCALES_VER}.tar.bz2
177
178 - cd ${S}
179 - use crypt && epatch ${FILESDIR}/squirrelmail-gpg-2.1-CVE-2005-1924.patch
180 + cd "${S}"
181 + use crypt && epatch "${FILESDIR}"/squirrelmail-gpg-2.1-CVE-2005-1924.patch
182 }
183
184 src_compile() {
185 @@ -176,9 +176,9 @@
186
187 # Copy the app's main files
188 einfo "Installing squirrelmail files."
189 - cp -r . ${D}${MY_HTDOCSDIR}
190 + cp -r . "${D}${MY_HTDOCSDIR}"
191
192 - cp ${WORKDIR}/squirrelmail-decode-${DECODING_VER}/*/*.php ${D}${MY_HTDOCSDIR}/functions/decode
193 + cp "${WORKDIR}/squirrelmail-decode-${DECODING_VER}/*/*.php" "${D}${MY_HTDOCSDIR}/functions/decode"
194
195 # Identify the configuration files that this app uses
196 local configs="config/config.php config/config_local.php plugins/retrieveuserdata/config.php"
197 @@ -207,7 +207,7 @@
198 done
199
200 # add the post-installation instructions
201 - webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
202 + webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
203
204 # all done
205 #
206
207
208
209 1.2 mail-client/squirrelmail/squirrelmail-1.5.1-r7.ebuild
210
211 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.5.1-r7.ebuild?rev=1.2&view=markup
212 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.5.1-r7.ebuild?rev=1.2&content-type=text/plain
213 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.5.1-r7.ebuild?r1=1.1&r2=1.2
214
215 Index: squirrelmail-1.5.1-r7.ebuild
216 ===================================================================
217 RCS file: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.5.1-r7.ebuild,v
218 retrieving revision 1.1
219 retrieving revision 1.2
220 diff -u -r1.1 -r1.2
221 --- squirrelmail-1.5.1-r7.ebuild 12 Jan 2008 02:40:39 -0000 1.1
222 +++ squirrelmail-1.5.1-r7.ebuild 2 Nov 2008 06:08:11 -0000 1.2
223 @@ -1,6 +1,6 @@
224 # Copyright 1999-2008 Gentoo Foundation
225 # Distributed under the terms of the GNU General Public License v2
226 -# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.5.1-r7.ebuild,v 1.1 2008/01/12 02:40:39 eradicator Exp $
227 +# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.5.1-r7.ebuild,v 1.2 2008/11/02 06:08:11 jmbsvicetto Exp $
228
229 IUSE="ldap spell ssl filter mysql postgres nls"
230
231 @@ -53,21 +53,21 @@
232 unpack ${MY_P}.tar.bz2
233 unpack squirrelmail-decode-${DECODING_VER}.tar.bz2
234
235 - cd ${S}
236 - epatch ${FILESDIR}/squirrelmail-1.5.1-CVE-2006-4019.patch
237 - epatch ${FILESDIR}/squirrelmail-1.5.1-CVE-2006-6142-draft_composesess.patch
238 - epatch ${FILESDIR}/squirrelmail-1.5.1-CVE-2006-6142-mailto.patch
239 - epatch ${FILESDIR}/squirrelmail-1.5.1-CVE-2006-6142-mime.patch
240 - epatch ${FILESDIR}/squirrelmail-1.5.1-ie-mime.patch
241 - epatch ${FILESDIR}/squirrelmail-1.5.1-CVE-2007-1262.patch
242 - epatch ${FILESDIR}/squirrelmail-1.5.1-sqimap_get_message.patch
243 + cd "${S}"
244 + epatch "${FILESDIR}/squirrelmail-1.5.1-CVE-2006-4019.patch"
245 + epatch "${FILESDIR}/squirrelmail-1.5.1-CVE-2006-6142-draft_composesess.patch"
246 + epatch "${FILESDIR}/squirrelmail-1.5.1-CVE-2006-6142-mailto.patch"
247 + epatch "${FILESDIR}/squirrelmail-1.5.1-CVE-2006-6142-mime.patch"
248 + epatch "${FILESDIR}/squirrelmail-1.5.1-ie-mime.patch"
249 + epatch "${FILESDIR}/squirrelmail-1.5.1-CVE-2007-1262.patch"
250 + epatch "${FILESDIR}/squirrelmail-1.5.1-sqimap_get_message.patch"
251
252 mv config/config_default.php config/config.php
253
254 sed -i "s:'/var/local/squirrelmail/data':SM_PATH . 'data/':" config/config.php
255
256 # Now do the plugins
257 - cd ${S}/plugins
258 + cd "${S}"/plugins
259
260 mv fortune/config_default.php fortune/config.php
261 sed -i 's:/usr/games/fortune:/usr/bin/fortune:g' fortune/config.php
262 @@ -94,7 +94,7 @@
263
264 use ldap &&
265 unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz &&
266 - epatch ${FILESDIR}/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch &&
267 + epatch "${FILESDIR}/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch" &&
268 mv ldapuserdata/config_sample.php ldapuserdata/config.php
269
270 use ssl &&
271 @@ -104,7 +104,7 @@
272 mv show_ssl_link/config.php.sample show_ssl_link/config.php
273
274 use nls &&
275 - cd ${S} &&
276 + cd "${S}" &&
277 unpack all_locales-${LOCALES_VER}.tar.bz2
278 }
279
280 @@ -118,7 +118,7 @@
281
282 # Copy the app's main files
283 einfo "Installing squirrelmail files."
284 - cp -r . ${D}${MY_HTDOCSDIR}
285 + cp -r . "${D}${MY_HTDOCSDIR}"
286
287 keepdir ${MY_HTDOCSDIR}/data
288
289 @@ -129,18 +129,18 @@
290
291 for doc in AUTHORS COPYING ChangeLog INSTALL README ReleaseNotes UPGRADE ; do
292 dodoc ${doc}
293 - rm -f ${D}${MY_HTDOCSDIR}/${doc}
294 + rm -f "${D}${MY_HTDOCSDIR}/${doc}"
295 done
296
297 for doc in plugins/{README.plugins,*/{INSTALL,README,COPYRIGHTS,CHANGELOG,API,UPGRADE,TODO,README.txt,INSTALL.txt,user_example.txt}} ; do
298 if [[ -f ${doc} ]] ; then
299 docinto $(dirname ${doc})
300 dodoc ${doc}
301 - rm -f ${D}${MY_HTDOCSDIR}/${doc}
302 + rm -f "${D}${MY_HTDOCSDIR}/${doc}"
303 fi
304 done
305
306 - cp ${WORKDIR}/squirrelmail-decode-${DECODING_VER}/*/*.php ${D}${MY_HTDOCSDIR}/functions/decode
307 + cp "${WORKDIR}/squirrelmail-decode-${DECODING_VER}/*/*.php" "${D}${MY_HTDOCSDIR}/functions/decode"
308
309 # Identify the configuration files that this app uses
310 for file in config/config.php plugins/*/{config.php,sqspell_config.php,gpg_local_prefs.txt}; do
311 @@ -165,7 +165,7 @@
312 done
313
314 # add the post-installation instructions
315 - webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
316 + webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
317
318 # all done
319 #