* [gentoo-commits] gentoo-x86 commit in net-mail/cyrus-imapd: cyrus-imapd-2.3.13-r1.ebuild metadata.xml ChangeLog
@ 2008-12-29 18:02 Tobias Scherbaum (dertobi123)
0 siblings, 0 replies; only message in thread
From: Tobias Scherbaum (dertobi123) @ 2008-12-29 18:02 UTC (permalink / raw
To: gentoo-commits
dertobi123 08/12/29 18:02:16
Modified: metadata.xml ChangeLog
Added: cyrus-imapd-2.3.13-r1.ebuild
Log:
Make sieve support optional (though enabled per default), #110218
(Portage version: 2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64)
Revision Changes Path
1.4 net-mail/cyrus-imapd/metadata.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imapd/metadata.xml?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imapd/metadata.xml?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imapd/metadata.xml?r1=1.3&r2=1.4
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml 23 Aug 2008 06:36:24 -0000 1.3
+++ metadata.xml 29 Dec 2008 18:02:16 -0000 1.4
@@ -11,5 +11,6 @@
<flag name="drac">Enable dynamic relay support in the cyrus imap server</flag>
<flag name="idled">Enable idled vs poll IMAP IDLE method</flag>
<flag name="replication">Enable replication support in the cyrus imap server</flag>
+ <flag name="sieve">Enable sieve support</flag>
</use>
</pkgmetadata>
1.127 net-mail/cyrus-imapd/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?rev=1.127&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?rev=1.127&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?r1=1.126&r2=1.127
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- ChangeLog 27 Oct 2008 19:02:43 -0000 1.126
+++ ChangeLog 29 Dec 2008 18:02:16 -0000 1.127
@@ -1,6 +1,12 @@
# ChangeLog for net-mail/cyrus-imapd
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.126 2008/10/27 19:02:43 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.127 2008/12/29 18:02:16 dertobi123 Exp $
+
+*cyrus-imapd-2.3.13-r1 (29 Dec 2008)
+
+ 29 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+ +cyrus-imapd-2.3.13-r1.ebuild:
+ Make sieve support optional (though enabled per default), #110218
*cyrus-imapd-2.3.13 (27 Oct 2008)
1.1 net-mail/cyrus-imapd/cyrus-imapd-2.3.13-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.13-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.13-r1.ebuild?rev=1.1&content-type=text/plain
Index: cyrus-imapd-2.3.13-r1.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.13-r1.ebuild,v 1.1 2008/12/29 18:02:16 dertobi123 Exp $
EAPI=1
inherit autotools eutils ssl-cert fixheadtails pam
MY_P=${P/_/}
DESCRIPTION="The Cyrus IMAP Server."
HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${MY_P}.tar.gz"
LIBWRAP_PATCH_VER="2.2"
LICENSE="as-is"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="drac idled kerberos kolab nntp pam replication +sieve snmp ssl tcpd"
PROVIDE="virtual/imapd"
RDEPEND=">=sys-libs/db-3.2
>=dev-libs/cyrus-sasl-2.1.13
pam? (
virtual/pam
>=net-mail/mailbase-1
)
kerberos? ( virtual/krb5 )
snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
ssl? ( >=dev-libs/openssl-0.9.6 )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
drac? ( >=mail-client/drac-1.12-r1 )
nntp? ( !net-nntp/leafnode )
kolab? ( net-nds/openldap )"
DEPEND="$RDEPEND
sys-devel/libtool
>=sys-devel/autoconf-2.58
sys-devel/automake"
RDEPEND="$RDEPEND
!virtual/imapd"
new_net-snmp_check() {
# tcpd USE flag check. Bug #68254.
if use tcpd ; then
if has_version net-analyzer/net-snmp && ! built_with_use net-analyzer/net-snmp tcpd ; then
eerror "You are emerging this package with USE=\"tcpd\""
eerror "but \"net-analyzer/net-snmp\" has been emerged with USE=\"-tcpd\""
fail_msg
fi
else
if has_version net-analyzer/net-snmp && built_with_use net-analyzer/net-snmp tcpd ; then
eerror "You are emerging this package with USE=\"-tcpd\""
eerror "but \"net-analyzer/net-snmp\" has been emerged with USE=\"tcpd\""
fail_msg
fi
fi
# DynaLoader check. Bug #67411
if [ -x "$(type -p net-snmp-config)" ]; then
einfo "$(type -p net-snmp-config) is found and executable."
NSC_AGENTLIBS="$(net-snmp-config --agent-libs)"
einfo "NSC_AGENTLIBS=\""${NSC_AGENTLIBS}"\""
if [ -z "$NSC_AGENTLIBS" ]; then
eerror "NSC_AGENTLIBS is null"
einfo "please report this to bugs.gentoo.org"
fi
for i in ${NSC_AGENTLIBS}; do
# check for the DynaLoader path.
if [ "$(expr "$i" : '.*\(DynaLoader\)')" == "DynaLoader" ] ; then
DYNALOADER_PATH="$i"
einfo "DYNALOADER_PATH=\""${DYNALOADER_PATH}"\""
if [[ ! -f "${DYNALOADER_PATH}" ]]; then
eerror "\""${DYNALOADER_PATH}"\" is not found."
einfo "Have you upgraded \"perl\" after"
einfo "you emerged \"net-snmp\". Please re-emerge"
einfo "\"net-snmp\" then try again. Bug #67411."
die "\""${DYNALOADER_PATH}"\" is not found."
fi
fi
done
else
eerror "\"net-snmp-config\" not found or not executable!"
die "You have \"net-snmp\" installed but \"net-snmp-config\" is not found or not executable. Please re-emerge \"net-snmp\" and try again!"
fi
}
fail_msg() {
eerror "enable "snmp" USE flag for this package requires"
eerror "that net-analyzer/net-snmp and this package both build with"
eerror "\"tcpd\" or \"-tcpd\". Bug #68254"
die "sanity check failed."
}
pkg_setup() {
use snmp && new_net-snmp_check
enewuser cyrus -1 -1 /usr/cyrus mail
}
S=${WORKDIR}/${MY_P}
src_unpack() {
unpack ${A} && cd "${S}"
ht_fix_file "${S}"/imap/xversion.sh
# Fix prestripped binaries
epatch "${FILESDIR}/${PN}-strip.patch"
if use drac ; then
epatch "${S}/contrib/drac_auth.patch"
fi
# KOLAB support
if use kolab ; then
EPATCH_SOURCE="${FILESDIR}/kolab/${PV}" EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" epatch
# These files are being created automatically and need to be updated
# # after the patches used above
rm -f lib/imapopts.h lib/imapopts.c
fi
# Add libwrap defines as we don't have a dynamicly linked library.
use tcpd && epatch "${FILESDIR}/${PN}-${LIBWRAP_PATCH_VER}-libwrap.patch"
# Fix master(8)->cyrusmaster(8) manpage.
for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
sed -i -e 's:master\.8:cyrusmaster.8:g' \
-e 's:master(8):cyrusmaster(8):g' \
"${i}" || die "sed failed" || die "sed failed"
done
mv man/master.8 man/cyrusmaster.8 || die "mv failed"
sed -i -e "s:MASTER:CYRUSMASTER:g" \
-e "s:Master:Cyrusmaster:g" \
-e "s:master:cyrusmaster:g" \
man/cyrusmaster.8 || die "sed failed"
# Recreate configure.
WANT_AUTOCONF="2.5"
AT_M4DIR="cmulocal" eautoreconf
# When linking with rpm, you need to link with more libraries.
sed -i -e "s:lrpm:lrpm -lrpmio -lrpmdb:" configure || die "sed failed"
if use kolab ; then
sed -i -e "s/{LIB_SASL}/{LIB_SASL} -lldap -llber /" configure || die "sed failed"
fi
}
src_compile() {
local myconf
myconf="${myconf} $(use_with ssl openssl)"
myconf="${myconf} $(use_with snmp ucdsnmp)"
myconf="${myconf} $(use_with tcpd libwrap)"
myconf="${myconf} $(use_enable kerberos gssapi) $(use_enable kerberos krb5afspts)"
myconf="${myconf} $(use_enable idled)"
myconf="${myconf} $(use_enable nntp nntp)"
myconf="${myconf} $(use_enable replication)"
if use drac; then
myconf="${myconf} --with-drac=/usr/$(get_libdir)"
else
myconf="${myconf} --without-drac"
fi
if use kerberos; then
myconf="${myconf} --with-auth=krb5"
else
myconf="${myconf} --with-auth=unix"
fi
econf \
--enable-murder \
--enable-listext \
--enable-netscapehack \
--with-extraident=Gentoo \
--with-service-path=/usr/lib/cyrus \
--with-cyrus-user=cyrus \
--with-cyrus-group=mail \
--with-com_err=yes \
--without-perl \
--disable-cyradm \
${myconf} || die "econf failed"
# needed for parallel make. Bug #72352.
cd "${S}"/imap
emake xversion.h || die "emake xversion.h failed"
# -j1 for #222529
cd "${S}"
emake -j1 || die "compile problem"
}
src_install() {
local SUBDIRS
if use sieve; then
SUBDIRS="master imap imtest timsieved notifyd sieve"
else
SUBDIRS="master imap imtest"
fi
dodir /usr/bin /usr/lib
for subdir in ${SUBDIRS}; do
make -C "${subdir}" DESTDIR="${D}" install || die "make install failed"
done
# Link master to cyrusmaster (postfix has a master too)
dosym /usr/lib/cyrus/master /usr/lib/cyrus/cyrusmaster
if ! use nntp ; then
rm man/fetchnews.8 man/syncnews.8 man/nntpd.8 man/nntptest.1
rm "${D}"/usr/bin/nntptest
fi
doman man/*.[0-8]
dodoc COPYRIGHT README*
dohtml doc/*.html doc/murder.png
cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
cp -r contrib tools "${D}/usr/share/doc/${PF}"
find "${D}/usr/share/doc" -name CVS -print0 | xargs -0 rm -rf
insinto /etc
doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
newinitd "${FILESDIR}/cyrus.rc6" cyrus
newconfd "${FILESDIR}/cyrus.confd" cyrus
newpamd "${FILESDIR}/cyrus.pam-include" sieve
for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
keepdir "/var/${subdir}"
fowners cyrus:mail "/var/${subdir}"
fperms 0750 "/var/${subdir}"
done
for subdir in imap/{user,quota,sieve} spool/imap ; do
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
keepdir "/var/${subdir}/${i}"
fowners cyrus:mail "/var/${subdir}/${i}"
fperms 0750 "/var/${subdir}/${i}"
done
done
}
pkg_postinst() {
# do not install server.{key,pem) if they are exist.
use ssl && {
if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
install_cert /etc/ssl/cyrus/server
chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
fi
}
if df -T /var/imap | grep -q ' ext2 ' ; then
ebegin "Making /var/imap/user/* and /var/imap/quota/* synchronous."
chattr +S /var/imap/{user,quota}{,/*}
eend $?
fi
if df -T /var/spool/imap | grep -q ' ext2 ' ; then
ebegin "Making /var/spool/imap/* synchronous."
chattr +S /var/spool/imap{,/*}
eend $?
fi
ewarn "If the queue directory of the mail daemon resides on an ext2"
ewarn "filesystem you need to set it manually to update"
ewarn "synchronously. E.g. 'chattr +S /var/spool/mqueue'."
echo
elog "For correct logging add the following to /etc/syslog.conf:"
elog " local6.* /var/log/imapd.log"
elog " auth.debug /var/log/auth.log"
echo
elog "You have to add user cyrus to the sasldb2. Do this with:"
elog " saslpasswd2 cyrus"
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-12-29 18:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-29 18:02 [gentoo-commits] gentoo-x86 commit in net-mail/cyrus-imapd: cyrus-imapd-2.3.13-r1.ebuild metadata.xml ChangeLog Tobias Scherbaum (dertobi123)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox