From 420eeee727d39d869d864caddb04a80dafda7160 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 17 Oct 2017 17:51:45 +0100 Subject: gentoo resync : 17.10.2017 --- net-mail/courier-imap/Manifest | 6 +- .../courier-imap/courier-imap-4.16.2-r1.ebuild | 1 + net-mail/courier-imap/courier-imap-4.17.3.ebuild | 1 + net-mail/courier-imap/courier-imap-4.18.0.ebuild | 231 +++++++++++++++++++++ 4 files changed, 237 insertions(+), 2 deletions(-) create mode 100644 net-mail/courier-imap/courier-imap-4.18.0.ebuild (limited to 'net-mail/courier-imap') diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest index ad89b64396f0..bf5fe5ecd639 100644 --- a/net-mail/courier-imap/Manifest +++ b/net-mail/courier-imap/Manifest @@ -25,9 +25,11 @@ AUX mkpop3dcert 996 SHA256 c241ccca359b5d126dc56fc73f21991d8a7bffb5c211d8b0a1e4e DIST courier-imap-4.15.tar.bz2 3266353 SHA256 6c34107e7ba9e5396d50b58fb414a495806335cab7135c96ad85a3816785b109 SHA512 7829662282db5e6f414a1d34f06a94c2dd028e263510f01b49ebd3a1a4994055ecc08604568f5a44a30f6411e3a34e0d6c38807c29eaf255752191e885f82e1a WHIRLPOOL 1b5e42bd1f72e3205030b54e9564ce45c4eccb394b31c64a616f225def5a5df05f74ef62c59fbea63b18ce336d77cc2368170a982abb7a6e94d309d0c6ee4dd2 DIST courier-imap-4.16.2.tar.bz2 3028445 SHA256 3be244b3c4d3d5c5e33efb37e4cf712ae83cbe21e43c31725e0d996ab4acc387 SHA512 42a685324b630835fe0c8735a67879e099f96eadf091c803368a9dd478a80b4ab47225fda6142942569c96b21355b5dac5e174ff434bcdc78784a810d2088609 WHIRLPOOL d1d8af441a8c6f13f81705489deded11fdd8f66bf79a66f9076ed4e7b6e0644d9f9034887a043d8c9c9a55031db9c2c9a2ca0ac53cbbef96c5ed25275c50e9e3 DIST courier-imap-4.17.3.tar.bz2 3202534 SHA256 6dcbd913344634c8d7bde573c5fd55c86307181798df1192b7d777ec567898fc SHA512 3166cc703cdc09a71d33257671a662d95cfdb8977bc3b19e0218a4d25eb99a1a108d2868a6eb593106e6538aadf684f11ff0426cd58d522e3ca4b2988f0a88f1 WHIRLPOOL edc8249f2eb923121978bde8f2895add4d74e3e54839bbf63f4b2e8506d162796f91550d63e7491afbc6e589fe034aa9b91ce8789ec5bd64b0e48a6472243a8c +DIST courier-imap-4.18.0.tar.bz2 3202389 SHA256 fa8c2e3b71295c9fa124dfad350f688263ddf7f2b15709f2d44d0f9722de7c52 SHA512 16dedefe8a43ef48f76388c65ee7f100aaf12c30d9610f4c85f9adbd1adab374f9a0978930e70c221b551a60ed3d804f6b5e87a979b549f5c8249c34af1a3a64 WHIRLPOOL f1c59bac69c33636d24c3bf637c7843770ab2b13132d36ff2e041f8387a433bfbc4ba0c2c407b4882cc060231ad1bd46644e068f9374dd6cf38b3d78bcbbaf53 EBUILD courier-imap-4.15-r2.ebuild 7383 SHA256 e1225c004ff78afa3603f31b4f341f319a90e60499e9d106dc3fc15db5418359 SHA512 e07b88d692df44d5ae6695ac38f24770aac5b1fb2efa5de5332b0c7ad599e2953185177029e73e6941dba3af10d65d800bad582b878fbdf2fdd071ed3c615c31 WHIRLPOOL d70c74937efe49552ef132680e09c40ed015fe1bbab00535b72b2e485db1fd4c4c59d54f9be0d73efde9b6f5b760e8bae12dffe8e30f38ddb8080238025aea6a -EBUILD courier-imap-4.16.2-r1.ebuild 6923 SHA256 cfa1cc540aa3980d74b9d795d195d7c3946d317189bf839bc4a8eeac0d8f2ea9 SHA512 700768d7aa98e16955a02f6a8ada023653620e232d2660500a682bb12939a544133ff5a1ffa5075e5da226e6d0319257409ccc49aba2bcfb19905bf66285a129 WHIRLPOOL 4e9ebce2f8718dd1f1e4a9a271230b15f74c25252941f84dfbf78287736e22c38cfc48e9cea465145fae7e3d4fccfcd5f3ffcc21686b2d759838b41587762bf3 -EBUILD courier-imap-4.17.3.ebuild 6758 SHA256 ac7d9f763f8afe34d52385dc1e69b27893e2f1db26005ed70cfeede98f57a106 SHA512 b6bafde30307a1747a75b5038c7b3f425aabe6c866db798dd487c49b3b924ba4fde5f8da02caecc5e72e6c74d7b350a0fbe7236fc3b08ad253bd6833bf6e6fe5 WHIRLPOOL cbab2b9244e240c69616e48f4544a2e4c103d40e485b68e694bd89bf10e196ac5176225aff379d1748254ef4915bc7a2467d87bae85a6392a4caf60fb4289567 +EBUILD courier-imap-4.16.2-r1.ebuild 6953 SHA256 a11cc284eb97f1a39f797ddfbd634bf674b525c9112c968ae767223f5596c30b SHA512 54e1948fec6d477a1c55649cf0658afba54a61e4b77fb2b64e4738cbb95e603bfc0fa6f029e6cbdc807b048800b4625efae620c838efd8d7f82e0170aadc52e6 WHIRLPOOL 07cd7bdbd5eb84895943b70c6857550509db2e18b639616c1dece54bff31620d3ff17a67996bd682e902cf76fd685ac84fbfd6b153d76484c2696dbeffff76b0 +EBUILD courier-imap-4.17.3.ebuild 6788 SHA256 2c7ae5f98456bb109ed196a3822228e4a56f47126cc841fc9efb36bf3c3b3a37 SHA512 22c42a1bf60270d9e2755cd67a4766d7b5629446c0938fc810bf10ce7450fef5dc002bbc5f9e2268c8fb4a13275cf3b0cbf36649feb0aa15bbc0d72cb8edf684 WHIRLPOOL 95adeb0cf71b58de1890da558425a269b6f4272fb3fce5c90e5a9475458e8950f77bd198ac0f5980940f419c51e83f11954b7df6700b0332599d73e2c3491711 +EBUILD courier-imap-4.18.0.ebuild 6764 SHA256 084d8b7ca00c7d260dbe4de0c84ac9b9e3d289ba6fe05841428491729e49b55f SHA512 04b7b67a0cce4f9a29782e4de0c831c9103fb21e0b7cca0f8a1cbac4ea4c743d4c90431829a4f1f406a1b7398762d7f9938778e7d9ff0b2fa78fe4b5a48d77f5 WHIRLPOOL 972c3b5d6181dbb44b02d91b6a14086f229d73b6ba413b209d857634e09a0b139f663d8af111244af2d8eedafc430a3abad3cc7c03d8bb082aa9677de25774cf MISC ChangeLog 5605 SHA256 85239e989467c9f1df21ab396cdf904e24eeb386c1af3eb6d530ef82df6e4609 SHA512 3c976dbf9b7d7282e48d2ddd13d9abf0a2bf1eb339339fba10b8839667d4ce17388bbe3a5e762920ced5cdcaec2c14bea56dad2a8b9a87a8cb4ceb1244eecaf3 WHIRLPOOL cefd6f6036161124fcf8690032fe9dc9005a9db74dda279d6a204cfbc16ec46da9d0939d2e50d9c28fda806db2eb233a7307f2e8df163d834c6686cfa253a5b0 MISC ChangeLog-2015 45263 SHA256 d18a98970f653f5592dd13bba1142ad1ab798dccec39150a8908623e3ed96679 SHA512 2e54a72d070a1061ec7fb311ee1daac1b3bad3c674a6a39813a5d773209cfa0a8628d78584d9312b1139329a68f371becf20cbca9c99dc6b255e303a4f769ac9 WHIRLPOOL 3cda3ab0b2d6af652909d962fd39b0bc6eee88b9a37cb66583e8f3c9eb210b879b7a0e9f72346dc926badf3ae81ca889ee379e1aa2f32ae49f9caa07459b5f5e MISC metadata.xml 382 SHA256 afb0794e4998fd065ec1a821728cdaf1f60de70a4f213f72cf0bc4156209206c SHA512 2422c2a28ee3049a7b8da4b27f0dfca5699cb62ac77d39c89de4b9287f32f78167fc4b3eabf20e890c5c5dc1e00ccdce8a745501d3423846e42224f60e8ed110 WHIRLPOOL 5bce0d3cbea9fbd04ec8efb58b0871eb164d75cfef1bece8927e029894fe63d10069e4cbface3dd0f0c4996fcbae630f4a1b5964e51507224ffe12f8110e37eb diff --git a/net-mail/courier-imap/courier-imap-4.16.2-r1.ebuild b/net-mail/courier-imap/courier-imap-4.16.2-r1.ebuild index 83083366938a..88952967ff8e 100644 --- a/net-mail/courier-imap/courier-imap-4.16.2-r1.ebuild +++ b/net-mail/courier-imap/courier-imap-4.16.2-r1.ebuild @@ -23,6 +23,7 @@ CDEPEND=" libressl? ( dev-libs/libressl:0= ) ) >=net-libs/courier-authlib-0.61 + <=net-libs/courier-unicode-2 >=net-libs/courier-unicode-1.3 >=net-mail/mailbase-0.00-r8 berkdb? ( sys-libs/db:= ) diff --git a/net-mail/courier-imap/courier-imap-4.17.3.ebuild b/net-mail/courier-imap/courier-imap-4.17.3.ebuild index 8347c0afb219..cd99c5cbdda5 100644 --- a/net-mail/courier-imap/courier-imap-4.17.3.ebuild +++ b/net-mail/courier-imap/courier-imap-4.17.3.ebuild @@ -23,6 +23,7 @@ CDEPEND=" libressl? ( dev-libs/libressl:0= ) ) >=net-libs/courier-authlib-0.61 + <=net-libs/courier-unicode-2 >=net-libs/courier-unicode-1.3 >=net-mail/mailbase-0.00-r8 berkdb? ( sys-libs/db:= ) diff --git a/net-mail/courier-imap/courier-imap-4.18.0.ebuild b/net-mail/courier-imap/courier-imap-4.18.0.ebuild new file mode 100644 index 000000000000..8226e3abd98a --- /dev/null +++ b/net-mail/courier-imap/courier-imap-4.18.0.ebuild @@ -0,0 +1,231 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools libtool systemd + +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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota" + +REQUIRED_USE="|| ( berkdb gdbm )" + +CDEPEND=" + gnutls? ( net-libs/gnutls ) + !gnutls? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + >=net-libs/courier-authlib-0.61 + >=net-libs/courier-unicode-2 + >=net-mail/mailbase-0.00-r8 + berkdb? ( sys-libs/db:= ) + fam? ( virtual/fam ) + gdbm? ( >=sys-libs/gdbm-1.8.0 )" +DEPEND="${CDEPEND} + dev-lang/perl + !mail-mta/courier + userland_GNU? ( sys-process/procps )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-courier )" + +# get rid of old style virtual - bug 350792 +# all blockers really needed? +RDEPEND="${RDEPEND} + !mail-mta/courier + !net-mail/bincimap + !net-mail/cyrus-imapd + !net-mail/uw-imap" + +RC_VER="4.0.6-r1" +INITD_VER="4.0.6-r1" + +PATCHES=( + "${FILESDIR}/${PN}-4.17-disable-fam-configure.ac.patch" + "${FILESDIR}/${PN}-4.17-aclocal-fix.patch" +) + +src_prepare() { + default + + # These patches should fix problems detecting BerkeleyDB. + # We now can compile with db4 support. + if use berkdb ; then + eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch" + eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch" + fi + + eautoreconf +} + +src_configure() { + local myconf="" + + # 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 + + if use trashquota ; then + einfo "Building with Trash Quota Support" + myconf="${myconf} --with-trashquota" + fi + + use debug && myconf="${myconf} debug=true" + + 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} + + # Change the pem file location. + sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \ + libs/imap/imapd-ssl.dist || \ + die "sed failed" + + sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \ + libs/imap/pop3d-ssl.dist || \ + die "sed failed" +} + +src_compile() { + # spurious failures with parallel compiles + emake -j1 +} + +src_install() { + dodir "/var/lib/${PN}" /etc/pam.d + default + rm -r "${D}/etc/pam.d" || die + + # Avoid name collisions in /usr/sbin wrt imapd and pop3d + for name in imapd pop3d ; do + mv "${D}/usr/sbin/"{,courier-}${name} \ + || die "failed to rename ${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. + for service in {imapd,pop3d}{,-ssl} ; do + sed -e 's/Maildir/${MAILDIR}/' \ + -i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \ + || die "sed failed" + sed -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \ + -i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \ + || die "sed failed" + done + + # Rename the config files correctly and add a value for ${MAILDIR} + # to them. + for service in {imapd,pop3d}{,-ssl} ; do + mv "${D}/etc/${PN}/${service}"{.dist,} \ + || die "failed to rename ${service}.dist to ${service}" + echo -e '\n# Hardwire a value for ${MAILDIR}' \ + >> "${D}/etc/${PN}/${service}" + echo 'MAILDIR=.maildir' >> "${D}/etc/${PN}/${service}" + echo 'MAILDIRPATH=.maildir' >> "${D}/etc/${PN}/${service}" + done + + for service in imapd pop3d ; do + echo -e '# Put any program for ${PRERUN} here' \ + >> "${D}/etc/${PN}/${service}" + echo 'PRERUN=' >> "${D}/etc/${PN}/${service}" + echo -e '# Put any program for ${LOGINRUN} here' \ + >> "${D}/etc/${PN}/${service}" + echo -e '# this is for relay-ctrl-allow in 4*' \ + >> "${D}/etc/${PN}/${service}" + echo 'LOGINRUN=' >> "${D}/etc/${PN}/${service}" + done + + for x in "${D}/usr/sbin"/* ; do + if [[ -L "${x}" ]] ; then + rm "${x}" || die "failed to remove ${x}" + fi + done + + mv "${D}/usr/share"/* "${D}/usr/sbin/" || die + mv "${D}/usr/sbin/man" "${D}/usr/share/" || die + + rm "${D}/usr/sbin/"{mkimapdcert,mkpop3dcert} || die + + dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert" + + dosym /usr/sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger" + + for initd in courier-{imapd,pop3d}{,-ssl} ; do + sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \ + "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" \ + > "${T}/${initd}" \ + || die "initd libdir-sed failed" + doinitd "${T}/${initd}" + done + + systemd_newunit "${FILESDIR}"/courier-authdaemond-r1.service \ + courier-authdaemond.service + systemd_newunit "${FILESDIR}"/courier-imapd-ssl-r1.service \ + courier-imapd-ssl.service + systemd_newunit "${FILESDIR}"/courier-imapd-r1.service \ + courier-imapd.service + + 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}" \ + > "${T}/${exe}" \ + || die "exe libdir-sed failed" + doexe "${T}/${exe}" + done + + # Avoid a collision with mail-mta/netqmail, bug 482098. + mv "${D}/usr/sbin/"{,courier-}maildirmake \ + || die "failed to rename maildirmake to courier-maildirmake" + mv "${D}/usr/share/man/man1/"{,courier-}maildirmake.1 \ + || die "failed to rename maildirmake.1 to courier-maildirmake.1" + + dodoc AUTHORS INSTALL NEWS README ChangeLog + dodoc "${FILESDIR}/${PN}-gentoo.readme" + docinto imap + dodoc libs/imap/ChangeLog libs/imap/BUGS* libs/imap/README* + docinto maildir + dodoc libs/maildir/AUTHORS libs/maildir/*.html libs/maildir/README* + docinto rfc2045 + dodoc libs/rfc2045/*.html + docinto tcpd + dodoc libs/tcpd/README* libs/tcpd/*.html +} + +pkg_postinst() { + elog "Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading" + elog "and remove TLS_DHPARAMS from configuration files or run mkdhparams" + + 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. + fperms 0755 "${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." +} -- cgit v1.2.3