1 |
dertobi123 09/12/31 09:29:16 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: cyrus-imapd-2.3.16.ebuild |
5 |
Removed: cyrus-imapd-2.3.14.ebuild |
6 |
Log: |
7 |
Cleanup, Version bump |
8 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.155 net-mail/cyrus-imapd/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?rev=1.155&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?rev=1.155&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?r1=1.154&r2=1.155 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v |
20 |
retrieving revision 1.154 |
21 |
retrieving revision 1.155 |
22 |
diff -u -r1.154 -r1.155 |
23 |
--- ChangeLog 27 Dec 2009 09:36:56 -0000 1.154 |
24 |
+++ ChangeLog 31 Dec 2009 09:29:16 -0000 1.155 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for net-mail/cyrus-imapd |
27 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.154 2009/12/27 09:36:56 josejx Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.155 2009/12/31 09:29:16 dertobi123 Exp $ |
30 |
+ |
31 |
+*cyrus-imapd-2.3.16 (31 Dec 2009) |
32 |
+ |
33 |
+ 31 Dec 2009; Tobias Scherbaum <dertobi123@g.o> |
34 |
+ -cyrus-imapd-2.3.14.ebuild, +cyrus-imapd-2.3.16.ebuild: |
35 |
+ Cleanup, Version bump |
36 |
|
37 |
27 Dec 2009; Joseph Jezak <josejx@g.o> |
38 |
cyrus-imapd-2.3.14-r3.ebuild: |
39 |
|
40 |
|
41 |
|
42 |
1.1 net-mail/cyrus-imapd/cyrus-imapd-2.3.16.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.16.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.16.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: cyrus-imapd-2.3.16.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2009 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.16.ebuild,v 1.1 2009/12/31 09:29:16 dertobi123 Exp $ |
52 |
|
53 |
EAPI=1 |
54 |
|
55 |
inherit autotools db-use eutils flag-o-matic ssl-cert fixheadtails pam multilib |
56 |
|
57 |
MY_P=${P/_/} |
58 |
|
59 |
DESCRIPTION="The Cyrus IMAP Server." |
60 |
HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/" |
61 |
SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${MY_P}.tar.gz" |
62 |
LIBWRAP_PATCH_VER="2.2" |
63 |
|
64 |
LICENSE="as-is" |
65 |
SLOT="0" |
66 |
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
67 |
IUSE="idled kerberos nntp pam replication +sieve snmp ssl tcpd" |
68 |
|
69 |
PROVIDE="virtual/imapd" |
70 |
RDEPEND=">=sys-libs/db-3.2 |
71 |
>=dev-libs/cyrus-sasl-2.1.13 |
72 |
pam? ( |
73 |
virtual/pam |
74 |
>=net-mail/mailbase-1 |
75 |
) |
76 |
kerberos? ( virtual/krb5 ) |
77 |
snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) |
78 |
ssl? ( >=dev-libs/openssl-0.9.6 ) |
79 |
tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) |
80 |
nntp? ( !net-nntp/leafnode )" |
81 |
|
82 |
DEPEND="$RDEPEND |
83 |
sys-devel/libtool |
84 |
>=sys-devel/autoconf-2.58 |
85 |
sys-devel/automake" |
86 |
|
87 |
RDEPEND="$RDEPEND |
88 |
!virtual/imapd" |
89 |
|
90 |
new_net-snmp_check() { |
91 |
# tcpd USE flag check. Bug #68254. |
92 |
if use tcpd ; then |
93 |
if has_version net-analyzer/net-snmp && ! built_with_use net-analyzer/net-snmp tcpd ; then |
94 |
eerror "You are emerging this package with USE=\"tcpd\"" |
95 |
eerror "but \"net-analyzer/net-snmp\" has been emerged with USE=\"-tcpd\"" |
96 |
fail_msg |
97 |
fi |
98 |
else |
99 |
if has_version net-analyzer/net-snmp && built_with_use net-analyzer/net-snmp tcpd ; then |
100 |
eerror "You are emerging this package with USE=\"-tcpd\"" |
101 |
eerror "but \"net-analyzer/net-snmp\" has been emerged with USE=\"tcpd\"" |
102 |
fail_msg |
103 |
fi |
104 |
fi |
105 |
# DynaLoader check. Bug #67411 |
106 |
|
107 |
if [ -x "$(type -p net-snmp-config)" ]; then |
108 |
einfo "$(type -p net-snmp-config) is found and executable." |
109 |
NSC_AGENTLIBS="$(net-snmp-config --agent-libs)" |
110 |
einfo "NSC_AGENTLIBS=\""${NSC_AGENTLIBS}"\"" |
111 |
if [ -z "$NSC_AGENTLIBS" ]; then |
112 |
eerror "NSC_AGENTLIBS is null" |
113 |
einfo "please report this to bugs.gentoo.org" |
114 |
fi |
115 |
for i in ${NSC_AGENTLIBS}; do |
116 |
# check for the DynaLoader path. |
117 |
if [ "$(expr "$i" : '.*\(DynaLoader\)')" == "DynaLoader" ] ; then |
118 |
DYNALOADER_PATH="$i" |
119 |
einfo "DYNALOADER_PATH=\""${DYNALOADER_PATH}"\"" |
120 |
if [[ ! -f "${DYNALOADER_PATH}" ]]; then |
121 |
eerror "\""${DYNALOADER_PATH}"\" is not found." |
122 |
einfo "Have you upgraded \"perl\" after" |
123 |
einfo "you emerged \"net-snmp\". Please re-emerge" |
124 |
einfo "\"net-snmp\" then try again. Bug #67411." |
125 |
die "\""${DYNALOADER_PATH}"\" is not found." |
126 |
fi |
127 |
fi |
128 |
done |
129 |
else |
130 |
eerror "\"net-snmp-config\" not found or not executable!" |
131 |
die "You have \"net-snmp\" installed but \"net-snmp-config\" is not found or not executable. Please re-emerge \"net-snmp\" and try again!" |
132 |
fi |
133 |
} |
134 |
|
135 |
fail_msg() { |
136 |
eerror "enable "snmp" USE flag for this package requires" |
137 |
eerror "that net-analyzer/net-snmp and this package both build with" |
138 |
eerror "\"tcpd\" or \"-tcpd\". Bug #68254" |
139 |
die "sanity check failed." |
140 |
} |
141 |
|
142 |
pkg_setup() { |
143 |
use snmp && new_net-snmp_check |
144 |
enewuser cyrus -1 -1 /usr/cyrus mail |
145 |
} |
146 |
|
147 |
S=${WORKDIR}/${MY_P} |
148 |
|
149 |
src_unpack() { |
150 |
unpack ${A} && cd "${S}" |
151 |
|
152 |
ht_fix_file "${S}"/imap/xversion.sh |
153 |
|
154 |
# Fix prestripped binaries |
155 |
epatch "${FILESDIR}/${PN}-strip.patch" |
156 |
|
157 |
# Add libwrap defines as we don't have a dynamicly linked library. |
158 |
use tcpd && epatch "${FILESDIR}/${PN}-${LIBWRAP_PATCH_VER}-libwrap.patch" |
159 |
|
160 |
# Fix master(8)->cyrusmaster(8) manpage. |
161 |
for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do |
162 |
sed -i -e 's:master\.8:cyrusmaster.8:g' \ |
163 |
-e 's:master(8):cyrusmaster(8):g' \ |
164 |
"${i}" || die "sed failed" || die "sed failed" |
165 |
done |
166 |
mv man/master.8 man/cyrusmaster.8 || die "mv failed" |
167 |
sed -i -e "s:MASTER:CYRUSMASTER:g" \ |
168 |
-e "s:Master:Cyrusmaster:g" \ |
169 |
-e "s:master:cyrusmaster:g" \ |
170 |
man/cyrusmaster.8 || die "sed failed" |
171 |
|
172 |
# Remove unwanted m4 files |
173 |
rm "cmulocal/ax_path_bdb.m4" || die "Failed to remove cmulocal/ax_path_bdb.m4" |
174 |
|
175 |
# Recreate configure. |
176 |
WANT_AUTOCONF="2.5" |
177 |
AT_M4DIR="cmulocal" eautoreconf |
178 |
|
179 |
# When linking with rpm, you need to link with more libraries. |
180 |
sed -i -e "s:lrpm:lrpm -lrpmio -lrpmdb:" configure || die "sed failed" |
181 |
|
182 |
} |
183 |
|
184 |
src_compile() { |
185 |
local myconf |
186 |
myconf="${myconf} $(use_with ssl openssl)" |
187 |
myconf="${myconf} $(use_with snmp ucdsnmp)" |
188 |
myconf="${myconf} $(use_with tcpd libwrap)" |
189 |
myconf="${myconf} $(use_enable kerberos gssapi) $(use_enable kerberos krb5afspts)" |
190 |
myconf="${myconf} $(use_enable idled)" |
191 |
myconf="${myconf} $(use_enable nntp)" |
192 |
myconf="${myconf} $(use_enable replication)" |
193 |
|
194 |
if use kerberos; then |
195 |
myconf="${myconf} --with-krb=$(krb5-config --prefix) --with-krbdes=no" |
196 |
else |
197 |
myconf="${myconf} --with-krb=no" |
198 |
fi |
199 |
|
200 |
econf \ |
201 |
--enable-murder \ |
202 |
--enable-listext \ |
203 |
--enable-netscapehack \ |
204 |
--with-service-path=/usr/$(get_libdir)/cyrus \ |
205 |
--with-cyrus-user=cyrus \ |
206 |
--with-cyrus-group=mail \ |
207 |
--with-com_err=yes \ |
208 |
--without-perl \ |
209 |
--with-bdb=$(db_libname) \ |
210 |
${myconf} || die "econf failed" |
211 |
|
212 |
# needed for parallel make. Bug #72352. |
213 |
cd "${S}"/imap |
214 |
emake xversion.h || die "emake xversion.h failed" |
215 |
|
216 |
# -j1 for #222529 |
217 |
cd "${S}" |
218 |
emake -j1 || die "compile problem" |
219 |
} |
220 |
|
221 |
src_install() { |
222 |
local SUBDIRS |
223 |
|
224 |
if use sieve; then |
225 |
SUBDIRS="master imap imtest timsieved notifyd sieve" |
226 |
else |
227 |
SUBDIRS="master imap imtest" |
228 |
fi |
229 |
|
230 |
dodir /usr/bin /usr/lib |
231 |
for subdir in ${SUBDIRS}; do |
232 |
make -C "${subdir}" DESTDIR="${D}" install || die "make install failed" |
233 |
done |
234 |
|
235 |
# Link master to cyrusmaster (postfix has a master too) |
236 |
dosym /usr/lib/cyrus/master /usr/lib/cyrus/cyrusmaster |
237 |
|
238 |
if ! use nntp ; then |
239 |
rm man/fetchnews.8 man/syncnews.8 man/nntpd.8 man/nntptest.1 |
240 |
rm "${D}"/usr/bin/nntptest |
241 |
fi |
242 |
|
243 |
doman man/*.[0-8] |
244 |
dodoc COPYRIGHT README* |
245 |
dohtml doc/*.html doc/murder.png |
246 |
cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html" |
247 |
cp -r contrib tools "${D}/usr/share/doc/${PF}" |
248 |
find "${D}/usr/share/doc" -name CVS -print0 | xargs -0 rm -rf |
249 |
|
250 |
insinto /etc |
251 |
doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf" |
252 |
|
253 |
newinitd "${FILESDIR}/cyrus.rc6" cyrus |
254 |
newconfd "${FILESDIR}/cyrus.confd" cyrus |
255 |
newpamd "${FILESDIR}/cyrus.pam-include" sieve |
256 |
|
257 |
for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do |
258 |
keepdir "/var/${subdir}" |
259 |
fowners cyrus:mail "/var/${subdir}" |
260 |
fperms 0750 "/var/${subdir}" |
261 |
done |
262 |
for subdir in imap/{user,quota,sieve} spool/imap ; do |
263 |
for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do |
264 |
keepdir "/var/${subdir}/${i}" |
265 |
fowners cyrus:mail "/var/${subdir}/${i}" |
266 |
fperms 0750 "/var/${subdir}/${i}" |
267 |
done |
268 |
done |
269 |
} |
270 |
|
271 |
pkg_postinst() { |
272 |
# do not install server.{key,pem) if they are exist. |
273 |
use ssl && { |
274 |
if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then |
275 |
install_cert /etc/ssl/cyrus/server |
276 |
chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem} |
277 |
fi |
278 |
} |
279 |
|
280 |
if df -T /var/imap | grep -q ' ext2 ' ; then |
281 |
ebegin "Making /var/imap/user/* and /var/imap/quota/* synchronous." |
282 |
chattr +S /var/imap/{user,quota}{,/*} |
283 |
eend $? |
284 |
fi |
285 |
|
286 |
if df -T /var/spool/imap | grep -q ' ext2 ' ; then |
287 |
ebegin "Making /var/spool/imap/* synchronous." |
288 |
chattr +S /var/spool/imap{,/*} |
289 |
eend $? |
290 |
fi |
291 |
|
292 |
ewarn "If the queue directory of the mail daemon resides on an ext2" |
293 |
ewarn "filesystem you need to set it manually to update" |
294 |
ewarn "synchronously. E.g. 'chattr +S /var/spool/mqueue'." |
295 |
echo |
296 |
|
297 |
elog "For correct logging add the following to /etc/syslog.conf:" |
298 |
elog " local6.* /var/log/imapd.log" |
299 |
elog " auth.debug /var/log/auth.log" |
300 |
echo |
301 |
|
302 |
elog "You have to add user cyrus to the sasldb2. Do this with:" |
303 |
elog " saslpasswd2 cyrus" |
304 |
} |