diff options
Diffstat (limited to 'net-mail')
-rw-r--r-- | net-mail/Manifest.gz | bin | 14562 -> 14567 bytes | |||
-rw-r--r-- | net-mail/dovecot/Manifest | 2 | ||||
-rw-r--r-- | net-mail/dovecot/dovecot-2.3.19.1-r2.ebuild | 304 | ||||
-rw-r--r-- | net-mail/dovecot/files/dovecot-2.3.19.1-slibtool.patch | 65 |
4 files changed, 371 insertions, 0 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz Binary files differindex 7424c142a715..fbc78d0e8b98 100644 --- a/net-mail/Manifest.gz +++ b/net-mail/Manifest.gz diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index 1d1960385fcd..2539421ce54d 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -1,8 +1,10 @@ AUX CVE-2022-30550.patch 5745 BLAKE2B ae48938734cceefa05473fa1d055e5d85c27f8a73ac4ed24debb631d83efbd1a1c94dd3629514d193abf5810d9adbf609c6cfc077d2a9de3e37d7429311ef86e SHA512 b2ff67fd8b6c5cea93877651a1168ef1a5d399cc5f1a61d1cce407c7624f5b6d758996084c6a5714b6880de0ce11ce5eac74a1e02918758cb6983caedb651c58 +AUX dovecot-2.3.19.1-slibtool.patch 2935 BLAKE2B b54beb9364aba2e326249f41c77efd4633551498f420e7cfcd7da9c2409774d3caa3cd1df713332eaf2da1dd6f3bcec5e12947c25e536224ab21958a90f77103 SHA512 7c16efa35be9800061ae513117e2e8ed23cb81aa0db6dabf51c8e6c984ec317976fe97ceafda3387b7fe0c62bc5838240c6167003e0364548ead9aae40b91756 AUX dovecot-autoconf-lua-version-v2.patch 524 BLAKE2B a0cb51a21169e55fe0ae92ed7fad3ccc898585ed4b0c9ed3db243b6f41165d5a4ad6470a6a76f5a04a44d450068da1b7173707f272f65a72265d4b49a630ac2e SHA512 cc9319926f90a4c4aaf1d1e77944bfa5df9f7f15ee9581469ff8c1a069ef18e55addb69fcfe88e024cad8544c0efb90f5b83c2b6d803e0c68770467849d31f78 AUX dovecot-socket-name-too-long.patch 356 BLAKE2B ada5007b620cd5eef5a950d64add7d83ac366f126e1a9a70268e528d44a0a036fec096015bee2421caeca8a052d118011c5911b3c432fa73e846c66781df4da9 SHA512 f362bad725c9e408830dc9d5908a2b35b8ee82cb05f3d58795079b32d5ac4712779e71bd0f479fe072906fcaf01e4e08f08cedb9fd5ee08931409887480b8349 AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed288c787dc81f8902e770f7774c54eba90de49e9634eb93873046a043bd7825cfb65bab5b2ea9ce108 SHA512 982f9897e4a0a5a3957bb12785961c9cde72a2c941f55efdb23e9a26cec19efe89e3be4effe79522c297ea2b258d201db78c19b6e3f9cd5e68d3736c2a0f0063 DIST dovecot-2.3-pigeonhole-0.5.19.tar.gz 1954148 BLAKE2B 0c52293f9447260f3e95f31c5ea3c04a1971b1a5621b56be1c79a8575aceb4f7e7fef62e7d0a3d980dcb5b8e1a8eeec543adcf0b016b65eb34ca4a26e8d2fe23 SHA512 5b0a61c7711232ea3651b818a970b500b05bd340a04bcd5a5f0ea0529eda65f498912a845c8f3b3b80196d010bc22bd4a380e1f682cb42f62b80d2d43a94993a DIST dovecot-2.3.19.1.tar.gz 7790851 BLAKE2B 6826977a0febfcb56eb99baf6e0dc0a130fc24a14f113ca7ce0f72b26b8c9755d8352999c5965e21320a62621787e02428c99dd6888768e8c35a46e4082ba071 SHA512 ceb87a5f76b6352d28fd030aae5ad2165a133e9a8a6309891e793911203fc0ada9fb254dc05d183eaaa7e2b9851d3f1755b33f08fa6ff5b4b415ac4272bfe150 EBUILD dovecot-2.3.19.1-r1.ebuild 8689 BLAKE2B a02875e7f8404cc3f404b66cfbce96c095c89e5ff83eb65a9104f02d81f524017eed3565bcd4b802ab119387956862dffbfa8e15d13e28e03f612fe09e1ad477 SHA512 b5d45fe0ce376eee7991f737b2e61dccb344683b924d1ec581cdf3d50c736d5a2904e71b332aca0453db17ff66bf796d4b93c2b34817d6a536ab08f016e36b46 +EBUILD dovecot-2.3.19.1-r2.ebuild 8746 BLAKE2B 1079de0ce2ef6e9aa72ce90024c82c51205464f71a80e9073d5a9c1f1840f5be241adce5705f1d9c9a5a6e8737cf9fc061c0324abe2845f78ac57a046a392fde SHA512 269b26933a9909ae660f360406836287f6ea4a810c97ad781b103bc0f5714c13766e721cf656ecee75168978c1a89845ba81b8ddd95bd6ad9b40f10d4e6b2611 MISC metadata.xml 965 BLAKE2B e0264c2ddea7b7b63647f3bacd999f164756808acea88d1e673dd381bedd72e915d584540def84f3f4cf35fc4d9e172da1cdd0c97cc49027e164bfa2780a1122 SHA512 c7ccd95428b3cdbac8486c30ff02ae13c07c5343fc2307747fcd714285408ee21dea63b51252f55a3b8255ff39890f02b2eca932fd5b457f02dc89739acc6680 diff --git a/net-mail/dovecot/dovecot-2.3.19.1-r2.ebuild b/net-mail/dovecot/dovecot-2.3.19.1-r2.ebuild new file mode 100644 index 000000000000..d0297e07ff84 --- /dev/null +++ b/net-mail/dovecot/dovecot-2.3.19.1-r2.ebuild @@ -0,0 +1,304 @@ +# 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 + "${FILESDIR}/${P}"-slibtool.patch # 782631 + "${FILESDIR}"/CVE-2022-30550.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, 782631 + #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/dovecot/files/dovecot-2.3.19.1-slibtool.patch b/net-mail/dovecot/files/dovecot-2.3.19.1-slibtool.patch new file mode 100644 index 000000000000..8371a6ee67f2 --- /dev/null +++ b/net-mail/dovecot/files/dovecot-2.3.19.1-slibtool.patch @@ -0,0 +1,65 @@ +Upstream-commit: https://github.com/dovecot/core/commit/d5f5cd32bafc18a28a7edbe1dbe559f8abe55323 + +From d5f5cd32bafc18a28a7edbe1dbe559f8abe55323 Mon Sep 17 00:00:00 2001 +From: Timo Sirainen <timo.sirainen@open-xchange.com> +Date: Mon, 25 Jul 2022 19:47:34 +0300 +Subject: [PATCH] lib-index: Makefile.am - Fix double-linking of + mail-index-util.o + +This fixes linking with slibtool. +--- + src/lib-index/Makefile.am | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/src/lib-index/Makefile.am b/src/lib-index/Makefile.am +index f203201bf7..a4af01715b 100644 +--- a/src/lib-index/Makefile.am ++++ b/src/lib-index/Makefile.am +@@ -79,10 +79,13 @@ test_programs = \ + noinst_PROGRAMS = $(test_programs) + + test_libs = \ +- mail-index-util.lo \ + ../lib-test/libtest.la \ + ../lib/liblib.la + ++test_minimal_libs = \ ++ mail-index-util.lo \ ++ $(test_libs) ++ + test_deps = $(noinst_LTLIBRARIES) $(test_libs) + + test_mail_cache_SOURCES = test-mail-cache-common.c test-mail-cache.c +@@ -114,19 +117,19 @@ test_mail_index_sync_ext_LDADD = $(noinst_LTLIBRARIES) $(test_libs) + test_mail_index_sync_ext_DEPENDENCIES = $(test_deps) + + test_mail_index_transaction_finish_SOURCES = test-mail-index-transaction-finish.c +-test_mail_index_transaction_finish_LDADD = mail-index-transaction-finish.lo $(test_libs) ++test_mail_index_transaction_finish_LDADD = mail-index-transaction-finish.lo $(test_minimal_libs) + test_mail_index_transaction_finish_DEPENDENCIES = $(test_deps) + + test_mail_index_transaction_update_SOURCES = test-mail-index-transaction-update.c +-test_mail_index_transaction_update_LDADD = mail-index-transaction-update.lo $(test_libs) ++test_mail_index_transaction_update_LDADD = mail-index-transaction-update.lo $(test_minimal_libs) + test_mail_index_transaction_update_DEPENDENCIES = $(test_deps) + + test_mail_index_write_SOURCES = test-mail-index-write.c +-test_mail_index_write_LDADD = mail-index-write.lo $(test_libs) ++test_mail_index_write_LDADD = mail-index-write.lo $(test_minimal_libs) + test_mail_index_write_DEPENDENCIES = $(test_deps) + + test_mail_transaction_log_append_SOURCES = test-mail-transaction-log-append.c +-test_mail_transaction_log_append_LDADD = mail-transaction-log-append.lo $(test_libs) ++test_mail_transaction_log_append_LDADD = mail-transaction-log-append.lo $(test_minimal_libs) + test_mail_transaction_log_append_DEPENDENCIES = $(test_deps) + + test_mail_transaction_log_file_SOURCES = test-mail-transaction-log-file.c +@@ -134,7 +137,7 @@ test_mail_transaction_log_file_LDADD = $(noinst_LTLIBRARIES) $(test_libs) + test_mail_transaction_log_file_DEPENDENCIES = $(test_deps) + + test_mail_transaction_log_view_SOURCES = test-mail-transaction-log-view.c +-test_mail_transaction_log_view_LDADD = mail-transaction-log-view.lo $(test_libs) ++test_mail_transaction_log_view_LDADD = mail-transaction-log-view.lo $(test_minimal_libs) + test_mail_transaction_log_view_DEPENDENCIES = $(test_deps) + + check-local: |