diff options
Diffstat (limited to 'net-mail')
| -rw-r--r-- | net-mail/cyrus-imapd/ChangeLog | 8 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-2.5.4.ebuild | 176 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/files/cyrus-imapd-db.patch | 81 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/metadata.xml | 2 |
4 files changed, 266 insertions, 1 deletions
diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog index 51cc835268e8..c5fb1093462c 100644 --- a/net-mail/cyrus-imapd/ChangeLog +++ b/net-mail/cyrus-imapd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-mail/cyrus-imapd # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.218 2015/07/21 15:39:59 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.219 2015/07/22 14:34:43 eras Exp $ + +*cyrus-imapd-2.5.4 (22 Jul 2015) + + 22 Jul 2015; Eray Aslan <eras@gentoo.org> +cyrus-imapd-2.5.4.ebuild, + +files/cyrus-imapd-db.patch, metadata.xml: + Version bump - bug #554336. Fix berkeleydb detection - bug #555122 21 Jul 2015; Eray Aslan <eras@gentoo.org> cyrus-imapd-2.4.18.ebuild: Add missing slot to sqlite diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.4.ebuild new file mode 100644 index 000000000000..8d49365ab46a --- /dev/null +++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.4.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2015 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.5.4.ebuild,v 1.1 2015/07/22 14:34:43 eras Exp $ + +EAPI=5 +inherit autotools eutils multilib pam ssl-cert user toolchain-funcs + +MY_P=${P/_/} + +DESCRIPTION="The Cyrus IMAP Server" +HOMEPAGE="http://www.cyrusimap.org/" +SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz" + +LICENSE="BSD-with-attribution" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \ + replication +server sieve snmp sqlite ssl static-libs tcpd" + +# virtual/mysql-5.5 added for the --variable= option below +DEPEND="sys-libs/zlib + dev-libs/libpcre + >=dev-libs/cyrus-sasl-2.1.13 + dev-libs/jansson + afs? ( net-fs/openafs ) + berkdb? ( >=sys-libs/db-3.2:* ) + clamav? ( app-antivirus/clamav ) + http? ( dev-libs/libxml2 dev-libs/libical ) + kerberos? ( virtual/krb5 ) + mysql? ( >=virtual/mysql-5.5 ) + nntp? ( !net-nntp/leafnode ) + pam? ( + virtual/pam + >=net-mail/mailbase-1 + ) + postgres? ( dev-db/postgresql:* ) + snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( >=dev-libs/openssl-0.9.6:* ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )" + +# all blockers really needed? +RDEPEND="${DEPEND} + !mail-mta/courier + !net-mail/bincimap + !net-mail/courier-imap + !net-mail/uw-imap" + +REQUIRED_USE="afs? ( kerberos )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + enewuser cyrus -1 -1 /usr/cyrus mail +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-db.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" + + # lock.h to afs/lock.h + sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \ + ptclient/afskrb.c || die + + eautoreconf +} + +src_configure() { + local myconf + if use afs ; then + myconf+=" --with-afs-libdir=/usr/$(get_libdir)" + myconf+=" --with-afs-incdir=/usr/include/afs" + fi + econf \ + --enable-murder \ + --enable-netscapehack \ + --enable-idled \ + --enable-event-notification \ + --enable-autocreate \ + --enable-pcre \ + --with-service-path=/usr/$(get_libdir)/cyrus \ + --with-cyrus-user=cyrus \ + --with-cyrus-group=mail \ + --with-com_err=yes \ + --with-sasl \ + --without-krb \ + --without-krbdes \ + --with-zlib \ + $(use_enable afs) \ + $(use_enable afs krb5afspts) \ + $(use_with berkdb bdb) \ + $(use_with clamav) \ + $(use_enable nntp) \ + $(use_enable replication) \ + $(use_enable kerberos gssapi) \ + $(use_with mysql) \ + $(use_with postgres pgsql) \ + $(use_with perl) \ + $(use_with sqlite) \ + $(use_with ssl openssl) \ + $(use_enable server) \ + $(use_enable sieve) \ + $(use_with snmp) \ + $(use_enable static-libs static) \ + $(use_with tcpd libwrap) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" INSTALLDIRS=vendor install + + dodoc README* + dohtml doc/*.html + docinto text + dodoc doc/text/* + cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html" + cp -r contrib tools "${D}/usr/share/doc/${PF}" + rm -f doc/text/Makefile* + + insinto /etc + doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf" + + # turn off sieve if not installed + if ! use sieve; then + sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die + fi + + 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_preinst() { + if ! has_version ${CATEGORY}/${PN} ; then + 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" + fi +} + +pkg_postinst() { + # do not install server.{key,pem) if they exist. + if use ssl ; then + 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 + fi +} diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-db.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-db.patch new file mode 100644 index 000000000000..f720cf2cb127 --- /dev/null +++ b/net-mail/cyrus-imapd/files/cyrus-imapd-db.patch @@ -0,0 +1,81 @@ +--- configure.ac 2015-07-06 01:22:19.000000000 +0000 ++++ configure.ac 2015-07-22 11:18:33.000000000 +0000 +@@ -236,50 +236,29 @@ + dnl Berkeley DB Detection + + AC_ARG_WITH(bdb, +- [AS_HELP_STRING([--with-bdb=DIR], [use Berkeley DB (in DIR) [yes]])], +- with_bdb=$withval, with_bdb="yes") +- +-dnl support old-style +-AC_ARG_WITH(dbdir,, with_bdb=$withval) ++ [AS_HELP_STRING([--with-bdb], [use Berkeley DB [yes]])], ++ [], ++ [with_bdb="yes"]) + ++# On a properly installed system, we build ++# by including <db.h> and by linking with -ldb + case "$with_bdb" in +- no) +- use_berkeley="no" +- ;; +- yes) +- use_berkeley="yes" +- with_bdb_lib=none +- with_bdb_inc=none +- ;; +- *) +- use_berkeley="yes" +- with_bdb_lib="$with_bdb/lib" +- with_bdb_inc="$with_bdb/include" ++ no) ;; ++ *) AC_CHECK_FILE([/usr/include/db.h], ++ [], ++ AC_CHECK_FILE([/usr/include/db/db.h]), ++ [BDB_INC="-I/usr/include/db"], ++ AC_MSG_ERROR([No <db.h> include file is found. Install the ++ appropriate db*-devel package first.])) ++ BDB_LIB="-ldb" ++ AC_SUBST(BDB_INC) ++ AC_SUBST(BDB_LIB) ++ LIBS="${LIBS} ${BDB_LIB}" ++ CPPFLAGS="${CPPFLAGS} ${BDB_INC}" ++ AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?]) + ;; + esac +- +-if test "$use_berkeley" != "no"; then +- CYRUS_BERKELEY_DB_CHK() +- +- if test "$dblib" = "no"; then +- AC_MSG_ERROR([Berkeley DB 3.x or later was not found. You may need to +- supply the --with-bdb-libdir or --with-bdb-incdir configure options.]) +- fi +- +- if test "$with_bdb_lib" != "none"; then +- CMU_ADD_LIBPATH($with_bdb_lib) +- fi +- +- BDB_INC=${BDB_INCADD} +- BDB_LIB=${BDB_LIBADD} +- AC_SUBST(BDB_INC) +- AC_SUBST(BDB_LIB) +- +- LIBS="${LIBS} ${BDB_LIBADD}" +- CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}" +- AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?]) +-fi +-AM_CONDITIONAL([USE_BERKELEY], [test "$use_berkeley" != "no"]) ++AM_CONDITIONAL([USE_BERKELEY], [test "$with_bdb" != "no"]) + + dnl End Berkeley DB Detection + +@@ -1800,7 +1779,7 @@ + pcre: $cyrus_cv_pcre_utf8 + + Database support: +- bdb: $use_berkeley ++ bdb: $with_bdb + mysql: $with_mysql + postgresql: $use_pgsql + sqlite: $use_sqlite diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml index eb85099509a8..120284d1cc4f 100644 --- a/net-mail/cyrus-imapd/metadata.xml +++ b/net-mail/cyrus-imapd/metadata.xml @@ -5,5 +5,7 @@ <use> <flag name="replication">Enable replication support in the cyrus imap server</flag> <flag name="sieve">Enable sieve support</flag> + <flag name="http">Enable http support</flag> + <flag name="server">Enable building server binaries</flag> </use> </pkgmetadata> |