* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/
@ 2019-07-30 6:35 Eray Aslan
0 siblings, 0 replies; 8+ messages in thread
From: Eray Aslan @ 2019-07-30 6:35 UTC (permalink / raw
To: gentoo-commits
commit: b5e9758e9142364cf5ebb277206c6b2463149814
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 06:34:55 2019 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 06:34:55 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5e9758e
net-mail/cyrus-imapd: remove old
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>
net-mail/cyrus-imapd/Manifest | 1 -
net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild | 221 ---------------------
.../cyrus-imapd/files/cyrus-imapd-fix-tests.patch | 21 --
.../files/cyrus-imapd-libcap-libs.patch | 35 ----
.../files/cyrus-imapd-sieve-libs-v4.patch | 127 ------------
net-mail/cyrus-imapd/metadata.xml | 2 -
6 files changed, 407 deletions(-)
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index a8109439a59..cfb8cb572cd 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,3 +1,2 @@
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.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873 SHA512 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
deleted file mode 100644
index ba030ccce89..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic pam ssl-cert user
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
- mysql nntp pam perl postgres replication +server sieve snmp \
- sphinx sqlite ssl static-libs tcpd test xapian"
-
-# virtual/mysql-5.5 added for the --variable= option below
-CDEPEND="sys-libs/zlib
- dev-libs/libpcre
- >=dev-libs/cyrus-sasl-2.1.13
- dev-libs/jansson
- dev-libs/icu:=
- afs? ( net-fs/openafs )
- caps? ( sys-libs/libcap )
- clamav? ( app-antivirus/clamav )
- http? ( dev-libs/libxml2 dev-libs/libical )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap )
- lmdb? ( dev-db/lmdb )
- mysql? ( >=virtual/mysql-5.5 )
- nntp? ( !net-nntp/leafnode )
- pam? (
- virtual/pam
- >=net-mail/mailbase-1
- )
- perl? ( dev-lang/perl:= )
- postgres? ( dev-db/postgresql:* )
- snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
- ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
- sqlite? ( dev-db/sqlite:3 )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
- xapian? ( >=dev-libs/xapian-1.4.0 )"
-
-DEPEND="${CDEPEND}
- test? ( dev-util/cunit )"
-
-# all blockers really needed?
-RDEPEND="${CDEPEND}
- !mail-mta/courier
- !net-mail/bincimap
- !net-mail/courier-imap
- !net-mail/uw-imap
- !net-mail/cyrus-imap-admin"
-
-REQUIRED_USE="afs? ( kerberos )
- backup? ( sqlite )
- calalarm? ( http )
- http? ( sqlite )
- jmap? ( http xapian )
- sphinx? ( mysql )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewuser cyrus -1 -1 /usr/cyrus mail
- append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
- # bug 604470
- eapply -p1 "${FILESDIR}/${PN}-sieve-libs-v4.patch"
- eapply -p1 "${FILESDIR}/${PN}-libcap-libs.patch"
- eapply -p1 "${FILESDIR}/${PN}-fix-tests.patch"
- # Fix master(8)->cyrusmaster(8) manpage.
- for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
- sed -i -e 's:master\.8:cyrusmaster.8:g' \
- -e 's:master(8):cyrusmaster(8):g' \
- "${i}" || die "sed failed" || die "sed failed"
- done
- mv man/master.8 man/cyrusmaster.8 || die "mv failed"
- sed -i -e "s:MASTER:CYRUSMASTER:g" \
- -e "s:Master:Cyrusmaster:g" \
- -e "s:master:cyrusmaster:g" \
- man/cyrusmaster.8 || die "sed failed"
-
- # lock.h to afs/lock.h
- sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
- ptclient/afskrb.c || die
-
- eapply_user
- eautoreconf
-}
-
-src_configure() {
- local myconf
- if use afs ; then
- myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
- myconf+=" --with-afs-incdir=/usr/include/afs"
- fi
- econf \
- --enable-unit-tests \
- --enable-murder \
- --enable-idled \
- --enable-event-notification \
- --enable-autocreate \
- --enable-pcre \
- --with-cyrus-user=cyrus \
- --with-cyrus-group=mail \
- --with-com_err=yes \
- --with-sasl \
- --without-krb \
- --without-krbdes \
- --enable-squat \
- --with-zlib \
- $(use_enable afs) \
- $(use_enable afs krb5afspts) \
- $(use_enable backup) \
- $(use_enable calalarm calalarmd) \
- $(use_with caps libcap) \
- $(use_with clamav) \
- $(use_enable jmap) \
- $(use_enable nntp) \
- $(use_enable http) \
- $(use_enable replication) \
- $(use_enable kerberos gssapi) \
- $(use_with ldap) \
- $(use_with lmdb) \
- $(use_with mysql) \
- $(use_with postgres pgsql) \
- $(use_with perl) \
- $(use_with sqlite) \
- $(use_with ssl openssl) \
- $(use_enable server) \
- $(use_enable sieve) \
- $(use_with snmp) \
- $(use_enable sphinx) \
- $(use_enable static-libs static) \
- $(use_with tcpd libwrap) \
- $(use_enable xapian) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
- dodoc README*
- dodoc -r doc
- cp -r contrib tools "${D}/usr/share/doc/${PF}"
- rm -f doc/text/Makefile*
-
- mv "${D}"usr/libexec/{master,cyrusmaster} || die
-
- insinto /etc
- newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
- newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
- sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
- -e '/^partition-default/s|/var/.*|/var/spool/imap|' \
- -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
- "${D}"etc/imapd.conf
-
- sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
- -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
- "${D}"etc/cyrus.conf
-
- # turn off sieve if not installed
- if ! use sieve; then
- sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
- fi
- # same thing for http(s) as well
- if ! use http; then
- sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
- fi
-
- newinitd "${FILESDIR}/cyrus.rc8" cyrus
- newconfd "${FILESDIR}/cyrus.confd" cyrus
- newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
- for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
- keepdir "/var/${subdir}"
- fowners cyrus:mail "/var/${subdir}"
- fperms 0750 "/var/${subdir}"
- done
- for subdir in imap/{user,quota,sieve} spool/imap ; do
- for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
- keepdir "/var/${subdir}/${i}"
- fowners cyrus:mail "/var/${subdir}/${i}"
- fperms 0750 "/var/${subdir}/${i}"
- done
- done
-}
-
-pkg_preinst() {
- if ! has_version ${CATEGORY}/${PN} ; then
- elog "For correct logging add the following to /etc/syslog.conf:"
- elog " local6.* /var/log/imapd.log"
- elog " auth.debug /var/log/auth.log"
- echo
-
- elog "You have to add user cyrus to the sasldb2. Do this with:"
- elog " saslpasswd2 cyrus"
- fi
-}
-
-pkg_postinst() {
- # do not install server.{key,pem) if they exist
- if use ssl ; then
- if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
- install_cert /etc/ssl/cyrus/server
- chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
- fi
- fi
-
- echo
- ewarn "Please see https://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
deleted file mode 100644
index c32f2065db0..00000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-fix-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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-libcap-libs.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs.patch
deleted file mode 100644
index e1f5332c6e8..00000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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@",
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs-v4.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs-v4.patch
deleted file mode 100644
index 4a7bac2e3c1..00000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs-v4.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_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_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 04d897e5405..271895d4f88 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -9,8 +9,6 @@
<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>
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/
@ 2023-07-02 11:14 David Seifert
0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2023-07-02 11:14 UTC (permalink / raw
To: gentoo-commits
commit: a489c9343b03c19a13e21716e29e644094da8de3
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 2 11:14:22 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jul 2 11:14:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a489c934
net-mail/cyrus-imapd: drop versions
Signed-off-by: David Seifert <soap <AT> gentoo.org>
net-mail/cyrus-imapd/Manifest | 6 -
net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild | 231 --------------------
net-mail/cyrus-imapd/cyrus-imapd-3.0.17-r1.ebuild | 232 --------------------
net-mail/cyrus-imapd/cyrus-imapd-3.0.18-r1.ebuild | 234 --------------------
net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r2.ebuild | 233 --------------------
net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r2.ebuild | 242 ---------------------
net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild | 247 ----------------------
net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild | 242 ---------------------
net-mail/cyrus-imapd/files/cyrus.conf | 41 ----
net-mail/cyrus-imapd/files/imapd.conf | 50 -----
net-mail/cyrus-imapd/metadata.xml | 1 -
11 files changed, 1759 deletions(-)
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index ef9fd5701264..da14e74b3b1a 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,7 +1 @@
-DIST cyrus-imapd-3.0.16.tar.gz 10875516 BLAKE2B 10915418b4de3f460a20d3808274f9ea83bdadc9a9edf2b383081605f7510a3e1563fa009e1dcc203f1c008f26e9db3ffd80f101f546de1dc8c3e714efc13596 SHA512 c17dd940102989d1e329ad8a1c08655bdd8b349ecb08e661f55ab8e602516ece1a86e52313e8cd5677048470f15f4272fcb598e4bbc61d27e5a673c01cb81ca3
-DIST cyrus-imapd-3.0.17.tar.gz 11445224 BLAKE2B bf2cd85f878c1b4198be5ce96cf6a4ae1e4fcc765b0c7fe60a6bfd04dd066c0420f86508cbfc1030831b57c2732715440cbf0e327f5147b074fe12926dcda85f SHA512 75519bf8a2ae4a8ff844338bee641d519eaf3419fb81b819dc7a42e5956ef57569e47a0e094ccb9726a9c43f0469cd3def6c62783565b2a2aaa863bda354a7da
-DIST cyrus-imapd-3.0.18.tar.gz 11465046 BLAKE2B 74b0ad899341959dd70f872fe5c190ddf5f4452834b0ee3f339b7c6c1c925d2a3ce091b826881fc3077aeb2ac0f9817f275469473155452236f5385134e3bcd7 SHA512 e4c2ebd979223ad577bf2d91299c324e08fa9e8a7871ef99d2db9e3ea29b44d170c36aa57ffe84bbbdd28014d06af9c54d5e72eb18036d5ee8aed910f45f5941
-DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6
-DIST cyrus-imapd-3.4.3.tar.gz 13182110 BLAKE2B 485df8e2518a55a3b096d0c330d55f7ed93209ca4ab5851dda53083082e203ad9b1d9218c0863a9bd1e678a732427ef499ff78bacf2d3fb2fe18464186a9e6d2 SHA512 5c4db2a0c26d2323332c1ba67f7b207acfad15f0442f20c6c8a205b5423498465524398315946213c8168bc7eba1fd9f7dc573a91efac6708bfbaf2cb57e9276
-DIST cyrus-imapd-3.4.4.tar.gz 13236335 BLAKE2B 105ae3defcf321a01394b38672b080ea58f68ecdc41384af46186c6ef88c02061ac066bd3e382d7b649761d5e462f2310a4568989c87e5ec518e08051179f4b3 SHA512 7904a9d0535e9d606bbb7748a4886e10092e2b682180dddf94933199f19402ae6f5cc4472a3797decf9ef20d3a8b7f1715ab00f6751037f14b19cd7322942dc2
DIST cyrus-imapd-3.4.5.tar.gz 13291987 BLAKE2B 4ac383ef7f3dea66a7dc11c2241b8663e3cda323b73e3b439255468cf9b6d80302a135793f952843ddee418acb4aa4a9a9d56fcb743b5d589d535764c2289c1d SHA512 e43185193130af2e11ced89b2241a7b6f321847cf8bc01c0d89cbbb1cb222a962fe00cdd54b1f89cea141a569b57d2ce2f0edffaca8db9fd5f7fc2cd82b4537b
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
deleted file mode 100644
index 06d4168cf795..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2022 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-fs/e2fsprogs
- 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"
-)
-
-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
-
- # https://bugs.gentoo.org/604466
- append-ldflags $(no-as-needed)
-
- 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/cyrus-imapd-3.0.17-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.17-r1.ebuild
deleted file mode 100644
index 9346b47b1dab..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.17-r1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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:=
- dev-libs/libpcre:3
- >=dev-libs/cyrus-sasl-2.1.13:2
- dev-libs/jansson:=
- dev-libs/icu:=
- sys-fs/e2fsprogs
- afs? ( net-fs/openafs )
- calalarm? ( dev-libs/libical:= )
- caps? ( sys-libs/libcap )
- clamav? ( app-antivirus/clamav )
- http? (
- dev-libs/libxml2:2
- dev-libs/libical:=
- net-libs/nghttp2:=
- )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap:= )
- lmdb? ( dev-db/lmdb:= )
- mysql? ( dev-db/mysql-connector-c:= )
- 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:= )
- ssl? ( >=dev-libs/openssl-1.0.1e:=[-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?
-# 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"
-)
-
-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
-
- # https://bugs.gentoo.org/604466
- append-ldflags $(no-as-needed)
-
- 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 "${ED}"/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf cyrus.conf
- newins "${ED}"/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf imapd.conf
-
- sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
- -e '/^partition-default/s|/var/.*|/var/spool/imap|' \
- -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
- "${ED}"/etc/imapd.conf || die
-
- sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
- -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
- "${ED}"/etc/cyrus.conf || die
-
- # turn off sieve if not installed
- if ! use sieve; then
- sed -i -e "/sieve/s/^/#/" "${ED}"/etc/cyrus.conf || die
- fi
- # same thing for http(s) as well
- if ! use http; then
- sed -i -e "/http/s/^/#/" "${ED}"/etc/cyrus.conf || die
- fi
-
- newinitd "${FILESDIR}"/cyrus.rc8 cyrus
- newconfd "${FILESDIR}"/cyrus.confd cyrus
- newpamd "${FILESDIR}"/cyrus.pam-include sieve
-
- for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
- keepdir "/var/${subdir}"
- fowners cyrus:mail "/var/${subdir}"
- fperms 0750 "/var/${subdir}"
- done
-
- for subdir in imap/{user,quota,sieve} spool/imap ; do
- for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
- keepdir "/var/${subdir}/${i}"
- fowners cyrus:mail "/var/${subdir}/${i}"
- fperms 0750 "/var/${subdir}/${i}"
- done
- done
-}
-
-pkg_preinst() {
- if ! has_version ${CATEGORY}/${PN} ; then
- elog "For correct logging add the following to /etc/syslog.conf:"
- elog " local6.* /var/log/imapd.log"
- elog " auth.debug /var/log/auth.log"
- echo
-
- elog "You have to add user cyrus to the sasldb2. Do this with:"
- elog " saslpasswd2 cyrus"
- fi
-}
-
-pkg_postinst() {
- # do not install server.{key,pem) if they exist
- if use ssl ; then
- if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
- install_cert /etc/ssl/cyrus/server
- chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
- fi
- fi
-
- einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
- einfo "for upgrade instructions."
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.18-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.18-r1.ebuild
deleted file mode 100644
index a9eb170fa2a1..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.18-r1.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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:=
- dev-libs/libpcre:3
- >=dev-libs/cyrus-sasl-2.1.13:2
- dev-libs/jansson:=
- dev-libs/icu:=
- sys-fs/e2fsprogs
- afs? ( net-fs/openafs )
- calalarm? ( dev-libs/libical:= )
- caps? ( sys-libs/libcap )
- clamav? ( app-antivirus/clamav )
- http? (
- dev-libs/libxml2:2
- dev-libs/libical:=
- net-libs/nghttp2:=
- )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap:= )
- lmdb? ( dev-db/lmdb:= )
- mysql? ( dev-db/mysql-connector-c:= )
- 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:= )
- ssl? ( >=dev-libs/openssl-1.0.1e:=[-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?
-# 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"
-)
-
-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
-
- # https://bugs.gentoo.org/604466
- append-ldflags $(no-as-needed)
-
- 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 "${ED}"/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf cyrus.conf
- newins "${ED}"/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf imapd.conf
-
- sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
- -e '/^partition-default/s|/var/.*|/var/spool/imap|' \
- -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
- "${ED}"/etc/imapd.conf || die
-
- sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
- -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
- "${ED}"/etc/cyrus.conf || die
-
- # turn off sieve if not installed
- if ! use sieve; then
- sed -i -e "/sieve/s/^/#/" "${ED}"/etc/cyrus.conf || die
- fi
- # same thing for http(s) as well
- if ! use http; then
- sed -i -e "/http/s/^/#/" "${ED}"/etc/cyrus.conf || die
- fi
-
- newinitd "${FILESDIR}"/cyrus.rc8 cyrus
- newconfd "${FILESDIR}"/cyrus.confd cyrus
- newpamd "${FILESDIR}"/cyrus.pam-include sieve
-
- for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
- keepdir "/var/${subdir}"
- fowners cyrus:mail "/var/${subdir}"
- fperms 0750 "/var/${subdir}"
- done
-
- for subdir in imap/{user,quota,sieve} spool/imap ; do
- for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
- keepdir "/var/${subdir}/${i}"
- fowners cyrus:mail "/var/${subdir}/${i}"
- fperms 0750 "/var/${subdir}/${i}"
- done
- done
-
- find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_preinst() {
- if ! has_version ${CATEGORY}/${PN} ; then
- elog "For correct logging add the following to /etc/syslog.conf:"
- elog " local6.* /var/log/imapd.log"
- elog " auth.debug /var/log/auth.log"
- echo
-
- elog "You have to add user cyrus to the sasldb2. Do this with:"
- elog " saslpasswd2 cyrus"
- fi
-}
-
-pkg_postinst() {
- # do not install server.{key,pem) if they exist
- if use ssl ; then
- if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
- install_cert /etc/ssl/cyrus/server
- chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
- fi
- fi
-
- einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
- einfo "for upgrade instructions."
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r2.ebuild
deleted file mode 100644
index 9d13260102be..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r2.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2022 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 \
- mysql nntp pam perl postgres replication +server sieve \
- 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-fs/e2fsprogs
- 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:=
- net-libs/nghttp2:=
- )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap:= )
- mysql? ( dev-db/mysql-connector-c:0= )
- nntp? ( !net-nntp/leafnode )
- pam? (
- >=net-mail/mailbase-1
- sys-libs/pam
- )
- perl? ( dev-lang/perl:= )
- postgres? ( dev-db/postgresql:* )
- ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
- sqlite? ( dev-db/sqlite:3 )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
- 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"
-#)
-
-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
-
- # https://bugs.gentoo.org/604466
- append-ldflags $(no-as-needed)
-
- if use afs ; then
- myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
- myconf+=" --with-afs-incdir=/usr/include/afs"
- fi
-
- # TODO:
- # - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
- # - post-emerge message re lmdb removal?
- econf \
- --enable-murder \
- --enable-idled \
- --enable-autocreate \
- --enable-pcre \
- --with-com_err \
- --with-cyrus-user=cyrus \
- --with-sasl \
- --with-sphinx-build=no \
- --without-krb \
- --without-krbdes \
- --enable-squat \
- --with-zlib \
- $(use_enable afs) \
- $(use_enable afs krb5afspts) \
- $(use_enable backup) \
- $(use_enable calalarm calalarmd) \
- $(use_with caps libcap) \
- $(use_with clamav) \
- $(use_enable nntp) \
- $(use_enable http) \
- $(use_with http nghttp2) \
- $(use_enable replication) \
- $(use_enable kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_with postgres pgsql) \
- $(use_with perl) \
- $(use_with sqlite) \
- $(use_with ssl openssl) \
- $(use_enable server) \
- $(use_enable sieve) \
- $(use_enable static-libs static) \
- $(use_with tcpd libwrap) \
- $(use_enable xapian) \
- $(use_enable test unit-tests) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
- dodoc README*
- dodoc -r doc
-
- cp -r contrib tools "${ED}/usr/share/doc/${PF}" || die
- rm -f doc/text/Makefile* || die
-
- mv "${ED}"/usr/libexec/{master,cyrusmaster} || die
-
- insinto /etc
- newins "${ED}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
- newins "${ED}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
- sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
- -e '/^partition-default/s|/var/.*|/var/spool/imap|' \
- -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
- "${ED}"/etc/imapd.conf || die
-
- sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
- -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
- "${ED}"/etc/cyrus.conf || die
-
- # turn off sieve if not installed
- if ! use sieve; then
- sed -i -e "/sieve/s/^/#/" "${ED}/etc/cyrus.conf" || die
- fi
-
- # same thing for http(s) as well
- if ! use http; then
- sed -i -e "/http/s/^/#/" "${ED}/etc/cyrus.conf" || die
- fi
-
- newinitd "${FILESDIR}/cyrus.rc8" cyrus
- newconfd "${FILESDIR}/cyrus.confd" cyrus
- newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
- for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
- keepdir "/var/${subdir}"
- fowners cyrus:mail "/var/${subdir}"
- fperms 0750 "/var/${subdir}"
- done
-
- for subdir in imap/{user,quota,sieve} spool/imap ; do
- for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
- keepdir "/var/${subdir}/${i}"
- fowners cyrus:mail "/var/${subdir}/${i}"
- fperms 0750 "/var/${subdir}/${i}"
- done
- done
-}
-
-pkg_preinst() {
- if ! has_version ${CATEGORY}/${PN} ; then
- elog "For correct logging add the following to /etc/syslog.conf:"
- elog " local6.* /var/log/imapd.log"
- elog " auth.debug /var/log/auth.log"
- echo
-
- elog "You have to add user cyrus to the sasldb2. Do this with:"
- elog " saslpasswd2 cyrus"
- fi
-}
-
-pkg_postinst() {
- # do not install server.{key,pem) if they exist
- if use ssl ; then
- if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then
- install_cert /etc/ssl/cyrus/server
- chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
- fi
- fi
-
- echo
- einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
- einfo "for upgrade instructions."
- echo
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r2.ebuild
deleted file mode 100644
index 84009a8c6375..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r2.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Keep an eye on https://www.cyrusimap.org/imap/developer/compiling.html!
-inherit autotools flag-o-matic pam ssl-cert
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap \
- mysql nntp pam perl postgres replication +server sieve \
- sqlite ssl static-libs tcpd test xapian"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/libpcre:3
- >=dev-libs/cyrus-sasl-2.1.13:2
- dev-libs/jansson:=
- dev-libs/icu:=
- sys-apps/util-linux
- sys-fs/e2fsprogs:=
- sys-libs/zlib:=
- afs? ( net-fs/openafs )
- calalarm? ( dev-libs/libical:= )
- caps? ( sys-libs/libcap )
- clamav? ( app-antivirus/clamav )
- http? (
- app-arch/brotli:=
- app-arch/zstd:=
- dev-libs/libxml2
- dev-libs/libical:=
- net-libs/nghttp2:=
- sci-libs/shapelib:=
- )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap:= )
- mysql? ( dev-db/mysql-connector-c:= )
- nntp? ( !net-nntp/leafnode )
- pam? (
- >=net-mail/mailbase-1
- sys-libs/pam
- )
- perl? (
- dev-lang/perl:=
- virtual/perl-Term-ReadLine
- )
- postgres? ( dev-db/postgresql:* )
- ssl? ( >=dev-libs/openssl-1.0.1e:=[-bindist(-)] )
- sqlite? ( dev-db/sqlite:3 )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
- xapian? ( >=dev-libs/xapian-1.4.0:= )"
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${DEPEND}
- acct-group/mail
- acct-user/cyrus
- !mail-mta/courier
- !net-mail/bincimap
- !net-mail/courier-imap
- !net-mail/uw-imap
- !app-arch/dump"
-DEPEND+=" test? ( dev-util/cunit )"
-BDEPEND="sys-devel/flex
- virtual/pkgconfig
- app-alternatives/yacc"
-
-REQUIRED_USE="afs? ( kerberos )
- backup? ( sqlite )
- calalarm? ( http )
- http? ( sqlite )"
-
-# https://bugs.gentoo.org/678754
-# TODO: check underlinking for other libraries
-#PATCHES=(
-# "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
-#)
-
-src_prepare() {
- default
-
- # Fix master(8)->cyrusmaster(8) manpage.
- for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
- sed -i -e 's:master\.8:cyrusmaster.8:g' \
- -e 's:master(8):cyrusmaster(8):g' \
- "${i}" || die "sed failed" || die "sed failed"
- done
- mv man/master.8 man/cyrusmaster.8 || die "mv failed"
- sed -i -e "s:MASTER:CYRUSMASTER:g" \
- -e "s:Master:Cyrusmaster:g" \
- -e "s:master:cyrusmaster:g" \
- man/cyrusmaster.8 || die "sed failed"
-
- # lock.h to afs/lock.h
- sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
- ptclient/afskrb.c || die
-
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- # bug #604466
- append-ldflags $(no-as-needed)
-
- # Workaround runtime crash
- # bug #834573
- append-flags -fno-toplevel-reorder
-
- if use afs ; then
- myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
- myconf+=" --with-afs-incdir=/usr/include/afs"
- fi
-
- # TODO:
- # - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
- # - post-emerge message re lmdb removal?
- econf \
- --enable-murder \
- --enable-idled \
- --enable-autocreate \
- --enable-pcre \
- --with-com_err \
- --with-cyrus-user=cyrus \
- --with-sasl \
- --with-sphinx-build=no \
- --without-krb \
- --without-krbdes \
- --enable-squat \
- --with-zlib \
- --without-wslay \
- --without-chardet \
- --without-cld2 \
- --disable-srs \
- $(use_enable afs) \
- $(use_enable afs krb5afspts) \
- $(use_enable backup) \
- $(use_enable calalarm calalarmd) \
- $(use_with caps libcap) \
- $(use_with clamav) \
- $(use_enable nntp) \
- $(use_enable http) \
- $(use_with http nghttp2) \
- $(use_enable replication) \
- $(use_enable kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_with postgres pgsql) \
- $(use_with perl) \
- $(use_with sqlite) \
- $(use_with ssl openssl) \
- $(use_enable server) \
- $(use_enable sieve) \
- $(use_enable static-libs static) \
- $(use_with tcpd libwrap) \
- $(use_enable xapian) \
- $(use_enable test unit-tests) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
- dodoc README*
- dodoc -r doc
-
- cp -r contrib tools "${ED}"/usr/share/doc/${PF} || die
- rm -f doc/text/Makefile* || die
-
- mv "${ED}"/usr/libexec/{master,cyrusmaster} || die
-
- insinto /etc
- newins "${ED}"/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf cyrus.conf
- newins "${ED}"/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf imapd.conf
-
- sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
- -e '/^partition-default/s|/var/.*|/var/spool/imap|' \
- -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
- "${ED}"/etc/imapd.conf || die
-
- sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
- -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
- "${ED}"/etc/cyrus.conf || die
-
- # turn off sieve if not installed
- if ! use sieve; then
- sed -i -e "/sieve/s/^/#/" "${ED}"/etc/cyrus.conf || die
- fi
-
- # same thing for http(s) as well
- if ! use http; then
- sed -i -e "/http/s/^/#/" "${ED}"/etc/cyrus.conf || die
- fi
-
- newinitd "${FILESDIR}"/cyrus.rc8 cyrus
- newconfd "${FILESDIR}"/cyrus.confd cyrus
- newpamd "${FILESDIR}"/cyrus.pam-include sieve
-
- for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
- keepdir "/var/${subdir}"
- fowners cyrus:mail "/var/${subdir}"
- fperms 0750 "/var/${subdir}"
- done
-
- for subdir in imap/{user,quota,sieve} spool/imap ; do
- for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
- keepdir "/var/${subdir}/${i}"
- fowners cyrus:mail "/var/${subdir}/${i}"
- fperms 0750 "/var/${subdir}/${i}"
- done
- done
-}
-
-pkg_preinst() {
- if ! has_version ${CATEGORY}/${PN} ; then
- elog "For correct logging add the following to /etc/syslog.conf:"
- elog " local6.* /var/log/imapd.log"
- elog " auth.debug /var/log/auth.log"
- echo
-
- elog "You have to add user cyrus to the sasldb2. Do this with:"
- elog " saslpasswd2 cyrus"
- fi
-}
-
-pkg_postinst() {
- # do not install server.{key,pem) if they exist
- if use ssl ; then
- if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then
- install_cert /etc/ssl/cyrus/server
- chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
- fi
- fi
-
- einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
- einfo "for upgrade instructions."
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild
deleted file mode 100644
index 33031ad0dced..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Keep an eye on https://www.cyrusimap.org/imap/developer/compiling.html!
-inherit autotools flag-o-matic pam ssl-cert
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap \
- mysql nntp pam perl postgres replication +server sieve \
- sqlite ssl static-libs tcpd test xapian"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/libpcre:3
- >=dev-libs/cyrus-sasl-2.1.13:2
- dev-libs/jansson:=
- dev-libs/icu:=
- sys-apps/util-linux
- sys-fs/e2fsprogs:=
- sys-libs/zlib:=
- afs? ( net-fs/openafs )
- calalarm? ( dev-libs/libical:= )
- caps? ( sys-libs/libcap )
- clamav? ( app-antivirus/clamav )
- http? (
- app-arch/brotli:=
- app-arch/zstd:=
- dev-libs/libxml2
- dev-libs/libical:=
- net-libs/nghttp2:=
- sci-libs/shapelib:=
- )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap:= )
- mysql? ( dev-db/mysql-connector-c:= )
- nntp? ( !net-nntp/leafnode )
- pam? (
- >=net-mail/mailbase-1
- sys-libs/pam
- )
- perl? (
- dev-lang/perl:=
- virtual/perl-Term-ReadLine
- )
- postgres? ( dev-db/postgresql:* )
- ssl? ( >=dev-libs/openssl-1.0.1e:=[-bindist(-)] )
- sqlite? ( dev-db/sqlite:3 )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
- xapian? ( >=dev-libs/xapian-1.4.0:= )"
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${DEPEND}
- acct-group/mail
- acct-user/cyrus
- !mail-mta/courier
- !net-mail/bincimap
- !net-mail/courier-imap
- !net-mail/uw-imap
- !app-arch/dump"
-DEPEND+=" test? ( dev-util/cunit )"
-BDEPEND="sys-devel/flex
- virtual/pkgconfig
- app-alternatives/yacc"
-
-REQUIRED_USE="afs? ( kerberos )
- backup? ( sqlite )
- calalarm? ( http )
- http? ( sqlite )"
-
-# https://bugs.gentoo.org/678754
-# TODO: check underlinking for other libraries
-#PATCHES=(
-# "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
-#)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4.4-0001-Test-for-libm.patch
- "${FILESDIR}"/${PN}-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch
-)
-
-src_prepare() {
- default
-
- # Fix master(8)->cyrusmaster(8) manpage.
- for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
- sed -i -e 's:master\.8:cyrusmaster.8:g' \
- -e 's:master(8):cyrusmaster(8):g' \
- "${i}" || die "sed failed" || die "sed failed"
- done
- mv man/master.8 man/cyrusmaster.8 || die "mv failed"
- sed -i -e "s:MASTER:CYRUSMASTER:g" \
- -e "s:Master:Cyrusmaster:g" \
- -e "s:master:cyrusmaster:g" \
- man/cyrusmaster.8 || die "sed failed"
-
- # lock.h to afs/lock.h
- sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
- ptclient/afskrb.c || die
-
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- # bug #604466
- append-ldflags $(no-as-needed)
-
- # Workaround runtime crash
- # bug #834573
- append-flags -fno-toplevel-reorder
-
- if use afs ; then
- myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
- myconf+=" --with-afs-incdir=/usr/include/afs"
- fi
-
- # TODO:
- # - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
- # - post-emerge message re lmdb removal?
- econf \
- --enable-murder \
- --enable-idled \
- --enable-autocreate \
- --enable-pcre \
- --with-com_err \
- --with-cyrus-user=cyrus \
- --with-sasl \
- --with-sphinx-build=no \
- --without-krb \
- --without-krbdes \
- --enable-squat \
- --with-zlib \
- --without-wslay \
- --without-chardet \
- --without-cld2 \
- --disable-srs \
- $(use_enable afs) \
- $(use_enable afs krb5afspts) \
- $(use_enable backup) \
- $(use_enable calalarm calalarmd) \
- $(use_with caps libcap) \
- $(use_with clamav) \
- $(use_enable nntp) \
- $(use_enable http) \
- $(use_with http nghttp2) \
- $(use_enable replication) \
- $(use_enable kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_with postgres pgsql) \
- $(use_with perl) \
- $(use_with sqlite) \
- $(use_with ssl openssl) \
- $(use_enable server) \
- $(use_enable sieve) \
- $(use_enable static-libs static) \
- $(use_with tcpd libwrap) \
- $(use_enable xapian) \
- $(use_enable test unit-tests) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
- dodoc README*
- dodoc -r doc
-
- cp -r contrib tools "${ED}"/usr/share/doc/${PF} || die
- rm -f doc/text/Makefile* || die
-
- mv "${ED}"/usr/libexec/{master,cyrusmaster} || die
-
- insinto /etc
- newins "${ED}"/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf cyrus.conf
- newins "${ED}"/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf imapd.conf
-
- sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
- -e '/^partition-default/s|/var/.*|/var/spool/imap|' \
- -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
- "${ED}"/etc/imapd.conf || die
-
- sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
- -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
- "${ED}"/etc/cyrus.conf || die
-
- # turn off sieve if not installed
- if ! use sieve; then
- sed -i -e "/sieve/s/^/#/" "${ED}"/etc/cyrus.conf || die
- fi
-
- # same thing for http(s) as well
- if ! use http; then
- sed -i -e "/http/s/^/#/" "${ED}"/etc/cyrus.conf || die
- fi
-
- newinitd "${FILESDIR}"/cyrus.rc8 cyrus
- newconfd "${FILESDIR}"/cyrus.confd cyrus
- newpamd "${FILESDIR}"/cyrus.pam-include sieve
-
- for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
- keepdir "/var/${subdir}"
- fowners cyrus:mail "/var/${subdir}"
- fperms 0750 "/var/${subdir}"
- done
-
- for subdir in imap/{user,quota,sieve} spool/imap ; do
- for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
- keepdir "/var/${subdir}/${i}"
- fowners cyrus:mail "/var/${subdir}/${i}"
- fperms 0750 "/var/${subdir}/${i}"
- done
- done
-}
-
-pkg_preinst() {
- if ! has_version ${CATEGORY}/${PN} ; then
- elog "For correct logging add the following to /etc/syslog.conf:"
- elog " local6.* /var/log/imapd.log"
- elog " auth.debug /var/log/auth.log"
- echo
-
- elog "You have to add user cyrus to the sasldb2. Do this with:"
- elog " saslpasswd2 cyrus"
- fi
-}
-
-pkg_postinst() {
- # do not install server.{key,pem) if they exist
- if use ssl ; then
- if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then
- install_cert /etc/ssl/cyrus/server
- chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
- fi
- fi
-
- einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
- einfo "for upgrade instructions."
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild
deleted file mode 100644
index 15b1b131ef6f..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Keep an eye on https://www.cyrusimap.org/imap/developer/compiling.html!
-inherit autotools flag-o-matic pam ssl-cert
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap \
- mysql nntp pam perl postgres replication +server sieve \
- sqlite ssl static-libs tcpd test xapian"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/libpcre:3
- >=dev-libs/cyrus-sasl-2.1.13:2
- dev-libs/jansson:=
- dev-libs/icu:=
- sys-apps/util-linux
- sys-fs/e2fsprogs:=
- sys-libs/zlib:=
- afs? ( net-fs/openafs )
- calalarm? ( dev-libs/libical:= )
- caps? ( sys-libs/libcap )
- clamav? ( app-antivirus/clamav )
- http? (
- app-arch/brotli:=
- app-arch/zstd:=
- dev-libs/libxml2
- dev-libs/libical:=
- net-libs/nghttp2:=
- sci-libs/shapelib:=
- )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap:= )
- mysql? ( dev-db/mysql-connector-c:= )
- nntp? ( !net-nntp/leafnode )
- pam? (
- >=net-mail/mailbase-1
- sys-libs/pam
- )
- perl? (
- dev-lang/perl:=
- virtual/perl-Term-ReadLine
- )
- postgres? ( dev-db/postgresql:* )
- ssl? ( >=dev-libs/openssl-1.0.1e:=[-bindist(-)] )
- sqlite? ( dev-db/sqlite:3 )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
- xapian? ( >=dev-libs/xapian-1.4.0:= )"
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${DEPEND}
- acct-group/mail
- acct-user/cyrus
- !mail-mta/courier
- !net-mail/bincimap
- !net-mail/courier-imap
- !net-mail/uw-imap
- !app-arch/dump"
-DEPEND+=" test? ( dev-util/cunit )"
-BDEPEND="sys-devel/flex
- virtual/pkgconfig
- app-alternatives/yacc"
-
-REQUIRED_USE="afs? ( kerberos )
- backup? ( sqlite )
- calalarm? ( http )
- http? ( sqlite )"
-
-# https://bugs.gentoo.org/678754
-# TODO: check underlinking for other libraries
-#PATCHES=(
-# "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
-#)
-
-src_prepare() {
- default
-
- # Fix master(8)->cyrusmaster(8) manpage.
- for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
- sed -i -e 's:master\.8:cyrusmaster.8:g' \
- -e 's:master(8):cyrusmaster(8):g' \
- "${i}" || die "sed failed" || die "sed failed"
- done
- mv man/master.8 man/cyrusmaster.8 || die "mv failed"
- sed -i -e "s:MASTER:CYRUSMASTER:g" \
- -e "s:Master:Cyrusmaster:g" \
- -e "s:master:cyrusmaster:g" \
- man/cyrusmaster.8 || die "sed failed"
-
- # lock.h to afs/lock.h
- sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
- ptclient/afskrb.c || die
-
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- # bug #604466
- append-ldflags $(no-as-needed)
-
- # Workaround runtime crash
- # bug #834573
- append-flags -fno-toplevel-reorder
-
- if use afs ; then
- myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
- myconf+=" --with-afs-incdir=/usr/include/afs"
- fi
-
- # TODO:
- # - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
- # - post-emerge message re lmdb removal?
- econf \
- --enable-murder \
- --enable-idled \
- --enable-autocreate \
- --enable-pcre \
- --with-com_err \
- --with-cyrus-user=cyrus \
- --with-sasl \
- --with-sphinx-build=no \
- --without-krb \
- --without-krbdes \
- --enable-squat \
- --with-zlib \
- --without-wslay \
- --without-chardet \
- --without-cld2 \
- --disable-srs \
- $(use_enable afs) \
- $(use_enable afs krb5afspts) \
- $(use_enable backup) \
- $(use_enable calalarm calalarmd) \
- $(use_with caps libcap) \
- $(use_with clamav) \
- $(use_enable nntp) \
- $(use_enable http) \
- $(use_with http nghttp2) \
- $(use_enable replication) \
- $(use_enable kerberos gssapi) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_with postgres pgsql) \
- $(use_with perl) \
- $(use_with sqlite) \
- $(use_with ssl openssl) \
- $(use_enable server) \
- $(use_enable sieve) \
- $(use_enable static-libs static) \
- $(use_with tcpd libwrap) \
- $(use_enable xapian) \
- $(use_enable test unit-tests) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
- dodoc README*
- dodoc -r doc
-
- cp -r contrib tools "${ED}"/usr/share/doc/${PF} || die
- rm -f doc/text/Makefile* || die
-
- mv "${ED}"/usr/libexec/{master,cyrusmaster} || die
-
- insinto /etc
- newins "${ED}"/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf cyrus.conf
- newins "${ED}"/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf imapd.conf
-
- sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
- -e '/^partition-default/s|/var/.*|/var/spool/imap|' \
- -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
- "${ED}"/etc/imapd.conf || die
-
- sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
- -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
- "${ED}"/etc/cyrus.conf || die
-
- # turn off sieve if not installed
- if ! use sieve; then
- sed -i -e "/sieve/s/^/#/" "${ED}"/etc/cyrus.conf || die
- fi
-
- # same thing for http(s) as well
- if ! use http; then
- sed -i -e "/http/s/^/#/" "${ED}"/etc/cyrus.conf || die
- fi
-
- newinitd "${FILESDIR}"/cyrus.rc8 cyrus
- newconfd "${FILESDIR}"/cyrus.confd cyrus
- newpamd "${FILESDIR}"/cyrus.pam-include sieve
-
- for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
- keepdir "/var/${subdir}"
- fowners cyrus:mail "/var/${subdir}"
- fperms 0750 "/var/${subdir}"
- done
-
- for subdir in imap/{user,quota,sieve} spool/imap ; do
- for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
- keepdir "/var/${subdir}/${i}"
- fowners cyrus:mail "/var/${subdir}/${i}"
- fperms 0750 "/var/${subdir}/${i}"
- done
- done
-}
-
-pkg_preinst() {
- if ! has_version ${CATEGORY}/${PN} ; then
- elog "For correct logging add the following to /etc/syslog.conf:"
- elog " local6.* /var/log/imapd.log"
- elog " auth.debug /var/log/auth.log"
- echo
-
- elog "You have to add user cyrus to the sasldb2. Do this with:"
- elog " saslpasswd2 cyrus"
- fi
-}
-
-pkg_postinst() {
- # do not install server.{key,pem) if they exist
- if use ssl ; then
- if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then
- install_cert /etc/ssl/cyrus/server
- chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
- fi
- fi
-
- einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
- einfo "for upgrade instructions."
-}
diff --git a/net-mail/cyrus-imapd/files/cyrus.conf b/net-mail/cyrus-imapd/files/cyrus.conf
deleted file mode 100644
index ab084d51a024..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-# Standard standalone server configuration.
-
-START {
- # Do not delete this entry!
- recover cmd="ctl_cyrusdb -r"
-
- # This is only necessary if using idled for IMAP IDLE.
- #idled cmd="idled"
-}
-
-# UNIX sockets start with a slash and are put into /var/imap/socket.
-SERVICES {
- # Add or remove based on preferences.
- imap cmd="imapd" listen="imap2" prefork=0
- pop3 cmd="pop3d" listen="pop-3" prefork=0
-
- # Don't forget to generate the needed keys for SSL or TLS
- # (see doc/html/install-configure.html).
- #imaps cmd="imapd -s" listen="imaps" prefork=0
- #pop3s cmd="pop3d -s" listen="pop3s" prefork=0
-
- sieve cmd="timsieved" listen="sieve" prefork=0
-
- # at least one LMTP is required for delivery
- #lmtp cmd="lmtpd" listen="lmtp" prefork=0
- lmtpunix cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=0
-
- # this is only necessary if using notifications
- #notify cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1
-}
-
-EVENTS {
- # This is required.
- checkpoint cmd="ctl_cyrusdb -c" period=30
-
- # This is only necessary if using duplicate delivery suppression.
- delprune cmd="ctl_deliver -E 3" period=1440
-
- # This is only necessary if caching TLS sessions.
- tlsprune cmd="tls_prune" period=1440
-}
diff --git a/net-mail/cyrus-imapd/files/imapd.conf b/net-mail/cyrus-imapd/files/imapd.conf
deleted file mode 100644
index e77ff2f4b887..000000000000
--- a/net-mail/cyrus-imapd/files/imapd.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-# Don't forget to use chattr +S (if you are using ext[23])
-# when you change these directories (read the docs).
-configdirectory: /var/imap
-partition-default: /var/spool/imap
-sievedir: /var/imap/sieve
-
-tls_ca_path: /etc/ssl/certs
-tls_cert_file: /etc/ssl/cyrus/server.crt
-tls_key_file: /etc/ssl/cyrus/server.key
-
-# Don't use an everyday user as admin.
-admins: cyrus
-
-hashimapspool: yes
-allowanonymouslogin: no
-allowplaintext: no
-
-# Allow renaming of top-level mailboxes.
-#allowusermoves: yes
-
-# Use this if sieve-scripts could be in ~user/.sieve.
-#sieveusehomedir: yes
-
-# Use saslauthd if you want to use pam for imap.
-# But be warned: login with DIGEST-MD5 or CRAM-MD5
-# is not possible using pam.
-#sasl_pwcheck_method: saslauthd
-
-####################################################
-## This is a recommended authentication method if you
-## emerge cyrus-sasl with 'postgres' or 'mysql'
-## To use with mysql database uncomment those lines below.
-
-#sasl_pwcheck_method: auxprop
-#sasl_auxprop_plugin: sql
-
-## possible values for sasl_auxprop_plugin 'mysql', 'pgsql', 'sqlite'.
-#sasl_sql_engine: mysql
-
-## all possible values.
-#sasl_mech_list: LOGIN PLAIN CRAM-MD5 DIGEST-MD5 NTLM
-## or limit to CRAM-MD5 only
-#sasl_mech_list: CRAM-MD5
-
-## change below to suit your setup.
-sasl_sql_user: mailsqluser
-sasl_sql_passwd: password
-sasl_sql_database: mailsqldb
-sasl_sql_hostnames: localhost
-sasl_sql_select: SELECT clear FROM users WHERE email = '%u@%r'
diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
index 5e5c1ac2074a..eedfb0270ce7 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -10,7 +10,6 @@
<flag name="backup">Enable backup service support</flag>
<flag name="calalarm">Enable CalDAV alarm 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>
<upstream>
<remote-id type="github">cyrusimap/cyrus-imapd</remote-id>
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/
@ 2022-09-15 0:09 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-09-15 0:09 UTC (permalink / raw
To: gentoo-commits
commit: 15c7f1aa8f2e0ff391b19af7573679ae33689b78
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 00:08:35 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 00:09:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c7f1aa
net-mail/cyrus-imapd: fix build w/ LLD
Closes: https://bugs.gentoo.org/721466
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild | 247 +++++++++++++++++++++
.../cyrus-imapd-3.4.4-0001-Test-for-libm.patch | 32 +++
...3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch | 23 ++
3 files changed, 302 insertions(+)
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild
new file mode 100644
index 000000000000..b1811815cfe3
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Keep an eye on https://www.cyrusimap.org/imap/developer/compiling.html!
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap \
+ mysql nntp pam perl postgres replication +server sieve \
+ sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/libpcre:3
+ >=dev-libs/cyrus-sasl-2.1.13:2
+ dev-libs/jansson:=
+ dev-libs/icu:=
+ sys-apps/util-linux
+ sys-fs/e2fsprogs:=
+ sys-libs/zlib:=
+ afs? ( net-fs/openafs )
+ calalarm? ( dev-libs/libical:= )
+ caps? ( sys-libs/libcap )
+ clamav? ( app-antivirus/clamav )
+ http? (
+ app-arch/brotli:=
+ app-arch/zstd:=
+ dev-libs/libxml2
+ dev-libs/libical:=
+ net-libs/nghttp2:=
+ sci-libs/shapelib:=
+ )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap:= )
+ mysql? ( dev-db/mysql-connector-c:= )
+ nntp? ( !net-nntp/leafnode )
+ pam? (
+ >=net-mail/mailbase-1
+ sys-libs/pam
+ )
+ perl? (
+ dev-lang/perl:=
+ virtual/perl-Term-ReadLine
+ )
+ postgres? ( dev-db/postgresql:* )
+ ssl? ( >=dev-libs/openssl-1.0.1e:=[-bindist(-)] )
+ sqlite? ( dev-db/sqlite:3 )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+ xapian? ( >=dev-libs/xapian-1.4.0:= )"
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${DEPEND}
+ acct-group/mail
+ acct-user/cyrus
+ !mail-mta/courier
+ !net-mail/bincimap
+ !net-mail/courier-imap
+ !net-mail/uw-imap
+ !app-arch/dump"
+DEPEND+=" test? ( dev-util/cunit )"
+BDEPEND="sys-devel/flex
+ virtual/pkgconfig
+ virtual/yacc"
+
+REQUIRED_USE="afs? ( kerberos )
+ backup? ( sqlite )
+ calalarm? ( http )
+ http? ( sqlite )"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+#PATCHES=(
+# "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+#)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.4-0001-Test-for-libm.patch
+ "${FILESDIR}"/${PN}-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch
+)
+
+src_prepare() {
+ default
+
+ # Fix master(8)->cyrusmaster(8) manpage.
+ for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+ sed -i -e 's:master\.8:cyrusmaster.8:g' \
+ -e 's:master(8):cyrusmaster(8):g' \
+ "${i}" || die "sed failed" || die "sed failed"
+ done
+ mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+ sed -i -e "s:MASTER:CYRUSMASTER:g" \
+ -e "s:Master:Cyrusmaster:g" \
+ -e "s:master:cyrusmaster:g" \
+ man/cyrusmaster.8 || die "sed failed"
+
+ # lock.h to afs/lock.h
+ sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+ ptclient/afskrb.c || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ # bug #604466
+ append-ldflags $(no-as-needed)
+
+ # Workaround runtime crash
+ # bug #834573
+ append-flags -fno-toplevel-reorder
+
+ if use afs ; then
+ myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+ myconf+=" --with-afs-incdir=/usr/include/afs"
+ fi
+
+ # TODO:
+ # - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
+ # - post-emerge message re lmdb removal?
+ econf \
+ --enable-murder \
+ --enable-idled \
+ --enable-autocreate \
+ --enable-pcre \
+ --with-com_err \
+ --with-cyrus-user=cyrus \
+ --with-sasl \
+ --with-sphinx-build=no \
+ --without-krb \
+ --without-krbdes \
+ --enable-squat \
+ --with-zlib \
+ --without-wslay \
+ --without-chardet \
+ --without-cld2 \
+ --disable-srs \
+ $(use_enable afs) \
+ $(use_enable afs krb5afspts) \
+ $(use_enable backup) \
+ $(use_enable calalarm calalarmd) \
+ $(use_with caps libcap) \
+ $(use_with clamav) \
+ $(use_enable nntp) \
+ $(use_enable http) \
+ $(use_with http nghttp2) \
+ $(use_enable replication) \
+ $(use_enable kerberos gssapi) \
+ $(use_with ldap) \
+ $(use_with mysql) \
+ $(use_with postgres pgsql) \
+ $(use_with perl) \
+ $(use_with sqlite) \
+ $(use_with ssl openssl) \
+ $(use_enable server) \
+ $(use_enable sieve) \
+ $(use_enable static-libs static) \
+ $(use_with tcpd libwrap) \
+ $(use_enable xapian) \
+ $(use_enable test unit-tests) \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+ dodoc README*
+ dodoc -r doc
+
+ cp -r contrib tools "${ED}"/usr/share/doc/${PF} || die
+ rm -f doc/text/Makefile* || die
+
+ mv "${ED}"/usr/libexec/{master,cyrusmaster} || die
+
+ insinto /etc
+ newins "${ED}"/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf cyrus.conf
+ newins "${ED}"/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf imapd.conf
+
+ sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+ -e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+ -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+ "${ED}"/etc/imapd.conf || die
+
+ sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+ -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+ "${ED}"/etc/cyrus.conf || die
+
+ # turn off sieve if not installed
+ if ! use sieve; then
+ sed -i -e "/sieve/s/^/#/" "${ED}"/etc/cyrus.conf || die
+ fi
+
+ # same thing for http(s) as well
+ if ! use http; then
+ sed -i -e "/http/s/^/#/" "${ED}"/etc/cyrus.conf || die
+ fi
+
+ newinitd "${FILESDIR}"/cyrus.rc8 cyrus
+ newconfd "${FILESDIR}"/cyrus.confd cyrus
+ newpamd "${FILESDIR}"/cyrus.pam-include sieve
+
+ for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+ keepdir "/var/${subdir}"
+ fowners cyrus:mail "/var/${subdir}"
+ fperms 0750 "/var/${subdir}"
+ done
+
+ for subdir in imap/{user,quota,sieve} spool/imap ; do
+ for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+ keepdir "/var/${subdir}/${i}"
+ fowners cyrus:mail "/var/${subdir}/${i}"
+ fperms 0750 "/var/${subdir}/${i}"
+ done
+ done
+}
+
+pkg_preinst() {
+ if ! has_version ${CATEGORY}/${PN} ; then
+ elog "For correct logging add the following to /etc/syslog.conf:"
+ elog " local6.* /var/log/imapd.log"
+ elog " auth.debug /var/log/auth.log"
+ echo
+
+ elog "You have to add user cyrus to the sasldb2. Do this with:"
+ elog " saslpasswd2 cyrus"
+ fi
+}
+
+pkg_postinst() {
+ # do not install server.{key,pem) if they exist
+ if use ssl ; then
+ if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then
+ install_cert /etc/ssl/cyrus/server
+ chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+ fi
+ fi
+
+ einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+ einfo "for upgrade instructions."
+}
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0001-Test-for-libm.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0001-Test-for-libm.patch
new file mode 100644
index 000000000000..4a3d197ef57b
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0001-Test-for-libm.patch
@@ -0,0 +1,32 @@
+https://github.com/cyrusimap/cyrus-imapd/pull/4235
+https://bugs.gentoo.org/721466
+
+From e23a32e0516803b99ae18f0c4d5d42b59a2af111 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 15 Sep 2022 00:55:20 +0100
+Subject: [PATCH 1/2] Test for libm
+
+Test for -lm to avoid hardcoding it.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1729,7 +1729,7 @@ master_master_SOURCES = \
+ master/masterconf.c \
+ master/masterconf.h \
+ master/service.h
+-master_master_LDADD = lib/libcyrus_min.la $(LIBS) $(GCOV_LIBS) -lm
++master_master_LDADD = lib/libcyrus_min.la $(LIBS) $(GCOV_LIBS) $(LIBM)
+
+
+ netnews_remotepurge_SOURCES = \
+--- a/configure.ac
++++ b/configure.ac
+@@ -143,6 +143,7 @@ if test $ac_cv_sys_long_file_names = no; then
+ AC_MSG_ERROR(The Cyrus IMAPD requires support for long file names)
+ fi
+ AC_C_INLINE
++LT_LIB_M
+
+ gl_VISIBILITY
+ AH_BOTTOM([#if HAVE_VISIBILITY
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch
new file mode 100644
index 000000000000..5a96cdb7c1c1
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch
@@ -0,0 +1,23 @@
+https://github.com/cyrusimap/cyrus-imapd/pull/4235
+https://bugs.gentoo.org/721466
+
+From 6fb292c3a071febfdb514589f12cc8d4b7329b53 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 15 Sep 2022 00:54:51 +0100
+Subject: [PATCH 2/2] Avoid underlinking libcyrus (-lm)
+
+Fixes building with lld.
+
+Bug: https://bugs.gentoo.org/721466
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1538,7 +1538,7 @@ lib_libcyrus_la_SOURCES += lib/nonblock_fcntl.c
+ else
+ lib_libcyrus_la_SOURCES += lib/nonblock_ioctl.c
+ endif
+-lib_libcyrus_la_LIBADD = libcrc32.la ${LIB_SASL} $(SSL_LIBS) $(GCOV_LIBS)
++lib_libcyrus_la_LIBADD = libcrc32.la ${LIB_SASL} $(SSL_LIBS) $(GCOV_LIBS) $(LIBM)
+ lib_libcyrus_la_CFLAGS = $(AM_CFLAGS) $(CFLAG_VISIBILITY)
+
+ if USE_ZEROSKIP
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/
@ 2019-03-15 7:38 Eray Aslan
0 siblings, 0 replies; 8+ messages in thread
From: Eray Aslan @ 2019-03-15 7:38 UTC (permalink / raw
To: gentoo-commits
commit: d90a3246db6e4d20a92632c266022dfcb85822fc
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 15 07:38:16 2019 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Fri Mar 15 07:38:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d90a3246
net-mail/cyrus-imapd: bump to 3.0.9
and fix underlinking perl modules
Closes: https://bugs.gentoo.org/678754
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>
net-mail/cyrus-imapd/Manifest | 1 +
net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild | 218 +++++++++++++++++++++
.../files/cyrus-imapd-libcap-libs-r1.patch | 35 ++++
3 files changed, 254 insertions(+)
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 36d2675692e..6f70f5a7858 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -4,3 +4,4 @@ DIST cyrus-imapd-3.0.4.tar.gz 10819487 BLAKE2B 209e379731c996ee083b0de61d6122b37
DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873 SHA512 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
DIST cyrus-imapd-3.0.6.tar.gz 10734548 BLAKE2B d16d1093b17f632fa75e77c1b923deb0c5a76de4c06a657c4c1dd2f9498ac0abd81ecee58c64378118d4b09be872957afc6db5d8deebf72c819623d6ea5aa0a9 SHA512 375e3936465e9ee448996cf738ebe93a35697a58a7784cf6f7a8be25e3e03925fb4f44ff98a0aacbc5b9e3ef39fc8a0e51acb4ea26cbbfbc8e492556fdc03a03
DIST cyrus-imapd-3.0.8.tar.gz 10735462 BLAKE2B 27fdead9a75048c12fe4c0eed1dcda9ce24319c2183851190068fd3ded32c1f6b4d550e726dd4a483bafe298ac0199aa2b1354c6f0c5ac0083d7d1ad0e69457a SHA512 f4aa9877e62479439bee2ca29f452bd7e9daa091c19bf3567aa7f493f5163c98b44086b749c70981402212ff90e19d9125b508cfcc077088f8c705e533812960
+DIST cyrus-imapd-3.0.9.tar.gz 10771916 BLAKE2B cc483246c83ed55fa7d4e85aa8189852f2e6be23aff5bb478c2d2123e3d928cc8248e580c80c1474b2b3eea9aa1c0f8b3336f779e72e690d8d093e70993cd657 SHA512 d1a65e957ad3bbbd70e4c8c699e226c17911c6f5815839694136b967a7067acaf4261c8aaad223ffb1e41d76ef78e9e7279a2805048de9b05939044ce17cb738
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild
new file mode 100644
index 00000000000..c6ba07699df
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic pam ssl-cert user
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${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 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:=
+ sys-libs/e2fsprogs-libs
+ afs? ( net-fs/openafs )
+ calalarm? ( dev-libs/libical )
+ 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? ( dev-db/mysql-connector-c:0= )
+ 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?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+ !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 )
+ sphinx? ( mysql )"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=( "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" )
+
+pkg_setup() {
+ enewuser cyrus -1 -1 /usr/cyrus mail
+ # 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
+ 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 \
+ --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_enable replication) \
+ $(use_enable kerberos gssapi) \
+ $(use_with ldap) \
+ $(use_with lmdb) \
+ $(use_with mysql) \
+ $(use_with postgres pgsql) \
+ $(use_with perl) \
+ $(use_with sqlite) \
+ $(use_with ssl openssl) \
+ $(use_enable server) \
+ $(use_enable sieve) \
+ $(use_with snmp) \
+ $(use_enable sphinx) \
+ $(use_enable static-libs static) \
+ $(use_with tcpd libwrap) \
+ $(use_enable xapian) \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+ dodoc README*
+ dodoc -r doc
+ cp -r contrib tools "${D}/usr/share/doc/${PF}"
+ rm -f doc/text/Makefile*
+
+ mv "${D}"usr/libexec/{master,cyrusmaster} || die
+
+ insinto /etc
+ newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+ newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+ sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+ -e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+ -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+ "${D}"etc/imapd.conf
+
+ sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+ -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+ "${D}"etc/cyrus.conf
+
+ # turn off sieve if not installed
+ if ! use sieve; then
+ sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+ fi
+ # same thing for http(s) as well
+ if ! use http; then
+ sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+ fi
+
+ newinitd "${FILESDIR}/cyrus.rc8" cyrus
+ newconfd "${FILESDIR}/cyrus.confd" cyrus
+ newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+ for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+ keepdir "/var/${subdir}"
+ fowners cyrus:mail "/var/${subdir}"
+ fperms 0750 "/var/${subdir}"
+ done
+ for subdir in imap/{user,quota,sieve} spool/imap ; do
+ for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+ keepdir "/var/${subdir}/${i}"
+ fowners cyrus:mail "/var/${subdir}/${i}"
+ fperms 0750 "/var/${subdir}/${i}"
+ done
+ done
+}
+
+pkg_preinst() {
+ if ! has_version ${CATEGORY}/${PN} ; then
+ elog "For correct logging add the following to /etc/syslog.conf:"
+ elog " local6.* /var/log/imapd.log"
+ elog " auth.debug /var/log/auth.log"
+ echo
+
+ elog "You have to add user cyrus to the sasldb2. Do this with:"
+ elog " saslpasswd2 cyrus"
+ fi
+}
+
+pkg_postinst() {
+ # do not install server.{key,pem) if they exist
+ if use ssl ; then
+ if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+ install_cert /etc/ssl/cyrus/server
+ chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+ fi
+ fi
+
+ echo
+ einfo "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+ einfo "for upgrade instructions."
+ echo
+}
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs-r1.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs-r1.patch
new file mode 100644
index 00000000000..4b1a51056f5
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs-r1.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 2019-02-25 15:43:44.370676803 +0100
++++ b/perl/imap/Makefile.PL.in 2019-02-25 15:44:02.595285944 +0100
+@@ -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_UUID@ @ZLIB@"],
++ 'LIBS' => [ "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @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 2019-02-25 15:42:40.852554632 +0100
++++ b/perl/sieve/managesieve/Makefile.PL.in 2019-02-25 15:43:05.029362231 +0100
+@@ -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_UUID@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_LIBADD@"],
++ 'LIBS' => ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_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] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/
@ 2018-01-22 13:45 Eray Aslan
0 siblings, 0 replies; 8+ messages in thread
From: Eray Aslan @ 2018-01-22 13:45 UTC (permalink / raw
To: gentoo-commits
commit: d736f075a435fb21769b64d0590578b6b27a84e7
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 22 13:45:05 2018 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Mon Jan 22 13:45:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d736f075
net-mail/cyrus-imapd: remove old
Package-Manager: Portage-2.3.20, Repoman-2.3.6
net-mail/cyrus-imapd/Manifest | 1 -
net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild | 178 -------------------
net-mail/cyrus-imapd/cyrus-imapd-3.0.3-r1.ebuild | 216 -----------------------
net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild | 215 ----------------------
net-mail/cyrus-imapd/files/cyrus.rc7 | 22 ---
5 files changed, 632 deletions(-)
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index be25800da38..4f7ad744835 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,4 +1,3 @@
DIST cyrus-imapd-2.5.10.tar.gz 3103914 BLAKE2B 588764d47b3d458633e0ced2619cc1cccdf26c18d54effd38d4f9f6df12ad98f554efa632af9c7e4b43d7899b04a14a8a71fc152ea360a38cdab6a50685ddf5e SHA512 78b85e37c63f1dbb60898da229f70f45810326a01244067d23b1317e2c2ae3326e48b6944787d59024e44c48c441ed2b848d6a83c451c192a3bb95c8f37880fa
DIST cyrus-imapd-2.5.11.tar.gz 3109188 BLAKE2B 9382d8e4b9317f7fa12f63f7262eb0c6a1571d405665694f735fb72b6de76058ea586172f2001babe280170f122c887374b1378f51fe9c89a522aaeb74b885c9 SHA512 bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538
-DIST cyrus-imapd-3.0.3.tar.gz 10819454 BLAKE2B 5f86378e37c39c5f6fb6f6280d0b0a500e671cbe29968f1579c6be59e15335e1b36b0d119e03bc683ed17b594ddebc7d0cd5588f762062ee9a01f8633e7f12f7 SHA512 0b5c3167d80d91371e3f07e64b8bc8c085481946e6536dd407976f6f8ae66405fd1f6d2ff5ad51e5e0eb827a64d90d93daf72d5a1afa409782a287bec29665df
DIST cyrus-imapd-3.0.4.tar.gz 10819487 BLAKE2B 209e379731c996ee083b0de61d6122b3756d1f6880071ebf015157057cf45845961d762ee762ae56213f72f15c01df29ab2d2661c4e352c6b4a680924d15d7b0 SHA512 9ceb7ac837c932c70fa0c1583bf8700b3ec27568d72538ae8d59f2f551e3007b3c2fc68fd29c009597c3949345dbe1bf2eb614bea038d70a5b49e5507df6b69a
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild
deleted file mode 100644
index 5ed4f130966..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.11.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools 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 clamav http kerberos mysql nntp pam perl postgres \
- replication +server sieve snmp sqlite ssl static-libs tcpd"
-
-# virtual/mysql-5.5 added for the --variable= option below
-DEPEND="sys-libs/zlib
- dev-libs/libpcre
- >=dev-libs/cyrus-sasl-2.1.13
- dev-libs/jansson
- afs? ( net-fs/openafs )
- berkdb? ( >=sys-libs/db-3.2:* )
- clamav? ( app-antivirus/clamav )
- http? ( dev-libs/libxml2 dev-libs/libical )
- kerberos? ( virtual/krb5 )
- 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 )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-# all blockers really needed?
-RDEPEND="${DEPEND}
- !mail-mta/courier
- !net-mail/bincimap
- !net-mail/courier-imap
- !net-mail/uw-imap
- !net-mail/cyrus-imap-admin"
-
-REQUIRED_USE="afs? ( kerberos )
- http? ( sqlite )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
- eapply -p0 "${FILESDIR}/${PN}-db.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-murder \
- --enable-netscapehack \
- --enable-idled \
- --enable-event-notification \
- --enable-autocreate \
- --enable-pcre \
- --with-service-path=/usr/$(get_libdir)/cyrus \
- --with-cyrus-user=cyrus \
- --with-cyrus-group=mail \
- --with-com_err=yes \
- --with-sasl \
- --without-krb \
- --without-krbdes \
- --with-zlib \
- $(use_enable afs) \
- $(use_enable afs krb5afspts) \
- $(use_with berkdb bdb) \
- $(use_with clamav) \
- $(use_enable nntp) \
- $(use_enable http) \
- $(use_enable replication) \
- $(use_enable kerberos gssapi) \
- $(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) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
- dodoc README*
- dodoc -r doc
- 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-3.0.3-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.3-r1.ebuild
deleted file mode 100644
index 6743077fa02..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,216 +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-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/cyrus-imapd-3.0.3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild
deleted file mode 100644
index f4638e0cc79..00000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild
+++ /dev/null
@@ -1,215 +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-v4.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/${P}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
- newins "${D}usr/share/doc/${P}/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.rc7 b/net-mail/cyrus-imapd/files/cyrus.rc7
deleted file mode 100644
index 348b01c0492..00000000000
--- a/net-mail/cyrus-imapd/files/cyrus.rc7
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- use net
- use dns logger
- after drac saslauthd
-}
-
-start() {
- ebegin "Starting cyrus imapd"
- start-stop-daemon --start --quiet --background \
- --exec /usr/libexec/cyrusmaster -- ${CYRUS_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping cyrus imapd"
- start-stop-daemon --stop --quiet --pidfile /run/cyrus-master.pid
- eend $?
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/
@ 2017-09-06 12:26 Eray Aslan
0 siblings, 0 replies; 8+ messages in thread
From: Eray Aslan @ 2017-09-06 12:26 UTC (permalink / raw
To: gentoo-commits
commit: b930b70fa5a5f5b011610d81c19a6fc5f761b84b
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 6 12:25:52 2017 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Wed Sep 6 12:26:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b930b70f
net-mail/cyrus-imapd: version bump to 3.0.4
Also sync cyrus and imapd socket locations and have the socket directory
created during startup - bug 627804
Package-Manager: Portage-2.3.8, Repoman-2.3.3
net-mail/cyrus-imapd/Manifest | 1 +
net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild | 220 ++++++++++++++++++++++++++
net-mail/cyrus-imapd/files/cyrus.rc8 | 34 ++++
3 files changed, 255 insertions(+)
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index d64ddbe28af..da4c847f44e 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,3 +1,4 @@
DIST cyrus-imapd-2.5.10.tar.gz 3103914 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.3.tar.gz 10819454 SHA256 6a76d8d00b26a2c9d03c65197724a28ab6d044527d7e230e6331f8de79af889a SHA512 0b5c3167d80d91371e3f07e64b8bc8c085481946e6536dd407976f6f8ae66405fd1f6d2ff5ad51e5e0eb827a64d90d93daf72d5a1afa409782a287bec29665df WHIRLPOOL 6d543b09d3f18d10c481133fafb78f82a6e2d0dd3fb7c4cdb1d181d906acef7db4c6da5dcc86254a836f69fc7cbd54034f889b0808da060a083f35dd8ee40434
+DIST cyrus-imapd-3.0.4.tar.gz 10819487 SHA256 ed17b4321bbe54df2c9b8832e189f52de4561f51e199f7c620216e79910c73a0 SHA512 9ceb7ac837c932c70fa0c1583bf8700b3ec27568d72538ae8d59f2f551e3007b3c2fc68fd29c009597c3949345dbe1bf2eb614bea038d70a5b49e5507df6b69a WHIRLPOOL a67a9d033ddb601608590f085f513a6f8b220cf5a0df786c68dcb642bb9f72018ca220ce8abdc57221aac81c60e3bddee7c8dd3ad8b1fb61ead8d653400f8b51
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
new file mode 100644
index 00000000000..9b55bcb7b8f
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
@@ -0,0 +1,220 @@
+# 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
+
+ sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+ -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+ "${D}"etc/cyrus.conf
+
+ # turn off sieve if not installed
+ if ! use sieve; then
+ sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+ fi
+ # same thing for http(s) as well
+ if ! use http; then
+ sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+ fi
+
+ newinitd "${FILESDIR}/cyrus.rc8" cyrus
+ newconfd "${FILESDIR}/cyrus.confd" cyrus
+ newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+ for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+ keepdir "/var/${subdir}"
+ fowners cyrus:mail "/var/${subdir}"
+ fperms 0750 "/var/${subdir}"
+ done
+ for subdir in imap/{user,quota,sieve} spool/imap ; do
+ for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+ keepdir "/var/${subdir}/${i}"
+ fowners cyrus:mail "/var/${subdir}/${i}"
+ fperms 0750 "/var/${subdir}/${i}"
+ done
+ done
+}
+
+pkg_preinst() {
+ if ! has_version ${CATEGORY}/${PN} ; then
+ elog "For correct logging add the following to /etc/syslog.conf:"
+ elog " local6.* /var/log/imapd.log"
+ elog " auth.debug /var/log/auth.log"
+ echo
+
+ elog "You have to add user cyrus to the sasldb2. Do this with:"
+ elog " saslpasswd2 cyrus"
+ fi
+}
+
+pkg_postinst() {
+ # do not install server.{key,pem) if they exist
+ if use ssl ; then
+ if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+ install_cert /etc/ssl/cyrus/server
+ chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+ fi
+ fi
+
+ echo
+ ewarn "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+ ewarn "for upgrade instructions."
+ echo
+}
diff --git a/net-mail/cyrus-imapd/files/cyrus.rc8 b/net-mail/cyrus-imapd/files/cyrus.rc8
new file mode 100644
index 00000000000..9d9e9452f56
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus.rc8
@@ -0,0 +1,34 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ use net
+ use dns logger
+ after drac saslauthd
+}
+
+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
+ }
+ done
+}
+
+
+start() {
+ checkdirs || return 1
+ ebegin "Starting cyrus imapd"
+ start-stop-daemon --start --quiet --background \
+ --exec /usr/libexec/cyrusmaster -- ${CYRUS_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping cyrus imapd"
+ start-stop-daemon --stop --quiet --pidfile /run/cyrus-master.pid
+ eend $?
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/
@ 2017-08-11 15:50 Eray Aslan
0 siblings, 0 replies; 8+ messages in thread
From: Eray Aslan @ 2017-08-11 15:50 UTC (permalink / raw
To: gentoo-commits
commit: 286be1db4511e0bde9f8094b03ce936407b06364
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 15:47:31 2017 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 15:50:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=286be1db
net-mail/cyrus-imapd: security bump to 3.0.3
Package-Manager: Portage-2.3.6, Repoman-2.3.3
net-mail/cyrus-imapd/Manifest | 1 +
net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild | 215 +++++++++++++++++++++
.../files/cyrus-imapd-sieve-libs-v4.patch | 127 ++++++++++++
net-mail/cyrus-imapd/files/cyrus.rc7 | 22 +++
net-mail/cyrus-imapd/metadata.xml | 20 +-
5 files changed, 375 insertions(+), 10 deletions(-)
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index d9f96c0ec77..3917ba2fa70 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -2,3 +2,4 @@ DIST cyrus-imapd-2.5.10.tar.gz 3103914 SHA256 b38f4fd72825a298ac47426dcd2a50c843
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.3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild
new file mode 100644
index 00000000000..f4638e0cc79
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.3.ebuild
@@ -0,0 +1,215 @@
+# 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}-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/${P}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+ newins "${D}usr/share/doc/${P}/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-sieve-libs-v4.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs-v4.patch
new file mode 100644
index 00000000000..4a7bac2e3c1
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs-v4.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_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_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/files/cyrus.rc7 b/net-mail/cyrus-imapd/files/cyrus.rc7
new file mode 100644
index 00000000000..348b01c0492
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus.rc7
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ use net
+ use dns logger
+ after drac saslauthd
+}
+
+start() {
+ ebegin "Starting cyrus imapd"
+ start-stop-daemon --start --quiet --background \
+ --exec /usr/libexec/cyrusmaster -- ${CYRUS_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping cyrus imapd"
+ start-stop-daemon --stop --quiet --pidfile /run/cyrus-master.pid
+ eend $?
+}
diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
index f21a8fca8af..23dc96dc53a 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -6,15 +6,15 @@
<name>Net-Mail</name>
</maintainer>
<use>
- <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>
+ <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] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/
@ 2017-05-09 9:45 Eray Aslan
0 siblings, 0 replies; 8+ messages in thread
From: Eray Aslan @ 2017-05-09 9:45 UTC (permalink / raw
To: gentoo-commits
commit: 5a962760019eb9bfd19f0d3c01fc4d13d8b82bd8
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue May 9 09:44:47 2017 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Tue May 9 09:44:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a962760
net-mail/cyrus-imapd: fix underlinking for sieve perl module
Thanks to Maciej S. Szmigiero for the patch. Bug 604470
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-mail/cyrus-imapd/cyrus-imapd-2.5.11-r1.ebuild | 180 +++++++++++++++++++++
.../cyrus-imapd/files/cyrus-imapd-sieve-libs.patch | 43 +++++
2 files changed, 223 insertions(+)
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.11-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.11-r1.ebuild
new file mode 100644
index 00000000000..cbe96037773
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.11-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools 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 clamav http kerberos mysql nntp pam perl postgres \
+ replication +server sieve snmp sqlite ssl static-libs tcpd"
+
+# virtual/mysql-5.5 added for the --variable= option below
+DEPEND="sys-libs/zlib
+ dev-libs/libpcre
+ >=dev-libs/cyrus-sasl-2.1.13
+ dev-libs/jansson
+ afs? ( net-fs/openafs )
+ berkdb? ( >=sys-libs/db-3.2:* )
+ clamav? ( app-antivirus/clamav )
+ http? ( dev-libs/libxml2 dev-libs/libical )
+ kerberos? ( virtual/krb5 )
+ 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 )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
+
+# all blockers really needed?
+RDEPEND="${DEPEND}
+ !mail-mta/courier
+ !net-mail/bincimap
+ !net-mail/courier-imap
+ !net-mail/uw-imap
+ !net-mail/cyrus-imap-admin"
+
+REQUIRED_USE="afs? ( kerberos )
+ http? ( sqlite )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_prepare() {
+ eapply -p0 "${FILESDIR}/${PN}-db.patch"
+ # bug 604470
+ eapply -p1 "${FILESDIR}/${PN}-sieve-libs.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-murder \
+ --enable-netscapehack \
+ --enable-idled \
+ --enable-event-notification \
+ --enable-autocreate \
+ --enable-pcre \
+ --with-service-path=/usr/$(get_libdir)/cyrus \
+ --with-cyrus-user=cyrus \
+ --with-cyrus-group=mail \
+ --with-com_err=yes \
+ --with-sasl \
+ --without-krb \
+ --without-krbdes \
+ --with-zlib \
+ $(use_enable afs) \
+ $(use_enable afs krb5afspts) \
+ $(use_with berkdb bdb) \
+ $(use_with clamav) \
+ $(use_enable nntp) \
+ $(use_enable http) \
+ $(use_enable replication) \
+ $(use_enable kerberos gssapi) \
+ $(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) \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+ dodoc README*
+ dodoc -r doc
+ 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-sieve-libs.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs.patch
new file mode 100644
index 00000000000..0bfdc1d3155
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs.patch
@@ -0,0 +1,43 @@
+--- a/configure.ac 2016-10-17 23:01:04.000000000 +0200
++++ b/configure.ac 2016-12-28 02:42:37.936610002 +0100
+@@ -400,6 +379,7 @@
+ fi
+
+ LIBS="${LIBS} ${SQLITE_LIBADD}"
++ AC_SUBST(SQLITE_LIBADD)
+ CPPFLAGS="${SQLITE_INCADD} ${CPPFLAGS}"
+
+ AC_DEFINE(HAVE_SQLITE,[],[Build in SQLite support?])
+@@ -437,7 +416,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
+--- a/perl/imap/Makefile.PL.in 2016-10-17 23:01:04.000000000 +0200
++++ b/perl/imap/Makefile.PL.in 2016-12-28 02:42:04.559449967 +0100
+@@ -69,7 +69,7 @@
+ 'clean' => {'FILES' => 'libcyrperl.a cyradm'},
+ 'OBJECT' => 'IMAP.o',
+ 'MYEXTLIB' => '@top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
+- 'LIBS' => [ "@BDB_LIB@ $LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@"],
++ 'LIBS' => [ "@BDB_LIB@ $LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@ @PCRE_LIBS@ @SQLITE_LIBADD@"],
+ 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
+ 'INC' => "@BDB_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 2016-10-17 23:01:04.000000000 +0200
++++ b/perl/sieve/managesieve/Makefile.PL.in 2016-12-28 02:42:34.496490437 +0100
+@@ -52,7 +52,7 @@
+ 'ABSTRACT' => 'Cyrus Sieve management interface',
+ 'VERSION_FROM' => "@top_srcdir@/perl/sieve/managesieve/managesieve.pm", # finds $VERSION
+ 'MYEXTLIB' => '../lib/libisieve.a @top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
+- 'LIBS' => ["@BDB_LIB@ $LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@"],
++ 'LIBS' => ["@BDB_LIB@ $LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@ @PCRE_LIBS@ @SQLITE_LIBADD@"],
+ 'CCFLAGS' => '@COV_CFLAGS@',
+ 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
+ 'INC' => "@BDB_INC@ -I@top_srcdir@/lib -I@top_srcdir@/perl/sieve/lib @SASLFLAGS@ @SSL_CPPFLAGS@",
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-07-02 11:14 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-30 6:35 [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/ Eray Aslan
-- strict thread matches above, loose matches on Subject: below --
2023-07-02 11:14 David Seifert
2022-09-15 0:09 Sam James
2019-03-15 7:38 Eray Aslan
2018-01-22 13:45 Eray Aslan
2017-09-06 12:26 Eray Aslan
2017-08-11 15:50 Eray Aslan
2017-05-09 9:45 Eray Aslan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox