diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-11 19:55:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-11 19:55:43 +0100 |
commit | 185fa19bbf68a4d4dca534d2b46729207a177f16 (patch) | |
tree | a8a537b82fda83a0799c2ca9887f212558363aa7 /net-mail/cyrus-imapd | |
parent | c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (diff) |
gentoo resync : 11.05.2021
Diffstat (limited to 'net-mail/cyrus-imapd')
-rw-r--r-- | net-mail/cyrus-imapd/Manifest | 6 | ||||
-rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild | 13 | ||||
-rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild (renamed from net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild) | 42 |
3 files changed, 32 insertions, 29 deletions
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.1.ebuild index 3a9516d6cca9..d0c9a1d5d28a 100644 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild @@ -28,15 +28,19 @@ CDEPEND=" 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 ) + 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 - ) + >=net-mail/mailbase-1 + sys-libs/pam + ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] ) @@ -73,11 +77,6 @@ REQUIRED_USE=" # "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" #) -pkg_setup() { - # https://bugs.gentoo.org/604466 - append-ldflags $(no-as-needed) -} - src_prepare() { default @@ -103,6 +102,9 @@ 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" @@ -118,7 +120,6 @@ src_configure() { --enable-unit-tests \ --enable-murder \ --enable-idled \ - --enable-event-notification \ --enable-autocreate \ --enable-pcre \ --with-com_err \ @@ -159,32 +160,33 @@ src_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 + 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 "${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 "${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|' \ - "${D}"/etc/imapd.conf + "${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|' \ - "${D}"/etc/cyrus.conf + "${ED}"/etc/cyrus.conf || die # turn off sieve if not installed if ! use sieve; then - sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die + 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/^/#/" "${D}/etc/cyrus.conf" || die + sed -i -e "/http/s/^/#/" "${ED}/etc/cyrus.conf" || die fi newinitd "${FILESDIR}/cyrus.rc8" cyrus @@ -221,7 +223,7 @@ 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} fi |