From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BA82415800F for ; Mon, 13 Feb 2023 04:23:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3BDFE07EF; Mon, 13 Feb 2023 04:23:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5892E07EF for ; Mon, 13 Feb 2023 04:23:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D3CF340D1B for ; Mon, 13 Feb 2023 04:23:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A919E89C for ; Mon, 13 Feb 2023 04:23:52 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1676261382.de49f727f63b4c0f3a4c61a33e64b6a978df9312.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-mail/cyrus-imapd/Manifest net-mail/cyrus-imapd/cyrus-imapd-3.4.5.ebuild X-VCS-Directories: net-mail/cyrus-imapd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: de49f727f63b4c0f3a4c61a33e64b6a978df9312 X-VCS-Branch: master Date: Mon, 13 Feb 2023 04:23:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4ec3e9ea-6b4a-43b6-98cd-541de9e26725 X-Archives-Hash: f6d0495c96e61ae1c4652fba83918785 commit: de49f727f63b4c0f3a4c61a33e64b6a978df9312 Author: Sam James gentoo org> AuthorDate: Mon Feb 13 04:09:42 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Feb 13 04:09:42 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de49f727 net-mail/cyrus-imapd: add 3.4.5 Signed-off-by: Sam James gentoo.org> net-mail/cyrus-imapd/Manifest | 1 + net-mail/cyrus-imapd/cyrus-imapd-3.4.5.ebuild | 247 ++++++++++++++++++++++++++ 2 files changed, 248 insertions(+) diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest index 5ec20a19c755..ef9fd5701264 100644 --- a/net-mail/cyrus-imapd/Manifest +++ b/net-mail/cyrus-imapd/Manifest @@ -4,3 +4,4 @@ DIST cyrus-imapd-3.0.18.tar.gz 11465046 BLAKE2B 74b0ad899341959dd70f872fe5c190dd DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6 DIST cyrus-imapd-3.4.3.tar.gz 13182110 BLAKE2B 485df8e2518a55a3b096d0c330d55f7ed93209ca4ab5851dda53083082e203ad9b1d9218c0863a9bd1e678a732427ef499ff78bacf2d3fb2fe18464186a9e6d2 SHA512 5c4db2a0c26d2323332c1ba67f7b207acfad15f0442f20c6c8a205b5423498465524398315946213c8168bc7eba1fd9f7dc573a91efac6708bfbaf2cb57e9276 DIST cyrus-imapd-3.4.4.tar.gz 13236335 BLAKE2B 105ae3defcf321a01394b38672b080ea58f68ecdc41384af46186c6ef88c02061ac066bd3e382d7b649761d5e462f2310a4568989c87e5ec518e08051179f4b3 SHA512 7904a9d0535e9d606bbb7748a4886e10092e2b682180dddf94933199f19402ae6f5cc4472a3797decf9ef20d3a8b7f1715ab00f6751037f14b19cd7322942dc2 +DIST cyrus-imapd-3.4.5.tar.gz 13291987 BLAKE2B 4ac383ef7f3dea66a7dc11c2241b8663e3cda323b73e3b439255468cf9b6d80302a135793f952843ddee418acb4aa4a9a9d56fcb743b5d589d535764c2289c1d SHA512 e43185193130af2e11ced89b2241a7b6f321847cf8bc01c0d89cbbb1cb222a962fe00cdd54b1f89cea141a569b57d2ce2f0edffaca8db9fd5f7fc2cd82b4537b diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.5.ebuild new file mode 100644 index 000000000000..ff38d8a5b3ab --- /dev/null +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.5.ebuild @@ -0,0 +1,247 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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" +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 \ + mysql nntp pam perl postgres replication +server sieve \ + sqlite ssl static-libs tcpd test xapian" +RESTRICT="!test? ( test )" + +DEPEND="dev-libs/libpcre:3 + >=dev-libs/cyrus-sasl-2.1.13:2 + dev-libs/jansson:= + dev-libs/icu:= + 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? ( + app-arch/brotli:= + app-arch/zstd:= + dev-libs/libxml2 + dev-libs/libical:= + net-libs/nghttp2:= + sci-libs/shapelib:= + ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap:= ) + mysql? ( dev-db/mysql-connector-c:= ) + nntp? ( !net-nntp/leafnode ) + pam? ( + >=net-mail/mailbase-1 + sys-libs/pam + ) + 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:= )" +# all blockers really needed? +# file collision with app-arch/dump - bug 619584 +RDEPEND="${DEPEND} + acct-group/mail + acct-user/cyrus + !mail-mta/courier + !net-mail/bincimap + !net-mail/courier-imap + !net-mail/uw-imap + !app-arch/dump" +DEPEND+=" test? ( dev-util/cunit )" +BDEPEND="sys-devel/flex + virtual/pkgconfig + app-alternatives/yacc" + +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" +#) + +PATCHES=( + "${FILESDIR}"/${PN}-3.4.4-0001-Test-for-libm.patch + "${FILESDIR}"/${PN}-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch +) + +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 + + # 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" + fi + + # TODO: + # - revisit --with-sphinx-build=no? (it's docs this time, not the search engine) + # - post-emerge message re lmdb removal? + econf \ + --enable-murder \ + --enable-idled \ + --enable-autocreate \ + --enable-pcre \ + --with-com_err \ + --with-cyrus-user=cyrus \ + --with-sasl \ + --with-sphinx-build=no \ + --without-krb \ + --without-krbdes \ + --enable-squat \ + --with-zlib \ + --without-wslay \ + --without-chardet \ + --without-cld2 \ + --disable-srs \ + $(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 mysql) \ + $(use_with postgres pgsql) \ + $(use_with perl) \ + $(use_with sqlite) \ + $(use_with ssl openssl) \ + $(use_enable server) \ + $(use_enable sieve) \ + $(use_enable static-libs static) \ + $(use_with tcpd libwrap) \ + $(use_enable xapian) \ + $(use_enable test unit-tests) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" INSTALLDIRS=vendor install + + dodoc README* + dodoc -r doc + + 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 "${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|' \ + "${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|' \ + "${ED}"/etc/cyrus.conf || die + + # turn off sieve if not installed + if ! use sieve; then + 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/^/#/" "${ED}"/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 + + einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html" + einfo "for upgrade instructions." +}