diff options
Diffstat (limited to 'net-mail')
24 files changed, 879 insertions, 921 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz Binary files differindex 98e6164410f4..6e82a0587d2d 100644 --- a/net-mail/Manifest.gz +++ b/net-mail/Manifest.gz diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest index bba1923a71d3..76c99de80e35 100644 --- a/net-mail/cyrus-imapd/Manifest +++ b/net-mail/cyrus-imapd/Manifest @@ -1,20 +1,13 @@ AUX cyrus-imapd-libcap-libs-r1.patch 2175 BLAKE2B 7160b277538c43f2304f676b8d7d67034fe3724d3dfc52f6111a4191aeeb502eaaaf209c6c2cf90bf3b61a8a1dc8c536b926a7df20a6740e36b0e8ba18d5faa5 SHA512 395c07b905745a7b6318aad1a17116df90fa9aadc49d1957289bf3c5afe1c94b63723304087488f0d81b16e6875e5c261fe398c2be18c1a356982609a75034b6 -AUX cyrus-imapd-libcap.patch 2050 BLAKE2B d090ee562bf94792c0f2e6f6ccfa9d3c808f9b6dbee1efb14d8180ae366b3c92824247b969b0fe03a6d5bd5596ed5d1c364767f5fd02d3484b9ee0222b29f5c6 SHA512 93b0c3324b7918c22908a83b3ff5b13ee71cafdee8ffc8edbf73a9a2ba059fd7208cee6807685a7f1e655e28f02ac1d3d657b28ff55b93267d5b9b5cb60d760b AUX cyrus.conf 1236 BLAKE2B 291a113314a0b89b200360473aed65d6542caeae02e251e2eb88db4abe01f4a367c0a65da939d94b81fafe68aaa1e788ae5f37bc6aa43fa07e52c0b1636ebdf6 SHA512 e4e02ddd02b7c77a1b43ee49f7ab9dcada1d518aaeae6e285b206d67d05b96a2f9007264967984c18cedc62cd1e9e9f59c802eb37da6e77d6990db7ced5e559a AUX cyrus.confd 164 BLAKE2B dde11def651971e4b8f52bf2aa1f32db8c7ab7697eecb66a73fbe6f30b0b7954d21e97c3afda7a61c1400079a91de7df24e0a7beb83d3501092f132ba62142cd SHA512 52fda6a61a3cd1a4fa7579ea0eb1c9cba857f59b8ca9145f8bb73731c2a7e7f798663ef38b8c646aca066b0f571928fd13b2463415f8afd142fa45626ad8db20 AUX cyrus.pam-include 109 BLAKE2B f241d45aead08952c5c7cbd6a8a25ca6926ec99703b0e879de2176b1d348efaab0b6547200f10e65a18f1926dcbabe74e5d7eaa9b9a7c7039a35421671b5ada0 SHA512 4c96d5b0a675ddb83f26200a8cbd18c7b663aec39eb78f8509751425fb062e39e6d13e4d06090c6765b32e1cce609db075d725a18cbd4638a7f8ce5c858c47a4 AUX cyrus.rc8 699 BLAKE2B b1a7cca8f7ee5a23870108550c990dad79c76a729c82efc77713939a537141df8b1ace2bfc6f3a384c28e155bece1bec480bbaf90fcd1899af854d441b518eee SHA512 9340877dd83cd4d5770c12a7f107ee697b42736a57cf304695f03f9f673c5c53b4477f20832ee4815515b2e33e8b33335b298cf5dd48015a6a581b8ab4f4f240 AUX imapd.conf 1471 BLAKE2B 5373950ac08b630a82fc00b5bf3fed9d400e092458310b64cb669e46470527b864dd5c960bae38f10fac10ca884291ee05203f4c380db57f750fb49217ca7a96 SHA512 dd19551b6e254c5e132f28748435ee61f2df86d6503643cd4946efcfba998d7bd487818ceaab1ca320289077eddd2531f6b05a493a5b5040ee5121165c3a712f -DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6 -DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209 -DIST cyrus-imapd-3.0.15.tar.gz 10843341 BLAKE2B efe65c7afc7d63770adef9e4ea13b87e3b7fdd1847e4ada028175999b31ebb84f9d84b014018bd2be3fee9af1b5e81dd08f63225bc62dc5a4fd4a0791da16594 SHA512 2f65209095f086092fec0bfc9547c999a6e568cccc0a4164e7a3751fe2881f47bbbbd67ba9c9169feafead8c40d42f594d34171d911e4028425cfd8ba72d8f4a 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.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6 DIST cyrus-imapd-3.4.3.tar.gz 13182110 BLAKE2B 485df8e2518a55a3b096d0c330d55f7ed93209ca4ab5851dda53083082e203ad9b1d9218c0863a9bd1e678a732427ef499ff78bacf2d3fb2fe18464186a9e6d2 SHA512 5c4db2a0c26d2323332c1ba67f7b207acfad15f0442f20c6c8a205b5423498465524398315946213c8168bc7eba1fd9f7dc573a91efac6708bfbaf2cb57e9276 -EBUILD cyrus-imapd-3.0.13-r4.ebuild 6069 BLAKE2B 19ee429653bbfba433ef2f44c275061dd7ce112f603277906224aa2634476788fc35d48160140d79969d0c1689c5b85cce570d3f856b065d67a5162a74e7547b SHA512 5578de86ab1a1b0ef1ce7d013f24f36fd8478ec604219a2284b4f3091ce42eef4df8a2d3f248908a7d7df9acb43e7e44bc63e03395f7eba7617608d3c3ed4cb7 -EBUILD cyrus-imapd-3.0.14-r4.ebuild 6030 BLAKE2B cd96fe62aedbefb2e6e2f4c69940556d1785978903442fbc3c95074e523f57dbb633e9566dde8a63d5b3c02a37980c4a6c2ea77b30d5163e7649510211efaeb7 SHA512 c632a0174fd7ca3c72eaf89886104d54eaa848f3d65f098779ac4a975962a0641791494fc712f5dd4cd91165589d18fbf4e57d81c54b323f75e958299acafc76 -EBUILD cyrus-imapd-3.0.15-r4.ebuild 6016 BLAKE2B e85d06a61f6c6573624cbbc92a118712dde2e095174fd7726ee09d4e765d435613e0534d7a76d0df4c94118207b799507d18d27670607c852c12c2b74cb127cb SHA512 35ac8660c0d6812b162083004559dd71ddaef2ea7d34320901b2639a4d6033bbe0d7b448292df2117a5cd03f3469e172cdc6b9645281979a6befe85ab56edcbe EBUILD cyrus-imapd-3.0.16-r2.ebuild 6016 BLAKE2B e85d06a61f6c6573624cbbc92a118712dde2e095174fd7726ee09d4e765d435613e0534d7a76d0df4c94118207b799507d18d27670607c852c12c2b74cb127cb SHA512 35ac8660c0d6812b162083004559dd71ddaef2ea7d34320901b2639a4d6033bbe0d7b448292df2117a5cd03f3469e172cdc6b9645281979a6befe85ab56edcbe EBUILD cyrus-imapd-3.0.17-r1.ebuild 6022 BLAKE2B 619618570289290e0a697e9280a18f249ef8898d1324f77f43b8ae0b275694f7b4f94b34ad822e4c90a923ed86b5d542d8b232e3a762aa093f353c0aad721f74 SHA512 17bc28ca592afc4c6a29fc765738c41c753e1f58996c40017d24c81584bf58493bc9e619ed36b4a6b6c90003cc9c4cd6e392f89a7b252bde16ed07af30240dbc EBUILD cyrus-imapd-3.4.2-r2.ebuild 5964 BLAKE2B d3b7b21d6da88a922562ab86a32995c89c4e18b550b20eef3e1f7c7b152262b01c0b57839b12acbe7afff20be07908557a43669eb853c1cf44ad2899a3cdba30 SHA512 c7645c12b7506b83f7db973eea2719f9fb4ce902ac312338df9c5a2faca0e22520c8af04c9e0e65348b672d61796789952b910a8e60b8476c876360e05d85d63 diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r4.ebuild deleted file mode 100644 index 824794bbbc35..000000000000 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r4.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" - "${FILESDIR}/cyrus-imapd-libcap.patch" - ) - -pkg_setup() { - # https://bugs.gentoo.org/604466 - append-ldflags $(no-as-needed) -} - -src_prepare() { - default - # Fix master(8)->cyrusmaster(8) manpage. - for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do - sed -i -e 's:master\.8:cyrusmaster.8:g' \ - -e 's:master(8):cyrusmaster(8):g' \ - "${i}" || die "sed failed" || die "sed failed" - done - mv man/master.8 man/cyrusmaster.8 || die "mv failed" - sed -i -e "s:MASTER:CYRUSMASTER:g" \ - -e "s:Master:Cyrusmaster:g" \ - -e "s:master:cyrusmaster:g" \ - man/cyrusmaster.8 || die "sed failed" - - # lock.h to afs/lock.h - sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \ - ptclient/afskrb.c || die - - eautoreconf -} - -src_configure() { - local myconf - if use afs ; then - myconf+=" --with-afs-libdir=/usr/$(get_libdir)" - myconf+=" --with-afs-incdir=/usr/include/afs" - fi - # sphinx is unmaintained and dead, bug #662944 - econf \ - --enable-unit-tests \ - --enable-murder \ - --enable-idled \ - --enable-event-notification \ - --enable-autocreate \ - --enable-pcre \ - --with-com_err \ - --with-cyrus-user=cyrus \ - --with-sasl \ - --without-krb \ - --without-krbdes \ - --disable-sphinx \ - --enable-squat \ - --with-zlib \ - $(use_enable afs) \ - $(use_enable afs krb5afspts) \ - $(use_enable backup) \ - $(use_enable calalarm calalarmd) \ - $(use_with caps libcap) \ - $(use_with clamav) \ - $(use_enable nntp) \ - $(use_enable http) \ - $(use_with http nghttp2) \ - $(use_enable replication) \ - $(use_enable kerberos gssapi) \ - $(use_with ldap) \ - $(use_with lmdb) \ - $(use_with mysql) \ - $(use_with postgres pgsql) \ - $(use_with perl) \ - $(use_with sqlite) \ - $(use_with ssl openssl) \ - $(use_enable server) \ - $(use_enable sieve) \ - $(use_with snmp) \ - $(use_enable static-libs static) \ - $(use_with tcpd libwrap) \ - $(use_enable xapian) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" INSTALLDIRS=vendor install - - dodoc README* - dodoc -r doc - cp -r contrib tools "${D}/usr/share/doc/${PF}" - rm -f doc/text/Makefile* - - mv "${D}"/usr/libexec/{master,cyrusmaster} || die - - insinto /etc - newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf - newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf - - sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \ - -e '/^partition-default/s|/var/.*|/var/spool/imap|' \ - -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \ - "${D}"/etc/imapd.conf - - sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \ - -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \ - "${D}"/etc/cyrus.conf - - # turn off sieve if not installed - if ! use sieve; then - sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die - fi - # same thing for http(s) as well - if ! use http; then - sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die - fi - - newinitd "${FILESDIR}/cyrus.rc8" cyrus - newconfd "${FILESDIR}/cyrus.confd" cyrus - newpamd "${FILESDIR}/cyrus.pam-include" sieve - - for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do - keepdir "/var/${subdir}" - fowners cyrus:mail "/var/${subdir}" - fperms 0750 "/var/${subdir}" - done - for subdir in imap/{user,quota,sieve} spool/imap ; do - for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do - keepdir "/var/${subdir}/${i}" - fowners cyrus:mail "/var/${subdir}/${i}" - fperms 0750 "/var/${subdir}/${i}" - done - done -} - -pkg_preinst() { - if ! has_version ${CATEGORY}/${PN} ; then - elog "For correct logging add the following to /etc/syslog.conf:" - elog " local6.* /var/log/imapd.log" - elog " auth.debug /var/log/auth.log" - echo - - elog "You have to add user cyrus to the sasldb2. Do this with:" - elog " saslpasswd2 cyrus" - fi -} - -pkg_postinst() { - # do not install server.{key,pem) if they exist - if use ssl ; then - if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then - install_cert /etc/ssl/cyrus/server - chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem} - fi - fi - - echo - einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html" - einfo "for upgrade instructions." - echo -} diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r4.ebuild deleted file mode 100644 index 471ab7129ca9..000000000000 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r4.ebuild +++ /dev/null @@ -1,230 +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" - ) - -pkg_setup() { - # https://bugs.gentoo.org/604466 - append-ldflags $(no-as-needed) -} - -src_prepare() { - default - # Fix master(8)->cyrusmaster(8) manpage. - for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do - sed -i -e 's:master\.8:cyrusmaster.8:g' \ - -e 's:master(8):cyrusmaster(8):g' \ - "${i}" || die "sed failed" || die "sed failed" - done - mv man/master.8 man/cyrusmaster.8 || die "mv failed" - sed -i -e "s:MASTER:CYRUSMASTER:g" \ - -e "s:Master:Cyrusmaster:g" \ - -e "s:master:cyrusmaster:g" \ - man/cyrusmaster.8 || die "sed failed" - - # lock.h to afs/lock.h - sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \ - ptclient/afskrb.c || die - - eautoreconf -} - -src_configure() { - local myconf - if use afs ; then - myconf+=" --with-afs-libdir=/usr/$(get_libdir)" - myconf+=" --with-afs-incdir=/usr/include/afs" - fi - # sphinx is unmaintained and dead, bug #662944 - econf \ - --enable-unit-tests \ - --enable-murder \ - --enable-idled \ - --enable-event-notification \ - --enable-autocreate \ - --enable-pcre \ - --with-com_err \ - --with-cyrus-user=cyrus \ - --with-sasl \ - --without-krb \ - --without-krbdes \ - --disable-sphinx \ - --enable-squat \ - --with-zlib \ - $(use_enable afs) \ - $(use_enable afs krb5afspts) \ - $(use_enable backup) \ - $(use_enable calalarm calalarmd) \ - $(use_with caps libcap) \ - $(use_with clamav) \ - $(use_enable nntp) \ - $(use_enable http) \ - $(use_with http nghttp2) \ - $(use_enable replication) \ - $(use_enable kerberos gssapi) \ - $(use_with ldap) \ - $(use_with lmdb) \ - $(use_with mysql) \ - $(use_with postgres pgsql) \ - $(use_with perl) \ - $(use_with sqlite) \ - $(use_with ssl openssl) \ - $(use_enable server) \ - $(use_enable sieve) \ - $(use_with snmp) \ - $(use_enable static-libs static) \ - $(use_with tcpd libwrap) \ - $(use_enable xapian) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" INSTALLDIRS=vendor install - - dodoc README* - dodoc -r doc - cp -r contrib tools "${D}/usr/share/doc/${PF}" - rm -f doc/text/Makefile* - - mv "${D}"/usr/libexec/{master,cyrusmaster} || die - - insinto /etc - newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf - newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf - - sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \ - -e '/^partition-default/s|/var/.*|/var/spool/imap|' \ - -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \ - "${D}"/etc/imapd.conf - - sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \ - -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \ - "${D}"/etc/cyrus.conf - - # turn off sieve if not installed - if ! use sieve; then - sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die - fi - # same thing for http(s) as well - if ! use http; then - sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die - fi - - newinitd "${FILESDIR}/cyrus.rc8" cyrus - newconfd "${FILESDIR}/cyrus.confd" cyrus - newpamd "${FILESDIR}/cyrus.pam-include" sieve - - for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do - keepdir "/var/${subdir}" - fowners cyrus:mail "/var/${subdir}" - fperms 0750 "/var/${subdir}" - done - for subdir in imap/{user,quota,sieve} spool/imap ; do - for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do - keepdir "/var/${subdir}/${i}" - fowners cyrus:mail "/var/${subdir}/${i}" - fperms 0750 "/var/${subdir}/${i}" - done - done -} - -pkg_preinst() { - if ! has_version ${CATEGORY}/${PN} ; then - elog "For correct logging add the following to /etc/syslog.conf:" - elog " local6.* /var/log/imapd.log" - elog " auth.debug /var/log/auth.log" - echo - - elog "You have to add user cyrus to the sasldb2. Do this with:" - elog " saslpasswd2 cyrus" - fi -} - -pkg_postinst() { - # do not install server.{key,pem) if they exist - if use ssl ; then - if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then - install_cert /etc/ssl/cyrus/server - chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem} - fi - fi - - echo - einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html" - einfo "for upgrade instructions." - echo -} diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r4.ebuild deleted file mode 100644 index 06d4168cf795..000000000000 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r4.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/files/cyrus-imapd-libcap.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap.patch deleted file mode 100644 index eda404bf0ddb..000000000000 --- a/net-mail/cyrus-imapd/files/cyrus-imapd-libcap.patch +++ /dev/null @@ -1,64 +0,0 @@ -Bug: https://bugs.gentoo.org/713728 -From f712d1268d5288e7f955567a07e99f409aba3e4a Mon Sep 17 00:00:00 2001 -From: Jakob Gahde <j5lx@fmail.co.uk> -Date: Sat, 15 Feb 2020 17:18:16 +0100 -Subject: [PATCH] Add compatibility with recent versions of libcap - ---- - lib/util.c | 6 +++--- - master/master.c | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lib/util.c b/lib/util.c -index 5f3cb1933..1256671f6 100644 ---- a/lib/util.c -+++ b/lib/util.c -@@ -579,7 +579,7 @@ EXPORTED int set_caps(int stage __attribute__((unused)), - } - #endif - --static int cap_setuid(int uid, int is_master) -+static int cyrus_cap_setuid(int uid, int is_master) - { - int r; - -@@ -599,7 +599,7 @@ EXPORTED int become_cyrus(int is_master) - int result; - static uid_t uid = 0; - -- if (uid) return cap_setuid(uid, is_master); -+ if (uid) return cyrus_cap_setuid(uid, is_master); - - const char *cyrus = cyrus_user(); - const char *mail = cyrus_group(); -@@ -645,7 +645,7 @@ EXPORTED int become_cyrus(int is_master) - return -1; - } - -- result = cap_setuid(newuid, is_master); -+ result = cyrus_cap_setuid(newuid, is_master); - - /* Only set static uid if successful, else future calls won't reset gid */ - if (result == 0) -diff --git a/master/master.c b/master/master.c -index 9c4d6f097..57f49f84a 100644 ---- a/master/master.c -+++ b/master/master.c -@@ -285,7 +285,7 @@ static void get_statsock(int filedes[2]) - fatalf(1, "unable to set close-on-exec: %m"); - } - --static int cap_bind(int socket, struct sockaddr *addr, socklen_t length) -+static int cyrus_cap_bind(int socket, struct sockaddr *addr, socklen_t length) - { - int r; - -@@ -643,7 +643,7 @@ static void service_create(struct service *s) - #endif - - oldumask = umask((mode_t) 0); /* for linux */ -- r = cap_bind(s->socket, res->ai_addr, res->ai_addrlen); -+ r = cyrus_cap_bind(s->socket, res->ai_addr, res->ai_addrlen); - umask(oldumask); - if (r < 0) { - syslog(LOG_ERR, "unable to bind to %s/%s socket: %m", diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index 77e7e41582d9..2b23766d6abd 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -5,10 +5,14 @@ AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed DIST dovecot-2.3-pigeonhole-0.5.14.tar.gz 1910607 BLAKE2B 5c08214535d298ce2b8defd8c945e96597a98bda6493a3e27481fdadc0e149e6dd01c6ececaa583dd331614669bd8e033cd1b91d64d03a9e0cdcef67fa9c27b8 SHA512 c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc DIST dovecot-2.3-pigeonhole-0.5.17.1.tar.gz 1952704 BLAKE2B 7dfc6b5bdb82bcaa60e0f41722f9a884edee7853ce09c9391d4c610be16728f58cc7095b8dd2d47e89296ff36aa926c687b39a418bc74ca0bfc3c4eab98156df SHA512 632a963d90a3fa052f314360d59ff25274d80952307ab5dd9193a2713ebf686500a7b2559b56f04b07e0a261066eed9b8525b14197f3be51728af09acb76e894 DIST dovecot-2.3-pigeonhole-0.5.18.tar.gz 1953892 BLAKE2B 478da07a2f507a3322c6b6035f8cb74a720c030cc9413496f90a793d165178617207e26b0b57f710a9b9c7671be3fffdbaccaacb8747198abf82943dcb4a24df SHA512 44c3d945a5aebb8935e6e46751e44f505f2abd529c31e3efb689d3b5b9cdf9bca4f5231fc42a8d19837cb95c7618f5b64dfdf5964f40a0a6987144a37cdbaaec +DIST dovecot-2.3-pigeonhole-0.5.19.tar.gz 1954148 BLAKE2B 0c52293f9447260f3e95f31c5ea3c04a1971b1a5621b56be1c79a8575aceb4f7e7fef62e7d0a3d980dcb5b8e1a8eeec543adcf0b016b65eb34ca4a26e8d2fe23 SHA512 5b0a61c7711232ea3651b818a970b500b05bd340a04bcd5a5f0ea0529eda65f498912a845c8f3b3b80196d010bc22bd4a380e1f682cb42f62b80d2d43a94993a DIST dovecot-2.3.14.1.tar.gz 7534719 BLAKE2B 1ba5143711fe340b9fad61db41ba658485e42be52f3b0f196eeb9b8e4b7c1b865b6a08f879dadeb2db3979b17be34699ce5febc4545887307f62bd5b72076f86 SHA512 b71b82c2918ac9940ef6bc274bc9c2b3e56a08cf5054244d80547ad89c421b9180c5afa8b5b140831239fbe2cbeeceb83a0052e037eb198d8fc27d07cba4ba35 DIST dovecot-2.3.17.1.tar.gz 7700848 BLAKE2B adf12c84def899795d8446766b5c88fd5c68a5969a1807b4dd9c2e4894ddc0693a771ce4d4c0c72b0b03501903c39c650eace97b6708114b7fe038b62ea2ecce SHA512 976aa4f68e86f401e5766017e1702740d5b03892aff98f31f9ef0c6d242311d0f4b50d7faa426306bf1c902d7fc6d021438977bc887fa66ee360b069ec32ad79 DIST dovecot-2.3.18.tar.gz 7763230 BLAKE2B ff3e0c2cad87d2e2632345a25825eebd0a6c1520376d85286453bde7505f22410d03911cd588a0d102b75f22cc1de051b01c43a57c90138340186e8cb024247a SHA512 b5eccf790a3960614876f122efb6296fe49ab7c523b08c10347fd4d10ed293fbd327279511c227b420f7c0786975186157eaa0fb5cd3aab1f3be9a4c5c3ad233 +DIST dovecot-2.3.19.tar.gz 7790661 BLAKE2B 060364dc83a5fcb7ee7a5a77467aedb79de13e65c5abfb1a9c1e76c7fac4b5b1ad07157917d095631ea72b194efdde38829d4c7274ced65dca7b457c0cc4bb13 SHA512 a61ce88b53c4f24faddf4951f16cb75dfe52aa7057d072c727566a7c9a683cc487d26cea9a83ad8aca161a053949d2f2196ba6a58015e3d33be897094aabf887 EBUILD dovecot-2.3.14.1-r2.ebuild 8701 BLAKE2B 6358279ab6e561cef151cd5bd57d383342588ef8af60b74da03282480ef44fa6e7941b30804e38376575eb6e51e24308b7070dbfcc671cfbcc72f94dff700daa SHA512 c7fb4f436942bcc65482fe4e93aa8c7a8215b835fc17de7cb772e6cf8dc95a54bc495c9f5e42edd84adeebb0ea4f91d786589213d8bd1b8888e03b35244b371c EBUILD dovecot-2.3.17.1-r1.ebuild 8866 BLAKE2B a34542d194d6479653b264a1e1c8918dac51e9580dcf5a37eb6fddbf0843575e28b254da3878853d6efd7a56f8cd810d9335940b8373388f5df17fe531a8583d SHA512 e9029be65421a0e913edac76fa4c2cc66750124be05992e8adaa5c684958e9187c2dbf0875e2bd2ab67cb7170a50cfaaa64989a99c9821f651e62ac73ad2f86f EBUILD dovecot-2.3.18-r1.ebuild 8860 BLAKE2B e45ff2afef6ba6b518bf14dd6abe82cd56eb2f5fd8c5ea5f017d3fa9445927a680f8368ee973ecf930684ad2afe7f4cbe3f0b3cf4ff605275e30d1061816257b SHA512 89f3e3fd3376ac544264b7cd084b25e916a7d6b114443657d9a124ac86f0a1c8f547bdb173c982090369e9bfcf0ce9edf236460d22ea4bb21fa01b7783c9be59 +EBUILD dovecot-2.3.18-r2.ebuild 8831 BLAKE2B a40f408980018005c8232064ad806132b11e448ef7f1aef0aa22b37a5b8583b1e575774b34a85346152c76b71bfcf2b66ea04dff7bcae7049e5baa5a592a0677 SHA512 e40c094f190fd94afb2722cc58f9f5f61b4a72c6bb0550e89619948ca54d195e8e2702d04552948cf58766430a1adbbb549d496d7c14cdb5075bbd2b0a07ee5b +EBUILD dovecot-2.3.19.ebuild 8658 BLAKE2B d9edf93a3287d299403509f0991f1c0a976207a2693ee62404a323803c22574ced457503297c209432f0d2a942be60780a40e913f62c11e3d600449d63a481ff SHA512 85c3138977452eb8ef341d5c67c30694230606d47dccec99feea37efafb8d9e6fa956fbe6d43d3e3670cc3183e0a26cf390e264f634ed7e97d2acbe5a8a62f29 MISC metadata.xml 1091 BLAKE2B 5852eefa5b3be607a1e7d1bd5e8aa8ce2317db6ccc8c915438ab1aef54d59d2bd6953b1015c429a391c4b7cf69bdb562da80bfd66451dc40f21cc5d6adc28c10 SHA512 9eb91f5290af634e94abd0d1542c88c69da77f892bb15cc5a90d461cd456df5c68f4c9b783a63705297e88291c7d9d917a9adcfb55a32fbc04da82ae0528dad3 diff --git a/net-mail/dovecot/dovecot-2.3.18-r2.ebuild b/net-mail/dovecot/dovecot-2.3.18-r2.ebuild new file mode 100644 index 000000000000..a0a7853cfdc8 --- /dev/null +++ b/net-mail/dovecot/dovecot-2.3.18-r2.ebuild @@ -0,0 +1,307 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-1 lua5-3 ) +# do not add a ssl USE flag. ssl is mandatory +SSL_DEPS_SKIP=1 +inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs + +MY_P="${P/_/.}" +#MY_S="${PN}-ce-${PV}" +major_minor="$(ver_cut 1-2)" +sieve_version="0.5.18" +if [[ ${PV} == *_rc* ]]; then + rc_dir="rc/" +else + rc_dir="" +fi +SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz + sieve? ( + https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz + ) + managesieve? ( + https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz + ) " +DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" +HOMEPAGE="https://www.dovecot.org/" + +SLOT="0" +LICENSE="LGPL-2.1 MIT" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite" +IUSE_DOVECOT_COMPRESS="lz4 zstd" +IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc + selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind" + +IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +DEPEND=" + app-arch/bzip2 + app-arch/xz-utils + dev-libs/icu:= + dev-libs/openssl:0= + sys-libs/zlib:= + virtual/libiconv + argon2? ( dev-libs/libsodium:= ) + caps? ( sys-libs/libcap ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + lucene? ( >=dev-cpp/clucene-2.3 ) + lz4? ( app-arch/lz4 ) + mysql? ( dev-db/mysql-connector-c:0= ) + pam? ( sys-libs/pam:= ) + postgres? ( dev-db/postgresql:* ) + rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) + selinux? ( sec-policy/selinux-dovecot ) + solr? ( net-misc/curl dev-libs/expat ) + sqlite? ( dev-db/sqlite:* ) + stemmer? ( dev-libs/snowball-stemmer:= ) + suid? ( acct-group/mail ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( sys-apps/tcp-wrappers ) + textcat? ( app-text/libexttextcat ) + unwind? ( sys-libs/libunwind:= ) + zstd? ( app-arch/zstd:= ) + virtual/libcrypt:= + " + +RDEPEND=" + ${DEPEND} + acct-group/dovecot + acct-group/dovenull + acct-user/dovecot + acct-user/dovenull + net-mail/mailbase + " + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch + "${FILESDIR}/${PN}"-socket-name-too-long.patch +) + +pkg_setup() { + use lua && lua-single_pkg_setup + if use managesieve && ! use sieve; then + ewarn "managesieve USE flag selected but sieve USE flag unselected" + ewarn "sieve USE flag will be turned on" + fi +} + +src_prepare() { + default + # bug 657108 + #elibtoolize + eautoreconf + + # Bug #727244 + append-cflags -fasynchronous-unwind-tables +} + +src_configure() { + local conf="" + + if use postgres || use mysql || use sqlite; then + conf="${conf} --with-sql" + fi + + # turn valgrind tests off. Bug #340791 + VALGRIND=no \ + LUAPC="${ELUA}" \ + systemdsystemunitdir="$(systemd_get_systemunitdir)" \ + econf \ + --with-rundir="${EPREFIX}/run/dovecot" \ + --with-statedir="${EPREFIX}/var/lib/dovecot" \ + --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ + --disable-rpath \ + --with-bzlib \ + --without-libbsd \ + --with-lzma \ + --with-icu \ + --with-ssl \ + --with-zlib \ + $( use_with argon2 sodium ) \ + $( use_with caps libcap ) \ + $( use_with kerberos gssapi ) \ + $( use_with lua ) \ + $( use_with ldap ) \ + $( use_with lucene ) \ + $( use_with lz4 ) \ + $( use_with mysql ) \ + $( use_with pam ) \ + $( use_with postgres pgsql ) \ + $( use_with sqlite ) \ + $( use_with solr ) \ + $( use_with stemmer ) \ + $( use_with systemd ) \ + $( use_with tcpd libwrap ) \ + $( use_with textcat ) \ + $( use_with unwind libunwind ) \ + $( use_with zstd ) \ + $( use_enable static-libs static ) \ + ${conf} + + if use sieve || use managesieve; then + # The sieve plugin needs this file to be build to determine the plugin + # directory and the list of libraries to link to. + emake dovecot-config + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" + econf \ + $( use_enable static-libs static ) \ + --localstatedir="${EPREFIX}/var" \ + --enable-shared \ + --with-dovecot="${S}" \ + $( use_with ldap ) \ + $( use_with managesieve ) + fi +} + +src_compile() { + default + if use sieve || use managesieve; then + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" + fi +} + +src_test() { + default + if use sieve || use managesieve; then + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" + default + fi +} + +src_install() { + default + + # insecure: + # use suid && fperms u+s /usr/libexec/dovecot/deliver + # better: + if use suid; then + einfo "Changing perms to allow deliver to be suided" + fowners root:mail "/usr/libexec/dovecot/dovecot-lda" + fperms 4750 "/usr/libexec/dovecot/dovecot-lda" + fi + + newinitd "${FILESDIR}"/dovecot.init-r6 dovecot + + rm -rf "${ED}"/usr/share/doc/dovecot + + dodoc AUTHORS NEWS README TODO + dodoc doc/*.{txt,cnf,xml,sh} + docinto example-config + dodoc doc/example-config/*.{conf,ext} + docinto example-config/conf.d + dodoc doc/example-config/conf.d/*.{conf,ext} + docinto wiki + dodoc doc/wiki/* + doman doc/man/*.{1,7} + + # Create the dovecot.conf file from the dovecot-example.conf file that + # the dovecot folks nicely left for us.... + local conf="${ED}/etc/dovecot/dovecot.conf" + local confd="${ED}/etc/dovecot/conf.d" + + insinto /etc/dovecot + doins doc/example-config/*.{conf,ext} + insinto /etc/dovecot/conf.d + doins doc/example-config/conf.d/*.{conf,ext} + fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext + rm -f "${confd}/../README" + + # .maildir is the Gentoo default + local mail_location="maildir:~/.maildir" + sed -i -e \ + "s|#mail_location =|mail_location = ${mail_location}|" \ + "${confd}/10-mail.conf" \ + || die "failed to update mail location settings in 10-mail.conf" + + # We're using pam files (imap and pop3) provided by mailbase + if use pam; then + sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \ + "${confd}/auth-system.conf.ext" \ + || die "failed to update PAM settings in auth-system.conf.ext" + # mailbase does not provide a sieve pam file + use managesieve && dosym imap /etc/pam.d/sieve + sed -i -e \ + 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \ + "${confd}/10-auth.conf" \ + || die "failed to update PAM settings in 10-auth.conf" + fi + + # Disable ipv6 if necessary + if ! use ipv6; then + sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \ + || die "failed to update listen settings in dovecot.conf" + fi + + # Update ssl cert locations + sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \ + || die "ssl conf failed" + sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \ + -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \ + "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf" + + # Install SQL configuration + if use mysql || use postgres; then + sed -i -e \ + 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \ + "${confd}/10-auth.conf" || die "failed to update SQL settings in \ + 10-auth.conf" + fi + + # Install LDAP configuration + if use ldap; then + sed -i -e \ + 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \ + "${confd}/10-auth.conf" \ + || die "failed to update ldap settings in 10-auth.conf" + fi + + if use sieve || use managesieve; then + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" + emake DESTDIR="${ED}" install + sed -i -e \ + 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \ + || die "failed to update sieve settings in 15-lda.conf" + rm -rf "${ED}"/usr/share/doc/dovecot + docinto example-config/conf.d + dodoc doc/example-config/conf.d/*.conf + insinto /etc/dovecot/conf.d + doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf + use managesieve && doins doc/example-config/conf.d/20-managesieve.conf + docinto sieve/rfc + dodoc doc/rfc/*.txt + docinto sieve/devel + dodoc doc/devel/DESIGN + docinto plugins + dodoc doc/plugins/*.txt + docinto extensions + dodoc doc/extensions/*.txt + docinto locations + dodoc doc/locations/*.txt + doman doc/man/*.{1,7} + fi + + use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete +} + +pkg_postinst() { + # Let's not make a new certificate if we already have one + if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \ + -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then + einfo "Creating SSL certificate" + SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}" + install_cert /etc/ssl/dovecot/server + fi + + elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes." +} diff --git a/net-mail/dovecot/dovecot-2.3.19.ebuild b/net-mail/dovecot/dovecot-2.3.19.ebuild new file mode 100644 index 000000000000..1fa7a3cfb45f --- /dev/null +++ b/net-mail/dovecot/dovecot-2.3.19.ebuild @@ -0,0 +1,302 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-1 lua5-3 ) +# do not add a ssl USE flag. ssl is mandatory +SSL_DEPS_SKIP=1 +inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs + +MY_P="${P/_/.}" +#MY_S="${PN}-ce-${PV}" +major_minor="$(ver_cut 1-2)" +sieve_version="0.5.19" +if [[ ${PV} == *_rc* ]]; then + rc_dir="rc/" +else + rc_dir="" +fi +SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz + sieve? ( + https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz + ) + managesieve? ( + https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz + ) " +DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" +HOMEPAGE="https://www.dovecot.org/" + +SLOT="0" +LICENSE="LGPL-2.1 MIT" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite" +IUSE_DOVECOT_COMPRESS="lz4 zstd" +IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc + selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind" + +IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +DEPEND=" + app-arch/bzip2 + app-arch/xz-utils + dev-libs/icu:= + dev-libs/openssl:0= + sys-libs/zlib:= + virtual/libiconv + argon2? ( dev-libs/libsodium:= ) + caps? ( sys-libs/libcap ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + lucene? ( >=dev-cpp/clucene-2.3 ) + lz4? ( app-arch/lz4 ) + mysql? ( dev-db/mysql-connector-c:0= ) + pam? ( sys-libs/pam:= ) + postgres? ( dev-db/postgresql:* ) + rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) + selinux? ( sec-policy/selinux-dovecot ) + solr? ( net-misc/curl dev-libs/expat ) + sqlite? ( dev-db/sqlite:* ) + stemmer? ( dev-libs/snowball-stemmer:= ) + suid? ( acct-group/mail ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( sys-apps/tcp-wrappers ) + textcat? ( app-text/libexttextcat ) + unwind? ( sys-libs/libunwind:= ) + zstd? ( app-arch/zstd:= ) + virtual/libcrypt:= + " + +RDEPEND=" + ${DEPEND} + acct-group/dovecot + acct-group/dovenull + acct-user/dovecot + acct-user/dovenull + net-mail/mailbase + " + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch + "${FILESDIR}/${PN}"-socket-name-too-long.patch +) + +pkg_setup() { + use lua && lua-single_pkg_setup + if use managesieve && ! use sieve; then + ewarn "managesieve USE flag selected but sieve USE flag unselected" + ewarn "sieve USE flag will be turned on" + fi +} + +src_prepare() { + default + # bug 657108 + #elibtoolize + eautoreconf + + # Bug #727244 + append-cflags -fasynchronous-unwind-tables +} + +src_configure() { + local conf="" + + if use postgres || use mysql || use sqlite; then + conf="${conf} --with-sql" + fi + + # turn valgrind tests off. Bug #340791 + VALGRIND=no \ + LUAPC="${ELUA}" \ + systemdsystemunitdir="$(systemd_get_systemunitdir)" \ + econf \ + --with-rundir="${EPREFIX}/run/dovecot" \ + --with-statedir="${EPREFIX}/var/lib/dovecot" \ + --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ + --disable-rpath \ + --with-bzlib \ + --without-libbsd \ + --with-lzma \ + --with-icu \ + --with-ssl \ + --with-zlib \ + $( use_with argon2 sodium ) \ + $( use_with caps libcap ) \ + $( use_with kerberos gssapi ) \ + $( use_with lua ) \ + $( use_with ldap ) \ + $( use_with lucene ) \ + $( use_with lz4 ) \ + $( use_with mysql ) \ + $( use_with pam ) \ + $( use_with postgres pgsql ) \ + $( use_with sqlite ) \ + $( use_with solr ) \ + $( use_with stemmer ) \ + $( use_with systemd ) \ + $( use_with tcpd libwrap ) \ + $( use_with textcat ) \ + $( use_with unwind libunwind ) \ + $( use_with zstd ) \ + $( use_enable static-libs static ) \ + ${conf} + + if use sieve || use managesieve; then + # The sieve plugin needs this file to be build to determine the plugin + # directory and the list of libraries to link to. + emake dovecot-config + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" + econf \ + $( use_enable static-libs static ) \ + --localstatedir="${EPREFIX}/var" \ + --enable-shared \ + --with-dovecot="${S}" \ + $( use_with ldap ) \ + $( use_with managesieve ) + fi +} + +src_compile() { + default + if use sieve || use managesieve; then + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" + fi +} + +src_test() { + default + if use sieve || use managesieve; then + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" + default + fi +} + +src_install() { + default + + if use suid; then + einfo "Changing perms to allow deliver to be suided" + fowners root:mail "/usr/libexec/dovecot/dovecot-lda" + fperms 4750 "/usr/libexec/dovecot/dovecot-lda" + fi + + newinitd "${FILESDIR}"/dovecot.init-r6 dovecot + + rm -rf "${ED}"/usr/share/doc/dovecot + + dodoc AUTHORS NEWS README TODO + dodoc doc/*.{txt,cnf,xml,sh} + docinto example-config + dodoc doc/example-config/*.{conf,ext} + docinto example-config/conf.d + dodoc doc/example-config/conf.d/*.{conf,ext} + docinto wiki + dodoc doc/wiki/* + doman doc/man/*.{1,7} + + # Create the dovecot.conf file from the dovecot-example.conf file that + # the dovecot folks nicely left for us.... + local conf="${ED}/etc/dovecot/dovecot.conf" + local confd="${ED}/etc/dovecot/conf.d" + + insinto /etc/dovecot + doins doc/example-config/*.{conf,ext} + insinto /etc/dovecot/conf.d + doins doc/example-config/conf.d/*.{conf,ext} + fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext + rm -f "${confd}/../README" + + # .maildir is the Gentoo default + local mail_location="maildir:~/.maildir" + sed -i -e \ + "s|#mail_location =|mail_location = ${mail_location}|" \ + "${confd}/10-mail.conf" \ + || die "failed to update mail location settings in 10-mail.conf" + + # We're using pam files (imap and pop3) provided by mailbase + if use pam; then + sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \ + "${confd}/auth-system.conf.ext" \ + || die "failed to update PAM settings in auth-system.conf.ext" + # mailbase does not provide a sieve pam file + use managesieve && dosym imap /etc/pam.d/sieve + sed -i -e \ + 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \ + "${confd}/10-auth.conf" \ + || die "failed to update PAM settings in 10-auth.conf" + fi + + # Disable ipv6 if necessary + if ! use ipv6; then + sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \ + || die "failed to update listen settings in dovecot.conf" + fi + + # Update ssl cert locations + sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \ + || die "ssl conf failed" + sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \ + -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \ + "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf" + + # Install SQL configuration + if use mysql || use postgres; then + sed -i -e \ + 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \ + "${confd}/10-auth.conf" || die "failed to update SQL settings in \ + 10-auth.conf" + fi + + # Install LDAP configuration + if use ldap; then + sed -i -e \ + 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \ + "${confd}/10-auth.conf" \ + || die "failed to update ldap settings in 10-auth.conf" + fi + + if use sieve || use managesieve; then + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" + emake DESTDIR="${ED}" install + sed -i -e \ + 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \ + || die "failed to update sieve settings in 15-lda.conf" + rm -rf "${ED}"/usr/share/doc/dovecot + docinto example-config/conf.d + dodoc doc/example-config/conf.d/*.conf + insinto /etc/dovecot/conf.d + doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf + use managesieve && doins doc/example-config/conf.d/20-managesieve.conf + docinto sieve/rfc + dodoc doc/rfc/*.txt + docinto sieve/devel + dodoc doc/devel/DESIGN + docinto plugins + dodoc doc/plugins/*.txt + docinto extensions + dodoc doc/extensions/*.txt + docinto locations + dodoc doc/locations/*.txt + doman doc/man/*.{1,7} + fi + + use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete +} + +pkg_postinst() { + # Let's not make a new certificate if we already have one + if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \ + -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then + einfo "Creating SSL certificate" + SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}" + install_cert /etc/ssl/dovecot/server + fi +} diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest index e004a297f7fe..09eb48464d8d 100644 --- a/net-mail/mailbase/Manifest +++ b/net-mail/mailbase/Manifest @@ -1,11 +1,7 @@ AUX aliases 809 BLAKE2B bc6295e7cddae8ee29450f4054992b6fe47f301303be7ea284d42f9e5d5a92e94aaba5a72482fbf9756bf0eb7ea3cb1ec899e3c71dbc7dc587352b56ef627d3c SHA512 748dcdd4da9deba0a5c0925b67d98bb0e46d3ef651bb97a4be2ac34a683a9090bd11e5e3c28b69d0309f806a4f60aa826e4d940e7549ac636196cd2ac4bbef2d AUX common-pamd 308 BLAKE2B 95a2b44b1bd2112da1160cf5c3f993debb85692111e046a79c14f89a83cd82eebc5580ea0375f6548d373a04ac17f214a0135047d99f7ed3cf62f5500953bf6a SHA512 5b7d878969e644aac8aa9355e1a8ff9e2a9c1b07edb5a62c694bd7a4f87961242db7c85b1030540c9ad733a4d3d4c5367a047a188b21517d1d077bec6e620ec7 AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd37037d3ea10bfab18fb48fae565304bd2eba6fc686da3f3bf71249975e8f8bc9deada66eb3665d20929020d SHA512 3516815034b419bf4fd57a43536e7a25b820013d5339cb818bbbee3f0e8e26651f6b4aefae0177240219e05010ba8a2aaf6d0337220cf176801992204c3216f0 -AUX mailcap-r1 997 BLAKE2B 1e5dc595de7deb3ac0a5dd688de86f93dd9f0e954da705ece43911c0224f186351e3406c949747f0630fcc8aa35734af2937aa76eba93ee43d3a81c79bf86997 SHA512 1243571e089f781c7469ff5e36b9be2b57de492909e32acaa6dc31d61a0f8b1045d9ea94a6d719cc675d2b09ce4a2bfd12dadca0b5a61c45cb1509e32e2138e8 -AUX mailcap-r2 1837 BLAKE2B ad868b4ba6b6cbf8dcc7be7b39d763cb7cdd37bd8453f2debda9ab2241f79074e2ffc4112b120027a07ed8c55e1e761b2ecb36436bf380996ea315cc611371c9 SHA512 4360ef0f1d25b6ffb616a957ee81a2b5e0f559dc2ed8a6e221d1122f4a447c90aca2ee83ca0dd4ce5a73b41493ff8cbbe710824c5b6808269d577904b8ab3e2c AUX mailcap-r3 1584 BLAKE2B eac2e35ea578079c4a67f71a690443d616f99d666dad12553ae2020fc0affcbc121529c62d9cad1419e42b5a9d95ec3166c3f71385b047827c97acc0cc81d460 SHA512 3be98f171d9b6d891a24cc759d595eb856e28bbe29a2578d409993a6dec33ffd369f1c40bdb143e3e0a3698d009b06d5a0a5d329563c886fc592d58d874eab35 AUX mailcap.5 8951 BLAKE2B 6bd704c8efe861471343e318734abed30c5f406a06646877286d91bfe3cb9afaf128ddf77675d4a14dd1e19a6979772cf013923cf30b02f62e54eac2a7fe02b7 SHA512 6973397bdd389e8eaf1977d8eeee271beda2ad1bd0b01ed7408156af0e7cf430a45e2b7261213a3278fbc2cbb250b65a3f34c11d3c5603cffffade4f1fba24e5 -EBUILD mailbase-1.6-r1.ebuild 1045 BLAKE2B 9363d11476b65fc5dc97420c0046d309756e52fc60cfe7a6c959a0fc40bcc262b666d2389fe1be81d75d721c61046aa5aeefb3784c0715c6a09bcaeb7650880f SHA512 fb737ebc602ad122c66b16f8b3f599d5378f08c7434f0cbb6dde31e16e45129a224c70d9d73e7825a59637c4e3ffcbadc54e925c1e57be7fe876f8c50cbe74d6 -EBUILD mailbase-1.7.ebuild 1042 BLAKE2B 35898d2c02870979a51a278d2725868ace638027427df3b0b3ba3dc4a93aee80ebb22ec28a955ec64e876c0e124ab41b766f057409dcc4b3622d5f5ac958ed4e SHA512 7431582eb7f98a01ad7c37725895e396bfde0ae594195e5640a0ca082850b78f4b81916e2c68db5a67fe41d212a60f9a0a6e3bd768a9d9472dcf482a30999468 -EBUILD mailbase-1.8.ebuild 1001 BLAKE2B e5c9157b7dc2aec3f2a10acbf01f93ed2ebb390dd6b3d5f23728837052e32fa9c15281a9e910436582501be05264a1d200c4d80306c93dbf2e820377ac1d2263 SHA512 1412d80e4aa8bf1cf74de66ac3e4ef50174b039b6d24afc564b63f97b00c5628407f5f8e27608ea20a53d78453b3d49a41a21bee615d17eb2f87d9a6f4a55933 -MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd +EBUILD mailbase-1.8.ebuild 1008 BLAKE2B 548491b99107ec8e4b6a65d5993f4feb4e393ee60d6aae8aa1aae968096eebb26fb63bfda967506b0dd955c3337e941af562ee9c6c7e151e0fd2f9a29f231e3d SHA512 be4f5edcc5f207654560306decfc091e87fa986ccb8e6e8ab9a9ceb93aaccf4b59b0bf007614d1b22e72fd1f107c222e2f423c894eb1e239cec51d11d9287c43 +MISC metadata.xml 273 BLAKE2B b4cfe539dd0b8abaa460e6a58d4eb4abca02c82a3174ed097dce35389b4d6aa0f80c0ae9fcb6cec3b57b0d5de6e8105f569a7872193177fade6a3ca96939ef9c SHA512 ea73916029216f884fa542103def24e21b8e7bd9efd6764554d14e7c34e0d4b289c39bb81b07524dc3ce87adc5abfd4c421a965506c583430e134e235f26012d diff --git a/net-mail/mailbase/files/mailcap-r1 b/net-mail/mailbase/files/mailcap-r1 deleted file mode 100644 index 0ffdcca3783f..000000000000 --- a/net-mail/mailbase/files/mailcap-r1 +++ /dev/null @@ -1,19 +0,0 @@ -application/pdf; xdg-open '%s'; needsterminal -application/postscript; xdg-open '%s'; needsterminal -application/x-info; info --subnodes -o /dev/stdout -f '%s' 2>/dev/null; copiousoutput; description=GNU Info document -application/x-gtar; tar tvzf -; print=tar tvzf - | print text/plain:-; copiousoutput -application/x-tar; tar tvf -; print=tar tvf - | print text/plain:-; copiousoutput -application/x-troff-man; nroff -mandoc -Tutf8; copiousoutput; print=nroff -mandoc -Tutf8 | print text/plain:- - -audio/*; xdg-open '%s'; needsterminal -image/*; xdg-open '%s'; needsterminal - -text/html; lynx -dump '%s'; copiousoutput; description=HTML Text; nametemplate=%s.html -text/troff; man -l '%s'; needsterminal; description=Man page -text/*; less '%s'; needsterminal -text/*; gview '%s'; edit=gvim -f '%s'; compose=gvim -f '%s'; test=test "$DISPLAY" != "" -text/*; view '%s'; edit=vim '%s'; compose=vim '%s'; needsterminal -text/*; more '%s'; needsterminal - -*/*; less '%s'; needsterminal -*/*; false; print=lpr '%s' diff --git a/net-mail/mailbase/files/mailcap-r2 b/net-mail/mailbase/files/mailcap-r2 deleted file mode 100644 index 5ecd40a4201a..000000000000 --- a/net-mail/mailbase/files/mailcap-r2 +++ /dev/null @@ -1,36 +0,0 @@ -# Database binding MIME types to programs that can process them. -# This file is generally used by mail clients to view attachments. -# -# Users should add their own rules to their ~/.mailcap file. That file will be -# processed first before falling back to this one. -# -# For more information, see the mailcap(5) man page. - -# NB: Do not quote %s. Clients will handle expanding it with proper quoting, -# so adding quotes ourselves just confuses things. - -application/pdf; xdg-open %s; needsterminal -application/postscript; xdg-open %s; needsterminal -application/x-info; info --subnodes -o /dev/stdout -f %s 2>/dev/null; copiousoutput; description=GNU Info document -application/x-gtar; tar tvzf -; print=tar tvzf - | print text/plain:-; copiousoutput -application/x-tar; tar tvf -; print=tar tvf - | print text/plain:-; copiousoutput -application/x-troff-man; nroff -mandoc -Tutf8; copiousoutput; print=nroff -mandoc -Tutf8 | print text/plain:- -# It'd be nice to limit this to compressed formats (e.g. x-*), but the file -# format doesn't support that, and less has good fallbacks already. -application/*; less %s; copiousoutput; needsterminal - -audio/*; xdg-open %s; needsterminal -image/*; xdg-open %s; needsterminal - -text/html; lynx -dump -assume_charset=%{charset} %s; copiousoutput; description=HTML Text; nametemplate=%s.html -text/troff; man -l %s; needsterminal; description=Man page -text/*; less %s; needsterminal -text/*; gview %s; edit=gvim -f %s; compose=gvim -f %s; test=test "$DISPLAY" != "" -text/*; view %s; edit=vim %s; compose=vim %s; needsterminal -text/*; more %s; needsterminal - -# NB: This is an extension in the hope that it might be useful to some programs. -# RFC1524 does not support * for the type (the string before the /), only for -# the subtype (the string after the /). -*/*; less %s; needsterminal -*/*; false; print=lpr %s diff --git a/net-mail/mailbase/mailbase-1.6-r1.ebuild b/net-mail/mailbase/mailbase-1.6-r1.ebuild deleted file mode 100644 index c8ddcc3a5694..000000000000 --- a/net-mail/mailbase/mailbase-1.6-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit pam - -DESCRIPTION="MTA layout package" -SRC_URI="" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -S=${WORKDIR} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="pam" - -RDEPEND=" - acct-group/mail - acct-user/mail - acct-user/postmaster - pam? ( sys-libs/pam ) - !<net-mail/metamail-2.7.53.3-r2 -" - -src_install() { - insinto /etc/mail - doins "${FILESDIR}"/aliases - insinto /etc - newins "${FILESDIR}"/mailcap-r1 mailcap - doman "${FILESDIR}"/mailcap.5 - - dosym spool/mail /var/mail - - if use pam ; then - newpamd "${FILESDIR}"/common-pamd-include pop - newpamd "${FILESDIR}"/common-pamd-include imap - local p - for p in pop3 pop3s pops ; do - dosym pop /etc/pam.d/${p} - done - for p in imap4 imap4s imaps ; do - dosym imap /etc/pam.d/${p} - done - fi -} diff --git a/net-mail/mailbase/mailbase-1.7.ebuild b/net-mail/mailbase/mailbase-1.7.ebuild deleted file mode 100644 index 242efe827056..000000000000 --- a/net-mail/mailbase/mailbase-1.7.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit pam - -DESCRIPTION="MTA layout package" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -S=${WORKDIR} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="pam" - -RDEPEND=" - acct-group/mail - acct-user/mail - acct-user/postmaster - pam? ( sys-libs/pam ) - !<net-mail/metamail-2.7.53.3-r2 -" - -src_install() { - insinto /etc/mail - doins "${FILESDIR}"/aliases - insinto /etc - newins "${FILESDIR}"/mailcap-r2 mailcap - doman "${FILESDIR}"/mailcap.5 - - dosym spool/mail /var/mail - - if use pam ; then - newpamd "${FILESDIR}"/common-pamd-include pop - newpamd "${FILESDIR}"/common-pamd-include imap - local p - for p in pop3 pop3s pops ; do - dosym pop /etc/pam.d/${p} - done - for p in imap4 imap4s imaps ; do - dosym imap /etc/pam.d/${p} - done - fi -} diff --git a/net-mail/mailbase/mailbase-1.8.ebuild b/net-mail/mailbase/mailbase-1.8.ebuild index ad0055041aa6..9fe729541140 100644 --- a/net-mail/mailbase/mailbase-1.8.ebuild +++ b/net-mail/mailbase/mailbase-1.8.ebuild @@ -11,7 +11,7 @@ S=${WORKDIR} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="pam" RDEPEND=" diff --git a/net-mail/mailbase/metadata.xml b/net-mail/mailbase/metadata.xml index 38ebffc8efa5..a790b9587a45 100644 --- a/net-mail/mailbase/metadata.xml +++ b/net-mail/mailbase/metadata.xml @@ -5,4 +5,5 @@ <email>eras@gentoo.org</email> <name>Eray Aslan</name> </maintainer> + <stabilize-allarches/> </pkgmetadata> diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest index afc7f1f86377..c50264100447 100644 --- a/net-mail/mailutils/Manifest +++ b/net-mail/mailutils/Manifest @@ -10,7 +10,9 @@ AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655 DIST mailutils-3.12.tar.xz 3134484 BLAKE2B eac7934e9332482adffa3d4b1574d89a65949644ca8dd14e507e9c5f268d485b97f4d61deadf34b2ddcae1b91deee93372e9ebd53c88a0c0092346a0d83fd67e SHA512 a7d681bc7a763b7f09b704c8a536ea1c2444c52ca736eca321ca72fd32e2e62c0e14687ba79654d9162d45189d0621b1c75c639b81e04a79bbf3b3c09b9cebd2 DIST mailutils-3.13.tar.xz 3152892 BLAKE2B cd7d9ce0391d85482581eeb52f60fcc175647d21e433a4dacee3547aa4dcd710331ad780b6706c242d1a7501ec7fc50ff0c25f9b5f4ceeed84893c637ca366c1 SHA512 fd0b23aa535c6446af1ae633d68d41d1aa243d489b2623d346f6a0d6b543c43ab6c2b9bb1449d664abacbcd3ec3a0a5e7a0a5d56d2762e8a961544c77ccc592a DIST mailutils-3.14.tar.xz 3215944 BLAKE2B 64965c177065eacab9f5545fbeacd538492995f808dab731d02acbe7d63161f3bfb1528a0ca71e30c32ba12edc7e4f68642f2e5154b66d3bb48c479cae95c754 SHA512 9797deb8901d03a231c3503d75a758fbfb1220d1e064dd8be74735e6c88aa04c94533e802a60fdfbe12f1bd7daec4a39249cd957b103f09b89df364bd9a8869d +DIST mailutils-3.15.tar.xz 3112212 BLAKE2B 78101178c101897bc75897a1e134796150fafccd7e8f4b603c82698dd0cd27a98dd1ed7837a87be4760e8bdb39ec7275023a8e2847f832e683b8e97e5e95d75d SHA512 b6b90ad4f71c83e500a9b176694f5fb51a99baf26e52d567d222d6f037a23a0814ac84f88762cbfb4f22382c0e662191af89fb74a8a287134b8fffa58086bdd8 EBUILD mailutils-3.12-r4.ebuild 3707 BLAKE2B e4427c611c1e14ac75bd100e212546a77086dd908699a4a63c58f824906fbfd0166c5546892ad5dd25ae30d339848efbb620509a8e40e8e48f671431b537cb9b SHA512 3bd0d885e6abd126ebb1cd987b238509853a04366e7c6ec84224f98649f4f20c6ba7b9c731d7a972e580ece1d71652f1c84c49c6220416d2718636194380efdc EBUILD mailutils-3.13-r1.ebuild 3589 BLAKE2B 34888aa7a2fadb732a39637ad3d4db29b17aa69803f658b0995a9c32e849ad103f1ed75619704c54ddbb8c1f4864f011d1008cdde5ab14e246eb5168bee0591f SHA512 c5fb2e09ad2284563a95af4e0596aef656068b3eb49cc7c781109acb5f6d3f69a6d30a65a2c92f70c401700ea6e7a9c0801659eb57f9de5e6de4c1c918229e5e EBUILD mailutils-3.14-r1.ebuild 3573 BLAKE2B f1dc990a14ae2d5a351cbec64929958fab59fba130cc9759a535d6ffdf15af074dafe2898a4ce88b66442514ccd047bef268a1e2e503112764e8edc6a0715f96 SHA512 8aab533a2a5a95479ab8eeec03105b75d13d31a6a3d9778d2ee489ccb8a8ac0b603d7260564f5184d917e48b5fcca743f57ed23bdc6085bd4f8b2497654cae27 +EBUILD mailutils-3.15.ebuild 3579 BLAKE2B b09f6992d5dad6c983577f1897c9f2dda0116f211acbb2bd5351c18e1d77bebe57382a432e331ea2f2bf0627ebaa6f63280bd0f828f95dcf76895f152508bd32 SHA512 a7ebeaac8ee01e59c74408a1bd75f09e13673f9b7b2a50f3b0495165d7ca1a7167429147b82f5544b0469e55b776e8d437a1f3628b0099d4ac96bb79b6698c9e MISC metadata.xml 603 BLAKE2B 1283fff637c3bc43fa0df8e17afe62bb83b38aa973337ad7082ef902f5c2d64e4b70db8775cad2a16610e07dea0b677769a810d7c9a730bfcca874b78b50da4e SHA512 a6eefadb824f089b2de3c61b30314fbbc82413c1c40be1cf243e82bc4fcaf9000c43fc00d73f19f2f7696cd06e71d72b0c6803ad329859574a0a6907a302f8c0 diff --git a/net-mail/mailutils/mailutils-3.15.ebuild b/net-mail/mailutils/mailutils-3.15.ebuild new file mode 100644 index 000000000000..d947248f0962 --- /dev/null +++ b/net-mail/mailutils/mailutils-3.15.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..10} ) + +inherit autotools elisp-common flag-o-matic python-single-r1 toolchain-funcs + +DESCRIPTION="A useful collection of mail servers, clients, and filters" +HOMEPAGE="https://mailutils.org/" +SRC_URI="mirror://gnu/mailutils/${P}.tar.xz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos" +IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \ + ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \ + tokyocabinet" + +RDEPEND=" + !mail-filter/libsieve + !mail-client/mailx + sys-libs/ncurses:= + sys-libs/readline:= + dev-libs/libltdl:0 + virtual/libcrypt:= + virtual/mta + berkdb? ( sys-libs/db:= ) + bidi? ( dev-libs/fribidi ) + emacs? ( >=app-editors/emacs-23.1:* ) + gdbm? ( sys-libs/gdbm:= ) + guile? ( dev-scheme/guile:12/2.2-1 ) + kerberos? ( virtual/krb5 ) + kyotocabinet? ( dev-db/kyotocabinet ) + ldap? ( net-nds/openldap:= ) + mysql? ( dev-db/mysql-connector-c:= ) + nls? ( sys-devel/gettext ) + pam? ( sys-libs/pam:= ) + postgres? ( dev-db/postgresql:= ) + python? ( ${PYTHON_DEPS} ) + sasl? ( virtual/gsasl ) + servers? ( virtual/libiconv dev-libs/libunistring:= ) + ssl? ( net-libs/gnutls:= ) + tcpd? ( sys-apps/tcp-wrappers ) + tokyocabinet? ( dev-db/tokyocabinet ) + " + +DEPEND="${RDEPEND}" + +BDEPEND="virtual/pkgconfig" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + servers? ( tcpd ldap )" + +DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO ) +PATCHES=( + "${FILESDIR}"/${PN}-3.5-add-include.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + if use mysql; then + sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \ + sql/Makefile.am || die + fi + eautoreconf +} + +src_configure() { + append-flags -fno-strict-aliasing + + # maildir is the Gentoo default + econf \ + MU_DEFAULT_SCHEME=maildir \ + CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \ + $(use_with berkdb berkeley-db) \ + $(use_with bidi fribidi) \ + $(use_enable ipv6) \ + $(use_with gdbm) \ + $(use_with sasl gsasl) \ + $(use_with guile) \ + $(use_with kerberos gssapi) \ + $(use_with ldap) \ + $(use_with mysql) \ + $(use_enable nls) \ + $(use_enable pam) \ + $(use_with postgres) \ + $(use_enable python) \ + $(use_with ssl gnutls) \ + $(use_enable static-libs static) \ + $(use_enable threads pthread) \ + $(use_with tokyocabinet) \ + $(use_with kyotocabinet) \ + $(use_with tcpd tcp-wrappers) \ + $(use_enable servers build-servers) \ + $(use_with servers unistring ) \ + $(use_enable clients build-clients) \ + EMACS=$(usex emacs emacs no) \ + --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \ + --with-mail-spool=/var/spool/mail \ + --with-readline \ + --enable-sendmail \ + --disable-debug +} + +src_install() { + default + + insinto /etc + # bug 613112 + newins "${FILESDIR}/mailutils.rc" mailutils.conf + keepdir /etc/mailutils.d/ + insinto /etc/mailutils.d + doins "${FILESDIR}/mail" + + if use python; then + python_optimize + if use static-libs; then + rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die + fi + fi + + if use servers; then + newinitd "${FILESDIR}"/imap4d.initd imap4d + newinitd "${FILESDIR}"/pop3d.initd pop3d + newinitd "${FILESDIR}"/comsatd.initd comsatd + fi + + # compatibility link + if use clients && use split-usr; then + dosym ../usr/bin/mail /bin/mail + fi + + if ! use static-libs; then + find "${D}" -name "*.la" -delete || die + fi +} diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest index c11b2b85dea5..fa0b19f0045c 100644 --- a/net-mail/mu/Manifest +++ b/net-mail/mu/Manifest @@ -1,7 +1,10 @@ AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea +AUX mu-1.7.12-gcc12.patch 279 BLAKE2B 6b193a92ffbb3d126d39b45c09c4ccc971fe362af9e2621fc6e21e5e697d376f3a21c8e7f3521340d169ba572f9ad857bcd2ef69917650a5e5be0c99fef3aa31 SHA512 59887f801811bc86de2a562ab93304887725421baf7cf878c33bd5bc3b12eca68db951008899b18050c9b597580bc98f676881e58aafdda4af49d20e2fc64d45 AUX mu-1.7.12-optional-mu4e.patch 1047 BLAKE2B a951fe687e59dc6cfd4266c3c3f18aa6a80e562f3bcd617526fc14c8c076768cff444d683a016100e829d6ee80c11d4701db62bcec3a13e28b40ef9b0d1505fe SHA512 3f79f0c8591170231ca800e6fd4476fa1475aea18ec5b1f6c035c88f6b947755527cfa6674a0b221cbae7808e4841b03aed8bbf56b71f2b68d84fe9c2562c363 DIST mu-1.6.10.tar.xz 867008 BLAKE2B 6cce22f18691c3ad6dda1ec012d72c398df2ba4d1beca70fc6f88d87aa9b749e2aa4c03f5c0e0d70f4f9978e2beb60ea02642b8ff71e86e0668df726e5923b52 SHA512 a51847b338afeff9c9fa88c4698df4b85289d017063cb5e3410eb967c605d8779618dcbd988e2d923a92291c1e0738ec84afecf017c76a63776149619d134887 DIST mu-1.7.12.tar.xz 2129072 BLAKE2B 3518a361bc06b632899f9296ec211dc926a07973433247bf6f9ecfb069dcfd8b762f358aa32418276bf7dcba40bad768dd4599534613a1fae285cef9c6ceedd0 SHA512 fe0f41520959df7f78525317bf5caad4ae7f7468ac6291b84c48805e133883192458a8f79a929c0ebda2e45ec2014db1aa72650d0a6e176d7678449be36fc4f2 -EBUILD mu-1.6.10.ebuild 1440 BLAKE2B 3e3c39a2691959ac6502772a4543d87d1cf1c9feaf1b2c8d44a2459f782236fa6c96fb42c59e8aa7c409352060a5b5a85361d203f71b810094491cc7bfd2b6a8 SHA512 42341654db5689f0fbecbce749e8653ccdcaf25d7dacd69d531a56ef3782e1ee0f12e307c28cfb8cdac1b749220770a14919476c4663ab0c392f766c146f4909 -EBUILD mu-1.7.12.ebuild 1901 BLAKE2B ab507df29e0b46eaf1ad2c4ac61f427a53a1430ef2f5885cacae6ee8d0fc9229ca6958522e51e25ae3bef5b4524878e01d825f3f54f59c525be219bc208f81e7 SHA512 2123a67149d7651475e52b9009bed1e731ef6037af0ff3fac45bffebcf833671bf1a5d2e3da2a5c4033c91d63161b6cb230b362987ed6bc4eb7aefd8efd62cb0 -MISC metadata.xml 784 BLAKE2B ee051513b24805053b4d278d1fe47df2ec0e05458283255dd55efa03b49462b3408ea8b9c4e9b21c7a1b13a00610f5af5f9db504774ed48f8c7dfb97542ffab4 SHA512 98e2efef7b28b462f8c62b053c27d40a624a886d3d813bc2e8e795db01332ae4d7ac7981759f2ac808a6ba238a5705e4834711f3ac7a2248d2824dc3a46df17c +DIST mu-1.7.13.tar.xz 2139140 BLAKE2B c5eea94df8640e0362fd7bd18da78cc53023e7c85c3b4a653df7ae52e57dc64433572bfb2bc41494ce60a1b26abdd75ee07cb945a282754a12f65835a4545e6d SHA512 c5c447cdcf6fd2a3c3dfb8c7cffc9c50e147de2779db04fedaf59897fd135a76b309576f2c9473919221f0dcd6b8793732af3483d86dbe0f073a66d2559fe315 +EBUILD mu-1.6.10.ebuild 1586 BLAKE2B d14b3421814913a85460439407fb4fc90b9537df3132520c64697a20b5b3f35fc8c658395a36d4fabf514da9964333969c4e86d1092866cc6d033732d836a168 SHA512 465f3afbb8e522ce51404d6f0de08984b680498fe322484bec0f9dd2a5740fc4405ea69a78d081d9e07fcc26520c50e3349706d830c8cc2fb5dd4539f719c15a +EBUILD mu-1.7.12.ebuild 1942 BLAKE2B c708aa3c6c104199eb7dad3d1b1c80337236549446fc4401fdf916be5dfa6b5b48888577253dd7a873247251827091ac0f69795abe12dfa79ea437044a984d9f SHA512 77c977665deea2fc90f75e672e99fda1dc1c710dabc8cb946ccfcda01bd8cb6a7bfc090883dc01817c1f5ac787cf84563801f564f49a83ae684628ec9f7d24c9 +EBUILD mu-1.7.13.ebuild 1942 BLAKE2B c708aa3c6c104199eb7dad3d1b1c80337236549446fc4401fdf916be5dfa6b5b48888577253dd7a873247251827091ac0f69795abe12dfa79ea437044a984d9f SHA512 77c977665deea2fc90f75e672e99fda1dc1c710dabc8cb946ccfcda01bd8cb6a7bfc090883dc01817c1f5ac787cf84563801f564f49a83ae684628ec9f7d24c9 +MISC metadata.xml 893 BLAKE2B 4d21c0794fc184957939ebaab628b9a1abe0bbdb63915157e266ce0a773fe3acc52722d010d3b4e096f86257e945c0f9dd51cd0dbe54c37f717408ffe942bc06 SHA512 7f499e039820d12c9acd0affe2a402fc53ee6367684a3c2ba25669987f02b0fabb3db0de978e197876bd9e3af315734af398ba7c8305119c511d59c709b6e225 diff --git a/net-mail/mu/files/mu-1.7.12-gcc12.patch b/net-mail/mu/files/mu-1.7.12-gcc12.patch new file mode 100644 index 000000000000..f360351e17f4 --- /dev/null +++ b/net-mail/mu/files/mu-1.7.12-gcc12.patch @@ -0,0 +1,12 @@ +https://github.com/djcb/mu/pull/2224 (rebased) +https://bugs.gentoo.org/839918 +--- a/lib/utils/mu-utils.cc ++++ b/lib/utils/mu-utils.cc +@@ -32,6 +32,7 @@ + #include <string.h> + #include <iostream> + #include <algorithm> ++#include <functional> + #include <numeric> + + #include <glib.h> diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml index e4a573847070..6df1a2d14725 100644 --- a/net-mail/mu/metadata.xml +++ b/net-mail/mu/metadata.xml @@ -8,6 +8,10 @@ <maintainer type="project"> <email>gnu-emacs@gentoo.org</email> <name>Gentoo GNU Emacs project</name> + <description> + For mu4e (installed with USE=emacs). + Do not assign for anything else. + </description> </maintainer> <longdescription lang="en"> 'mu' is a set of command-line tools for Linux/Unix that enable you to quickly find the e-mails you diff --git a/net-mail/mu/mu-1.6.10.ebuild b/net-mail/mu/mu-1.6.10.ebuild index ce62a8d42dd1..7900e1384200 100644 --- a/net-mail/mu/mu-1.6.10.ebuild +++ b/net-mail/mu/mu-1.6.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -38,6 +38,12 @@ src_configure() { econf "${myeconfargs[@]}" } +src_test() { + # On some systems make -n errors out so the default src_test + # implementation does not call the tests. Bug #836782 + emake test +} + src_install() { default find "${ED}" -name '*.la' -type f -delete || die diff --git a/net-mail/mu/mu-1.7.12.ebuild b/net-mail/mu/mu-1.7.12.ebuild index 02358e6b56c8..902c7c8d9e4b 100644 --- a/net-mail/mu/mu-1.7.12.ebuild +++ b/net-mail/mu/mu-1.7.12.ebuild @@ -26,7 +26,10 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( "${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch + "${FILESDIR}"/${PN}-1.7.12-gcc12.patch +) SITEFILE="70mu-gentoo-autoload.el" diff --git a/net-mail/mu/mu-1.7.13.ebuild b/net-mail/mu/mu-1.7.13.ebuild new file mode 100644 index 000000000000..902c7c8d9e4b --- /dev/null +++ b/net-mail/mu/mu-1.7.13.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit elisp-common meson + +DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing" +HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu" +SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos" +IUSE="emacs readline" + +DEPEND=" + dev-libs/glib:2 + dev-libs/gmime:3.0 + >=dev-libs/xapian-1.4:= + emacs? ( >=app-editors/emacs-25.3:* ) + readline? ( sys-libs/readline:= )" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-apps/texinfo + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch + "${FILESDIR}"/${PN}-1.7.12-gcc12.patch +) + +SITEFILE="70mu-gentoo-autoload.el" + +src_prepare() { + default + + # Don't install NEWS.org into /usr/share/doc. + sed -i '/NEWS.org/,+1 d' meson.build || die + + # Instead, put it in /usr/share/doc/${PF}. + sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die +} + +src_configure() { + local emesonargs=( + $(meson_feature emacs) + $(meson_feature readline) + # NOTE: Guile interface is deprecated to be removed shortly. + -Dguile=disabled + -Dtoys=disabled + ) + meson_src_configure +} + +src_install() { + meson_src_install + + # Since meson no longer installs NEWS.org, install it with dodoc. + # Also, it must be uncompressed so that it can be viewed with + # mu4e-info. + docompress -x /usr/share/doc/${PF}/NEWS.org + dodoc NEWS.org +} + +pkg_preinst() { + if [[ -n ${REPLACING_VERSIONS} ]]; then + elog "After upgrading from an old major version, you should" + elog "rebuild your mail index." + fi +} + +pkg_postinst() { + if use emacs; then + einfo "To use mu4e you need to configure it in your .emacs file" + einfo "See the manual for more information:" + einfo "https://www.djcbsoftware.nl/code/mu/mu4e/" + + elisp-site-regen + fi +} + +pkg_postrm() { + use emacs && elisp-site-regen +} |