diff options
Diffstat (limited to 'net-mail/cyrus-imapd')
| -rw-r--r-- | net-mail/cyrus-imapd/Manifest | 8 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild | 225 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild | 2 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild (renamed from net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild) | 30 |
4 files changed, 21 insertions, 244 deletions
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest index 0b45ddbcd484..b99776d7df26 100644 --- a/net-mail/cyrus-imapd/Manifest +++ b/net-mail/cyrus-imapd/Manifest @@ -5,10 +5,8 @@ AUX cyrus.confd 164 BLAKE2B dde11def651971e4b8f52bf2aa1f32db8c7ab7697eecb66a73fb AUX cyrus.pam-include 109 BLAKE2B f241d45aead08952c5c7cbd6a8a25ca6926ec99703b0e879de2176b1d348efaab0b6547200f10e65a18f1926dcbabe74e5d7eaa9b9a7c7039a35421671b5ada0 SHA512 4c96d5b0a675ddb83f26200a8cbd18c7b663aec39eb78f8509751425fb062e39e6d13e4d06090c6765b32e1cce609db075d725a18cbd4638a7f8ce5c858c47a4 AUX cyrus.rc8 699 BLAKE2B b1a7cca8f7ee5a23870108550c990dad79c76a729c82efc77713939a537141df8b1ace2bfc6f3a384c28e155bece1bec480bbaf90fcd1899af854d441b518eee SHA512 9340877dd83cd4d5770c12a7f107ee697b42736a57cf304695f03f9f673c5c53b4477f20832ee4815515b2e33e8b33335b298cf5dd48015a6a581b8ab4f4f240 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 -EBUILD cyrus-imapd-3.0.13.ebuild 6069 BLAKE2B 462ed74a7efd3bf986dc3f06a55034b003dc079e073aee00e7ba918952cab179c6f6e14f436b11c7ab11b0c47757dbaeef5ae232608d057704e6d13b22d5488d SHA512 9d166468ffd343788761c57ec55b1b78a923ae85949c81292532c40305e57b3a5904a03434dfd0138ed9ce2cfc3e93168455ed8dd884e5d9f78f0618a2191d16 +DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209 +EBUILD cyrus-imapd-3.0.13.ebuild 6068 BLAKE2B f6f8e1e4ed70120380a8115820fde63a86bf1eec1472ab58b3a382eb73fd643b87668fa5bb6af48b752d8f6df91b39b3e99083a0401b71bc36fa22399f8f5fb1 SHA512 dd16ecf950d4ef61c7cee53133d8890d940a2d91d10ff32bc56ce17b9a7fb9ae0da47a40d31e1435e9ed14d26579de1a4e6945b787b712f09e2773ed9316bf74 +EBUILD cyrus-imapd-3.0.14.ebuild 6032 BLAKE2B 993cb480007f6a76a8789ece078fc162f86ba79d926b488a06d681cb84668abf52e745419bb7f7b3eb07328285d26a7ebb58b469d972baca6e87067cb52ba929 SHA512 eb934a7a3ade30240159999e210bdaf0b638a46d94c89ce25e07c09f35db686d161fd89916c817dabd24c91b0e67fa167d37be88ca8bdd56bfc186d70b86b60d MISC metadata.xml 688 BLAKE2B 123d6658cc5bd6f9ac3c20dcc7a06cf6300dcb83129d59e8b275d82b64c1c3ff2c315891c0ee432e6cfb445f74c78f49195e89a20616a51d70ef8bf25aeb9092 SHA512 77075e3673b25f4b4c31815f0bfa8f112e6609a36b9c57a843be5bcf9d5d1ad743e05010fbb4809960b0b74498763bc69b6abbe16e8eced683268398a7be077b diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild deleted file mode 100644 index 855c2e53448b..000000000000 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild +++ /dev/null @@ -1,225 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools flag-o-matic pam ssl-cert user - -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= ) - 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} - !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() { - enewuser cyrus -1 -1 /usr/cyrus mail - # 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_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/cyrus-imapd-3.0.13.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild index 349c1c1f07a3..ecad086e12b0 100644 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild @@ -10,7 +10,7 @@ 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" +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" diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild index 5f70b01ab23e..3487441622a7 100644 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools flag-o-matic pam ssl-cert user +EAPI=7 +inherit autotools flag-o-matic pam ssl-cert DESCRIPTION="The Cyrus IMAP Server" HOMEPAGE="https://www.cyrusimap.org/" @@ -27,7 +27,7 @@ CDEPEND=" calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) - http? ( dev-libs/libxml2:2 dev-libs/libical:0= ) + http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) @@ -54,6 +54,8 @@ DEPEND="${CDEPEND} # 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 @@ -70,10 +72,11 @@ REQUIRED_USE=" # https://bugs.gentoo.org/678754 # TODO: check underlinking for other libraries -PATCHES=( "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" ) +PATCHES=( + "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" + ) pkg_setup() { - enewuser cyrus -1 -1 /usr/cyrus mail # https://bugs.gentoo.org/604466 append-ldflags $(no-as-needed) } @@ -129,6 +132,7 @@ src_configure() { $(use_with clamav) \ $(use_enable nntp) \ $(use_enable http) \ + $(use_with http nghttp2) \ $(use_enable replication) \ $(use_enable kerberos gssapi) \ $(use_with ldap) \ @@ -155,20 +159,20 @@ src_install() { cp -r contrib tools "${D}/usr/share/doc/${PF}" rm -f doc/text/Makefile* - mv "${D}"usr/libexec/{master,cyrusmaster} || die + 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 + 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 + "${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 + "${D}"/etc/cyrus.conf # turn off sieve if not installed if ! use sieve; then @@ -212,9 +216,9 @@ pkg_preinst() { pkg_postinst() { # do not install server.{key,pem) if they exist if use ssl ; then - if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; 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} + chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem} fi fi |