commit: 84e9b414a31b33d01fd785378bac68833031792e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Mar 6 10:01:54 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Mar 6 10:08:17 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e9b414
net-mail/cyrus-imapd: fix automagic and missing dependencies; fix crash Automagic dependency changes: - USE=http: app-arch/brotli, app-arch/zstd, and sci-libs/shapelib - USE=perl: virtual/perl-Term-ReadLine - sys-apps/util-linux for libuuid - Proactively disable libwslay, libchardet, and libcld2 (unpackaged) - Disable libsrs2 support (mail-filter/libsrs2) as it was automagic before Build-time dependency changes: - sys-devel/flex - virtual/pkgconfig - virtual/yacc Closes: https://bugs.gentoo.org/818925 Closes: https://bugs.gentoo.org/834573 Thanks-to: Thomas Arnett <tom_gentoo <AT> misfeature.net> Signed-off-by: Sam James <sam <AT> gentoo.org> ...pd-3.4.3.ebuild => cyrus-imapd-3.4.3-r1.ebuild} | 38 +++++++++++++++------- profiles/arch/hppa/package.use.mask | 4 +++ profiles/arch/ia64/package.use.mask | 4 +++ profiles/arch/sparc/package.use.mask | 4 +++ 4 files changed, 39 insertions(+), 11 deletions(-) diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r1.ebuild similarity index 90% rename from net-mail/cyrus-imapd/cyrus-imapd-3.4.3.ebuild rename to net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r1.ebuild index 5bcd06cfed19..6f4377b85644 100644 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.3.ebuild +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r1.ebuild @@ -3,6 +3,7 @@ EAPI=8 +# Keep an eye on https://www.cyrusimap.org/imap/developer/compiling.html! inherit autotools flag-o-matic pam ssl-cert DESCRIPTION="The Cyrus IMAP Server" @@ -17,21 +18,24 @@ IUSE="afs backup calalarm caps clamav http kerberos ldap \ sqlite ssl static-libs tcpd test xapian" RESTRICT="!test? ( test )" -CDEPEND=" - sys-libs/zlib:= - dev-libs/libpcre:3 +DEPEND="dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson:= dev-libs/icu:= - sys-fs/e2fsprogs + sys-apps/util-linux + sys-fs/e2fsprogs:= + sys-libs/zlib:= afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( - dev-libs/libxml2:2 + app-arch/brotli:= + app-arch/zstd:= + dev-libs/libxml2 dev-libs/libical:= - net-libs/nghttp2 + net-libs/nghttp2:= + sci-libs/shapelib:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) @@ -41,18 +45,18 @@ CDEPEND=" >=net-mail/mailbase-1 sys-libs/pam ) - perl? ( dev-lang/perl:= ) + perl? ( + dev-lang/perl:= + virtual/perl-Term-ReadLine + ) postgres? ( dev-db/postgresql:* ) ssl? ( >=dev-libs/openssl-1.0.1e:=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xapian? ( >=dev-libs/xapian-1.4.0:= )" -DEPEND="${CDEPEND} - test? ( dev-util/cunit )" - # all blockers really needed? # file collision with app-arch/dump - bug 619584 -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} acct-group/mail acct-user/cyrus !mail-mta/courier @@ -60,6 +64,10 @@ RDEPEND="${CDEPEND} !net-mail/courier-imap !net-mail/uw-imap !app-arch/dump" +DEPEND+=" test? ( dev-util/cunit )" +BDEPEND="sys-devel/flex + virtual/pkgconfig + virtual/yacc" REQUIRED_USE="afs? ( kerberos ) backup? ( sqlite ) @@ -100,6 +108,10 @@ src_configure() { # bug #604466 append-ldflags $(no-as-needed) + # Workaround runtime crash + # bug #834573 + append-flags -fno-toplevel-reorder + if use afs ; then myconf+=" --with-afs-libdir=/usr/$(get_libdir)" myconf+=" --with-afs-incdir=/usr/include/afs" @@ -121,6 +133,10 @@ src_configure() { --without-krbdes \ --enable-squat \ --with-zlib \ + --without-wslay \ + --without-chardet \ + --without-cld2 \ + --disable-srs \ $(use_enable afs) \ $(use_enable afs krb5afspts) \ $(use_enable backup) \ diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask index 7620037f991f..18a3a96b39d0 100644 --- a/profiles/arch/hppa/package.use.mask +++ b/profiles/arch/hppa/package.use.mask @@ -4,6 +4,10 @@ # NOTE: When masking a USE flag due to missing keywords, please file a keyword # request bug for the hppa arch. +# Sam James <s...@gentoo.org> (2022-03-06) +# Unkeyworded dependencies +net-mail/cyrus-imapd http + # Adel Kara Slimane <adel...@zegrapher.com> (2022-02-17) # Mask AMF keyword on non-amd64 arches # It is unusable, for now, in other arches diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask index 0285d16d0270..9a979c438247 100644 --- a/profiles/arch/ia64/package.use.mask +++ b/profiles/arch/ia64/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James <s...@gentoo.org> (2022-03-06) +# Unkeyworded dependencies +net-mail/cyrus-imapd http + # Adel Kara Slimane <adel...@zegrapher.com> (2022-01-11) # Mask AMF keyword on non-amd64 arches # It is unusable, for now, in other arches diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask index dcafc2dac2b2..4defb78de906 100644 --- a/profiles/arch/sparc/package.use.mask +++ b/profiles/arch/sparc/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James <s...@gentoo.org> (2022-03-06) +# Unkeyworded dependencies +net-mail/cyrus-imapd http + # Adel Kara Slimane <adel...@zegrapher.com> (2022-02-17) # Mask AMF keyword on non-amd64 arches # It is unusable, for now, in other arches
