1 |
hanno 08/04/20 12:11:17 |
2 |
|
3 |
Modified: ChangeLog courier-0.55.1-r1.ebuild |
4 |
Log: |
5 |
fix quotes on courier (only latest ebuild) |
6 |
(Portage version: 2.1.5_rc5) |
7 |
|
8 |
Revision Changes Path |
9 |
1.99 mail-mta/courier/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/courier/ChangeLog?rev=1.99&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/courier/ChangeLog?rev=1.99&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/courier/ChangeLog?r1=1.98&r2=1.99 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v |
18 |
retrieving revision 1.98 |
19 |
retrieving revision 1.99 |
20 |
diff -u -r1.98 -r1.99 |
21 |
--- ChangeLog 3 Feb 2008 10:51:33 -0000 1.98 |
22 |
+++ ChangeLog 20 Apr 2008 12:11:16 -0000 1.99 |
23 |
@@ -1,6 +1,9 @@ |
24 |
# ChangeLog for mail-mta/courier |
25 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.98 2008/02/03 10:51:33 hollow Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.99 2008/04/20 12:11:16 hanno Exp $ |
28 |
+ |
29 |
+ 20 Apr 2008; Hanno Boeck <hanno@g.o> courier-0.55.1-r1.ebuild: |
30 |
+ Fix quoting. |
31 |
|
32 |
03 Feb 2008; Benedikt Böhm <hollow@g.o> courier-0.53.2.ebuild, |
33 |
courier-0.53.2-r1.ebuild, courier-0.55.1.ebuild, courier-0.55.1-r1.ebuild: |
34 |
|
35 |
|
36 |
|
37 |
1.5 mail-mta/courier/courier-0.55.1-r1.ebuild |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/courier/courier-0.55.1-r1.ebuild?rev=1.5&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/courier/courier-0.55.1-r1.ebuild?rev=1.5&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/courier/courier-0.55.1-r1.ebuild?r1=1.4&r2=1.5 |
42 |
|
43 |
Index: courier-0.55.1-r1.ebuild |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.55.1-r1.ebuild,v |
46 |
retrieving revision 1.4 |
47 |
retrieving revision 1.5 |
48 |
diff -u -r1.4 -r1.5 |
49 |
--- courier-0.55.1-r1.ebuild 3 Feb 2008 10:51:33 -0000 1.4 |
50 |
+++ courier-0.55.1-r1.ebuild 20 Apr 2008 12:11:16 -0000 1.5 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2008 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.55.1-r1.ebuild,v 1.4 2008/02/03 10:51:33 hollow Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.55.1-r1.ebuild,v 1.5 2008/04/20 12:11:16 hanno Exp $ |
56 |
|
57 |
WANT_AUTOCONF="latest" |
58 |
WANT_AUTOMAKE="latest" |
59 |
@@ -59,15 +59,15 @@ |
60 |
ebeep 4 |
61 |
epause 4 ) |
62 |
unpack ${A} |
63 |
- cd ${S} |
64 |
- use norewrite && epatch ${FILESDIR}/norewrite.patch |
65 |
+ cd "${S}" |
66 |
+ use norewrite && epatch "${FILESDIR}/norewrite.patch" |
67 |
use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub |
68 |
|
69 |
epatch "${FILESDIR}/pam-include.patch" |
70 |
|
71 |
# disable link to fam. |
72 |
- epatch ${FILESDIR}/fam-disable-check.patch |
73 |
- cd ${S}/maildir |
74 |
+ epatch "${FILESDIR}/fam-disable-check.patch" |
75 |
+ cd "${S}/maildir" |
76 |
eautoreconf |
77 |
} |
78 |
|
79 |
@@ -101,7 +101,7 @@ |
80 |
--with-paranoid-smtpext \ |
81 |
--with-db=gdbm \ |
82 |
--disable-autorenamesent \ |
83 |
- --cache-file=${S}/configuring.cache \ |
84 |
+ --cache-file="${S}/configuring.cache" \ |
85 |
--host=${CHOST} ${myconf} debug=true || die "./configure" |
86 |
sed -e'/^install-perms-local:/a\ sed -e\"s|^|'${D}'|g\" -i permissions.dat' -i Makefile |
87 |
emake || die "Compile problem" |
88 |
@@ -140,26 +140,26 @@ |
89 |
einfo "Setting up maildirs in the account skeleton ..." |
90 |
diropts -m 755 -o root -g root |
91 |
dodir /etc/skel |
92 |
- ${S}/maildir/maildirmake ${D}/etc/skel/.maildir |
93 |
+ "${S}/maildir/maildirmake" "${D}/etc/skel/.maildir" |
94 |
keepdir /etc/skel/.maildir |
95 |
|
96 |
diropts -o mail -g mail |
97 |
keepdir /var/run/courier |
98 |
keepdir /var/lib/courier/tmp |
99 |
keepdir /var/lib/courier/msgs |
100 |
- make install DESTDIR=${D} || die "install" |
101 |
+ make install DESTDIR="${D}" || die "install" |
102 |
make install-configure || die "install-configure" |
103 |
|
104 |
- for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do |
105 |
+ for dir2keep in `(cd "${D}" && find ./var/lib/courier -type d)` ; do |
106 |
keepdir $dir2keep || die "failed running keepdir: $dir2keep" |
107 |
done |
108 |
|
109 |
- newinitd ${FILESDIR}/courier-init-r1 courier |
110 |
- use fam || sed -i -e's|^.*use famd$||g' ${D}/etc/init.d/courier |
111 |
+ newinitd "${FILESDIR}/courier-init-r1" courier |
112 |
+ use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier" |
113 |
|
114 |
- cd ${D}/etc/courier |
115 |
+ cd "${D}/etc/courier" |
116 |
insinto /etc/courier |
117 |
- newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc |
118 |
+ newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc |
119 |
|
120 |
if use pam ; then |
121 |
dodir /etc/pam.d |
122 |
@@ -172,7 +172,7 @@ |
123 |
set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist |
124 |
|
125 |
( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \ |
126 |
- > ${D}/etc/courier/sizelimit |
127 |
+ > "${D}/etc/courier/sizelimit" |
128 |
etc_courier maildroprc "" |
129 |
etc_courier esmtproutes "" |
130 |
etc_courier backuprelay "" |
131 |
@@ -207,53 +207,53 @@ |
132 |
|
133 |
# Fix for a sandbox violation on subsequential merges |
134 |
# - ticho@g.o, 2005-07-10 |
135 |
- rm ${D}/usr/sbin/{pop3d,imapd}{,-ssl} |
136 |
+ rm "${D}"/usr/sbin/{pop3d,imapd}{,-ssl} |
137 |
dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d |
138 |
dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl |
139 |
dosym /usr/share/courier/imapd /usr/sbin/courier-imapd |
140 |
dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl |
141 |
|
142 |
- cd ${S} |
143 |
+ cd "${S}" |
144 |
cp imap/README README.imap |
145 |
use nls && cp unicode/README README.unicode |
146 |
dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt |
147 |
dodoc tcpd/README.couriertls |
148 |
echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \ |
149 |
- >> ${D}/usr/share/doc/${P}/README.htmldocs |
150 |
+ >> "${D}/usr/share/doc/${P}/README.htmldocs" |
151 |
|
152 |
insinto /usr/$(get_libdir)/courier/courier |
153 |
insopts -m 755 -o mail -g mail |
154 |
- doins ${S}/courier/webmaild |
155 |
+ doins "${S}/courier/webmaild" |
156 |
insinto /etc/courier/webadmin |
157 |
insopts -m 400 -o mail -g mail |
158 |
- doins ${FILESDIR}/password.dist |
159 |
+ doins "${FILESDIR}/password.dist" |
160 |
|
161 |
# avoid name collisions in /usr/sbin, make webadmin match |
162 |
- cd ${D}/usr/sbin |
163 |
+ cd "${D}/usr/sbin" |
164 |
for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv ${f} courier-${f} ; done |
165 |
sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \ |
166 |
-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \ |
167 |
- ${D}/usr/share/courier/courierwebadmin/admin-40imap.pl \ |
168 |
+ "${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \ |
169 |
|| ewarn "failed to fix webadmin" |
170 |
sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \ |
171 |
-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \ |
172 |
- ${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl \ |
173 |
+ "${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \ |
174 |
|| ewarn "failed to fix webadmin" |
175 |
|
176 |
if use mailwrapper ; then |
177 |
- mv ${D}/usr/bin/sendmail ${D}/usr/bin/sendmail.courier |
178 |
- mv ${D}/usr/bin/rmail ${D}/usr/bin/rmail.courier |
179 |
- mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.courier |
180 |
- |
181 |
- mv ${D}/usr/share/man/man1/sendmail.1 \ |
182 |
- ${D}/usr/share/man/man1/sendmail-courier.1 |
183 |
- mv ${D}/usr/share/man/man1/mailq.1 \ |
184 |
- ${D}/usr/share/man/man1/mailq-courier.1 |
185 |
- mv ${D}/usr/share/man/man1/rmail.1 \ |
186 |
- ${D}/usr/share/man/man1/rmail-courier.1 |
187 |
+ mv "${D}/usr/bin/sendmail" "${D}/usr/bin/sendmail.courier" |
188 |
+ mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.courier" |
189 |
+ mv "${D}/usr/bin/mailq" "${D}/usr/bin/mailq.courier" |
190 |
+ |
191 |
+ mv "${D}/usr/share/man/man1/sendmail.1" \ |
192 |
+ "${D}/usr/share/man/man1/sendmail-courier.1" |
193 |
+ mv "${D}/usr/share/man/man1/mailq.1" \ |
194 |
+ "${D}/usr/share/man/man1/mailq-courier.1" |
195 |
+ mv "${D}/usr/share/man/man1/rmail.1" \ |
196 |
+ "${D}/usr/share/man/man1/rmail-courier.1" |
197 |
|
198 |
insinto /etc/mail |
199 |
- doins ${FILESDIR}/mailer.conf |
200 |
+ doins "${FILESDIR}/mailer.conf" |
201 |
else |
202 |
dosym /usr/bin/sendmail /usr/sbin/sendmail |
203 |
fi |
204 |
@@ -293,7 +293,7 @@ |
205 |
fi |
206 |
export domainname |
207 |
|
208 |
- if [ ${ROOT} = "/" ] ; then |
209 |
+ if [ "${ROOT}" = "/" ] ; then |
210 |
file=${ROOT}/etc/courier/locals |
211 |
if [ ! -f ${file} ] ; then |
212 |
echo "localhost" > ${file}; |
213 |
|
214 |
|
215 |
|
216 |
-- |
217 |
gentoo-commits@l.g.o mailing list |