From 185fa19bbf68a4d4dca534d2b46729207a177f16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 11 May 2021 19:55:43 +0100 Subject: gentoo resync : 11.05.2021 --- net-mail/Manifest.gz | Bin 15576 -> 15573 bytes net-mail/courier-imap/Manifest | 10 +- net-mail/courier-imap/courier-imap-5.0.10.ebuild | 253 ---------------------- net-mail/courier-imap/courier-imap-5.0.11.ebuild | 254 ----------------------- net-mail/courier-imap/courier-imap-5.0.8.ebuild | 253 ---------------------- net-mail/courier-imap/courier-imap-5.1.2.ebuild | 2 +- net-mail/courier-imap/courier-imap-5.1.3.ebuild | 252 ++++++++++++++++++++++ net-mail/cyrus-imapd/Manifest | 6 +- net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild | 13 +- net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild | 234 --------------------- net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild | 236 +++++++++++++++++++++ 11 files changed, 502 insertions(+), 1011 deletions(-) delete mode 100644 net-mail/courier-imap/courier-imap-5.0.10.ebuild delete mode 100644 net-mail/courier-imap/courier-imap-5.0.11.ebuild delete mode 100644 net-mail/courier-imap/courier-imap-5.0.8.ebuild create mode 100644 net-mail/courier-imap/courier-imap-5.1.3.ebuild delete mode 100644 net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild create mode 100644 net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild (limited to 'net-mail') diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz index a537db7dd11c..50fd31a77054 100644 Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest index 610f80f4fb61..83afb6906044 100644 --- a/net-mail/courier-imap/Manifest +++ b/net-mail/courier-imap/Manifest @@ -21,17 +21,13 @@ AUX courier-imapd-ssl-r1.service 310 BLAKE2B 3894d582ace57379929712aabdfb243b28c AUX mkimapdcert 996 BLAKE2B 76a8bbe16f182a32fc47acc5410c20e545c117cda1af40b94d71f53b4ac668044dc3b5ba415fe3e0f8842a03757d9caf206846dc1c6f6dd589a3adafd0af226e SHA512 502eec64d1db7106ca83a38c18bb48ea9fa9d9a2526076fe45fbf54f7313866d9a4cf3bda7b0a8984af88fb8e8f35a24447071d3bc6882c8f158395d55548bf4 AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d191168c58336206099e0eb3aafd3e50238d83391478bdede627156718bd613741efc34b1dc978984 SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078 DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d4289e00aacff487609cfe01bce351e180561b4bec4904e2701a0c05916bbac2e301409530ccbdcd08474b50be4c1365e3 SHA512 821f0151012f1a357faf705d938d8498a939cc994957398c0d5e2b7a619eabe202549f174e625161545ba6a94b753072458e9f0edc30cbb2443b15405740347e -DIST courier-imap-5.0.10.tar.bz2 3324560 BLAKE2B f59034184c6423ba4c8a238e1756e431bc240a5e80db5abc62af10eb776446f7c6afcba2935dfd49a7cf5dfec83087f3cdfe98785b13faa23287b0c6d24a9bd9 SHA512 7b1bd179fb7d9ed99ea4a92414e13d1313d10239bd1d7ddef76d17bb618e6dfd5d51f11d1fdb2fcd6a204a5000e3756ecb30aa2c791c6063ab3991dde65a3590 -DIST courier-imap-5.0.11.tar.bz2 3356907 BLAKE2B 6d4aa2d67ef92b318a87d8c71232d1801d908143c044f03891c9130cb8458958c4c0cbcd214d4f548a2e5e247a37120d1e824469c7b77b8e02d1f75fe2a77e5c SHA512 5fbadfe3a554596a1fdd74648b002964e18d933209f0b832c4782a242c5c76336274756dcd6cc086f55ab66ba4a7292d6d5b9bfe84c0d776f6b3b14d7531bedc DIST courier-imap-5.0.14.tar.bz2 3359363 BLAKE2B 23a734494ee3591b33361f209a465a54f893dd5ed30295fbda4d11707664f9750d5dd422449ff4a159a1fa8130d201bb50cde3fd56051293c45fe53d62c8ed41 SHA512 fa6feb9c6dc04a53e569cb0fdbf34cf4bbccd890cb827a4a0948bd221eb41834033cc7cb7b4c03e8b21c5a59545d73b845865a4da464c1b1b546f70805b18c31 DIST courier-imap-5.0.7.tar.bz2 3296879 BLAKE2B 022522387cc667223c44354f4f3da822ac8abab19222bfc69a9dde4b7460665c97ca565b21705519f3bc0dfbe1d69bbd2ef288329bfa7b8d99e3251a4f9d3e98 SHA512 a0be5cb3e6bc42f4bf45b14132e7d4ad7e822c26aa3b3dd4bfefa7783a047b9c928ad503b462c8e832fddefb356af58b4adfa5ee91481bd024149992157a1aad -DIST courier-imap-5.0.8.tar.bz2 3296810 BLAKE2B 43b9cf61253145c4f877ed350140159014d812c197f82cb2621db4484c66ae57e0c1a237ba0f13e0edb35439f562662557ca98d3193ba8b6e35e392dac00cd03 SHA512 bc60f4540da8db02758d593694ca4b7336a7d65fd3c48ea5c373e18abfc9973db836c505f77caf844529947ad0c4ef0dc276898e437ca60f0facb2ec6650702c DIST courier-imap-5.1.2.tar.bz2 3361084 BLAKE2B 0b42ec3a765c1adf425408f72b34beb7626bb9707df5adbc86b61cf60a12c3cbcad808a3173441666925f3ac4e44c137b611d4c8213566e2dc2e8fb8122d37c8 SHA512 697b7c91ea603ae67a3c167238841dcad266c6262965e7753bb2d2efee3a434c405ea55d35393330f7a55c2efc2cefbcca339c8b8f4867513e5157acc42c498d +DIST courier-imap-5.1.3.tar.bz2 3361334 BLAKE2B 750a0fdca6882b26a7f9eef062b516a2d9271e6f73b8cd999653fc37947ffcfcbe7bb88c246be0e662f235b04c5a6f7d5dc7e06010075353670ecb1a2ca413ff SHA512 6685fe596eefcdc976f23aa115b3bc3d13e14421b1d430eb59a4bbee419ba86cb190e536871b42cbebba96160a3894cdef86571ae10bd7ee052cb7e7f8552dca EBUILD courier-imap-4.18.2.ebuild 6787 BLAKE2B d3315cb5d74d86e9096df5823a9f34361a239495551ef52f67749e9fe08a9ddf3437d69da99e804e2a46e44d35e2ec9bd21a8f9881c2c707b146d255565ea1f2 SHA512 428ec41f625200965ef59ddda9b3650dd5f65a41fe1219e33a81c7d2971eb7948b9271fcbc6e45bfecd1442ec59af68195bb39e1e789ae475b8480fa4b2bd5e1 -EBUILD courier-imap-5.0.10.ebuild 7161 BLAKE2B a0b046e7106faf2df9aacc461b76e635f6522d3614915e8a0d2aca1ea6ec501c51c74cdcfaabf74874133131d7178f35910324a422d85f13cf60a4fc63924d90 SHA512 42e18709a7af106e78fc1ebd5d07b60d1e38425ea4cb531e2437912d9f29f160f4ffe827c1882a53264bc6ecb55e4ab9c35e6cd083bdad91586bd376e055a066 -EBUILD courier-imap-5.0.11.ebuild 7193 BLAKE2B 5b9bd6f0a86e39a1ce3199fd41ada07ccaa7492874ca25a67bddba203c67b7d9d402e5029646758e483d35020724062ffa19e7e93ad1a5c646734b8735cb00c1 SHA512 87b9168db76cb69f9b37336ae5725a277e8799739716fda395f998103b1c9272f65692d0fd76ef8598f6f143e43b435ff13892f6270b735f224ef9cdc7a9fe7e EBUILD courier-imap-5.0.14.ebuild 7193 BLAKE2B 5b9bd6f0a86e39a1ce3199fd41ada07ccaa7492874ca25a67bddba203c67b7d9d402e5029646758e483d35020724062ffa19e7e93ad1a5c646734b8735cb00c1 SHA512 87b9168db76cb69f9b37336ae5725a277e8799739716fda395f998103b1c9272f65692d0fd76ef8598f6f143e43b435ff13892f6270b735f224ef9cdc7a9fe7e EBUILD courier-imap-5.0.7.ebuild 7113 BLAKE2B 0406cf720873e5fad5073091d59b55bec309e37d937556371ed701354363f5fd5323e2dee0b426f16950fd4694bb05ad07b9c56d19c2a5af34b641afd6a212f3 SHA512 9690b253dad1f5adcf3372832054e789677b84ec0def9a03058f01f46b3183cc8964ed45898915d38eef35dedef97081ebb74634f1da1ee97d0d4a1c125ffd88 -EBUILD courier-imap-5.0.8.ebuild 7154 BLAKE2B 85dfdc91c1d5312c6fcd48d45a365d59a1bb8c3e2ba2ab51914625399b114e0edc9e047986c8e8c9445ea8975dc1f579bbe92b2e2e003986078e7885280cd7a6 SHA512 ce9b2e1ea02ac71e2f88b82f02469134aa087808ab2e3d65752bbd2e11131f699d4c7ddc87656c2b9076d55f03dd83d6da1c1992fe6d27077a540f0d751ed8fb -EBUILD courier-imap-5.1.2.ebuild 7104 BLAKE2B 626450701b402212d1e1ab038cc8c02c6c62c170392374d673315153030a5e1032a90d116a23e3fd7b2c2624750033f9510ff0181457119ad89ebd1b71243356 SHA512 67b4110af6192b628bf90d5a5baf992edc81ee75a8b60b8a93f5cbb8428ae51cc8941bfbc83770ad89eedd48f39f084bb27645a16cce9d8bb696f22714f0fa07 +EBUILD courier-imap-5.1.2.ebuild 7097 BLAKE2B 3b476330c95888be56632e15c73cf79db78bfd6ad0676c93657340e2c7e2c3ec5f23dc504b8b0b96a47647b512db404ccdfd275a731f487842a4645fab7bf5c8 SHA512 21fe362f3d0737b369894894305f9fc2fbccd139c9a8d38eea659ac6074576b722728e0ba6bbbf4e12d253763180c5a3ddb7016553c805ce12d6c2d9e68f3e9c +EBUILD courier-imap-5.1.3.ebuild 7104 BLAKE2B 626450701b402212d1e1ab038cc8c02c6c62c170392374d673315153030a5e1032a90d116a23e3fd7b2c2624750033f9510ff0181457119ad89ebd1b71243356 SHA512 67b4110af6192b628bf90d5a5baf992edc81ee75a8b60b8a93f5cbb8428ae51cc8941bfbc83770ad89eedd48f39f084bb27645a16cce9d8bb696f22714f0fa07 MISC metadata.xml 462 BLAKE2B c03535d9f421fd089459b7c628f093b9ba1edf1317e0943b5dff3eca2f6645b6ed6947ae777dcf63752566602a30abe5143494d863ae6331a023abc0c73df446 SHA512 c26c6bd707b0cea4dd97389ef294420ad1d8a35ed588d041acc35580867e3ca64569e07b993db94bedeb92142cde77135e9bdba295cc8bf3152dd1371937e6a0 diff --git a/net-mail/courier-imap/courier-imap-5.0.10.ebuild b/net-mail/courier-imap/courier-imap-5.0.10.ebuild deleted file mode 100644 index 18471a0b84fb..000000000000 --- a/net-mail/courier-imap/courier-imap-5.0.10.ebuild +++ /dev/null @@ -1,253 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools libtool readme.gentoo-r1 systemd - -DESCRIPTION="An IMAP daemon designed specifically for maildirs" -HOMEPAGE="https://www.courier-mta.org/imap/" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" - -IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota" -REQUIRED_USE="|| ( berkdb gdbm )" - -CDEPEND=" - gnutls? ( net-libs/gnutls[tools] ) - !gnutls? ( - dev-libs/openssl:0= - ) - >=net-libs/courier-authlib-0.66.4 - >=net-libs/courier-unicode-2 - >=net-mail/mailbase-0.00-r8 - net-dns/libidn:= - 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 -RDEPEND="${RDEPEND} - !mail-mta/courier - !net-mail/bincimap - !net-mail/cyrus-imapd -" - -RC_VER="4.0.6-r1" -INITD_VER="4.0.6-r1" - -# make check is not supported by this package due to the -# --enable-workarounds-for-imap-client-bugs option. -RESTRICT="test" - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading -and remove TLS_DHPARAMS from configuration files or run mkdhparams - -For a quick-start howto please refer to -${PN}-gentoo.readme in /usr/share/doc/${PF} - -Please convert maildir to utf8 -and rerun mkdhparams if needed. Location has changed -" - -PATCHES=( - "${FILESDIR}/${PN}-4.17-disable-fam-configure.ac.patch" - "${FILESDIR}/${PN}-4.17-aclocal-fix.patch" - "${FILESDIR}/${PN}-5.0.8-ar-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 \ - --with-notice=unicode \ - --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 \ - --with-certsdir="/etc/courier-imap" \ - $(use_with fam) \ - $(use_with ipv6) \ - $(use_with gnutls) \ - ${myconf} -} - -#src_compile() { - # spurious failures with parallel compiles, bug #???? -# emake -j1 -#} - -src_install() { - dodir "/var/lib/${PN}" /etc/pam.d - keepdir /var/lib/courier-imap - - 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 ../../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 - - cp "${FILESDIR}"/courier-*-r1.service . - - sed -i \ - -e "s:/usr/lib/:/usr/$(get_libdir)/:" \ - courier-*-r1.service \ - || die - - systemd_newunit courier-authdaemond-r1.service \ - courier-authdaemond.service - systemd_newunit courier-imapd-ssl-r1.service \ - courier-imapd-ssl.service - systemd_newunit 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 - readme.gentoo_create_doc - 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 - exeinto /etc/cron.monthly - newexe "${FILESDIR}"/${PN}.cron ${PN} -} - -pkg_postinst() { - # 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}" - - readme.gentoo_print_elog - - elog "" - elog "Courier Imap now run as user mail:mail." - elog "" - elog "This require you to enable read/write access to the caches:" - elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)" - elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )" -} diff --git a/net-mail/courier-imap/courier-imap-5.0.11.ebuild b/net-mail/courier-imap/courier-imap-5.0.11.ebuild deleted file mode 100644 index 060bb3b5a84f..000000000000 --- a/net-mail/courier-imap/courier-imap-5.0.11.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools libtool readme.gentoo-r1 systemd - -DESCRIPTION="An IMAP daemon designed specifically for maildirs" -HOMEPAGE="https://www.courier-mta.org/imap/" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" - -IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota" -REQUIRED_USE="|| ( berkdb gdbm )" - -CDEPEND=" - gnutls? ( net-libs/gnutls[tools] ) - !gnutls? ( - dev-libs/openssl:0= - ) - >=net-libs/courier-authlib-0.66.4 - >=net-libs/courier-unicode-2 - >=net-mail/mailbase-0.00-r8 - net-dns/libidn:= - 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 -RDEPEND="${RDEPEND} - !mail-mta/courier - !net-mail/bincimap - !net-mail/cyrus-imapd -" - -RC_VER="4.0.6-r1" -INITD_VER="4.0.6-r1" - -# make check is not supported by this package due to the -# --enable-workarounds-for-imap-client-bugs option. -RESTRICT="test" - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading -and remove TLS_DHPARAMS from configuration files or run mkdhparams - -For a quick-start howto please refer to -${PN}-gentoo.readme in /usr/share/doc/${PF} - -Please convert maildir to utf8 -and rerun mkdhparams if needed. Location has changed -" - -PATCHES=( - "${FILESDIR}/${PN}-4.17-disable-fam-configure.ac.patch" - "${FILESDIR}/${PN}-4.17-aclocal-fix.patch" - "${FILESDIR}/${PN}-5.0.8-ar-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 - - cd libs/rootcerts & autoupdate - 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 \ - --with-notice=unicode \ - --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 \ - --with-certsdir="/etc/courier-imap" \ - $(use_with fam) \ - $(use_with ipv6) \ - $(use_with gnutls) \ - ${myconf} -} - -#src_compile() { - # spurious failures with parallel compiles, bug #???? -# emake -j1 -#} - -src_install() { - dodir "/var/lib/${PN}" /etc/pam.d - keepdir /var/lib/courier-imap - - 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 ../../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 - - cp "${FILESDIR}"/courier-*-r1.service . - - sed -i \ - -e "s:/usr/lib/:/usr/$(get_libdir)/:" \ - courier-*-r1.service \ - || die - - systemd_newunit courier-authdaemond-r1.service \ - courier-authdaemond.service - systemd_newunit courier-imapd-ssl-r1.service \ - courier-imapd-ssl.service - systemd_newunit 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 - readme.gentoo_create_doc - 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 - exeinto /etc/cron.monthly - newexe "${FILESDIR}"/${PN}.cron ${PN} -} - -pkg_postinst() { - # 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}" - - readme.gentoo_print_elog - - elog "" - elog "Courier Imap now run as user mail:mail." - elog "" - elog "This require you to enable read/write access to the caches:" - elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)" - elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )" -} diff --git a/net-mail/courier-imap/courier-imap-5.0.8.ebuild b/net-mail/courier-imap/courier-imap-5.0.8.ebuild deleted file mode 100644 index 2fc791acd0bf..000000000000 --- a/net-mail/courier-imap/courier-imap-5.0.8.ebuild +++ /dev/null @@ -1,253 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools libtool readme.gentoo-r1 systemd - -DESCRIPTION="An IMAP daemon designed specifically for maildirs" -HOMEPAGE="https://www.courier-mta.org/imap/" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" - -IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota" -REQUIRED_USE="|| ( berkdb gdbm )" - -CDEPEND=" - gnutls? ( net-libs/gnutls[tools] ) - !gnutls? ( - dev-libs/openssl:0= - ) - >=net-libs/courier-authlib-0.66.4 - >=net-libs/courier-unicode-2 - >=net-mail/mailbase-0.00-r8 - net-dns/libidn:= - 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 -RDEPEND="${RDEPEND} - !mail-mta/courier - !net-mail/bincimap - !net-mail/cyrus-imapd -" - -RC_VER="4.0.6-r1" -INITD_VER="4.0.6-r1" - -# make check is not supported by this package due to the -# --enable-workarounds-for-imap-client-bugs option. -RESTRICT="test" - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading -and remove TLS_DHPARAMS from configuration files or run mkdhparams - -For a quick-start howto please refer to -${PN}-gentoo.readme in /usr/share/doc/${PF} - -Please convert maildir to utf8 -and rerun mkdhparams if needed. Location has changed -" - -PATCHES=( - "${FILESDIR}/${PN}-4.17-disable-fam-configure.ac.patch" - "${FILESDIR}/${PN}-4.17-aclocal-fix.patch" - "${FILESDIR}/${P}-ar-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 \ - --with-notice=unicode \ - --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 \ - --with-certsdir="/etc/courier-imap" \ - $(use_with fam) \ - $(use_with ipv6) \ - $(use_with gnutls) \ - ${myconf} -} - -#src_compile() { - # spurious failures with parallel compiles, bug #???? -# emake -j1 -#} - -src_install() { - dodir "/var/lib/${PN}" /etc/pam.d - keepdir /var/lib/courier-imap - - 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 ../../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 - - cp "${FILESDIR}"/courier-*-r1.service . - - sed -i \ - -e "s:/usr/lib/:/usr/$(get_libdir)/:" \ - courier-*-r1.service \ - || die - - systemd_newunit courier-authdaemond-r1.service \ - courier-authdaemond.service - systemd_newunit courier-imapd-ssl-r1.service \ - courier-imapd-ssl.service - systemd_newunit 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 - readme.gentoo_create_doc - 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 - exeinto /etc/cron.monthly - newexe "${FILESDIR}"/${PN}.cron ${PN} -} - -pkg_postinst() { - # 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}" - - readme.gentoo_print_elog - - elog "" - elog "Courier Imap now run as user mail:mail." - elog "" - elog "This require you to enable read/write access to the caches:" - elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)" - elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )" -} diff --git a/net-mail/courier-imap/courier-imap-5.1.2.ebuild b/net-mail/courier-imap/courier-imap-5.1.2.ebuild index 7b287e483581..b4536b532519 100644 --- a/net-mail/courier-imap/courier-imap-5.1.2.ebuild +++ b/net-mail/courier-imap/courier-imap-5.1.2.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota" REQUIRED_USE="|| ( berkdb gdbm )" diff --git a/net-mail/courier-imap/courier-imap-5.1.3.ebuild b/net-mail/courier-imap/courier-imap-5.1.3.ebuild new file mode 100644 index 000000000000..7b287e483581 --- /dev/null +++ b/net-mail/courier-imap/courier-imap-5.1.3.ebuild @@ -0,0 +1,252 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools libtool readme.gentoo-r1 systemd + +DESCRIPTION="An IMAP daemon designed specifically for maildirs" +HOMEPAGE="https://www.courier-mta.org/imap/" +SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" + +IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota" +REQUIRED_USE="|| ( berkdb gdbm )" + +CDEPEND=" + gnutls? ( net-libs/gnutls[tools] ) + !gnutls? ( + dev-libs/openssl:0= + ) + >=net-libs/courier-authlib-0.66.4 + >=net-libs/courier-unicode-2 + >=net-mail/mailbase-0.00-r8 + net-dns/libidn:= + 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 +RDEPEND="${RDEPEND} + !mail-mta/courier + !net-mail/bincimap + !net-mail/cyrus-imapd +" + +RC_VER="4.0.6-r1" +INITD_VER="4.0.6-r1" + +# make check is not supported by this package due to the +# --enable-workarounds-for-imap-client-bugs option. +RESTRICT="test" + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading +and remove TLS_DHPARAMS from configuration files or run mkdhparams + +For a quick-start howto please refer to +${PN}-gentoo.readme in /usr/share/doc/${PF} + +Please convert maildir to utf8 +and rerun mkdhparams if needed. Location has changed +" + +PATCHES=( + "${FILESDIR}/${PN}-4.17-aclocal-fix.patch" + "${FILESDIR}/${PN}-5.0.8-ar-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 \ + --with-notice=unicode \ + --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 \ + --with-certsdir="/etc/courier-imap" \ + $(use_with fam) \ + $(use_with ipv6) \ + $(use_with gnutls) \ + ${myconf} +} + +#src_compile() { + # spurious failures with parallel compiles, bug #???? +# emake -j1 +#} + +src_install() { + dodir "/var/lib/${PN}" /etc/pam.d + keepdir /var/lib/courier-imap + + 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 ../../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 + + cp "${FILESDIR}"/courier-*-r1.service . + + sed -i \ + -e "s:/usr/lib/:/usr/$(get_libdir)/:" \ + courier-*-r1.service \ + || die + + systemd_newunit courier-authdaemond-r1.service \ + courier-authdaemond.service + systemd_newunit courier-imapd-ssl-r1.service \ + courier-imapd-ssl.service + systemd_newunit 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 + readme.gentoo_create_doc + 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 + exeinto /etc/cron.monthly + newexe "${FILESDIR}"/${PN}.cron ${PN} +} + +pkg_postinst() { + # 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}" + + readme.gentoo_print_elog + + elog "" + elog "Courier Imap now run as user mail:mail." + elog "" + elog "This require you to enable read/write access to the caches:" + elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)" + elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )" +} diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest index 154ca73019fc..90c20400d24e 100644 --- a/net-mail/cyrus-imapd/Manifest +++ b/net-mail/cyrus-imapd/Manifest @@ -8,9 +8,9 @@ AUX imapd.conf 1471 BLAKE2B 5373950ac08b630a82fc00b5bf3fed9d400e092458310b64cb66 DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6 DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209 DIST cyrus-imapd-3.0.15.tar.gz 10843341 BLAKE2B efe65c7afc7d63770adef9e4ea13b87e3b7fdd1847e4ada028175999b31ebb84f9d84b014018bd2be3fee9af1b5e81dd08f63225bc62dc5a4fd4a0791da16594 SHA512 2f65209095f086092fec0bfc9547c999a6e568cccc0a4164e7a3751fe2881f47bbbbd67ba9c9169feafead8c40d42f594d34171d911e4028425cfd8ba72d8f4a -DIST cyrus-imapd-3.4.0.tar.gz 12514849 BLAKE2B 319a2c69bb293c55340e9ac87258799458fc216f39b949fefc01178ac6c8a06962a9b02dfd143fb1d7715b789b4b9401f85b55f30abfcae06b815a87def2b017 SHA512 1dc6c721d8d59f403895dc772dabaa38a1c8dce2c433674e6d34b7ab9e51ab1a3e0fa584db883a9e9c76bbaf28c2c2c63d90453e614d8c2aab870dbaf3148741 +DIST cyrus-imapd-3.4.1.tar.gz 12539102 BLAKE2B f791d26f34a9a5e9896231ec812ae623bb3f5fc85a577ea25deea956bda153f941f2a759f77de10d105d0746827243efed773fe67eea4921200cb2cddf81e049 SHA512 9fd13e93755aca98215c1bd9c21fa3ef3a3db8b1ff48f71dd6070e614e9c68cb591b1cb411fa1319d46ab1d49ddc971f188a41cc0c9a2e2c9df0cc08299f8bfa EBUILD cyrus-imapd-3.0.13.ebuild 6068 BLAKE2B f6f8e1e4ed70120380a8115820fde63a86bf1eec1472ab58b3a382eb73fd643b87668fa5bb6af48b752d8f6df91b39b3e99083a0401b71bc36fa22399f8f5fb1 SHA512 dd16ecf950d4ef61c7cee53133d8890d940a2d91d10ff32bc56ce17b9a7fb9ae0da47a40d31e1435e9ed14d26579de1a4e6945b787b712f09e2773ed9316bf74 EBUILD cyrus-imapd-3.0.14.ebuild 6029 BLAKE2B a42974b90673ee9d7306e21732fc2d98ddfb1e6e79a98fb10de8e5cc2062eb040f3840ab1c6d7804bf50a3845b6a6ef8b937fa74119eefe11830c46a7ce0dabb SHA512 ad87a1b5cab6503d30f8c0bd22c0ad67e22f4d09e1c6d5d859eaae741b140439af984d3b4943cdd707dc9683c144e3cc2e73b4fc5411be0927511afa6b982db3 -EBUILD cyrus-imapd-3.0.15.ebuild 6032 BLAKE2B 8518366516bf2062b77240ca9d80bd49f11edead53de23a905f642bf1aa5e19e1ce6d5cefd3c9dcbdafd21a24767c99e9dc8affb7b16bcca215e9fa282a01c03 SHA512 3e6a8303ed28d47a559dd125462739aa421f2f1a8948ae9e4222820ca739cc761de2c17db59ccb31c624ee1d067c4ab06132bb35ad62cb9db00bc03a6a160006 -EBUILD cyrus-imapd-3.4.0.ebuild 6113 BLAKE2B 8494509b99b41b83865bd185d46f7d163e53dff2b9a22401ba57ba0fcdf26e66e9873d1c30db59cf10a62c5a22fd4e66bd7cd1de88752a1d34b559f996809f3f SHA512 e7210d01cdeaddf0db1ce094d6d44b1868fd4b701c533be75455620018d0dfa0e37330c70d8aa2cb9c14aabae4946cad15d34282076c53e3090739727f8754da +EBUILD cyrus-imapd-3.0.15.ebuild 6018 BLAKE2B a29b25cd54fc59d2c821ccb3b8f4cfea6e9351c4e00f46290c5f5afd8192eec42b88bd3904800b58f6c647d797f90a225f6abe425525c29d459f980bab586b15 SHA512 ed87bec9b03819b45844be784599c88136ba67ebd9f0980371da8f604e25aee6987d89dbdfb02c591f70de6640b5c2a1781a2b7769e8e8cc1fc0716ce26e8236 +EBUILD cyrus-imapd-3.4.1.ebuild 6108 BLAKE2B b0f21a6fce58a4dbfb8506f48c8e2c49107b512de45b4c6439631b36c8d25c9ab06b4478dbcf8cbdd6c363803181249b96698778e441d23bc5ab375ba82d3086 SHA512 959da94dbfe7b9a0b7502d545f6fc612056e97fcac789338b49a01e6b08768493904cf11a1c67f30c681013da4099531c151423ad74b818d34a09060e128e434 MISC metadata.xml 755 BLAKE2B 91a98ad4c523212160a8d64843fbc77a376c13d69c4a0ebf6c2555f546634f6192c40c75f3a0f8c24b23283643e216c33e2d9e3fd52d663b5f90b956d6f6bd9e SHA512 a289dce9ddd43330b438c3096c8b186cfbb1a0e9d0398e76cbcaff28f72b21735d699d3c470164c5dc25cd9a609ba100e794860f03a87286cdbab9e41e2d41bc diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild index 621e5456a13b..aa2bb2f6608b 100644 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools flag-o-matic pam ssl-cert DESCRIPTION="The Cyrus IMAP Server" @@ -74,12 +75,7 @@ REQUIRED_USE=" # TODO: check underlinking for other libraries PATCHES=( "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" - ) - -pkg_setup() { - # https://bugs.gentoo.org/604466 - append-ldflags $(no-as-needed) -} +) src_prepare() { default @@ -104,10 +100,15 @@ src_prepare() { src_configure() { local myconf + + # https://bugs.gentoo.org/604466 + append-ldflags $(no-as-needed) + if use afs ; then myconf+=" --with-afs-libdir=/usr/$(get_libdir)" myconf+=" --with-afs-incdir=/usr/include/afs" fi + # sphinx is unmaintained and dead, bug #662944 econf \ --enable-unit-tests \ diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild deleted file mode 100644 index 3a9516d6cca9..000000000000 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic pam ssl-cert - -DESCRIPTION="The Cyrus IMAP Server" -HOMEPAGE="https://www.cyrusimap.org/" -SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz" - -LICENSE="BSD-with-attribution GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="afs backup calalarm caps clamav http kerberos ldap \ - mysql nntp pam perl postgres replication +server sieve \ - sqlite ssl static-libs tcpd test xapian" -RESTRICT="!test? ( test )" - -CDEPEND=" - sys-libs/zlib:0= - dev-libs/libpcre:3 - >=dev-libs/cyrus-sasl-2.1.13:2 - dev-libs/jansson - dev-libs/icu:0= - sys-libs/e2fsprogs-libs - afs? ( net-fs/openafs ) - calalarm? ( dev-libs/libical:0= ) - caps? ( sys-libs/libcap ) - clamav? ( app-antivirus/clamav ) - http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - mysql? ( dev-db/mysql-connector-c:0= ) - nntp? ( !net-nntp/leafnode ) - pam? ( - sys-libs/pam - >=net-mail/mailbase-1 - ) - perl? ( dev-lang/perl:= ) - postgres? ( dev-db/postgresql:* ) - ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] ) - sqlite? ( dev-db/sqlite:3 ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - xapian? ( >=dev-libs/xapian-1.4.0:0= ) -" -DEPEND="${CDEPEND} - test? ( dev-util/cunit ) -" - -# all blockers really needed? -# file collision with app-arch/dump - bug 619584 -RDEPEND="${CDEPEND} - acct-group/mail - acct-user/cyrus - !mail-mta/courier - !net-mail/bincimap - !net-mail/courier-imap - !net-mail/uw-imap - !app-arch/dump -" - -REQUIRED_USE=" - afs? ( kerberos ) - backup? ( sqlite ) - calalarm? ( http ) - http? ( sqlite ) -" - -# https://bugs.gentoo.org/678754 -# TODO: check underlinking for other libraries -#PATCHES=( -# "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" -#) - -pkg_setup() { - # https://bugs.gentoo.org/604466 - append-ldflags $(no-as-needed) -} - -src_prepare() { - default - - # 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 - - # TODO: - # - revisit --with-sphinx-build=no? (it's docs this time, not the search engine) - # - post-emerge message re lmdb removal? - # - fix sieve usage upstream to allow it to be conditional again? - # (remove package.use.force) - # (https://github.com/cyrusimap/cyrus-imapd/pull/3270) - econf \ - --enable-unit-tests \ - --enable-murder \ - --enable-idled \ - --enable-event-notification \ - --enable-autocreate \ - --enable-pcre \ - --with-com_err \ - --with-cyrus-user=cyrus \ - --with-sasl \ - --with-sphinx-build=no \ - --without-krb \ - --without-krbdes \ - --enable-squat \ - --with-zlib \ - $(use_enable afs) \ - $(use_enable afs krb5afspts) \ - $(use_enable backup) \ - $(use_enable calalarm calalarmd) \ - $(use_with caps libcap) \ - $(use_with clamav) \ - $(use_enable nntp) \ - $(use_enable http) \ - $(use_with http nghttp2) \ - $(use_enable replication) \ - $(use_enable kerberos gssapi) \ - $(use_with ldap) \ - $(use_with mysql) \ - $(use_with postgres pgsql) \ - $(use_with perl) \ - $(use_with sqlite) \ - $(use_with ssl openssl) \ - $(use_enable server) \ - $(use_enable sieve) \ - $(use_enable static-libs static) \ - $(use_with tcpd libwrap) \ - $(use_enable xapian) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" INSTALLDIRS=vendor install - - dodoc README* - dodoc -r doc - cp -r contrib tools "${D}/usr/share/doc/${PF}" - rm -f doc/text/Makefile* - - mv "${D}"/usr/libexec/{master,cyrusmaster} || die - - insinto /etc - newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf - newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf - - sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \ - -e '/^partition-default/s|/var/.*|/var/spool/imap|' \ - -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \ - "${D}"/etc/imapd.conf - - sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \ - -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \ - "${D}"/etc/cyrus.conf - - # turn off sieve if not installed - if ! use sieve; then - sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die - fi - - # same thing for http(s) as well - if ! use http; then - sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die - fi - - newinitd "${FILESDIR}/cyrus.rc8" 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 - - echo - einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html" - einfo "for upgrade instructions." - echo -} diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild new file mode 100644 index 000000000000..d0c9a1d5d28a --- /dev/null +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild @@ -0,0 +1,236 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic pam ssl-cert + +DESCRIPTION="The Cyrus IMAP Server" +HOMEPAGE="https://www.cyrusimap.org/" +SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz" + +LICENSE="BSD-with-attribution GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="afs backup calalarm caps clamav http kerberos ldap \ + mysql nntp pam perl postgres replication +server sieve \ + sqlite ssl static-libs tcpd test xapian" +RESTRICT="!test? ( test )" + +CDEPEND=" + sys-libs/zlib:0= + dev-libs/libpcre:3 + >=dev-libs/cyrus-sasl-2.1.13:2 + dev-libs/jansson + dev-libs/icu:0= + sys-libs/e2fsprogs-libs + afs? ( net-fs/openafs ) + calalarm? ( dev-libs/libical:0= ) + caps? ( sys-libs/libcap ) + clamav? ( app-antivirus/clamav ) + http? ( + dev-libs/libxml2:2 + dev-libs/libical:0= + net-libs/nghttp2 + ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap ) + mysql? ( dev-db/mysql-connector-c:0= ) + nntp? ( !net-nntp/leafnode ) + pam? ( + >=net-mail/mailbase-1 + sys-libs/pam + ) + perl? ( dev-lang/perl:= ) + postgres? ( dev-db/postgresql:* ) + ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] ) + sqlite? ( dev-db/sqlite:3 ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xapian? ( >=dev-libs/xapian-1.4.0:0= ) +" +DEPEND="${CDEPEND} + test? ( dev-util/cunit ) +" + +# all blockers really needed? +# file collision with app-arch/dump - bug 619584 +RDEPEND="${CDEPEND} + acct-group/mail + acct-user/cyrus + !mail-mta/courier + !net-mail/bincimap + !net-mail/courier-imap + !net-mail/uw-imap + !app-arch/dump +" + +REQUIRED_USE=" + afs? ( kerberos ) + backup? ( sqlite ) + calalarm? ( http ) + http? ( sqlite ) +" + +# https://bugs.gentoo.org/678754 +# TODO: check underlinking for other libraries +#PATCHES=( +# "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" +#) + +src_prepare() { + default + + # 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 + + # https://bugs.gentoo.org/604466 + append-ldflags $(no-as-needed) + + if use afs ; then + myconf+=" --with-afs-libdir=/usr/$(get_libdir)" + myconf+=" --with-afs-incdir=/usr/include/afs" + fi + + # TODO: + # - revisit --with-sphinx-build=no? (it's docs this time, not the search engine) + # - post-emerge message re lmdb removal? + # - fix sieve usage upstream to allow it to be conditional again? + # (remove package.use.force) + # (https://github.com/cyrusimap/cyrus-imapd/pull/3270) + econf \ + --enable-unit-tests \ + --enable-murder \ + --enable-idled \ + --enable-autocreate \ + --enable-pcre \ + --with-com_err \ + --with-cyrus-user=cyrus \ + --with-sasl \ + --with-sphinx-build=no \ + --without-krb \ + --without-krbdes \ + --enable-squat \ + --with-zlib \ + $(use_enable afs) \ + $(use_enable afs krb5afspts) \ + $(use_enable backup) \ + $(use_enable calalarm calalarmd) \ + $(use_with caps libcap) \ + $(use_with clamav) \ + $(use_enable nntp) \ + $(use_enable http) \ + $(use_with http nghttp2) \ + $(use_enable replication) \ + $(use_enable kerberos gssapi) \ + $(use_with ldap) \ + $(use_with mysql) \ + $(use_with postgres pgsql) \ + $(use_with perl) \ + $(use_with sqlite) \ + $(use_with ssl openssl) \ + $(use_enable server) \ + $(use_enable sieve) \ + $(use_enable static-libs static) \ + $(use_with tcpd libwrap) \ + $(use_enable xapian) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" INSTALLDIRS=vendor install + + dodoc README* + dodoc -r doc + + cp -r contrib tools "${ED}/usr/share/doc/${PF}" || die + rm -f doc/text/Makefile* || die + + mv "${ED}"/usr/libexec/{master,cyrusmaster} || die + + insinto /etc + newins "${ED}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf + newins "${ED}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf + + sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \ + -e '/^partition-default/s|/var/.*|/var/spool/imap|' \ + -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \ + "${ED}"/etc/imapd.conf || die + + sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \ + -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \ + "${ED}"/etc/cyrus.conf || die + + # turn off sieve if not installed + if ! use sieve; then + sed -i -e "/sieve/s/^/#/" "${ED}/etc/cyrus.conf" || die + fi + + # same thing for http(s) as well + if ! use http; then + sed -i -e "/http/s/^/#/" "${ED}/etc/cyrus.conf" || die + fi + + newinitd "${FILESDIR}/cyrus.rc8" 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 + + echo + einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html" + einfo "for upgrade instructions." + echo +} -- cgit v1.2.3