From: Bernard Cafarelli Date: Mon, 28 Jun 2010 22:02:23 +0000 (+0000) Subject: Version bump X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f7dd49007a469529aaba2203c3a54850615bdce8;p=gentoo.git Version bump Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog index 9d41a6e70baa..379308bf91f0 100644 --- a/net-mail/courier-imap/ChangeLog +++ b/net-mail/courier-imap/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-mail/courier-imap # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.184 2010/02/15 19:42:50 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.185 2010/06/28 22:02:23 voyageur Exp $ + +*courier-imap-4.8.0 (28 Jun 2010) + + 28 Jun 2010; Bernard Cafarelli + +courier-imap-4.8.0.ebuild: + Version bump 15 Feb 2010; Raúl Porcel courier-imap-4.0.6-r3.ebuild, courier-imap-4.5.0.ebuild, diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest index b652fbe614dc..76a7163a3bb1 100644 --- a/net-mail/courier-imap/Manifest +++ b/net-mail/courier-imap/Manifest @@ -19,8 +19,10 @@ AUX mkpop3dcert 996 RMD160 424c61ae95914f267397a1180dcb8fee64586ea3 SHA1 28f43f0 DIST courier-imap-4.0.6.tar.bz2 3157577 RMD160 4006c5ec4db6b2adac393e2ebdf9ee99af3a8b2a SHA1 d7fee884cc0015586459c511dbe03bc2a8466c7f SHA256 27e6847507ddecfab1672fdf52447f8351f4cf046145974768ea93ebfea6ddbb DIST courier-imap-4.5.0.tar.bz2 3565751 RMD160 eb53e59521d6c8799e6c28546258b77ded67be2c SHA1 e9828ae7f6880b546d4d4316952a26a5da640c12 SHA256 3d7de2ba6d5f7fa2e7ac4bfeb053055e127234c3442a09f36aa5dd71b9f44ffa DIST courier-imap-4.6.0.tar.bz2 3397972 RMD160 664fb26c1351965af6b1bb21e22230ef6632f110 SHA1 bec24c374007c3da265e0544891992ce5994d57f SHA256 d84e4bd4f643ec03ef1bdea9743c4b917fce7a36cf8967edeeefb7c15b825b37 +DIST courier-imap-4.8.0.tar.bz2 3362734 RMD160 cfc0beec6893c155cf9712d920002320169ad0c5 SHA1 f688cea87c66181362622ce9cbd4710d75268cfc SHA256 ec7511a4398920a04f3bb60cf1208e29a9a5432baeff4d356a4ec142113bfbf2 EBUILD courier-imap-4.0.6-r3.ebuild 8500 RMD160 be84f60cb53d29016343bdba58ef759a424ae5c3 SHA1 c502b351f11d0fa940dc8af62440ecbd4edc8371 SHA256 2f6173ef13c662b062ad93129da76224ba01c56a0def4e1f998cca98e195a351 EBUILD courier-imap-4.5.0.ebuild 8225 RMD160 e651272ff98a5a5b9806f6fb2cf613ac04a0afd3 SHA1 705983eb092dc9aa968131296c2db2ef932a5167 SHA256 b34ed53609dead813ecf365fbb60c046c072a8a87ca15a352ab7ea515e4caf61 EBUILD courier-imap-4.6.0.ebuild 7684 RMD160 1cf83bb411c6700a71a863eaa6189006404bcec8 SHA1 c62703c86477e3b41b2922607108b395ae2604ea SHA256 d610242d6f9a7a7c98eec25350f7c7ab32cea2d9d77038bfa9ff58c2546b946b -MISC ChangeLog 37244 RMD160 7dec8d0d2e5abfeeb8254ce9aac00c4b56916071 SHA1 91d8441a305f3bc09231491c39d44975bea768c2 SHA256 70613bd36a4efc49d40b7b830c90813b325efb3ab990e5ddece46043e3d4423a +EBUILD courier-imap-4.8.0.ebuild 7685 RMD160 10603a9e3bf475a0724026dae3a202b61f7da03c SHA1 99c951d1435dedf4db8af27c299c8024e35a2038 SHA256 d1e31ff9472da081211294c79b211aeb22831f8df63a2e812b9824af14a8dc0e +MISC ChangeLog 37381 RMD160 bf3d2df71b840187776816a7238fd1a2970e3dc2 SHA1 6da1f6e9acdde8a2bdcac46bdeaa603b796ccfff SHA256 f0520d0a74d5bdb19625ce216a968cfe93751b6e54f161b3084fc524d09e1e7b MISC metadata.xml 495 RMD160 a08ec4892b1931702f94b78f75841d4a6d0989ab SHA1 6fee69c5c0cc8fe6092d12e0028ca43739d94040 SHA256 009ce86710a6c7acebacfd6338e68e3eb73e17f9be05042aadad0a469a8a3da5 diff --git a/net-mail/courier-imap/courier-imap-4.8.0.ebuild b/net-mail/courier-imap/courier-imap-4.8.0.ebuild new file mode 100644 index 000000000000..fc9112dee6dc --- /dev/null +++ b/net-mail/courier-imap/courier-imap-4.8.0.ebuild @@ -0,0 +1,228 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.8.0.ebuild,v 1.1 2010/06/28 22:02:23 voyageur Exp $ + +EAPI=2 +inherit autotools eutils multilib libtool + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" + +DESCRIPTION="An IMAP daemon designed specifically for maildirs." +HOMEPAGE="http://www.courier-mta.org/" +SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" +LICENSE="GPL-3" +SLOT="0" +IUSE="berkdb debug fam gdbm ipv6 nls selinux gnutls trashquota" + +RDEPEND="gnutls? ( net-libs/gnutls ) + !gnutls? ( >=dev-libs/openssl-0.9.6 ) + >=net-libs/courier-authlib-0.61 + >=net-mail/mailbase-0.00-r8 + berkdb? ( sys-libs/db ) + fam? ( virtual/fam ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + selinux? ( sec-policy/selinux-courier-imap )" +DEPEND="${RDEPEND} + dev-lang/perl + !mail-mta/courier + userland_GNU? ( sys-process/procps )" +RDEPEND="${RDEPEND} + !virtual/imapd" + +PROVIDE="virtual/imapd" + +RC_VER="4.0.6-r1" +INITD_VER="4.0.6-r1" + +pkg_setup() { + if ! use berkdb && ! use gdbm ; then + echo + eerror "Either the 'berkdb' or the 'gdbm' USE flag is required." + eerror "Please add it to '/etc/make.conf' or '/etc/portage/package.use'." + eerror "Use 'man 5 portage' for more info on '/etc/portage/package.use'." + echo + die "Required USE flag missing." + fi +} + +src_prepare() { + # Bug #48838. Patch to enable/disable FAM support. + # 20 Aug 2004 langthang@gentoo.org + # This patch should fix bug #51540. fam USE flag is not needed for shared folder support. + epatch "${FILESDIR}"/${PN}-4.0.1-disable-fam-configure.in.patch + + # Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206). + epatch "${FILESDIR}"/${PN}-4.0.6-aclocal-fix.patch + + # These patches should fix problems detecting BerkeleyDB. + # We now can compile with db4 support. + if use berkdb ; then + epatch "${FILESDIR}"/${PN}-4.0.6-db4-bdbobj_configure.in.patch + epatch "${FILESDIR}"/${PN}-4.0.6-db4-configure.in.patch + fi + + eautoreconf || die "eautoreconf failed" +} + +src_configure() { + local myconf="" + + # 19 Aug 2004 langthang@gentoo.org + # Default to gdbm if both berkdb and gdbm are present. + if use gdbm ; then + einfo "Building with GDBM support" + myconf="${myconf} --with-db=gdbm" + elif use berkdb ; then + einfo "Building with BerkeleyDB support" + myconf="${myconf} --with-db=db" + fi + + # The default character set is ISO-8859-1/US-ASCII. + # USE 'nls' will enable all available character sets. + # Set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10 + # to include only specified translation tables. + if use nls && [[ -z "${ENABLE_UNICODE}" ]] ; then + einfo "ENABLE_UNICODE is not set, building with all available character sets" + myconf="${myconf} --enable-unicode" + elif use nls ; then + einfo "ENABLE_UNICODE is set, building with unicode=${ENABLE_UNICODE}" + myconf="${myconf} --enable-unicode=${ENABLE_UNICODE}" + else + einfo "Disabling unicode support" + myconf="${myconf} --disable-unicode" + fi + + if use trashquota ; then + einfo "Building with Trash Quota Support" + myconf="${myconf} --with-trashquota" + fi + + use debug && myconf="${myconf} debug=true" + + # Do the actual build now + econf \ + --disable-root-check \ + --bindir=/usr/sbin \ + --sysconfdir=/etc/${PN} \ + --libexecdir=/usr/$(get_libdir)/${PN} \ + --localstatedir=/var/lib/${PN} \ + --with-authdaemonvar=/var/lib/${PN}/authdaemon \ + --enable-workarounds-for-imap-client-bugs \ + --with-mailuser=mail \ + --with-mailgroup=mail \ + $(use_with fam) \ + $(use_with ipv6) \ + $(use_with gnutls) \ + ${myconf} || die "econf failed" + + # Change the pem file location. + sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \ + imap/imapd-ssl.dist || \ + die "sed failed" + + sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \ + imap/pop3d-ssl.dist || \ + die "sed failed" +} + +src_compile() { + # spurious failures with parallel compiles + emake -j1 || die "emake failed" +} + +src_install() { + dodir /var/lib/${PN} /etc/pam.d + emake DESTDIR="${D}" install || die "emake install failed" + rm -Rf "${D}/etc/pam.d" + + # Avoid name collisions in /usr/sbin wrt imapd and pop3d + cd "${D}/usr/sbin" + for name in imapd pop3d ; do + mv -f "${name}" "courier-${name}" || die "Failed to mv ${name} to courier-${name}" + done + + # Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of + # 'Maildir', and to use /usr/sbin/courier-foo names. + cd "${D}/usr/$(get_libdir)/${PN}" + for service in {imapd,pop3d}{,-ssl} ; do + sed -i -e 's/Maildir/${MAILDIR}/' "${service}.rc" || die "sed failed" + sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" "${service}.rc" || die "sed failed" + done + + # Rename the config files correctly and add a value for ${MAILDIR} to them. + cd "${D}/etc/${PN}" + for service in {imapd,pop3d}{,-ssl} ; do + mv -f "${service}.dist" "${service}" || die "Failed to mv ${service}.dist to ${service}" + echo -e '\n# Hardwire a value for ${MAILDIR}' >> "${service}" + echo 'MAILDIR=.maildir' >> "${service}" + echo 'MAILDIRPATH=.maildir' >> "${service}" + done + for service in imapd pop3d ; do + echo -e '# Put any program for ${PRERUN} here' >> "${service}" + echo 'PRERUN=' >> "${service}" + echo -e '# Put any program for ${LOGINRUN} here' >> "${service}" + echo -e '# this is for relay-ctrl-allow in 4*' >> "${service}" + echo 'LOGINRUN=' >> "${service}" + done + + cd "${D}/usr/sbin" + for x in * ; do + if [[ -L "${x}" ]] ; then + rm -f "${x}" || die "Failed to rm ${x}" + fi + done + + cd ../share + mv -f * ../sbin + mv -f ../sbin/man . + cd .. + + for x in mkimapdcert mkpop3dcert ; do + mv -f "${D}/usr/sbin/${x}" "${D}/usr/sbin/${x}.orig" || die "Failed to mv /usr/sbin/${x} to /usr/sbin/${x}.orig" + done + + exeinto /usr/sbin + doexe "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert" || die "doexe failed" + + dosym /usr/sbin/courierlogger /usr/$(get_libdir)/${PN}/courierlogger || die "dosym failed" + + mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp" + for initd in courier-{imapd,pop3d}{,-ssl} ; do + sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" > "${initd}" || die "initd libdir-sed failed" + doinitd "${initd}" || die "doinitd ${initd} failed" + done + exeinto /usr/$(get_libdir)/${PN} + for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do + sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${RC_VER}-${exe}" > "${exe}" || die "exe libdir-sed failed" + doexe "${exe}" || die "doexe ${exe} failed" + done + + dodir /usr/bin + mv -f "${D}/usr/sbin/maildirmake" "${D}/usr/bin/maildirmake" || die "Failed to mv /usr/sbin/maildirmake to /usr/bin/maildirmake" + + # Bug #45953, more docs. + cd "${S}" + dohtml -r "${S}"/* + dodoc "${S}"/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme + docinto imap + dodoc "${S}"/imap/{ChangeLog,BUGS,BUGS.html,README} + docinto maildir + dodoc "${S}"/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt} + docinto tcpd + dodoc "${S}"/tcpd/README.couriertls +} + +pkg_postinst() { + elog "Authdaemond is no longer provided by this package." + elog "Authentication libraries are now in courier-authlib." + elog "For a quick-start howto please refer to" + elog "${PN}-gentoo.readme in /usr/share/doc/${PF}" + # Some users have been reporting that permissions on this directory were + # getting scrambled, so let's ensure that they are sane. + chmod 0755 "${ROOT}/usr/$(get_libdir)/${PN}" || die "Failed to ensure sane permissions on ${ROOT}/usr/$(get_libdir)/${PN}" +} + +src_test() { + ewarn "make check is not supported by this package due to the" + ewarn "--enable-workarounds-for-imap-client-bugs option." +}