commit: 79bb171634092180e12bf8772b8ee666c807ad50 Author: Brett A C Sheffield <bacs <AT> librecast <DOT> net> AuthorDate: Tue Mar 10 12:12:28 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Mar 11 13:14:04 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79bb1716
net-mail/cyrus-imapd: drop 3.4.5-r3 Bug: https://bugs.gentoo.org/953911 Signed-off-by: Brett A C Sheffield <bacs <AT> librecast.net> Part-of: https://codeberg.org/gentoo/gentoo/pulls/284 Signed-off-by: Sam James <sam <AT> gentoo.org> net-mail/cyrus-imapd/Manifest | 1 - net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r3.ebuild | 246 --------------------- .../files/cyrus-imapd-libcap-libs-r1.patch | 35 --- 3 files changed, 282 deletions(-) diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest index 650ebf8ba38e..4ca3467bfb9b 100644 --- a/net-mail/cyrus-imapd/Manifest +++ b/net-mail/cyrus-imapd/Manifest @@ -1,2 +1 @@ -DIST cyrus-imapd-3.4.5.tar.gz 13291987 BLAKE2B 4ac383ef7f3dea66a7dc11c2241b8663e3cda323b73e3b439255468cf9b6d80302a135793f952843ddee418acb4aa4a9a9d56fcb743b5d589d535764c2289c1d SHA512 e43185193130af2e11ced89b2241a7b6f321847cf8bc01c0d89cbbb1cb222a962fe00cdd54b1f89cea141a569b57d2ce2f0edffaca8db9fd5f7fc2cd82b4537b DIST cyrus-imapd-3.4.9.tar.gz 13439643 BLAKE2B 2744963009b9aca61517c106d0685e9ed79a143499b711c0f4888bf5f4e0537da006c414c9e5d7fcf0add858656d6535e86e7fb21e56bef2de55edae6a8f70e4 SHA512 a6d9e4442e624efbdb041654060d59aa7770e4f6a3c4e70eae2784827142b5870da67c81905cf1d5c416f94d0e04d5ea857988309e8c98936307ce15ea232c31 diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r3.ebuild deleted file mode 100644 index 72380c9ae4ba..000000000000 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r3.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 1999-2025 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 ~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:= - virtual/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:= - ) - 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/courier-imap - !app-arch/dump" -DEPEND+=" test? ( dev-util/cunit )" -BDEPEND="app-alternatives/lex - 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 - - 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/files/cyrus-imapd-libcap-libs-r1.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs-r1.patch deleted file mode 100644 index 4b1a51056f53..000000000000 --- a/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs-r1.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 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@",
