[gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/files/, net-mail/cyrus-imapd/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/files/, net-mail/cyrus-imapd/
@ 2017-05-16 14:13 Eray Aslan
  0 siblings, 0 replies; 6+ messages in thread
From: Eray Aslan @ 2017-05-16 14:13 UTC (permalink / raw
  To: gentoo-commits

commit:     0d2297018938fbfbe03950ae36919702db872002
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue May 16 14:12:48 2017 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Tue May 16 14:12:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d229701

net-mail/cyrus-imapd: bump to 3.0.1 - bug 613874

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-mail/cyrus-imapd/Manifest                      |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.1.ebuild      | 203 +++++++++++++++++++++
 .../cyrus-imapd/files/cyrus-imapd-fix-tests.patch  |  21 +++
 .../files/cyrus-imapd-sieve-libs-v3.patch          | 127 +++++++++++++
 net-mail/cyrus-imapd/metadata.xml                  |   8 +-
 5 files changed, 359 insertions(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 3f392aa24cf..bee93e3f91b 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -6,3 +6,4 @@ DIST cyrus-imapd-2.5.11.tar.gz 3109188 SHA256 36a79117b320c78d62bc6842c3024d970d
 DIST cyrus-imapd-2.5.7.tar.gz 2928358 SHA256 f06c2c030b16b70145fecdf7edaa0f2ef6bf690b0d8fd6e2c62d95af303d68da SHA512 7514779cb3e36fb76bddfd12c7ec8d986609af671f8a1f0f3ae5007f5a7aa80c3c440bfbc8e7766d4de178dd5aa704076401b35cb5f03a2e25d2ea97ccbc7642 WHIRLPOOL 4db36b3fb27751d15cb74e63272c0adaa8348a90d7e9c4cb9c027837477e22347fce912b3e73c669a30a6b0c9de879644f146f7261eacd90fd237218051e1777
 DIST cyrus-imapd-2.5.8.tar.gz 3069068 SHA256 664dd0a4eccfbf810ec74ccac1766c64e7db87f028f9066ae135390ab0d5c888 SHA512 e9c94696b980c7b10c52ee2c46f2dbdadc633a63ad943ebd5002c2052b13a64d8917e4e0ac4e4ae44a1f553e1fda02010840c9053c936374c06c7e88e09302ef WHIRLPOOL e8dcf43e694a8f91ab610d831ecddd516ebf1773b7543b15ba1b0e32fae7388681a9e0698951862efebb01e4894e6f40b29eae665dd36f16bf26d31583fe9822
 DIST cyrus-imapd-2.5.9.tar.gz 3097555 SHA256 8e1bb6cc373bf318b5895b299c8344eaecbfb83db4566182f5d57f2707bce23d SHA512 aad575b7bf8afb4664bb321c2e9ae2be8d9ec6998341a7ca5582db7d27b2b727376693d5e1ac776c26cbd8dc12d8e299f981a33fc0aab8d802832cbf927e454f WHIRLPOOL 1fb97a70dec59f69b60d72282939d4ff85b820e988b0770c46e2b8d9878dae2c541bd5523042c9a1e9c783e32b7d45fa6c9f668fd2bc5ea2e611ef0d5331563b
+DIST cyrus-imapd-3.0.1.tar.gz 10515460 SHA256 24a9886aa6bbe001484a54b29309ff99415c0f355b98325ebb29ad61fff5e257 SHA512 0a2bf13b4793e642f3df53231fd66774e0c5ad753b436a7fb0645db6ee70121d0da245038527cc58cb078255fec3e7b32a6230c196cceea040f74813ef78e337 WHIRLPOOL 830284e3d96b2d34d88350f8e65de2cac28c34c9d302dc7fe4247022c5d96251d72989714062408cfcf08828650a7b67aecfb1672165fed344b2e98c2dc06265

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.1.ebuild
new file mode 100644
index 00000000000..c5a0435e386
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.1.ebuild
@@ -0,0 +1,203 @@
+# 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-v3.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*
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc6" 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-fix-tests.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-fix-tests.patch
new file mode 100644
index 00000000000..c32f2065db0
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-fix-tests.patch
@@ -0,0 +1,21 @@
+--- a/Makefile.am	2017-05-16 15:48:55.943709210 +0300
++++ b/Makefile.am	2017-05-16 15:50:20.950184710 +0300
+@@ -635,7 +635,6 @@
+ 	cunit/guid.testc \
+ 	cunit/hash.testc \
+ 	cunit/imapurl.testc \
+-	cunit/jmapauth.testc \
+ 	cunit/libconfig.testc \
+ 	cunit/mboxname.testc \
+ 	cunit/md5.testc \
+@@ -654,6 +653,10 @@
+ cunit_TESTS += cunit/sieve.testc
+ endif
+ 
++if JMAP
++cunit_TESTS += cunit/jmapauth.testc
++endif
++
+ cunit_TESTS += \
+ 	cunit/spool.testc \
+ 	cunit/squat.testc \

diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs-v3.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs-v3.patch
new file mode 100644
index 00000000000..3c07a6df006
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs-v3.patch
@@ -0,0 +1,127 @@
+--- a/configure.ac	2017-04-20 04:21:48.000000000 +0300
++++ b/configure.ac	2017-05-16 10:30:37.337965921 +0300
+@@ -666,7 +666,9 @@
+         fi
+ 
+         if test "$cyrus_cv_pcre_utf8" = "yes"; then
+-                LIBS="$LIBS -lpcre -lpcreposix";
++                PCRE_LIBS="-lpcre -lpcreposix"
++                AC_SUBST(PCRE_LIBS)
++                LIBS="$LIBS $PCRE_LIBS"
+                 AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?])
+                 AC_DEFINE(HAVE_PCREPOSIX_H, [], [Do we have usable pcre library?])
+         else
+@@ -1938,6 +1940,7 @@
+     fi
+ 
+     LIBS="${LIBS} ${SQLITE_LIBADD}"
++    AC_SUBST(SQLITE_LIBADD)
+     CPPFLAGS="${SQLITE_INCADD} ${CPPFLAGS}"
+     AC_DEFINE(HAVE_SQLITE,[],[Build in SQLite support?])
+   else
+--- a/perl/imap/Makefile.PL.in	2017-04-07 08:31:10.000000000 +0300
++++ b/perl/imap/Makefile.PL.in	2017-05-16 10:26:08.193965921 +0300
+@@ -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@"],
++    'LIBS'      => [ "$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@ @PCRE_LIBS@ @SQLITE_LIBADD@"],
+     '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-04-07 08:31:10.000000000 +0300
++++ b/perl/sieve/managesieve/Makefile.PL.in	2017-05-16 10:26:31.048965921 +0300
+@@ -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@"],
++    'LIBS'      => ["$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@ @PCRE_LIBS@ @SQLITE_LIBADD@"],
+     '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@",
+--- a/configure.ac	2017-05-16 15:18:23.648756211 +0300
++++ b/configure.ac	2017-05-16 15:26:49.241756211 +0300
+@@ -633,8 +633,6 @@
+ 
+ AC_ARG_ENABLE(sieve,
+         [AS_HELP_STRING([--disable-sieve], [disable Sieve support])],,[enable_sieve="yes";])
+-AC_ARG_ENABLE(pcre,
+-        [AS_HELP_STRING([--disable-pcre], [disable PCRE library])])
+ 
+ if test "$enable_sieve" != "no"; then
+         AC_DEFINE(USE_SIEVE,[],[Build in Sieve support?])
+@@ -650,42 +648,46 @@
+         if test -z "$ac_cv_prog_LEX"; then
+             AC_MSG_ERROR([Sieve requires flex/lex, but none is installed])
+         fi
++fi
++AM_CONDITIONAL([SIEVE], [test "${enable_sieve}" != "no"])
++
+ 
+-        if test "$enable_pcre" != "no"; then
+-            AC_CHECK_HEADER(pcreposix.h)
+-            if test "$ac_cv_header_pcreposix_h" = "yes"; then
+-                    AC_MSG_CHECKING(for utf8 enabled pcre)
+-                    AC_CACHE_VAL(cyrus_cv_pcre_utf8, AC_TRY_CPP([#include <pcreposix.h>
++AC_ARG_ENABLE(pcre,
++        [AS_HELP_STRING([--disable-pcre], [disable PCRE library])])
++	
++if test "$enable_pcre" != "no"; then
++        AC_CHECK_HEADER(pcreposix.h)
++        if test "$ac_cv_header_pcreposix_h" = "yes"; then
++                AC_MSG_CHECKING(for utf8 enabled pcre)
++                AC_CACHE_VAL(cyrus_cv_pcre_utf8, AC_TRY_CPP([#include <pcreposix.h>
+ #ifndef REG_UTF8
+ #include </nonexistent>
+ #endif],cyrus_cv_pcre_utf8=yes,cyrus_cv_pcre_utf8=no))
+-                    AC_MSG_RESULT($cyrus_cv_pcre_utf8)
+-            else
+-                    cyrus_cv_pcre_utf8="no"
+-            fi
++                AC_MSG_RESULT($cyrus_cv_pcre_utf8)
++        else
++                cyrus_cv_pcre_utf8="no"
+         fi
++fi
+ 
+-        if test "$cyrus_cv_pcre_utf8" = "yes"; then
+-                PCRE_LIBS="-lpcre -lpcreposix"
+-                AC_SUBST(PCRE_LIBS)
+-                LIBS="$LIBS $PCRE_LIBS"
+-                AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?])
+-                AC_DEFINE(HAVE_PCREPOSIX_H, [], [Do we have usable pcre library?])
++if test "$cyrus_cv_pcre_utf8" = "yes"; then
++        PCRE_LIBS="-lpcre -lpcreposix"
++        AC_SUBST(PCRE_LIBS)
++        LIBS="$LIBS $PCRE_LIBS"
++        AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?])
++        AC_DEFINE(HAVE_PCREPOSIX_H, [], [Do we have usable pcre library?])
++else
++        AC_CHECK_HEADERS(rxposix.h)
++        if test "$ac_cv_header_rxposix_h" = "yes"; then
++                LIBS="$LIBS -lrx"
++                AC_DEFINE(ENABLE_REGEX, [],
++                          [Do we have a regex library?])
+         else
+-                AC_CHECK_HEADERS(rxposix.h)
+-                if test "$ac_cv_header_rxposix_h" = "yes"; then
+-                        LIBS="$LIBS -lrx"
+-                        AC_DEFINE(ENABLE_REGEX, [],
+-                                  [Do we have a regex library?])
+-                else
+-                        AC_SEARCH_LIBS(regcomp, regex,
+-                                        AC_DEFINE(ENABLE_REGEX, [],
+-                                        [Do we have a regex library?]), [])
+-                fi
++                AC_SEARCH_LIBS(regcomp, regex,
++                    AC_DEFINE(ENABLE_REGEX, [],
++                        [Do we have a regex library?]), [])
+         fi
+ fi
+ 
+-AM_CONDITIONAL([SIEVE], [test "${enable_sieve}" != "no"])
+ 
+ dnl look for an option to disable sign-comparison warnings (needed for
+ dnl flex-generated sieve sources when building with -Werror)

diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
index 7b08e190232..f21a8fca8af 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -6,9 +6,15 @@
   <name>Net-Mail</name>
   </maintainer>
   <use>
-	<flag name="replication">Enable replication support in the cyrus imap server</flag>
+	<flag name="replication">Enable replication support</flag>
 	<flag name="sieve">Enable sieve support</flag>
 	<flag name="http">Enable http support</flag>
 	<flag name="server">Enable building server binaries</flag>
+	<flag name="backup">Enable backup service support</flag>
+	<flag name="calalarm">Enable CalDAV alarm support</flag>
+	<flag name="jmap">Enable JMAP support</flag>
+	<flag name="sphinx">Enable Sphinx search engine support</flag>
+	<flag name="xapian">Enable Xapian search engine support</flag>
+	<flag name="lmdb">Enable support for using <pkg>dev-db/lmdb</pkg></flag>
   </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/files/, net-mail/cyrus-imapd/
@ 2017-07-14 11:11 Pacho Ramos
  0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2017-07-14 11:11 UTC (permalink / raw
  To: gentoo-commits

commit:     5b78cbe19c5df746b9e361889a32c596e2f70207
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 11:05:35 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 11:05:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b78cbe1

net-mail/cyrus-imapd: Drop hardmasked versions

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-mail/cyrus-imapd/Manifest                      |   3 -
 net-mail/cyrus-imapd/cyrus-imapd-2.4.16.ebuild     | 182 -------------------
 net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild  | 202 ---------------------
 net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild     | 197 --------------------
 net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild     | 197 --------------------
 .../files/cyrus-imapd-2.4.17-statuscache.diff      |  11 --
 6 files changed, 792 deletions(-)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 1e280f1d391..d9f96c0ec77 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,6 +1,3 @@
-DIST cyrus-imapd-2.4.16.tar.gz 2484201 SHA256 beac9d6059680bbf65948db60a30c6e8f59786df4a7821c70dc27b2a225f32c4 SHA512 31931e94ebe869516f10886cee5ab152fb6d6376bf009250718077732c6172a6430f3502370e15e94f6165500e5b4108623bceea7c0dcfb3eb746e9ff0fcffab WHIRLPOOL 1e9916d03448e7f036aa6320af69a7ae57ae37205f98d4cfee8c335d9dcdc1c09ba243f4506036da4ca17f859f5c7eef0cb56443dfe51ad3075f0e4d62874fcb
-DIST cyrus-imapd-2.4.17.tar.gz 2486355 SHA256 b3e30052c764ee7163947ffde27bdd58bd4dd2e5697ad144491941e46300a583 SHA512 86ffe1664ca3c3df164ed8fca21cc08ddae12380e1485deccec7da4ec263d8b953a806e05f0b10f6fb7717a0d40fc05669792b77cc66d7c5067061c8506e59ee WHIRLPOOL 22566578217a5901793b886ff020aa1deecbb81bf85f54a524b58de129029e51b0aa358db902a2139584d05f668404cb98ca2ff3fa33803ce986e07b95c69c45
-DIST cyrus-imapd-2.4.18.tar.gz 2495098 SHA256 166a0a1efbf01f71d9d8449569152b3cda4949cd689f299a5e77a38d7026012c SHA512 3b234c1773fe5d57cae35743985930bc7fed2eedaa0919598da8fb19588f95b3beb8ad166d3b4f0c96faf006ff56ed5027ec516fab6007edbe46c4f45572a1ef WHIRLPOOL 1a243a9b3875105dfc414e1092f328691b6bef7c0d04f8bd91824ca0d01c715ebc2449c37bbca2ab86193e4d2dc426b33cfd31a0cdfdea0bacc081fd9010b1df
 DIST cyrus-imapd-2.5.10.tar.gz 3103914 SHA256 b38f4fd72825a298ac47426dcd2a50c8437c2947864ba50d79a9a53fe9845c5f SHA512 78b85e37c63f1dbb60898da229f70f45810326a01244067d23b1317e2c2ae3326e48b6944787d59024e44c48c441ed2b848d6a83c451c192a3bb95c8f37880fa WHIRLPOOL d2167900596c1b6f8e595de7aec499a7fbd6228537d7a27bec4fe0bda6a74b861303c4e9691ca829994972b099f29c362f9692f266df66d76c05a69629b52dfd
 DIST cyrus-imapd-2.5.11.tar.gz 3109188 SHA256 36a79117b320c78d62bc6842c3024d970d3bec7aa12908f862d92cf1d63397d5 SHA512 bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538 WHIRLPOOL e6aaedb642b634d9fc0c56f7ddd06e15130091bd21f4e089ae46168fb2976c7e1fa281f8c6fc0f3e171e70bbfeb5cec8f6cc613f62d5b769fb8b6af4dede6e67
 DIST cyrus-imapd-3.0.1.tar.gz 10515460 SHA256 24a9886aa6bbe001484a54b29309ff99415c0f355b98325ebb29ad61fff5e257 SHA512 0a2bf13b4793e642f3df53231fd66774e0c5ad753b436a7fb0645db6ee70121d0da245038527cc58cb078255fec3e7b32a6230c196cceea040f74813ef78e337 WHIRLPOOL 830284e3d96b2d34d88350f8e65de2cac28c34c9d302dc7fe4247022c5d96251d72989714062408cfcf08828650a7b67aecfb1672165fed344b2e98c2dc06265

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.16.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.16.ebuild
deleted file mode 100644
index 514db3fbe22..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.16.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit db-use eutils multilib 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 berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd"
-
-RDEPEND="sys-libs/zlib
-	>=dev-libs/cyrus-sasl-2.1.13
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2 )
-	kerberos? ( virtual/krb5 )
-	mysql? ( virtual/mysql )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	postgres? ( dev-db/postgresql )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-DEPEND="$RDEPEND"
-
-# get rid of old style virtual - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap"
-
-REQUIRED_USE="afs? ( kerberos )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	# 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"
-
-	# do not strip
-	sed -i -e '/(INSTALL/s/-s //' "${S}"/imtest/Makefile.in
-
-	# correct afs include and liblwp.a directory
-	sed -i -e '/I${with_afs_incdir/s/\/include//' \
-		-e '/liblwp/s/liblwp/afs\/liblwp/' \
-		"${S}"/configure{,.in} || die
-	# same with lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-	# libcom_err.a to libafscom_err.a
-	sed -i -e '/afs\/libcom_err.a/s:libcom_err.a:libafscom_err.a:' \
-		configure{,.in} || die
-}
-
-src_configure() {
-	local myconf
-	if use mysql ; then
-		myconf=$(mysql_config --include)
-		myconf="--with-mysql-incdir=${myconf#-I}"
-	fi
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	if use berkdb ; then
-		myconf+=" --with-bdb-incdir=$(db_includedir)"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-perl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_enable nntp) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# file collision - bug #368245
-	if ! use nntp ; then
-		rm "${D}"/usr/share/man/man8/fetchnews.8*
-	fi
-
-	dodoc README*
-	dohtml doc/*.html doc/murder.png
-	docinto text
-	dodoc doc/text/*
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" 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_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
-
-	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"
-}

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild
deleted file mode 100644
index 786326bd692..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools db-use eutils multilib pam ssl-cert user toolchain-funcs
-
-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 berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd"
-
-# virtual/mysql-5.5 added for the --variable= option below
-RDEPEND="sys-libs/zlib
-	>=dev-libs/cyrus-sasl-2.1.13
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2 )
-	kerberos? ( virtual/krb5 )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	postgres? ( dev-db/postgresql )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-DEPEND="$RDEPEND"
-
-# get rid of old style virtual - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap"
-
-REQUIRED_USE="afs? ( kerberos )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	# fix squatter segfaults, see:
-	# https://bugzilla.cyrusimap.org/show_bug.cgi?id=3757
-	epatch "${FILESDIR}/${P}-statuscache.diff"
-
-	# 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"
-
-	# do not strip
-	sed -i -e '/(INSTALL/s/-s //' "${S}"/imtest/Makefile.in
-
-	# correct afs include and liblwp.a directory
-	sed -i -e '/I${with_afs_incdir/s/\/include//' \
-		-e '/liblwp/s/liblwp/afs\/liblwp/' \
-		"${S}"/configure{,.in} || die
-	# same with lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-	# libcom_err.a to libafscom_err.a
-	sed -i -e '/afs\/libcom_err.a/s:libcom_err.a:libafscom_err.a:' \
-		configure{,.in} || die
-
-	sed -i -e "s/ar cr/$(tc-getAR) cr/" \
-		perl/sieve/lib/Makefile.in \
-		imap/Makefile.in \
-		lib/Makefile.in \
-		installsieve/Makefile.in \
-		com_err/et/Makefile.in \
-		sieve/Makefile.in \
-		syslog/Makefile.in || die
-
-	AT_M4DIR="cmulocal" eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use mysql ; then
-		myconf="--with-mysql-incdir=$(mysql_config --variable=pkgincludedir)"
-		myconf+=" --with-mysql-libdir=$(mysql_config --variable=pkglibdir)"
-	fi
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	if use berkdb ; then
-		myconf+=" --with-bdb-incdir=$(db_includedir)"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-perl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_enable nntp) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# file collision - bug #368245
-	if ! use nntp ; then
-		rm "${D}"/usr/share/man/man8/fetchnews.8*
-	fi
-
-	dodoc README*
-	dohtml doc/*.html doc/murder.png
-	docinto text
-	dodoc doc/text/*
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" 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
-}

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild
deleted file mode 100644
index 0d555c7617c..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools db-use eutils multilib pam ssl-cert user toolchain-funcs
-
-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 berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd"
-
-RDEPEND="sys-libs/zlib
-	>=dev-libs/cyrus-sasl-2.1.13
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2 )
-	kerberos? ( virtual/krb5 )
-	mysql? ( virtual/mysql )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	postgres? ( dev-db/postgresql )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-DEPEND="$RDEPEND"
-
-# get rid of old style virtual - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap"
-
-REQUIRED_USE="afs? ( kerberos )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	# 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"
-
-	# do not strip
-	sed -i -e '/(INSTALL/s/-s //' "${S}"/imtest/Makefile.in
-
-	# correct afs include and liblwp.a directory
-	sed -i -e '/I${with_afs_incdir/s/\/include//' \
-		-e '/liblwp/s/liblwp/afs\/liblwp/' \
-		"${S}"/configure{,.in} || die
-	# same with lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-	# libcom_err.a to libafscom_err.a
-	sed -i -e '/afs\/libcom_err.a/s:libcom_err.a:libafscom_err.a:' \
-		configure{,.in} || die
-
-	sed -i -e "s/ar cr/$(tc-getAR) cr/" \
-		perl/sieve/lib/Makefile.in \
-		imap/Makefile.in \
-		lib/Makefile.in \
-		installsieve/Makefile.in \
-		com_err/et/Makefile.in \
-		sieve/Makefile.in \
-		syslog/Makefile.in || die
-
-	AT_M4DIR="cmulocal" eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use mysql ; then
-		myconf=$(mysql_config --include)
-		myconf="--with-mysql-incdir=${myconf#-I}"
-	fi
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	if use berkdb ; then
-		myconf+=" --with-bdb-incdir=$(db_includedir)"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-perl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_enable nntp) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# file collision - bug #368245
-	if ! use nntp ; then
-		rm "${D}"/usr/share/man/man8/fetchnews.8*
-	fi
-
-	dodoc README*
-	dohtml doc/*.html doc/murder.png
-	docinto text
-	dodoc doc/text/*
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" 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
-}

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild
deleted file mode 100644
index 33de3282055..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools db-use eutils multilib pam ssl-cert user toolchain-funcs
-
-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 berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd"
-
-# virtual/mysql-5.5 added for the --variable= option below
-RDEPEND="sys-libs/zlib
-	>=dev-libs/cyrus-sasl-2.1.13
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2:* )
-	kerberos? ( virtual/krb5 )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-0.9.6:* )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-DEPEND="$RDEPEND"
-
-# get rid of old style virtual - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap"
-
-REQUIRED_USE="afs? ( kerberos )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	# 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"
-
-	# do not strip
-	sed -i -e '/(INSTALL/s/-s //' "${S}"/imtest/Makefile.in
-
-	# correct afs include and liblwp.a directory
-	sed -i -e '/I${with_afs_incdir/s/\/include//' \
-		-e '/liblwp/s/liblwp/afs\/liblwp/' \
-		"${S}"/configure{,.in} || die
-	# same with lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-	# libcom_err.a to libafscom_err.a
-	sed -i -e '/afs\/libcom_err.a/s:libcom_err.a:libafscom_err.a:' \
-		configure{,.in} || die
-
-	sed -i -e "s/ar cr/$(tc-getAR) cr/" \
-		perl/sieve/lib/Makefile.in \
-		imap/Makefile.in \
-		lib/Makefile.in \
-		installsieve/Makefile.in \
-		com_err/et/Makefile.in \
-		sieve/Makefile.in \
-		syslog/Makefile.in || die
-
-	AT_M4DIR="cmulocal" eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use mysql ; then
-		myconf="--with-mysql-incdir=$(mysql_config --variable=pkgincludedir)"
-		myconf+=" --with-mysql-libdir=$(mysql_config --variable=pkglibdir)"
-	fi
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	if use berkdb ; then
-		myconf+=" --with-bdb-incdir=$(db_includedir)"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-perl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_enable nntp) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# file collision - bug #368245
-	if ! use nntp ; then
-		rm "${D}"/usr/share/man/man8/fetchnews.8*
-	fi
-
-	dodoc README*
-	dohtml doc/*.html doc/murder.png
-	docinto text
-	dodoc doc/text/*
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" 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
-}

diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.4.17-statuscache.diff b/net-mail/cyrus-imapd/files/cyrus-imapd-2.4.17-statuscache.diff
deleted file mode 100644
index b939479e4a7..00000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.4.17-statuscache.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- imap/statuscache_db.c.orig	2012-12-01 20:57:54.000000000 +0100
-+++ imap/statuscache_db.c	2013-10-18 17:09:42.110915989 +0200
-@@ -152,7 +152,7 @@
-     len = strlcpy(key, mailboxname, sizeof(key));
-     key[len++] = '%';
-     key[len++] = '%';
--    len += strlcpy(key + len, userid, sizeof(key) - len);
-+    if (userid) len += strlcpy(key + len, userid, sizeof(key) - len);
- 
-     *keylen = len;
- 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/files/, net-mail/cyrus-imapd/
@ 2017-08-11 15:50 Eray Aslan
  0 siblings, 0 replies; 6+ messages in thread
From: Eray Aslan @ 2017-08-11 15:50 UTC (permalink / raw
  To: gentoo-commits

commit:     001e4977e5a5847a1e2f08d0510872a6d0684660
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 15:50:20 2017 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 15:50:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=001e4977

net-mail/cyrus-imapd: remove vulnerable

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 net-mail/cyrus-imapd/Manifest                      |   2 -
 net-mail/cyrus-imapd/cyrus-imapd-3.0.1.ebuild      | 203 ---------------------
 net-mail/cyrus-imapd/cyrus-imapd-3.0.2.ebuild      | 203 ---------------------
 .../files/cyrus-imapd-sieve-libs-v3.patch          | 127 -------------
 4 files changed, 535 deletions(-)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 3917ba2fa70..d64ddbe28af 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,5 +1,3 @@
 DIST cyrus-imapd-2.5.10.tar.gz 3103914 SHA256 b38f4fd72825a298ac47426dcd2a50c8437c2947864ba50d79a9a53fe9845c5f SHA512 78b85e37c63f1dbb60898da229f70f45810326a01244067d23b1317e2c2ae3326e48b6944787d59024e44c48c441ed2b848d6a83c451c192a3bb95c8f37880fa WHIRLPOOL d2167900596c1b6f8e595de7aec499a7fbd6228537d7a27bec4fe0bda6a74b861303c4e9691ca829994972b099f29c362f9692f266df66d76c05a69629b52dfd
 DIST cyrus-imapd-2.5.11.tar.gz 3109188 SHA256 36a79117b320c78d62bc6842c3024d970d3bec7aa12908f862d92cf1d63397d5 SHA512 bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538 WHIRLPOOL e6aaedb642b634d9fc0c56f7ddd06e15130091bd21f4e089ae46168fb2976c7e1fa281f8c6fc0f3e171e70bbfeb5cec8f6cc613f62d5b769fb8b6af4dede6e67
-DIST cyrus-imapd-3.0.1.tar.gz 10515460 SHA256 24a9886aa6bbe001484a54b29309ff99415c0f355b98325ebb29ad61fff5e257 SHA512 0a2bf13b4793e642f3df53231fd66774e0c5ad753b436a7fb0645db6ee70121d0da245038527cc58cb078255fec3e7b32a6230c196cceea040f74813ef78e337 WHIRLPOOL 830284e3d96b2d34d88350f8e65de2cac28c34c9d302dc7fe4247022c5d96251d72989714062408cfcf08828650a7b67aecfb1672165fed344b2e98c2dc06265
-DIST cyrus-imapd-3.0.2.tar.gz 10706654 SHA256 5612f3cfa0504eb50bc3e49a77bf04a31c1aff3096fa1bbddb26cd7dbb69d94d SHA512 95f145733a4b2589b2f7eb6281ce0d1df5788521dea0c81fda10c7c7ae4ac7cf1a9037dba45deee6101a73bbde4552906d7c6bfa9369aa3c802061a7f5cec85d WHIRLPOOL cf56390ea0d8ecd9fcfb9a2459a552ba7815474b52b089c54b1428b42691826f91b163cfe723c795b28289530911ed614e2252e038919c4d710d9a95658f8997
 DIST cyrus-imapd-3.0.3.tar.gz 10819454 SHA256 6a76d8d00b26a2c9d03c65197724a28ab6d044527d7e230e6331f8de79af889a SHA512 0b5c3167d80d91371e3f07e64b8bc8c085481946e6536dd407976f6f8ae66405fd1f6d2ff5ad51e5e0eb827a64d90d93daf72d5a1afa409782a287bec29665df WHIRLPOOL 6d543b09d3f18d10c481133fafb78f82a6e2d0dd3fb7c4cdb1d181d906acef7db4c6da5dcc86254a836f69fc7cbd54034f889b0808da060a083f35dd8ee40434

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.1.ebuild
deleted file mode 100644
index c5a0435e386..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# 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-v3.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*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" 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/cyrus-imapd-3.0.2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.2.ebuild
deleted file mode 100644
index c5a0435e386..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.2.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# 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-v3.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*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" 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-sieve-libs-v3.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs-v3.patch
deleted file mode 100644
index 3c07a6df006..00000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs-v3.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- a/configure.ac	2017-04-20 04:21:48.000000000 +0300
-+++ b/configure.ac	2017-05-16 10:30:37.337965921 +0300
-@@ -666,7 +666,9 @@
-         fi
- 
-         if test "$cyrus_cv_pcre_utf8" = "yes"; then
--                LIBS="$LIBS -lpcre -lpcreposix";
-+                PCRE_LIBS="-lpcre -lpcreposix"
-+                AC_SUBST(PCRE_LIBS)
-+                LIBS="$LIBS $PCRE_LIBS"
-                 AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?])
-                 AC_DEFINE(HAVE_PCREPOSIX_H, [], [Do we have usable pcre library?])
-         else
-@@ -1938,6 +1940,7 @@
-     fi
- 
-     LIBS="${LIBS} ${SQLITE_LIBADD}"
-+    AC_SUBST(SQLITE_LIBADD)
-     CPPFLAGS="${SQLITE_INCADD} ${CPPFLAGS}"
-     AC_DEFINE(HAVE_SQLITE,[],[Build in SQLite support?])
-   else
---- a/perl/imap/Makefile.PL.in	2017-04-07 08:31:10.000000000 +0300
-+++ b/perl/imap/Makefile.PL.in	2017-05-16 10:26:08.193965921 +0300
-@@ -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@"],
-+    'LIBS'      => [ "$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@ @PCRE_LIBS@ @SQLITE_LIBADD@"],
-     '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-04-07 08:31:10.000000000 +0300
-+++ b/perl/sieve/managesieve/Makefile.PL.in	2017-05-16 10:26:31.048965921 +0300
-@@ -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@"],
-+    'LIBS'      => ["$LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@ @PCRE_LIBS@ @SQLITE_LIBADD@"],
-     '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@",
---- a/configure.ac	2017-05-16 15:18:23.648756211 +0300
-+++ b/configure.ac	2017-05-16 15:26:49.241756211 +0300
-@@ -633,8 +633,6 @@
- 
- AC_ARG_ENABLE(sieve,
-         [AS_HELP_STRING([--disable-sieve], [disable Sieve support])],,[enable_sieve="yes";])
--AC_ARG_ENABLE(pcre,
--        [AS_HELP_STRING([--disable-pcre], [disable PCRE library])])
- 
- if test "$enable_sieve" != "no"; then
-         AC_DEFINE(USE_SIEVE,[],[Build in Sieve support?])
-@@ -650,42 +648,46 @@
-         if test -z "$ac_cv_prog_LEX"; then
-             AC_MSG_ERROR([Sieve requires flex/lex, but none is installed])
-         fi
-+fi
-+AM_CONDITIONAL([SIEVE], [test "${enable_sieve}" != "no"])
-+
- 
--        if test "$enable_pcre" != "no"; then
--            AC_CHECK_HEADER(pcreposix.h)
--            if test "$ac_cv_header_pcreposix_h" = "yes"; then
--                    AC_MSG_CHECKING(for utf8 enabled pcre)
--                    AC_CACHE_VAL(cyrus_cv_pcre_utf8, AC_TRY_CPP([#include <pcreposix.h>
-+AC_ARG_ENABLE(pcre,
-+        [AS_HELP_STRING([--disable-pcre], [disable PCRE library])])
-+	
-+if test "$enable_pcre" != "no"; then
-+        AC_CHECK_HEADER(pcreposix.h)
-+        if test "$ac_cv_header_pcreposix_h" = "yes"; then
-+                AC_MSG_CHECKING(for utf8 enabled pcre)
-+                AC_CACHE_VAL(cyrus_cv_pcre_utf8, AC_TRY_CPP([#include <pcreposix.h>
- #ifndef REG_UTF8
- #include </nonexistent>
- #endif],cyrus_cv_pcre_utf8=yes,cyrus_cv_pcre_utf8=no))
--                    AC_MSG_RESULT($cyrus_cv_pcre_utf8)
--            else
--                    cyrus_cv_pcre_utf8="no"
--            fi
-+                AC_MSG_RESULT($cyrus_cv_pcre_utf8)
-+        else
-+                cyrus_cv_pcre_utf8="no"
-         fi
-+fi
- 
--        if test "$cyrus_cv_pcre_utf8" = "yes"; then
--                PCRE_LIBS="-lpcre -lpcreposix"
--                AC_SUBST(PCRE_LIBS)
--                LIBS="$LIBS $PCRE_LIBS"
--                AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?])
--                AC_DEFINE(HAVE_PCREPOSIX_H, [], [Do we have usable pcre library?])
-+if test "$cyrus_cv_pcre_utf8" = "yes"; then
-+        PCRE_LIBS="-lpcre -lpcreposix"
-+        AC_SUBST(PCRE_LIBS)
-+        LIBS="$LIBS $PCRE_LIBS"
-+        AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?])
-+        AC_DEFINE(HAVE_PCREPOSIX_H, [], [Do we have usable pcre library?])
-+else
-+        AC_CHECK_HEADERS(rxposix.h)
-+        if test "$ac_cv_header_rxposix_h" = "yes"; then
-+                LIBS="$LIBS -lrx"
-+                AC_DEFINE(ENABLE_REGEX, [],
-+                          [Do we have a regex library?])
-         else
--                AC_CHECK_HEADERS(rxposix.h)
--                if test "$ac_cv_header_rxposix_h" = "yes"; then
--                        LIBS="$LIBS -lrx"
--                        AC_DEFINE(ENABLE_REGEX, [],
--                                  [Do we have a regex library?])
--                else
--                        AC_SEARCH_LIBS(regcomp, regex,
--                                        AC_DEFINE(ENABLE_REGEX, [],
--                                        [Do we have a regex library?]), [])
--                fi
-+                AC_SEARCH_LIBS(regcomp, regex,
-+                    AC_DEFINE(ENABLE_REGEX, [],
-+                        [Do we have a regex library?]), [])
-         fi
- fi
- 
--AM_CONDITIONAL([SIEVE], [test "${enable_sieve}" != "no"])
- 
- dnl look for an option to disable sign-comparison warnings (needed for
- dnl flex-generated sieve sources when building with -Werror)


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/files/, net-mail/cyrus-imapd/
@ 2017-08-15  6:22 Eray Aslan
  0 siblings, 0 replies; 6+ messages in thread
From: Eray Aslan @ 2017-08-15  6:22 UTC (permalink / raw
  To: gentoo-commits

commit:     7b1c7450c98762b79e9768eedb0e2dede8efbb1b
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 15 06:21:54 2017 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> 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@",


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/files/, net-mail/cyrus-imapd/
@ 2020-04-09 14:08 Eray Aslan
  0 siblings, 0 replies; 6+ messages in thread
From: Eray Aslan @ 2020-04-09 14:08 UTC (permalink / raw
  To: gentoo-commits

commit:     bccf2ea2f117c28889359760444e1740e96b7f97
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  9 14:07:45 2020 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 14:07:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bccf2ea2

net-mail/cyrus-imapd: security bump to 3.0.13

also fixes building with new versions of libcap and gcc-10

Closes: https://bugs.gentoo.org/713728
Closes: https://bugs.gentoo.org/713502
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                      |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild     | 230 +++++++++++++++++++++
 .../cyrus-imapd/files/cyrus-imapd-libcap.patch     |  64 ++++++
 net-mail/cyrus-imapd/metadata.xml                  |   2 +-
 4 files changed, 296 insertions(+), 1 deletion(-)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index cfb8cb572cd..7449e34e203 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,2 +1,3 @@
 DIST cyrus-imapd-3.0.10.tar.gz 10766263 BLAKE2B 366a8f524849d2173b8ea836e9f239ae20295dd435594af17d4c4682e7e672bc92c9f1bb0a60d7f7dce638beb94954f20906f9454b33830d2dcabb956ebd558a SHA512 1ae153a8f181bbe020326bec2dc177b78ef3c442f94e24e89b7a719298d93701006596dd21fa1c3a40afd75f01162b03524cf793dd7438ec7192f9a13f7614d0
 DIST cyrus-imapd-3.0.11.tar.gz 10797507 BLAKE2B ac62c11e50b6d92c17056a050f3adcfdeb055930a8568873f65c14a131a04223929c00679265ab7b96a056d7642f93f484ac75b136a9d09c0fa5e0dba0e89a06 SHA512 058efc2e462729b79e431e1b5dab1addfe737aeec8b686698cd2270748275028ca5722ed3960fcd680a0393027ee1b1d7dff65872dd1d8349a3f933e81227e48
+DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
new file mode 100644
index 00000000000..2ba848e8625
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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"
+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 lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	sys-libs/zlib:0=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson
+	dev-libs/icu:0=
+	sys-libs/e2fsprogs-libs
+	afs? ( net-fs/openafs )
+	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 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb:0= )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			sys-libs/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
+	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:0=[tcpd=] )
+		)
+	xapian? ( >=dev-libs/xapian-1.4.0:0= )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )
+"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump
+"
+
+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"
+	"${FILESDIR}/cyrus-imapd-libcap.patch"
+	)
+
+pkg_setup() {
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+}
+
+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
+	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 \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--disable-sphinx \
+		--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 nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(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 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
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}

diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-libcap.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap.patch
new file mode 100644
index 00000000000..eda404bf0dd
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap.patch
@@ -0,0 +1,64 @@
+Bug: https://bugs.gentoo.org/713728
+From f712d1268d5288e7f955567a07e99f409aba3e4a Mon Sep 17 00:00:00 2001
+From: Jakob Gahde <j5lx@fmail.co.uk>
+Date: Sat, 15 Feb 2020 17:18:16 +0100
+Subject: [PATCH] Add compatibility with recent versions of libcap
+
+---
+ lib/util.c      | 6 +++---
+ master/master.c | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/lib/util.c b/lib/util.c
+index 5f3cb1933..1256671f6 100644
+--- a/lib/util.c
++++ b/lib/util.c
+@@ -579,7 +579,7 @@ EXPORTED int set_caps(int stage __attribute__((unused)),
+ }
+ #endif
+ 
+-static int cap_setuid(int uid, int is_master)
++static int cyrus_cap_setuid(int uid, int is_master)
+ {
+     int r;
+ 
+@@ -599,7 +599,7 @@ EXPORTED int become_cyrus(int is_master)
+     int result;
+     static uid_t uid = 0;
+ 
+-    if (uid) return cap_setuid(uid, is_master);
++    if (uid) return cyrus_cap_setuid(uid, is_master);
+ 
+     const char *cyrus = cyrus_user();
+     const char *mail = cyrus_group();
+@@ -645,7 +645,7 @@ EXPORTED int become_cyrus(int is_master)
+         return -1;
+     }
+ 
+-    result = cap_setuid(newuid, is_master);
++    result = cyrus_cap_setuid(newuid, is_master);
+ 
+     /* Only set static uid if successful, else future calls won't reset gid */
+     if (result == 0)
+diff --git a/master/master.c b/master/master.c
+index 9c4d6f097..57f49f84a 100644
+--- a/master/master.c
++++ b/master/master.c
+@@ -285,7 +285,7 @@ static void get_statsock(int filedes[2])
+         fatalf(1, "unable to set close-on-exec: %m");
+ }
+ 
+-static int cap_bind(int socket, struct sockaddr *addr, socklen_t length)
++static int cyrus_cap_bind(int socket, struct sockaddr *addr, socklen_t length)
+ {
+     int r;
+ 
+@@ -643,7 +643,7 @@ static void service_create(struct service *s)
+ #endif
+ 
+         oldumask = umask((mode_t) 0); /* for linux */
+-        r = cap_bind(s->socket, res->ai_addr, res->ai_addrlen);
++        r = cyrus_cap_bind(s->socket, res->ai_addr, res->ai_addrlen);
+         umask(oldumask);
+         if (r < 0) {
+             syslog(LOG_ERR, "unable to bind to %s/%s socket: %m",

diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
index 271895d4f88..c0215ef6fa4 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -5,7 +5,7 @@
   <use>
     <flag name="replication">Enable replication support</flag>
     <flag name="sieve">Enable sieve support</flag>
-    <flag name="http">Enable http support</flag>
+    <flag name="http">Enable http and http/2 support</flag>
     <flag name="server">Enable building server binaries</flag>
     <flag name="backup">Enable backup service support</flag>
     <flag name="calalarm">Enable CalDAV alarm support</flag>


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/files/, net-mail/cyrus-imapd/
@ 2023-02-13 22:45 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-02-13 22:45 UTC (permalink / raw
  To: gentoo-commits

commit:     20bff3caf26436646577e2fddaac7d1d31b586e6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 08:42:31 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 22:44:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20bff3ca

net-mail/cyrus-imapd: drop .la files, fix trivial bashism in init script

Closes: https://bugs.gentoo.org/843692
Closes: https://bugs.gentoo.org/843695
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...cyrus-imapd-3.0.18.ebuild => cyrus-imapd-3.0.18-r1.ebuild} |  2 ++
 .../{cyrus-imapd-3.4.5.ebuild => cyrus-imapd-3.4.5-r1.ebuild} |  2 ++
 net-mail/cyrus-imapd/files/cyrus.rc8                          | 11 +++++------
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.18.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.18-r1.ebuild
similarity index 99%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.0.18.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.0.18-r1.ebuild
index e7037f973119..a9eb170fa2a1 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.18.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.18-r1.ebuild
@@ -204,6 +204,8 @@ src_install() {
 			fperms 0750 "/var/${subdir}/${i}"
 		done
 	done
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }
 
 pkg_preinst() {

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild
similarity index 99%
rename from net-mail/cyrus-imapd/cyrus-imapd-3.4.5.ebuild
rename to net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild
index ff38d8a5b3ab..53019d534474 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.5.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild
@@ -219,6 +219,8 @@ src_install() {
 			fperms 0750 "/var/${subdir}/${i}"
 		done
 	done
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }
 
 pkg_preinst() {

diff --git a/net-mail/cyrus-imapd/files/cyrus.rc8 b/net-mail/cyrus-imapd/files/cyrus.rc8
index 9d9e9452f565..e3be47fadf63 100644
--- a/net-mail/cyrus-imapd/files/cyrus.rc8
+++ b/net-mail/cyrus-imapd/files/cyrus.rc8
@@ -9,12 +9,11 @@ depend() {
 }
 
 checkdirs() {
-	for dir in /run/cyrus/{,proc,lock,socket,sync}
-	do
-	checkpath -q -d -o cyrus:mail -m 0750 "${dir}" || {
-                eerror "Failed to create directory at $dir"
-                return 1
-	}
+	for dir in /run/cyrus /run/cyrus/proc /run/cyrus/lock /run/cyrus/socket /run/cyrus/sync; do
+		checkpath -q -d -o cyrus:mail -m 0750 "${dir}" || {
+			eerror "Failed to create directory at $dir"
+			return 1
+		}
 	done
 }
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2023-02-13 22:45 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-16 14:13 [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/files/, net-mail/cyrus-imapd/ Eray Aslan
  -- strict thread matches above, loose matches on Subject: below --
2017-07-14 11:11 Pacho Ramos
2017-08-11 15:50 Eray Aslan
2017-08-15  6:22 Eray Aslan
2020-04-09 14:08 Eray Aslan
2023-02-13 22:45 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox