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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CDA6E1396D0 for ; Tue, 15 Aug 2017 06:22:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12C01E085E; Tue, 15 Aug 2017 06:22:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 CC3E1E085E for ; Tue, 15 Aug 2017 06:22:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 5FD6F341727 for ; Tue, 15 Aug 2017 06:22:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 16CC575DD for ; Tue, 15 Aug 2017 06:22:16 +0000 (UTC) From: "Eray Aslan" 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" Message-ID: <1502778114.7b1c7450c98762b79e9768eedb0e2dede8efbb1b.eras@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/files/, net-mail/cyrus-imapd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-mail/cyrus-imapd/cyrus-imapd-3.0.3-r1.ebuild net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs.patch X-VCS-Directories: net-mail/cyrus-imapd/ net-mail/cyrus-imapd/files/ X-VCS-Committer: eras X-VCS-Committer-Name: Eray Aslan X-VCS-Revision: 7b1c7450c98762b79e9768eedb0e2dede8efbb1b X-VCS-Branch: master Date: Tue, 15 Aug 2017 06:22:16 +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-Archives-Salt: c946be16-53fe-4482-bbf3-c82fd0dbd6db X-Archives-Hash: 4141cbbe853d77e0b3c13cedbab80543 commit: 7b1c7450c98762b79e9768eedb0e2dede8efbb1b Author: Eray Aslan gentoo org> AuthorDate: Tue Aug 15 06:21:54 2017 +0000 Commit: Eray Aslan gentoo org> CommitDate: Tue Aug 15 06:21:54 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b1c7450 net-mail/cyrus-imapd: fix linking with perl,caps USE flags Bug 625156. Thanks to Guillaume Castagnino Package-Manager: Portage-2.3.7, Repoman-2.3.3 net-mail/cyrus-imapd/cyrus-imapd-3.0.3-r1.ebuild | 216 +++++++++++++++++++++ .../files/cyrus-imapd-libcap-libs.patch | 35 ++++ 2 files changed, 251 insertions(+) diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.3-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.3-r1.ebuild new file mode 100644 index 00000000000..6743077fa02 --- /dev/null +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.3-r1.ebuild @@ -0,0 +1,216 @@ +# 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}-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 + + # 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/files/cyrus-imapd-libcap-libs.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs.patch new file mode 100644 index 00000000000..e1f5332c6e8 --- /dev/null +++ b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs.patch @@ -0,0 +1,35 @@ +--- a/configure.ac 2017-07-15 07:26:38.375295969 +0200 ++++ b/configure.ac 2017-07-15 07:28:33.250194410 +0200 +@@ -1351,7 +1351,9 @@ + AC_CHECK_HEADERS([sys/capability.h sys/prctl.h], , have_libcap=no) + if test "$have_libcap" = "yes"; then + AC_DEFINE(HAVE_LIBCAP, [], [Do we have libcap system capabilities handling (Linux systems only)?]) +- LIBS="$LIBS -lcap" ++ LIBCAP="-lcap" ++ AC_SUBST(LIBCAP) ++ LIBS="$LIBS $LIBCAP" + fi + fi + ;; +--- a/perl/imap/Makefile.PL.in 2017-07-15 07:28:49.886034889 +0200 ++++ b/perl/imap/Makefile.PL.in 2017-07-15 07:29:10.621836046 +0200 +@@ -90,7 +90,7 @@ + 'clean' => {'FILES' => 'libcyrperl.a cyradm'}, + 'OBJECT' => 'IMAP.o', + 'MYEXTLIB' => '@top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a', +- 'LIBS' => [ "$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@ @PCRE_LIBS@ @SQLITE_LIBADD@"], ++ 'LIBS' => [ "$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@ @PCRE_LIBS@ @SQLITE_LIBADD@ @LIBCAP@"], + 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING' + 'INC' => "-I@top_srcdir@ -I@top_srcdir@/com_err/et @SASLFLAGS@ @SSL_CPPFLAGS@ -I@top_srcdir@/perl/imap", + 'EXE_FILES' => [cyradm], +--- a/perl/sieve/managesieve/Makefile.PL.in 2017-07-15 07:29:29.433655659 +0200 ++++ b/perl/sieve/managesieve/Makefile.PL.in 2017-07-15 07:29:44.593510288 +0200 +@@ -69,7 +69,7 @@ + 'ABSTRACT' => 'Cyrus Sieve management interface', + 'VERSION_FROM' => "@top_srcdir@/perl/sieve/managesieve/managesieve.pm", # finds $VERSION + 'MYEXTLIB' => '../lib/.libs/libisieve.a @top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a', +- 'LIBS' => ["$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@ @PCRE_LIBS@ @SQLITE_LIBADD@"], ++ 'LIBS' => ["$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@ @PCRE_LIBS@ @SQLITE_LIBADD@ @LIBCAP@"], + 'CCFLAGS' => '@GCOV_CFLAGS@', + 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING' + 'INC' => "-I@top_srcdir@/lib -I@top_srcdir@/perl/sieve -I@top_srcdir@/perl/sieve/lib @SASLFLAGS@ @SSL_CPPFLAGS@",