From 66543ca625e9716424499bdb4b728d536713cd9d Mon Sep 17 00:00:00 2001 From: Tobias Scherbaum Date: Sat, 11 Apr 2009 16:09:05 +0000 Subject: Version bump (Portage version: 2.2_rc29/cvs/Linux x86_64) --- net-mail/cyrus-imapd/ChangeLog | 8 +- net-mail/cyrus-imapd/cyrus-imapd-2.3.13-r1.ebuild | 278 ---------------------- net-mail/cyrus-imapd/cyrus-imapd-2.3.14.ebuild | 251 +++++++++++++++++++ 3 files changed, 258 insertions(+), 279 deletions(-) delete mode 100644 net-mail/cyrus-imapd/cyrus-imapd-2.3.13-r1.ebuild create mode 100644 net-mail/cyrus-imapd/cyrus-imapd-2.3.14.ebuild (limited to 'net-mail') diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog index 25c1d6d021ea..15aaa97840f5 100644 --- a/net-mail/cyrus-imapd/ChangeLog +++ b/net-mail/cyrus-imapd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-mail/cyrus-imapd # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.133 2009/02/16 19:04:37 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.134 2009/04/11 16:09:05 dertobi123 Exp $ + +*cyrus-imapd-2.3.14 (11 Apr 2009) + + 11 Apr 2009; Tobias Scherbaum + -cyrus-imapd-2.3.13-r1.ebuild, +cyrus-imapd-2.3.14.ebuild: + Version bump 16 Feb 2009; Tobias Scherbaum -files/cyrus-imapd-2.3.8-drac_with_autocreate.patch, diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.13-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.13-r1.ebuild deleted file mode 100644 index 391f3d4ef665..000000000000 --- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.13-r1.ebuild +++ /dev/null @@ -1,278 +0,0 @@ -# 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" -} diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.14.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.14.ebuild new file mode 100644 index 000000000000..bef6c9c64465 --- /dev/null +++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.14.ebuild @@ -0,0 +1,251 @@ +# Copyright 1999-2009 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.14.ebuild,v 1.1 2009/04/11 16:09:05 dertobi123 Exp $ + +EAPI=1 + +inherit autotools eutils ssl-cert fixheadtails pam multilib + +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="idled kerberos 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 ) + nntp? ( !net-nntp/leafnode )" + +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" + + # 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" +} + +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)" + myconf="${myconf} $(use_enable replication)" + + if use kerberos; then + myconf="${myconf} --with-krb=$(krb5-config --prefix) --with-krbdes=no" + else + myconf="${myconf} --with-krb=no" + fi + + econf \ + --enable-murder \ + --enable-listext \ + --enable-netscapehack \ + --with-service-path=/usr/$(get_libdir)/cyrus \ + --with-cyrus-user=cyrus \ + --with-cyrus-group=mail \ + --with-com_err=yes \ + --without-perl \ + ${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" +} -- cgit v1.2.3-65-gdbad