From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-999100-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E40551382C5 for <garchives@archives.gentoo.org>; Mon, 22 Jan 2018 14:21:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 119FAE0920; Mon, 22 Jan 2018 14:21:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D212CE0920 for <gentoo-commits@lists.gentoo.org>; Mon, 22 Jan 2018 14:21:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7211A335C2C for <gentoo-commits@lists.gentoo.org>; Mon, 22 Jan 2018 14:21:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C0AA01A0 for <gentoo-commits@lists.gentoo.org>; Mon, 22 Jan 2018 14:21:02 +0000 (UTC) From: "Eray Aslan" <eras@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Eray Aslan" <eras@gentoo.org> Message-ID: <1516630845.7c8e1ea5dacdafacb4cf4d9f811a9a3146970f5c.eras@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.0.5.ebuild X-VCS-Directories: net-mail/cyrus-imapd/ X-VCS-Committer: eras X-VCS-Committer-Name: Eray Aslan X-VCS-Revision: 7c8e1ea5dacdafacb4cf4d9f811a9a3146970f5c X-VCS-Branch: master Date: Mon, 22 Jan 2018 14:21:02 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1ed3d6ef-8f95-4e59-830f-7a3dcb906975 X-Archives-Hash: 334548a15024405454f89f57bc84d622 commit: 7c8e1ea5dacdafacb4cf4d9f811a9a3146970f5c Author: Eray Aslan <eras <AT> gentoo <DOT> org> AuthorDate: Mon Jan 22 14:20:45 2018 +0000 Commit: Eray Aslan <eras <AT> gentoo <DOT> org> CommitDate: Mon Jan 22 14:20:45 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c8e1ea5 net-mail/cyrus-imapd: bump to 3.0.5 Filter --as-needed for working sieve implementation. Should really be resolved at toolchain level Bug: https://bugs.gentoo.org/604466 Package-Manager: Portage-2.3.20, Repoman-2.3.6 net-mail/cyrus-imapd/Manifest | 1 + net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild | 221 ++++++++++++++++++++++++++ 2 files changed, 222 insertions(+) diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest index 4f7ad744835..102d9c65627 100644 --- a/net-mail/cyrus-imapd/Manifest +++ b/net-mail/cyrus-imapd/Manifest @@ -1,3 +1,4 @@ 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.4.tar.gz 10819487 BLAKE2B 209e379731c996ee083b0de61d6122b3756d1f6880071ebf015157057cf45845961d762ee762ae56213f72f15c01df29ab2d2661c4e352c6b4a680924d15d7b0 SHA512 9ceb7ac837c932c70fa0c1583bf8700b3ec27568d72538ae8d59f2f551e3007b3c2fc68fd29c009597c3949345dbe1bf2eb614bea038d70a5b49e5507df6b69a +DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873 SHA512 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410 diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild new file mode 100644 index 00000000000..13ed85c3a1d --- /dev/null +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild @@ -0,0 +1,221 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools flag-o-matic 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 + append-ldflags $(no-as-needed) +} + +src_prepare() { + # bug 604470 + eapply -p1 "${FILESDIR}/${PN}-sieve-libs-v4.patch" + eapply -p1 "${FILESDIR}/${PN}-libcap-libs.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/${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 + ewarn "Please see http://www.cyrusimap.org/imap/download/upgrade.html" + ewarn "for upgrade instructions." + echo +}