diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-26 15:48:02 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-26 15:48:02 +0000 |
commit | 38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch) | |
tree | 6fce284d5bfddaf597a490ac66069d16c6a485db /net-mail/cyrus-imapd | |
parent | 0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff) |
gentoo resync : 25.01.2018
Diffstat (limited to 'net-mail/cyrus-imapd')
-rw-r--r-- | net-mail/cyrus-imapd/Manifest | 7 | ||||
-rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild | 178 | ||||
-rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild | 215 | ||||
-rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild (renamed from net-mail/cyrus-imapd/cyrus-imapd-3.0.3-r1.ebuild) | 13 | ||||
-rw-r--r-- | net-mail/cyrus-imapd/files/cyrus.rc7 | 22 |
5 files changed, 11 insertions, 424 deletions
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest index f8fab73bb314..2af490ed7573 100644 --- a/net-mail/cyrus-imapd/Manifest +++ b/net-mail/cyrus-imapd/Manifest @@ -7,17 +7,14 @@ AUX cyrus.conf 1236 BLAKE2B 291a113314a0b89b200360473aed65d6542caeae02e251e2eb88 AUX cyrus.confd 164 BLAKE2B dde11def651971e4b8f52bf2aa1f32db8c7ab7697eecb66a73fbe6f30b0b7954d21e97c3afda7a61c1400079a91de7df24e0a7beb83d3501092f132ba62142cd SHA512 52fda6a61a3cd1a4fa7579ea0eb1c9cba857f59b8ca9145f8bb73731c2a7e7f798663ef38b8c646aca066b0f571928fd13b2463415f8afd142fa45626ad8db20 AUX cyrus.pam-include 109 BLAKE2B f241d45aead08952c5c7cbd6a8a25ca6926ec99703b0e879de2176b1d348efaab0b6547200f10e65a18f1926dcbabe74e5d7eaa9b9a7c7039a35421671b5ada0 SHA512 4c96d5b0a675ddb83f26200a8cbd18c7b663aec39eb78f8509751425fb062e39e6d13e4d06090c6765b32e1cce609db075d725a18cbd4638a7f8ce5c858c47a4 AUX cyrus.rc6 460 BLAKE2B ea05165af565d6362ec23b08c80b03573ba8ef6aa72a17631dc2f795cafa96a7f992c00115cf3c438e6ff61138f245adedb614195ae51faf01281475d994335d SHA512 926aa90c5285ed05bbc0cef5c4351acef26e70772bb7a0e490c05a9a4ce9e808e250e19bac1640a61852fa394e42368d33f88ea9b0b8d1751224daef04350920 -AUX cyrus.rc7 459 BLAKE2B ad164576c7bfb70b4086ac077e6bf0407888365e1c196d4f849097f8bd5a4fc60152006d764f6d535a5c4dc526cbe84553e6abbb767d431a0d50250aa63f03dd SHA512 acd561be944aa5ebfe4f89f19552b61416ee2355f37cf2c3d6e44294d7079e382a3e4ba2ce606842c283ce8c02cdc8c6dbbd4b08758d8e99f74fe8a258b89ca3 AUX cyrus.rc8 699 BLAKE2B b1a7cca8f7ee5a23870108550c990dad79c76a729c82efc77713939a537141df8b1ace2bfc6f3a384c28e155bece1bec480bbaf90fcd1899af854d441b518eee SHA512 9340877dd83cd4d5770c12a7f107ee697b42736a57cf304695f03f9f673c5c53b4477f20832ee4815515b2e33e8b33335b298cf5dd48015a6a581b8ab4f4f240 AUX imapd.conf 1471 BLAKE2B 5373950ac08b630a82fc00b5bf3fed9d400e092458310b64cb669e46470527b864dd5c960bae38f10fac10ca884291ee05203f4c380db57f750fb49217ca7a96 SHA512 dd19551b6e254c5e132f28748435ee61f2df86d6503643cd4946efcfba998d7bd487818ceaab1ca320289077eddd2531f6b05a493a5b5040ee5121165c3a712f DIST cyrus-imapd-2.5.10.tar.gz 3103914 BLAKE2B 588764d47b3d458633e0ced2619cc1cccdf26c18d54effd38d4f9f6df12ad98f554efa632af9c7e4b43d7899b04a14a8a71fc152ea360a38cdab6a50685ddf5e SHA512 78b85e37c63f1dbb60898da229f70f45810326a01244067d23b1317e2c2ae3326e48b6944787d59024e44c48c441ed2b848d6a83c451c192a3bb95c8f37880fa DIST cyrus-imapd-2.5.11.tar.gz 3109188 BLAKE2B 9382d8e4b9317f7fa12f63f7262eb0c6a1571d405665694f735fb72b6de76058ea586172f2001babe280170f122c887374b1378f51fe9c89a522aaeb74b885c9 SHA512 bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538 -DIST cyrus-imapd-3.0.3.tar.gz 10819454 BLAKE2B 5f86378e37c39c5f6fb6f6280d0b0a500e671cbe29968f1579c6be59e15335e1b36b0d119e03bc683ed17b594ddebc7d0cd5588f762062ee9a01f8633e7f12f7 SHA512 0b5c3167d80d91371e3f07e64b8bc8c085481946e6536dd407976f6f8ae66405fd1f6d2ff5ad51e5e0eb827a64d90d93daf72d5a1afa409782a287bec29665df DIST cyrus-imapd-3.0.4.tar.gz 10819487 BLAKE2B 209e379731c996ee083b0de61d6122b3756d1f6880071ebf015157057cf45845961d762ee762ae56213f72f15c01df29ab2d2661c4e352c6b4a680924d15d7b0 SHA512 9ceb7ac837c932c70fa0c1583bf8700b3ec27568d72538ae8d59f2f551e3007b3c2fc68fd29c009597c3949345dbe1bf2eb614bea038d70a5b49e5507df6b69a +DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873 SHA512 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410 EBUILD cyrus-imapd-2.5.10.ebuild 4676 BLAKE2B 4e3960ade8b08e85a9beec894dd11bd144b218ca665fb4ddd762db8e881dbaa8a1f814fdf8e811e7d54e5d4f6456d601898f2fd1b7065be6edfa6c38dd83b965 SHA512 80bd9c18c80d5408862f4ad20b4f0f82c21b3a11f5ef54e504cdea454e0a7fde5f0cd8ffbf455665b0a907eadc243c45d5ccae9a08dde5faca7ff2f9cddb1ceb EBUILD cyrus-imapd-2.5.11-r1.ebuild 4772 BLAKE2B 72c2a8d1927728dfb638eac22ed3ecff4651dcee12250e169683dc910c8132320ec23b09408eace65799be99629c529a37298f5cb51d91817fa7c44899d02fac SHA512 c14ac12b41bb9594b7686ff6f1fe44e9af160f8eed4cfa7e1c94d1c5098fb55ec160b7b6bfe30bfca494278d18bfd3c9c37a8ed3991e02889512d43f9dd4ceb1 -EBUILD cyrus-imapd-2.5.11.ebuild 4709 BLAKE2B b747381e94ddf12d2a9728a8587e90e1a95bcb6acc1c9a50c3c12dff9263556159626a83f753190978cb2b5d8178c317ced0cbb0b0d98cc9a9f54fc460faf3fe SHA512 a07326ba69a7f81d900838e4796f85c90c00aaf16385818b8d3f47f70e77ff9a2de135a76effda42db5656b96f70c3369632c1138cb5fd377a2b8507da6e9d71 -EBUILD cyrus-imapd-3.0.3-r1.ebuild 5754 BLAKE2B f0f0ce5188675cdcf38facdc6c12ddb92322087475fc035b9b3c5084a39de64b6a50bff295ba01eb504634a4d7bada65421fcd0d5a8854ad8c09acf83570b866 SHA512 d345ee957cbeca761b6bc6f60fa4c010e2887f73a08cec49c16fb7082450258d3d900856e6773ba9ffa7fdba5ddf061616adc626c61b44e6f98b1dea8c218a1b -EBUILD cyrus-imapd-3.0.3.ebuild 5702 BLAKE2B 49532668ab5fc591f0d35862afc61e73f9ab00faaef944595d64a82fcbe404a1e00cc166c592e13f902d6cb3bab86fedc651397b94f9625ff2642526187608eb SHA512 35aaa7a6d27ac8186fde64371b9866cd1683e923d31a04cf2a11207955e0b92a181fba5a2707ccf8e4dd3906a7041046c9254fd09b18e6f110a58416e98cdecb EBUILD cyrus-imapd-3.0.4.ebuild 5896 BLAKE2B 933086d8d6d45ec33a5a82a0a4a90b1c83848a9d59e39d2027da4ea52a28e9302040e39f61a28ef6112d012cd7bd4b9934506993cb2b8d6a1de75a15a59828d0 SHA512 e0ebe34958c93003798a045c64287dda83d97d1d829889f4601446567ac2f0334a03acd554f0cacdd86b90fbf167f13c020e5b3edbdf78f3d9f9a9d871ea140f +EBUILD cyrus-imapd-3.0.5.ebuild 5946 BLAKE2B 47bd3523d9a8f915df052c40cd9145bc60ee5acefa39bdb0921b983790d48c1692b365beded17e765f68dc04fc56b1a48597cfa95aa47cfee99b2a9925f042da SHA512 93e5f2d9c9410f157aabbe3abcd8e415628a412ea55a2f74493c03700e1d4180e108aaaee9a3d1a7020c81fd5cf0054f67d67a55d15976ff95f9469b73744f7a MISC metadata.xml 871 BLAKE2B 4fe48aebf6e59d75cf53cafc92d5bf4668c4a489dba3a43d6df6c4efaeb74590c49f083e03ee9d5eed32ee09b324d8116bcb0fc77576f8aa77a96c56a739dfae SHA512 25449c1218dfad7b692b37b799a659b6a10e0e31bb003fbed27b3b43ce3610f9ee5f17a995cf9244d5027ad84889a8e79a774f63101bb6ea35054ce9dbb1fe20 diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild deleted file mode 100644 index 5ed4f1309661..000000000000 --- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools multilib pam ssl-cert user toolchain-funcs - -MY_P=${P/_/} - -DESCRIPTION="The Cyrus IMAP Server" -HOMEPAGE="http://www.cyrusimap.org/" -SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz" - -LICENSE="BSD-with-attribution" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \ - replication +server sieve snmp sqlite ssl static-libs tcpd" - -# virtual/mysql-5.5 added for the --variable= option below -DEPEND="sys-libs/zlib - dev-libs/libpcre - >=dev-libs/cyrus-sasl-2.1.13 - dev-libs/jansson - afs? ( net-fs/openafs ) - berkdb? ( >=sys-libs/db-3.2:* ) - clamav? ( app-antivirus/clamav ) - http? ( dev-libs/libxml2 dev-libs/libical ) - kerberos? ( virtual/krb5 ) - mysql? ( >=virtual/mysql-5.5 ) - nntp? ( !net-nntp/leafnode ) - pam? ( - virtual/pam - >=net-mail/mailbase-1 - ) - perl? ( dev-lang/perl:= ) - postgres? ( dev-db/postgresql:* ) - snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )" - -# all blockers really needed? -RDEPEND="${DEPEND} - !mail-mta/courier - !net-mail/bincimap - !net-mail/courier-imap - !net-mail/uw-imap - !net-mail/cyrus-imap-admin" - -REQUIRED_USE="afs? ( kerberos ) - http? ( sqlite )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - enewuser cyrus -1 -1 /usr/cyrus mail -} - -src_prepare() { - eapply -p0 "${FILESDIR}/${PN}-db.patch" - # 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 - - eapply_user - eautoreconf -} - -src_configure() { - local myconf - if use afs ; then - myconf+=" --with-afs-libdir=/usr/$(get_libdir)" - myconf+=" --with-afs-incdir=/usr/include/afs" - fi - econf \ - --enable-murder \ - --enable-netscapehack \ - --enable-idled \ - --enable-event-notification \ - --enable-autocreate \ - --enable-pcre \ - --with-service-path=/usr/$(get_libdir)/cyrus \ - --with-cyrus-user=cyrus \ - --with-cyrus-group=mail \ - --with-com_err=yes \ - --with-sasl \ - --without-krb \ - --without-krbdes \ - --with-zlib \ - $(use_enable afs) \ - $(use_enable afs krb5afspts) \ - $(use_with berkdb bdb) \ - $(use_with clamav) \ - $(use_enable nntp) \ - $(use_enable http) \ - $(use_enable replication) \ - $(use_enable kerberos gssapi) \ - $(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) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" INSTALLDIRS=vendor install - - dodoc README* - dodoc -r doc - cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html" - cp -r contrib tools "${D}/usr/share/doc/${PF}" - rm -f doc/text/Makefile* - - insinto /etc - doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf" - - # turn off sieve if not installed - if ! use sieve; then - sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die - fi - - newinitd "${FILESDIR}/cyrus.rc6" 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 -} diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild deleted file mode 100644 index f4638e0cc79e..000000000000 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools pam ssl-cert user - -MY_P=${P/_/} - -DESCRIPTION="The Cyrus IMAP Server" -HOMEPAGE="http://www.cyrusimap.org/" -SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz" - -LICENSE="BSD-with-attribution" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \ - mysql nntp pam perl postgres replication +server sieve snmp \ - sphinx sqlite ssl static-libs tcpd test xapian" - -# virtual/mysql-5.5 added for the --variable= option below -CDEPEND="sys-libs/zlib - dev-libs/libpcre - >=dev-libs/cyrus-sasl-2.1.13 - dev-libs/jansson - dev-libs/icu:= - afs? ( net-fs/openafs ) - caps? ( sys-libs/libcap ) - clamav? ( app-antivirus/clamav ) - http? ( dev-libs/libxml2 dev-libs/libical ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - lmdb? ( dev-db/lmdb ) - mysql? ( >=virtual/mysql-5.5 ) - nntp? ( !net-nntp/leafnode ) - pam? ( - virtual/pam - >=net-mail/mailbase-1 - ) - perl? ( dev-lang/perl:= ) - postgres? ( dev-db/postgresql:* ) - snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) - 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[tcpd=] ) ) - xapian? ( >=dev-libs/xapian-1.4.0 )" - -DEPEND="${CDEPEND} - test? ( dev-util/cunit )" - -# all blockers really needed? -RDEPEND="${CDEPEND} - !mail-mta/courier - !net-mail/bincimap - !net-mail/courier-imap - !net-mail/uw-imap - !net-mail/cyrus-imap-admin" - -REQUIRED_USE="afs? ( kerberos ) - backup? ( sqlite ) - calalarm? ( http ) - http? ( sqlite ) - jmap? ( http xapian ) - sphinx? ( mysql )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - enewuser cyrus -1 -1 /usr/cyrus mail -} - -src_prepare() { - # bug 604470 - eapply -p1 "${FILESDIR}/${PN}-sieve-libs-v4.patch" - eapply -p1 "${FILESDIR}/${PN}-fix-tests.patch" - # 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 - - eapply_user - eautoreconf -} - -src_configure() { - local myconf - if use afs ; then - myconf+=" --with-afs-libdir=/usr/$(get_libdir)" - myconf+=" --with-afs-incdir=/usr/include/afs" - fi - econf \ - --enable-unit-tests \ - --enable-murder \ - --enable-idled \ - --enable-event-notification \ - --enable-autocreate \ - --enable-pcre \ - --with-cyrus-user=cyrus \ - --with-cyrus-group=mail \ - --with-com_err=yes \ - --with-sasl \ - --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 jmap) \ - $(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 sphinx) \ - $(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/${P}/doc/examples/cyrus_conf/normal.conf" cyrus.conf - newins "${D}usr/share/doc/${P}/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 - - # 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.rc7" 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 - ewarn "Please see http://www.cyrusimap.org/imap/download/upgrade.html" - ewarn "for upgrade instructions." - echo -} diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.3-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild index 6743077fa02e..13ed85c3a1d6 100644 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.3-r1.ebuild +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools pam ssl-cert user +inherit autotools flag-o-matic pam ssl-cert user MY_P=${P/_/} @@ -66,6 +66,7 @@ S=${WORKDIR}/${MY_P} pkg_setup() { enewuser cyrus -1 -1 /usr/cyrus mail + append-ldflags $(no-as-needed) } src_prepare() { @@ -158,9 +159,13 @@ src_install() { sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \ -e '/^partition-default/s|/var/.*|/var/spool/imap|' \ - -e '/^sievedir/s|/var/.*|/var//imap/sieve|' \ + -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 @@ -170,7 +175,7 @@ src_install() { sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die fi - newinitd "${FILESDIR}/cyrus.rc7" cyrus + newinitd "${FILESDIR}/cyrus.rc8" cyrus newconfd "${FILESDIR}/cyrus.confd" cyrus newpamd "${FILESDIR}/cyrus.pam-include" sieve diff --git a/net-mail/cyrus-imapd/files/cyrus.rc7 b/net-mail/cyrus-imapd/files/cyrus.rc7 deleted file mode 100644 index 348b01c04921..000000000000 --- a/net-mail/cyrus-imapd/files/cyrus.rc7 +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - use net - use dns logger - after drac saslauthd -} - -start() { - ebegin "Starting cyrus imapd" - start-stop-daemon --start --quiet --background \ - --exec /usr/libexec/cyrusmaster -- ${CYRUS_OPTS} - eend $? -} - -stop() { - ebegin "Stopping cyrus imapd" - start-stop-daemon --stop --quiet --pidfile /run/cyrus-master.pid - eend $? -} |