Gentoo Archives: gentoo-commits

From: "Hanno Boeck (hanno)" <hanno@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in mail-mta/courier: ChangeLog courier-0.66.3.ebuild courier-0.62.2.ebuild courier-0.59.0.ebuild courier-0.64.1.ebuild
Date: Tue, 02 Aug 2011 18:44:36
Message-Id: 20110802184426.4174F2004C@flycatcher.gentoo.org
1 hanno 11/08/02 18:44:26
2
3 Modified: ChangeLog
4 Added: courier-0.66.3.ebuild
5 Removed: courier-0.62.2.ebuild courier-0.59.0.ebuild
6 courier-0.64.1.ebuild
7 Log:
8 courier 0.66.3 bump
9
10 (Portage version: 2.1.10.9/cvs/Linux x86_64)
11
12 Revision Changes Path
13 1.150 mail-mta/courier/ChangeLog
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/courier/ChangeLog?rev=1.150&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/courier/ChangeLog?rev=1.150&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/courier/ChangeLog?r1=1.149&r2=1.150
18
19 Index: ChangeLog
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v
22 retrieving revision 1.149
23 retrieving revision 1.150
24 diff -u -r1.149 -r1.150
25 --- ChangeLog 8 Jul 2011 10:03:11 -0000 1.149
26 +++ ChangeLog 2 Aug 2011 18:44:26 -0000 1.150
27 @@ -1,6 +1,16 @@
28 # ChangeLog for mail-mta/courier
29 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
30 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.149 2011/07/08 10:03:11 ssuominen Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.150 2011/08/02 18:44:26 hanno Exp $
32 +
33 + 02 Aug 2011; Hanno Boeck <hanno@g.o> -courier-0.59.0.ebuild,
34 + -files/courier-0.59.0-asneeded.patch, -courier-0.62.2.ebuild,
35 + -courier-0.64.1.ebuild, +courier-0.66.3.ebuild, -files/courier-init-r1:
36 + Remove old versions after stabilizing 0.65.2-r1.
37 +
38 +*courier-0.66.3 (02 Aug 2011)
39 +
40 + 02 Aug 2011; Hanno Boeck <hanno@g.o> +courier-0.66.3.ebuild:
41 + Version bump.
42
43 08 Jul 2011; Samuli Suominen <ssuominen@g.o> courier-0.59.0.ebuild:
44 Convert from "hasq" to "has".
45
46
47
48 1.1 mail-mta/courier/courier-0.66.3.ebuild
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/courier/courier-0.66.3.ebuild?rev=1.1&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/courier/courier-0.66.3.ebuild?rev=1.1&content-type=text/plain
52
53 Index: courier-0.66.3.ebuild
54 ===================================================================
55 # Copyright 1999-2011 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 # $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.66.3.ebuild,v 1.1 2011/08/02 18:44:26 hanno Exp $
58
59 inherit eutils flag-o-matic multilib
60
61 DESCRIPTION="An MTA designed specifically for maildirs"
62 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
63 HOMEPAGE="http://www.courier-mta.org/"
64 SLOT="0"
65 LICENSE="GPL-2"
66 # not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
67 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
68 IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
69 fam web webmail gnutls"
70
71 DEPEND="
72 >=net-libs/courier-authlib-0.61.0
73 !gnutls? ( >=dev-libs/openssl-0.9.6 )
74 gnutls? ( net-libs/gnutls )
75 >=sys-libs/gdbm-1.8.0
76 dev-libs/libpcre
77 app-misc/mime-types
78 fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
79 pam? ( virtual/pam )
80 mysql? ( virtual/mysql )
81 ldap? ( >=net-nds/openldap-1.2.11 )
82 postgres? ( dev-db/postgresql-base )
83 spell? ( app-text/aspell )
84 fam? ( virtual/fam )
85 !mail-filter/maildrop
86 !mail-mta/esmtp
87 !mail-mta/exim
88 !mail-mta/mini-qmail
89 !mail-mta/msmtp
90 !mail-mta/nbsmtp
91 !mail-mta/netqmail
92 !mail-mta/nullmailer
93 !mail-mta/postfix
94 !mail-mta/qmail-ldap
95 !mail-mta/sendmail
96 !mail-mta/ssmtp
97 "
98
99 RDEPEND="${DEPEND}
100 dev-lang/perl
101 sys-process/procps"
102
103 # get rid of old style virtual/imapd - bug 350792
104 # all blockers really needed?
105 RDEPEND="${RDEPEND}
106 !net-mail/bincimap
107 !net-mail/courier-imap
108 !net-mail/cyrus-imapd
109 !net-mail/uw-imap"
110
111 PDEPEND="pam? ( net-mail/mailbase )
112 crypt? ( >=app-crypt/gnupg-1.0.4 )"
113
114 src_unpack() {
115 unpack ${A}
116 cd "${S}"
117 use norewrite && epatch "${FILESDIR}/norewrite.patch"
118 }
119
120 src_compile() {
121 filter-flags '-fomit-frame-pointer'
122
123 local myconf
124 myconf=""
125
126 use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
127
128 econf ${myconf} \
129 $(use_with fam) \
130 $(use_with ipv6) \
131 $(use_with spell ispell) \
132 $(use_with ldap ldapaliasd) \
133 $(use_enable ldap maildroldap) \
134 $(use_with gnutls) \
135 --enable-mimetypes=/etc/mime.types \
136 --prefix=/usr \
137 --disable-root-check \
138 --mandir=/usr/share/man \
139 --sysconfdir=/etc/courier \
140 --libexecdir=/usr/$(get_libdir)/courier \
141 --datadir=/usr/share/courier \
142 --sharedstatedir=/var/lib/courier/com \
143 --localstatedir=/var/lib/courier \
144 --with-piddir=/var/run/courier \
145 --with-authdaemonvar=/var/lib/courier/authdaemon \
146 --with-mailuser=mail \
147 --with-mailgroup=mail \
148 --with-paranoid-smtpext \
149 --with-db=gdbm \
150 --disable-autorenamesent \
151 --cache-file="${S}/configuring.cache" \
152 --host="${CHOST}" debug=true || die "./configure"
153 sed -e'/^install-perms-local:/a\ sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
154 emake || die "Compile problem"
155 }
156
157 etc_courier() {
158 # Import existing /etc/courier/file if it exists.
159 # Add option only if it was not already set or even commented out
160 file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
161 [ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
162 cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
163 grep -q "${word}" "${D}/etc/courier/${file}" || \
164 echo "${2}" >> "${D}/etc/courier/${file}"
165 }
166
167 etc_courier_chg() {
168 file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
169 [ -z "${section}" ] && section="${2}"
170 grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
171 sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
172 }
173
174 src_install() {
175 local f
176 diropts -o mail -g mail
177 keepdir /var/run/courier
178 keepdir /var/lib/courier/tmp
179 keepdir /var/lib/courier/msgs
180 make install DESTDIR="${D}" || die "install"
181 make install-configure || die "install-configure"
182
183 # Get rid of files we dont want
184 if ! use webmail ; then
185 rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
186 "${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
187 "${D}/usr/share/courier/sqwebmail/" \
188 "${D}/usr/sbin/webmaild" \
189 "${D}/usr/sbin/webgpg" \
190 "${D}/etc/courier/webmail.authpam" \
191 "${D}/var/lib/courier/webmail-logincache" \
192 "${D}"/etc/courier/sqwebmaild*
193 fi
194
195 if ! use web ; then
196 rm -rf "${D}/usr/share/courier/courierwebadmin/" \
197 "${D}/etc/courier/webadmin"
198 fi
199
200 for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
201 keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
202 done
203
204 newinitd "${FILESDIR}/courier-init-r3" "courier"
205 use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
206
207 cd "${D}/etc/courier"
208 if use webmail ; then
209 insinto /etc/courier
210 newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
211 fi
212
213 for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
214 if use ldap ; then
215 [ -e ldapaliasrc ] && ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )
216 else
217 rm -f ldapaliasrc
218 fi
219
220 ( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
221 > "${D}/etc/courier/sizelimit"
222 etc_courier maildroprc ""
223 etc_courier esmtproutes ""
224 etc_courier backuprelay ""
225 etc_courier locallowercase ""
226 etc_courier bofh "opt BOFHBADMIME=accept"
227 etc_courier bofh "opt BOFHSPFTRUSTME=1"
228 etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
229 etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
230 etc_courier bofh "opt BOFHSPFFROM=all"
231 etc_courier bofh "opt BOFHSPFMAILFROM=all"
232 etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
233 etc_courier esmtpd "BOFHBADMIME=accept"
234 etc_courier esmtpd-ssl "BOFHBADMIME=accept"
235 etc_courier esmtpd-msa "BOFHBADMIME=accept"
236
237 use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
238 use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
239
240 # Fix for a sandbox violation on subsequential merges
241 # - ticho@g.o, 2005-07-10
242 dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
243 dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
244 dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
245 dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
246
247 cd "${S}"
248 cp imap/README README.imap
249 use nls && cp unicode/README README.unicode
250 dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
251 dodoc tcpd/README.couriertls
252 mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
253
254 if use webmail ; then
255 insinto /usr/$(get_libdir)/courier/courier
256 insopts -m 755 -o mail -g mail
257 doins "${S}/courier/webmaild"
258 fi
259
260 if use web ; then
261 insinto /etc/courier/webadmin
262 insopts -m 400 -o mail -g mail
263 doins "${FILESDIR}/password.dist"
264 fi
265
266 # avoid name collisions in /usr/sbin, make webadmin match
267 cd "${D}/usr/sbin"
268 for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
269 if use web ; then
270 sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
271 -e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
272 "${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
273 || ewarn "failed to fix webadmin"
274 sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
275 -e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
276 "${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
277 || ewarn "failed to fix webadmin"
278 fi
279
280 # users should be able to send mail. Could be restricted with suictl.
281 chmod u+s "${D}/usr/bin/sendmail"
282
283 dosym /usr/bin/sendmail /usr/sbin/sendmail
284 }
285
286 src_test() {
287 if [ `whoami` != 'root' ]; then
288 emake -j1 check || die "Make check failed."
289 else
290 einfo "make check skipped, can't run as root."
291 einfo "You can enable it with FEATURES=\"userpriv\""
292 fi
293 }
294
295 pkg_postinst() {
296 use fam && elog "fam daemon is needed for courier-imapd" \
297 || ewarn "courier was built without fam support"
298 }
299
300 pkg_config() {
301 mailhost="$(hostname)"
302 export mailhost
303
304 domainname="$(domainname)"
305 if [ "x$domainname" = "x(none)" ] ; then
306 domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
307 fi
308 export domainname
309
310 if [ "${ROOT}" = "/" ] ; then
311 file="${ROOT}/etc/courier/locals"
312 if [ ! -f "${file}" ] ; then
313 echo "localhost" > "${file}";
314 echo "${domainname}" >> "${file}";
315 fi
316 file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
317 if [ ! -f "${file}" ] ; then
318 echo "${domainname}" > "${file}"
319 /usr/sbin/makeacceptmailfor
320 fi
321
322 file="${ROOT}/etc/courier/smtpaccess/${domainname}"
323 if [ ! -f "${file}" ]
324 then
325 netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
326 do
327 i=1
328 net=""
329 TIFS="${IFS}"
330 IFS="."
331 for o in "${netmask}"
332 do
333 if [ "${o}" == "255" ]
334 then
335 [ "_${net}" == "_" ] || net="${net}."
336 t="$(echo "${network}" | cut -d " " -f ${i})"
337 net="${net}${t}"
338 fi
339 i="$((${i} + 1))"
340 done
341 IFS="${TIFS}"
342 echo "doing configuration - relay control for the network ${net} !"
343 echo "${net} allow,RELAYCLIENT" >> ${file}
344 done
345 /usr/sbin/makesmtpaccess
346 fi
347 fi
348
349 echo "creating cert for esmtpd-ssl:"
350 /usr/sbin/mkesmtpdcert
351 echo "creating cert for imapd-ssl:"
352 /usr/sbin/mkpop3dcert
353 echo "creating cert for pop3d-ssl:"
354 /usr/sbin/mkimapdcert
355 }