diff options
Diffstat (limited to 'net-mail/cyrus-imapd')
| -rw-r--r-- | net-mail/cyrus-imapd/Manifest | 5 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild | 230 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/files/cyrus-imapd-libcap.patch | 64 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/metadata.xml | 2 |
4 files changed, 299 insertions, 2 deletions
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest index 570d6b163c9f..a26b41cb0d5f 100644 --- a/net-mail/cyrus-imapd/Manifest +++ b/net-mail/cyrus-imapd/Manifest @@ -1,4 +1,5 @@ AUX cyrus-imapd-libcap-libs-r1.patch 2175 BLAKE2B 7160b277538c43f2304f676b8d7d67034fe3724d3dfc52f6111a4191aeeb502eaaaf209c6c2cf90bf3b61a8a1dc8c536b926a7df20a6740e36b0e8ba18d5faa5 SHA512 395c07b905745a7b6318aad1a17116df90fa9aadc49d1957289bf3c5afe1c94b63723304087488f0d81b16e6875e5c261fe398c2be18c1a356982609a75034b6 +AUX cyrus-imapd-libcap.patch 2050 BLAKE2B d090ee562bf94792c0f2e6f6ccfa9d3c808f9b6dbee1efb14d8180ae366b3c92824247b969b0fe03a6d5bd5596ed5d1c364767f5fd02d3484b9ee0222b29f5c6 SHA512 93b0c3324b7918c22908a83b3ff5b13ee71cafdee8ffc8edbf73a9a2ba059fd7208cee6807685a7f1e655e28f02ac1d3d657b28ff55b93267d5b9b5cb60d760b AUX cyrus.conf 1236 BLAKE2B 291a113314a0b89b200360473aed65d6542caeae02e251e2eb88db4abe01f4a367c0a65da939d94b81fafe68aaa1e788ae5f37bc6aa43fa07e52c0b1636ebdf6 SHA512 e4e02ddd02b7c77a1b43ee49f7ab9dcada1d518aaeae6e285b206d67d05b96a2f9007264967984c18cedc62cd1e9e9f59c802eb37da6e77d6990db7ced5e559a AUX cyrus.confd 164 BLAKE2B dde11def651971e4b8f52bf2aa1f32db8c7ab7697eecb66a73fbe6f30b0b7954d21e97c3afda7a61c1400079a91de7df24e0a7beb83d3501092f132ba62142cd SHA512 52fda6a61a3cd1a4fa7579ea0eb1c9cba857f59b8ca9145f8bb73731c2a7e7f798663ef38b8c646aca066b0f571928fd13b2463415f8afd142fa45626ad8db20 AUX cyrus.pam-include 109 BLAKE2B f241d45aead08952c5c7cbd6a8a25ca6926ec99703b0e879de2176b1d348efaab0b6547200f10e65a18f1926dcbabe74e5d7eaa9b9a7c7039a35421671b5ada0 SHA512 4c96d5b0a675ddb83f26200a8cbd18c7b663aec39eb78f8509751425fb062e39e6d13e4d06090c6765b32e1cce609db075d725a18cbd4638a7f8ce5c858c47a4 @@ -6,6 +7,8 @@ AUX cyrus.rc8 699 BLAKE2B b1a7cca8f7ee5a23870108550c990dad79c76a729c82efc7771393 AUX imapd.conf 1471 BLAKE2B 5373950ac08b630a82fc00b5bf3fed9d400e092458310b64cb669e46470527b864dd5c960bae38f10fac10ca884291ee05203f4c380db57f750fb49217ca7a96 SHA512 dd19551b6e254c5e132f28748435ee61f2df86d6503643cd4946efcfba998d7bd487818ceaab1ca320289077eddd2531f6b05a493a5b5040ee5121165c3a712f DIST cyrus-imapd-3.0.10.tar.gz 10766263 BLAKE2B 366a8f524849d2173b8ea836e9f239ae20295dd435594af17d4c4682e7e672bc92c9f1bb0a60d7f7dce638beb94954f20906f9454b33830d2dcabb956ebd558a SHA512 1ae153a8f181bbe020326bec2dc177b78ef3c442f94e24e89b7a719298d93701006596dd21fa1c3a40afd75f01162b03524cf793dd7438ec7192f9a13f7614d0 DIST cyrus-imapd-3.0.11.tar.gz 10797507 BLAKE2B ac62c11e50b6d92c17056a050f3adcfdeb055930a8568873f65c14a131a04223929c00679265ab7b96a056d7642f93f484ac75b136a9d09c0fa5e0dba0e89a06 SHA512 058efc2e462729b79e431e1b5dab1addfe737aeec8b686698cd2270748275028ca5722ed3960fcd680a0393027ee1b1d7dff65872dd1d8349a3f933e81227e48 +DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6 EBUILD cyrus-imapd-3.0.10-r1.ebuild 5982 BLAKE2B bf66be0f1d2d3ecec9f8f8becfe3f30e670a578dd2134d5286c94cfaea66e4d6dc3401ded3d62de117930f8cf82495bf720532f72335ed697187b01fc68c2a2f SHA512 176f44ce62781cd4390a22c800f64b4eb09cab36c707ada066c52a623b508b28bb5797c9fbc6cced5424ae0846edfa5991453fa162676115b1ec5da9d5773dfb EBUILD cyrus-imapd-3.0.11.ebuild 5986 BLAKE2B 88c0ee292037ad25157cb3a3cfcfeace9057aa945cfc57c121dfc6e068c072061a0ca8f94b439fac8dca84ebe2728a9f67b0fa8849b4ba284afa19cac00dc30a SHA512 286cb4d0d755b3ade98ce722ba4c684c7f4424a015f9d2f162fb0dfd6a31c8f2d98dff65306b449ad47730791e76b45dcb86edc44e7df9f7ca5b9525d31a4b83 -MISC metadata.xml 677 BLAKE2B d1172bd68328762c6f54a337b9c7587bb430caf74a9b343bc747363de8508f856f3d6ed6ad2ef89c99dacb2b08528f72101fa73c1107f7b6adeb82a49a24f3e5 SHA512 e6e10b820ce521fc2bb51dc7e8bcbbc669055f9cdcc595801e0ad461bfbb7bc01125047caec84788b355f2dc30502bace67cf948647255e366a49963a52b0095 +EBUILD cyrus-imapd-3.0.13.ebuild 6072 BLAKE2B 8a2e1b938dcbaf992d9b22b8d8df0c8e2cfd9fd450d74cbe0e34265fa84f80d5c6aa4abf8811fcfd85e485da69e2ab6c132ff20942aa3a92f097e69863d0478e SHA512 41efc2a8c714e14c5ceb492adc483c6841ce9536c779ba0071e6959e3fc6dc05f90dfbaf3b1a969772a129f7329de4e123b7e05d9d009481e566581996715964 +MISC metadata.xml 688 BLAKE2B 123d6658cc5bd6f9ac3c20dcc7a06cf6300dcb83129d59e8b275d82b64c1c3ff2c315891c0ee432e6cfb445f74c78f49195e89a20616a51d70ef8bf25aeb9092 SHA512 77075e3673b25f4b4c31815f0bfa8f112e6609a36b9c57a843be5bcf9d5d1ad743e05010fbb4809960b0b74498763bc69b6abbe16e8eced683268398a7be077b diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild new file mode 100644 index 000000000000..73ea9e3ef7b3 --- /dev/null +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild @@ -0,0 +1,230 @@ +# Copyright 1999-2020 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 lmdb \ + mysql nntp pam perl postgres replication +server sieve snmp \ + 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 ) + lmdb? ( dev-db/lmdb:0= ) + 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:* ) + snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) + ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] ) + sqlite? ( dev-db/sqlite:3 ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 + snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) + ) + 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" + "${FILESDIR}/cyrus-imapd-libcap.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 + # sphinx is unmaintained and dead, bug #662944 + econf \ + --enable-unit-tests \ + --enable-murder \ + --enable-idled \ + --enable-event-notification \ + --enable-autocreate \ + --enable-pcre \ + --with-com_err \ + --with-cyrus-user=cyrus \ + --with-sasl \ + --without-krb \ + --without-krbdes \ + --disable-sphinx \ + --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 lmdb) \ + $(use_with mysql) \ + $(use_with postgres pgsql) \ + $(use_with perl) \ + $(use_with sqlite) \ + $(use_with ssl openssl) \ + $(use_enable server) \ + $(use_enable sieve) \ + $(use_with snmp) \ + $(use_enable static-libs static) \ + $(use_with tcpd libwrap) \ + $(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/files/cyrus-imapd-libcap.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap.patch new file mode 100644 index 000000000000..eda404bf0ddb --- /dev/null +++ b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap.patch @@ -0,0 +1,64 @@ +Bug: https://bugs.gentoo.org/713728 +From f712d1268d5288e7f955567a07e99f409aba3e4a Mon Sep 17 00:00:00 2001 +From: Jakob Gahde <j5lx@fmail.co.uk> +Date: Sat, 15 Feb 2020 17:18:16 +0100 +Subject: [PATCH] Add compatibility with recent versions of libcap + +--- + lib/util.c | 6 +++--- + master/master.c | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/util.c b/lib/util.c +index 5f3cb1933..1256671f6 100644 +--- a/lib/util.c ++++ b/lib/util.c +@@ -579,7 +579,7 @@ EXPORTED int set_caps(int stage __attribute__((unused)), + } + #endif + +-static int cap_setuid(int uid, int is_master) ++static int cyrus_cap_setuid(int uid, int is_master) + { + int r; + +@@ -599,7 +599,7 @@ EXPORTED int become_cyrus(int is_master) + int result; + static uid_t uid = 0; + +- if (uid) return cap_setuid(uid, is_master); ++ if (uid) return cyrus_cap_setuid(uid, is_master); + + const char *cyrus = cyrus_user(); + const char *mail = cyrus_group(); +@@ -645,7 +645,7 @@ EXPORTED int become_cyrus(int is_master) + return -1; + } + +- result = cap_setuid(newuid, is_master); ++ result = cyrus_cap_setuid(newuid, is_master); + + /* Only set static uid if successful, else future calls won't reset gid */ + if (result == 0) +diff --git a/master/master.c b/master/master.c +index 9c4d6f097..57f49f84a 100644 +--- a/master/master.c ++++ b/master/master.c +@@ -285,7 +285,7 @@ static void get_statsock(int filedes[2]) + fatalf(1, "unable to set close-on-exec: %m"); + } + +-static int cap_bind(int socket, struct sockaddr *addr, socklen_t length) ++static int cyrus_cap_bind(int socket, struct sockaddr *addr, socklen_t length) + { + int r; + +@@ -643,7 +643,7 @@ static void service_create(struct service *s) + #endif + + oldumask = umask((mode_t) 0); /* for linux */ +- r = cap_bind(s->socket, res->ai_addr, res->ai_addrlen); ++ r = cyrus_cap_bind(s->socket, res->ai_addr, res->ai_addrlen); + umask(oldumask); + if (r < 0) { + syslog(LOG_ERR, "unable to bind to %s/%s socket: %m", diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml index 271895d4f887..c0215ef6fa4f 100644 --- a/net-mail/cyrus-imapd/metadata.xml +++ b/net-mail/cyrus-imapd/metadata.xml @@ -5,7 +5,7 @@ <use> <flag name="replication">Enable replication support</flag> <flag name="sieve">Enable sieve support</flag> - <flag name="http">Enable http support</flag> + <flag name="http">Enable http and http/2 support</flag> <flag name="server">Enable building server binaries</flag> <flag name="backup">Enable backup service support</flag> <flag name="calalarm">Enable CalDAV alarm support</flag> |