commit: 0255f8a3c5049930a6432363d0ae9dea9e222bac Author: Eray Aslan <eras <AT> gentoo <DOT> org> AuthorDate: Mon Nov 3 12:48:10 2025 +0000 Commit: Eray Aslan <eras <AT> gentoo <DOT> org> CommitDate: Mon Nov 3 12:48:39 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0255f8a3
net-mail/dovecot: drop versions. security cleanup Bug: https://bugs.gentoo.org/965297 Signed-off-by: Eray Aslan <eras <AT> gentoo.org> net-mail/dovecot/Manifest | 2 - net-mail/dovecot/dovecot-2.4.1-r1.ebuild | 239 ------------------- net-mail/dovecot/dovecot-2.4.1-r2.ebuild | 248 ------------------- net-mail/dovecot/dovecot-2.4.1-r3.ebuild | 249 -------------------- net-mail/dovecot/dovecot-2.4.1-r4.ebuild | 259 -------------------- net-mail/dovecot/dovecot-2.4.1-r5.ebuild | 262 --------------------- .../dovecot/files/dovecot-2.4.1-anvil-group.patch | 26 -- .../dovecot/files/dovecot-2.4.1-config-crash.patch | 44 ---- .../dovecot/files/dovecot-2.4.1-crash-on-arm.patch | 25 -- .../files/dovecot-2.4.1-fix-hardened-crash.patch | 26 -- .../files/dovecot-2.4.1-fix-ldap-build.patch | 29 --- .../files/dovecot-2.4.1-fix-ldap-sasl.patch | 65 ----- .../files/dovecot-2.4.1-fix-musl-build.patch | 26 -- .../files/dovecot-2.4.1-gssapi-regression.patch | 14 -- ...ovecot-2.4.1-trivial-auto-var-init-attrib.patch | 60 ----- 15 files changed, 1574 deletions(-) diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index cf75ad5adc7f..1aede2e868ad 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -1,6 +1,4 @@ DIST dovecot-2.3-pigeonhole-0.5.21.1.tar.gz 1956404 BLAKE2B ad0ea5c2c181aa9cdf12a7b58141a9812cad11e6ead4d4f38366e13589a84135db1998da179192a6e66a53240647906d96bb330982e7f2f204ba8c402f14cbbd SHA512 7387b417611599fe70d1a83d3b408321e66f5a883bf78a9d55c7496b1a17220677daebaefde2061e0d7064fe07c410ecfc64662878bb253ddcd9e128dd83fbaa DIST dovecot-2.3.21.1.tar.gz 7842044 BLAKE2B 3f4238a2f6a73bce1ed37d0def7dc2e61823173836879ed8b4ef5806b4403300335d551215fc4fb2ee8b4106276f84d16b24c2be53148b92da3f946a3b904e46 SHA512 9de6ce3a579ef2040248b692874a6d64a732bb735a9cee3144604927cad49690c4b0e29f7ecf3af23190d56f30956d955d13acd5d352534df62fbdfde4b60f9f -DIST dovecot-2.4.1.tar.gz 6288223 BLAKE2B 4e0864984682e3b8a7e0cfb91794d7b8609fa1f33323443921a10abd286e58aa9e1e07807ddaf55d80e7994c6490e11d5f2543235c9a538cca2c8f4a268ea4f1 SHA512 4915e9282898a4bce4dc3c9781f9aa849e8a2d5bb89dffc2222b417560eaa0135d66342ef342098a86dd5e9b4e76d41145381b7264144411cf45a6f88ca36698 DIST dovecot-2.4.2.tar.gz 7807240 BLAKE2B 20c3e0e4aea36cdd7e13a62ffc287cc3950a41a5d900ff00a48b2eba81ac2db85005c7fa6aec969d6615f4327fa0076572a607a0bbcbf620b6151dd09c6c09b7 SHA512 0524695341abe711d3a811c56156889d6fef7a09becc684c6f1dc1e5add605969ca8794eb7d44bfbc49f70515f22e8640b5828443addecfe4798fb8b174670ae -DIST dovecot-pigeonhole-2.4.1.tar.gz 2014526 BLAKE2B 29b395065bbc8bb535ff15ba84238db4bb5494662814208eb03d1104d16914e9954fbec6bd406f2f3d1d267177694c47defb69d9b04565916d8b2dc52c89cde8 SHA512 47b9cc62b13d710123389c47d13c104e70b815d683dc6b957e86b57b2f175101d07f462d0fdb0488d6dcdcfbbc137c926825ba9a0d798551576aa7f3c9082100 DIST dovecot-pigeonhole-2.4.2.tar.gz 2071623 BLAKE2B 2364f8e58b348c45b3d03646e07949a8c71e1bb7bb856fd9db61a919f53ba8440ca54d0ed1e5b7110597ace03e2e1c1edf52a4fc086af1dd786a30f713806619 SHA512 82c46c7ac2792aa5c211c8b66309f9f21c05ecd2fa8ab3abf98fb4e05831fd37aaa3edffcfbe1b3defbb9ac8ef9df1c33ece83cf7524e8b226c4deab8c250134 diff --git a/net-mail/dovecot/dovecot-2.4.1-r1.ebuild b/net-mail/dovecot/dovecot-2.4.1-r1.ebuild deleted file mode 100644 index 85785a66b4de..000000000000 --- a/net-mail/dovecot/dovecot-2.4.1-r1.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-1 lua5-{3..4} ) -# do not add a ssl USE flag. ssl is mandatory -SSL_DEPS_SKIP=1 -inherit autotools eapi9-ver flag-o-matic lua-single ssl-cert systemd toolchain-funcs - -MY_P="${P/_/.}-4" -MY_PV="${PV}-4" -major_minor="$(ver_cut 1-2)" - -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" -HOMEPAGE="https://www.dovecot.org/"; -SRC_URI="https://www.dovecot.org/releases/${major_minor}/${MY_P}.tar.gz \ - -> ${P}.tar.gz - sieve? ( - https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-pigeonhole-${MY_PV}.tar.gz \ - -> ${PN}-pigeonhole-${PV}.tar.gz - ) - managesieve? ( - https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-pigeonhole-${MY_PV}.tar.gz \ - -> ${PN}-pigeonhole-${PV}.tar.gz - ) " -S="${WORKDIR}/${MY_P}" -LICENSE="LGPL-2.1 MIT" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -IUSE_DOVECOT_AUTH_DICT="cdb kerberos ldap lua mysql pam postgres sqlite" -IUSE_DOVECOT_COMPRESS="lz4 zstd" -IUSE_DOVECOT_FTS="solr stemmer textcat xapian" -IUSE_DOVECOT_OTHER="argon2 managesieve selinux sieve static-libs suid systemd unwind" - -IUSE="${IUSE_DOVECOT_AUTH_DICT} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_FTS} ${IUSE_DOVECOT_OTHER}" - -# ldap requirement for sieve seems to be a bug -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) - sieve? ( ldap )" - -DEPEND=" - app-arch/bzip2 - dev-libs/icu:= - dev-libs/openssl:0= - net-libs/libtirpc:= - net-libs/rpcsvc-proto - sys-libs/libcap - sys-libs/zlib:= - virtual/libiconv - argon2? ( dev-libs/libsodium:= ) - cdb? ( dev-db/tinycdb ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap:= ) - lua? ( ${LUA_DEPS} ) - xapian? ( dev-libs/xapian:= ) - lz4? ( app-arch/lz4 ) - mysql? ( dev-db/mysql-connector-c:0= ) - pam? ( sys-libs/pam:= ) - postgres? ( dev-db/postgresql:* ) - 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:= ) - 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[pam?] - " - -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-autoconf-lua-version-v3.patch" - "${FILESDIR}/${PN}-2.4.1-gssapi-regression.patch" - "${FILESDIR}/${PN}-2.4.1-fix-hardened-crash.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 - - # rename default cert files - sed -i -e "s:ssl-cert.pem:server.pem:" \ - -e "s:ssl-key.pem:server.key:" \ - doc/dovecot.conf.in || die "sed failed" - - # bug 657108, 782631 - #elibtoolize - eautoreconf - - # Bug #727244 - append-cflags -fasynchronous-unwind-tables -} - -src_configure() { - # --disable-hardening because our toolchain already defaults to - # these bits on, and it actually regresses the default _FORTIFY_SOURCE - # level for hardened at least from 3 to 2. - # - # 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-hardening \ - --disable-rpath \ - --with-bzlib \ - --without-libbsd \ - --with-libcap \ - --with-icu \ - --enable-experimental-mail-utf8 \ - $( use_with argon2 sodium ) \ - $( use_with cdb) \ - $( use_with kerberos gssapi ) \ - $( use_with lua ) \ - $( use_with ldap ) \ - $( use_with xapian flatcurve ) \ - $( 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 textcat ) \ - $( use_with unwind libunwind ) \ - $( use_with zstd ) \ - $( use_enable static-libs static ) - - 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-pigeonhole-${MY_PV}" || die "cd failed" - econf \ - $( use_enable static-libs static ) \ - --localstatedir="${EPREFIX}/var" \ - --enable-shared \ - --disable-hardening \ - --with-dovecot="${S}" \ - $( use_with ldap ) \ - $( use_with managesieve ) - fi -} - -src_compile() { - default - if use sieve || use managesieve; then - cd "../dovecot-pigeonhole-${MY_PV}" || die "cd failed" - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" - fi -} - -src_test() { - # bug #340791 and bug #807178 - local -x NOVALGRIND=true - - default - if use sieve || use managesieve; then - cd "../dovecot-pigeonhole-${MY_PV}" || 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 - - use pam && dosym imap /etc/pam.d/dovecot - - insinto /etc/dovecot/conf.d - doins "${FILESDIR}/50-misc.conf" - - dodoc AUTHORS NEWS README.md TODO - docinto stopwords - dodoc src/lib-language/stopwords/stopwords*.txt - - if use sieve || use managesieve; then - cd "../dovecot-pigeonhole-${MY_PV}" || die "cd failed" - emake DESTDIR="${ED}" install - - newdoc README README.pigeonhole - 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 - fi - - rm -r "${ED}"/usr/share/dovecot - use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete -} - -pkg_postinst() { - if ver_replacing -lt 2.4 ; then - # This is an upgrade which requires user review - ewarn "Dovecot-2.4.x has new settings and WILL NOT work" - ewarn "unless the configuration files are updated." - ewarn "Please read the migration guide at:" - ewarn " https://doc.dovecot.org/2.4.1/installation/upgrade/2.3-to-2.4.html"; - fi - - # 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/dovecot/server - fi -} diff --git a/net-mail/dovecot/dovecot-2.4.1-r2.ebuild b/net-mail/dovecot/dovecot-2.4.1-r2.ebuild deleted file mode 100644 index c3189f78c53a..000000000000 --- a/net-mail/dovecot/dovecot-2.4.1-r2.ebuild +++ /dev/null @@ -1,248 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-1 lua5-{3..4} ) -# do not add a ssl USE flag. ssl is mandatory -SSL_DEPS_SKIP=1 -inherit autotools eapi9-ver flag-o-matic lua-single ssl-cert systemd toolchain-funcs - -MY_P="${P/_/.}-4" -MY_PV="${PV}-4" -major_minor="$(ver_cut 1-2)" - -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" -HOMEPAGE="https://www.dovecot.org/"; -SRC_URI="https://www.dovecot.org/releases/${major_minor}/${MY_P}.tar.gz \ - -> ${P}.tar.gz - sieve? ( - https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-pigeonhole-${MY_PV}.tar.gz \ - -> ${PN}-pigeonhole-${PV}.tar.gz - ) - managesieve? ( - https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-pigeonhole-${MY_PV}.tar.gz \ - -> ${PN}-pigeonhole-${PV}.tar.gz - ) " -S="${WORKDIR}/${MY_P}" -PIEGONHOLE_S="../dovecot-pigeonhole-${MY_PV}" -LICENSE="LGPL-2.1 MIT" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -IUSE_DOVECOT_AUTH_DICT="cdb kerberos ldap lua mysql pam postgres sqlite" -IUSE_DOVECOT_COMPRESS="lz4 zstd" -IUSE_DOVECOT_FTS="solr stemmer textcat xapian" -IUSE_DOVECOT_OTHER="argon2 managesieve selinux sieve static-libs suid systemd unwind" - -IUSE="${IUSE_DOVECOT_AUTH_DICT} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_FTS} ${IUSE_DOVECOT_OTHER}" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -DEPEND=" - app-arch/bzip2 - dev-libs/icu:= - dev-libs/openssl:0= - net-libs/libtirpc:= - net-libs/rpcsvc-proto - sys-libs/libcap - sys-libs/zlib:= - virtual/libiconv - argon2? ( dev-libs/libsodium:= ) - cdb? ( dev-db/tinycdb ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap:= ) - lua? ( ${LUA_DEPS} ) - xapian? ( dev-libs/xapian:= ) - lz4? ( app-arch/lz4 ) - mysql? ( dev-db/mysql-connector-c:0= ) - pam? ( sys-libs/pam:= ) - postgres? ( dev-db/postgresql:* ) - 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:= ) - 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[pam?] - " - -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-autoconf-lua-version-v3.patch" - "${FILESDIR}/${PN}-2.4.1-gssapi-regression.patch" - "${FILESDIR}/${PN}-2.4.1-fix-hardened-crash.patch" - "${FILESDIR}/${PN}-2.4.1-fix-musl-build.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 - if use sieve || use managesieve; then - pushd "${PIEGONHOLE_S}" > /dev/null || die - eapply "${FILESDIR}/${PN}-2.4.1-fix-ldap-build.patch" - popd > /dev/null || die - fi - - # rename default cert files - sed -i -e "s:ssl-cert.pem:server.pem:" \ - -e "s:ssl-key.pem:server.key:" \ - doc/dovecot.conf.in || die "sed failed" - - # bug 657108, 782631 - #elibtoolize - eautoreconf - - # Bug #727244 - append-cflags -fasynchronous-unwind-tables -} - -src_configure() { - # --disable-hardening because our toolchain already defaults to - # these bits on, and it actually regresses the default _FORTIFY_SOURCE - # level for hardened at least from 3 to 2. - # - # 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-hardening \ - --disable-rpath \ - --with-bzlib \ - --without-libbsd \ - --with-libcap \ - --with-icu \ - --enable-experimental-mail-utf8 \ - $( use_with argon2 sodium ) \ - $( use_with cdb) \ - $( use_with kerberos gssapi ) \ - $( use_with lua ) \ - $( use_with ldap ) \ - $( use_with xapian flatcurve ) \ - $( 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 textcat ) \ - $( use_with unwind libunwind ) \ - $( use_with zstd ) \ - $( use_enable static-libs static ) - - 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 - pushd "${PIEGONHOLE_S}" > /dev/null || die - econf \ - $( use_enable static-libs static ) \ - --localstatedir="${EPREFIX}/var" \ - --enable-shared \ - --disable-hardening \ - --with-dovecot="${S}" \ - $( use_with ldap ) \ - $( use_with managesieve ) - popd > /dev/null || die - fi -} - -src_compile() { - default - if use sieve || use managesieve; then - pushd "${PIEGONHOLE_S}" > /dev/null || die - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" - popd > /dev/null || die - fi -} - -src_test() { - # bug #340791 and bug #807178 - local -x NOVALGRIND=true - - default - if use sieve || use managesieve; then - pushd "${PIEGONHOLE_S}" > /dev/null || die - default - popd > /dev/null || die - 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 - - use pam && dosym imap /etc/pam.d/dovecot - - insinto /etc/dovecot/conf.d - doins "${FILESDIR}/50-misc.conf" - - dodoc AUTHORS NEWS README.md TODO - docinto stopwords - dodoc src/lib-language/stopwords/stopwords*.txt - - if use sieve || use managesieve; then - pushd "${PIEGONHOLE_S}" > /dev/null || die - emake DESTDIR="${ED}" install - - newdoc README README.pigeonhole - 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 - popd > /dev/null || die - fi - - rm -r "${ED}"/usr/share/dovecot - use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete -} - -pkg_postinst() { - if ver_replacing -lt 2.4 ; then - # This is an upgrade which requires user review - ewarn "Dovecot-2.4.x has new settings and WILL NOT work" - ewarn "unless the configuration files are updated." - ewarn "Please read the migration guide at:" - ewarn " https://doc.dovecot.org/2.4.1/installation/upgrade/2.3-to-2.4.html"; - fi - - # 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/dovecot/server - fi -} diff --git a/net-mail/dovecot/dovecot-2.4.1-r3.ebuild b/net-mail/dovecot/dovecot-2.4.1-r3.ebuild deleted file mode 100644 index 5d55d3b4d07a..000000000000 --- a/net-mail/dovecot/dovecot-2.4.1-r3.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-1 lua5-{3..4} ) -# do not add a ssl USE flag. ssl is mandatory -SSL_DEPS_SKIP=1 -inherit autotools eapi9-ver flag-o-matic lua-single ssl-cert systemd toolchain-funcs - -MY_P="${P/_/.}-4" -MY_PV="${PV}-4" -major_minor="$(ver_cut 1-2)" - -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" -HOMEPAGE="https://www.dovecot.org/"; -SRC_URI="https://www.dovecot.org/releases/${major_minor}/${MY_P}.tar.gz \ - -> ${P}.tar.gz - sieve? ( - https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-pigeonhole-${MY_PV}.tar.gz \ - -> ${PN}-pigeonhole-${PV}.tar.gz - ) - managesieve? ( - https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-pigeonhole-${MY_PV}.tar.gz \ - -> ${PN}-pigeonhole-${PV}.tar.gz - ) " -S="${WORKDIR}/${MY_P}" -PIEGONHOLE_S="../dovecot-pigeonhole-${MY_PV}" -LICENSE="LGPL-2.1 MIT" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -IUSE_DOVECOT_AUTH_DICT="cdb kerberos ldap lua mysql pam postgres sqlite" -IUSE_DOVECOT_COMPRESS="lz4 zstd" -IUSE_DOVECOT_FTS="solr stemmer textcat xapian" -IUSE_DOVECOT_OTHER="argon2 managesieve selinux sieve static-libs suid systemd unwind" - -IUSE="${IUSE_DOVECOT_AUTH_DICT} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_FTS} ${IUSE_DOVECOT_OTHER}" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -DEPEND=" - app-arch/bzip2 - dev-libs/icu:= - dev-libs/openssl:0= - net-libs/libtirpc:= - net-libs/rpcsvc-proto - sys-libs/libcap - sys-libs/zlib:= - virtual/libiconv - argon2? ( dev-libs/libsodium:= ) - cdb? ( dev-db/tinycdb ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap:= ) - lua? ( ${LUA_DEPS} ) - xapian? ( dev-libs/xapian:= ) - lz4? ( app-arch/lz4 ) - mysql? ( dev-db/mysql-connector-c:0= ) - pam? ( sys-libs/pam:= ) - postgres? ( dev-db/postgresql:* ) - 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:= ) - 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[pam?] - " - -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-autoconf-lua-version-v3.patch" - "${FILESDIR}/${PN}-2.4.1-gssapi-regression.patch" - "${FILESDIR}/${PN}-2.4.1-fix-hardened-crash.patch" - "${FILESDIR}/${PN}-2.4.1-fix-musl-build.patch" - "${FILESDIR}/${PN}-2.4.1-crash-on-arm.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 - if use sieve || use managesieve; then - pushd "${PIEGONHOLE_S}" > /dev/null || die - eapply "${FILESDIR}/${PN}-2.4.1-fix-ldap-build.patch" - popd > /dev/null || die - fi - - # rename default cert files - sed -i -e "s:ssl-cert.pem:server.pem:" \ - -e "s:ssl-key.pem:server.key:" \ - doc/dovecot.conf.in || die "sed failed" - - # bug 657108, 782631 - #elibtoolize - eautoreconf - - # Bug #727244 - append-cflags -fasynchronous-unwind-tables -} - -src_configure() { - # --disable-hardening because our toolchain already defaults to - # these bits on, and it actually regresses the default _FORTIFY_SOURCE - # level for hardened at least from 3 to 2. - # - # 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-hardening \ - --disable-rpath \ - --with-bzlib \ - --without-libbsd \ - --with-libcap \ - --with-icu \ - --enable-experimental-mail-utf8 \ - $( use_with argon2 sodium ) \ - $( use_with cdb) \ - $( use_with kerberos gssapi ) \ - $( use_with lua ) \ - $( use_with ldap ) \ - $( use_with xapian flatcurve ) \ - $( 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 textcat ) \ - $( use_with unwind libunwind ) \ - $( use_with zstd ) \ - $( use_enable static-libs static ) - - 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 - pushd "${PIEGONHOLE_S}" > /dev/null || die - econf \ - $( use_enable static-libs static ) \ - --localstatedir="${EPREFIX}/var" \ - --enable-shared \ - --disable-hardening \ - --with-dovecot="${S}" \ - $( use_with ldap ) \ - $( use_with managesieve ) - popd > /dev/null || die - fi -} - -src_compile() { - default - if use sieve || use managesieve; then - pushd "${PIEGONHOLE_S}" > /dev/null || die - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" - popd > /dev/null || die - fi -} - -src_test() { - # bug #340791 and bug #807178 - local -x NOVALGRIND=true - - default - if use sieve || use managesieve; then - pushd "${PIEGONHOLE_S}" > /dev/null || die - default - popd > /dev/null || die - 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 - - use pam && dosym imap /etc/pam.d/dovecot - - insinto /etc/dovecot/conf.d - doins "${FILESDIR}/50-misc.conf" - - dodoc AUTHORS NEWS README.md TODO - docinto stopwords - dodoc src/lib-language/stopwords/stopwords*.txt - - if use sieve || use managesieve; then - pushd "${PIEGONHOLE_S}" > /dev/null || die - emake DESTDIR="${ED}" install - - newdoc README README.pigeonhole - 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 - popd > /dev/null || die - fi - - rm -r "${ED}"/usr/share/dovecot - use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete -} - -pkg_postinst() { - if ver_replacing -lt 2.4 ; then - # This is an upgrade which requires user review - ewarn "Dovecot-2.4.x has new settings and WILL NOT work" - ewarn "unless the configuration files are updated." - ewarn "Please read the migration guide at:" - ewarn " https://doc.dovecot.org/2.4.1/installation/upgrade/2.3-to-2.4.html"; - fi - - # 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/dovecot/server - fi -} diff --git a/net-mail/dovecot/dovecot-2.4.1-r4.ebuild b/net-mail/dovecot/dovecot-2.4.1-r4.ebuild deleted file mode 100644 index 6febeb6ba59d..000000000000 --- a/net-mail/dovecot/dovecot-2.4.1-r4.ebuild +++ /dev/null @@ -1,259 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-1 lua5-{3..4} ) -# do not add a ssl USE flag. ssl is mandatory -SSL_DEPS_SKIP=1 -inherit autotools eapi9-ver flag-o-matic lua-single ssl-cert systemd toolchain-funcs - -MY_P="${P/_/.}-4" -MY_PV="${PV}-4" -major_minor="$(ver_cut 1-2)" - -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" -HOMEPAGE="https://www.dovecot.org/"; -SRC_URI="https://www.dovecot.org/releases/${major_minor}/${MY_P}.tar.gz \ - -> ${P}.tar.gz - sieve? ( - https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-pigeonhole-${MY_PV}.tar.gz \ - -> ${PN}-pigeonhole-${PV}.tar.gz - ) - managesieve? ( - https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-pigeonhole-${MY_PV}.tar.gz \ - -> ${PN}-pigeonhole-${PV}.tar.gz - ) " -S="${WORKDIR}/${MY_P}" -PIEGONHOLE_S="../dovecot-pigeonhole-${MY_PV}" -LICENSE="LGPL-2.1 MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" - -IUSE_DOVECOT_AUTH_DICT="cdb kerberos ldap lua mysql pam postgres sqlite" -IUSE_DOVECOT_COMPRESS="lz4 zstd" -IUSE_DOVECOT_FTS="solr stemmer textcat xapian" -IUSE_DOVECOT_OTHER="argon2 managesieve selinux sieve static-libs suid systemd test unwind" - -IUSE="${IUSE_DOVECOT_AUTH_DICT} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_FTS} ${IUSE_DOVECOT_OTHER}" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -DEPEND=" - app-arch/bzip2 - dev-libs/icu:= - dev-libs/openssl:0= - net-libs/libtirpc:= - net-libs/rpcsvc-proto - sys-libs/libcap - sys-libs/zlib:= - virtual/libiconv - argon2? ( dev-libs/libsodium:= ) - cdb? ( dev-db/tinycdb ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap:= ) - lua? ( ${LUA_DEPS} ) - xapian? ( dev-libs/xapian:= ) - lz4? ( app-arch/lz4 ) - mysql? ( dev-db/mysql-connector-c:0= ) - pam? ( sys-libs/pam:= ) - postgres? ( dev-db/postgresql:* ) - 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:= ) - 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[pam?] - " - -BDEPEND="virtual/pkgconfig - test? ( - lua? ( - $(lua_gen_cond_dep ' - dev-lua/luajson[${LUA_USEDEP}] - ') - ) - ) - " - -PATCHES=( - "${FILESDIR}/${PN}-autoconf-lua-version-v3.patch" - "${FILESDIR}/${PN}-2.4.1-gssapi-regression.patch" - "${FILESDIR}/${PN}-2.4.1-fix-hardened-crash.patch" - "${FILESDIR}/${PN}-2.4.1-fix-musl-build.patch" - "${FILESDIR}/${PN}-2.4.1-crash-on-arm.patch" - "${FILESDIR}/${PN}-2.4.1-trivial-auto-var-init-attrib.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 - if use sieve || use managesieve; then - pushd "${PIEGONHOLE_S}" > /dev/null || die - eapply "${FILESDIR}/${PN}-2.4.1-fix-ldap-build.patch" - popd > /dev/null || die - fi - - # rename default cert files - sed -i -e "s:ssl-cert.pem:server.pem:" \ - -e "s:ssl-key.pem:server.key:" \ - doc/dovecot.conf.in || die "sed failed" - - # bug 657108, 782631 - #elibtoolize - eautoreconf - - # Bug #727244 - append-cflags -fasynchronous-unwind-tables -} - -src_configure() { - # --disable-hardening because our toolchain already defaults to - # these bits on, and it actually regresses the default _FORTIFY_SOURCE - # level for hardened at least from 3 to 2. - # - # 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-hardening \ - --disable-rpath \ - --with-bzlib \ - --without-libbsd \ - --with-libcap \ - --with-icu \ - --enable-experimental-mail-utf8 \ - $( use_with argon2 sodium ) \ - $( use_with cdb) \ - $( use_with kerberos gssapi ) \ - $( use_with lua ) \ - $( use_with ldap ) \ - $( use_with xapian flatcurve ) \ - $( 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 textcat ) \ - $( use_with unwind libunwind ) \ - $( use_with zstd ) \ - $( use_enable static-libs static ) - - 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 - pushd "${PIEGONHOLE_S}" > /dev/null || die - econf \ - $( use_enable static-libs static ) \ - --localstatedir="${EPREFIX}/var" \ - --enable-shared \ - --disable-hardening \ - --with-dovecot="${S}" \ - $( use_with ldap ) \ - $( use_with managesieve ) - popd > /dev/null || die - fi -} - -src_compile() { - default - if use sieve || use managesieve; then - pushd "${PIEGONHOLE_S}" > /dev/null || die - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" - popd > /dev/null || die - fi -} - -src_test() { - # bug #340791 and bug #807178 - local -x NOVALGRIND=true - - default - if use sieve || use managesieve; then - pushd "${PIEGONHOLE_S}" > /dev/null || die - default - popd > /dev/null || die - 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 - - use pam && dosym imap /etc/pam.d/dovecot - - insinto /etc/dovecot/conf.d - doins "${FILESDIR}/50-misc.conf" - - dodoc AUTHORS NEWS README.md TODO - docinto stopwords - dodoc src/lib-language/stopwords/stopwords*.txt - - if use sieve || use managesieve; then - pushd "${PIEGONHOLE_S}" > /dev/null || die - emake DESTDIR="${ED}" install - - newdoc README README.pigeonhole - 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 - popd > /dev/null || die - fi - - rm -r "${ED}"/usr/share/dovecot - use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete -} - -pkg_postinst() { - if ver_replacing -lt 2.4 ; then - # This is an upgrade which requires user review - ewarn "Dovecot-2.4.x has new settings and WILL NOT work" - ewarn "unless the configuration files are updated." - ewarn "Please read the migration guide at:" - ewarn " https://doc.dovecot.org/2.4.1/installation/upgrade/2.3-to-2.4.html"; - fi - - # 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/dovecot/server - fi -} diff --git a/net-mail/dovecot/dovecot-2.4.1-r5.ebuild b/net-mail/dovecot/dovecot-2.4.1-r5.ebuild deleted file mode 100644 index d23aa151971a..000000000000 --- a/net-mail/dovecot/dovecot-2.4.1-r5.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-1 lua5-{3..4} ) -# do not add a ssl USE flag. ssl is mandatory -SSL_DEPS_SKIP=1 -inherit autotools eapi9-ver flag-o-matic lua-single ssl-cert systemd toolchain-funcs - -MY_P="${P/_/.}-4" -MY_PV="${PV}-4" -major_minor="$(ver_cut 1-2)" - -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" -HOMEPAGE="https://www.dovecot.org/"; -SRC_URI="https://www.dovecot.org/releases/${major_minor}/${MY_P}.tar.gz \ - -> ${P}.tar.gz - sieve? ( - https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-pigeonhole-${MY_PV}.tar.gz \ - -> ${PN}-pigeonhole-${PV}.tar.gz - ) - managesieve? ( - https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-pigeonhole-${MY_PV}.tar.gz \ - -> ${PN}-pigeonhole-${PV}.tar.gz - ) " -S="${WORKDIR}/${MY_P}" -PIEGONHOLE_S="../dovecot-pigeonhole-${MY_PV}" -LICENSE="LGPL-2.1 MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" - -IUSE_DOVECOT_AUTH_DICT="cdb kerberos ldap lua mysql pam postgres sqlite" -IUSE_DOVECOT_COMPRESS="lz4 zstd" -IUSE_DOVECOT_FTS="solr stemmer textcat xapian" -IUSE_DOVECOT_OTHER="argon2 managesieve selinux sieve static-libs suid systemd test unwind" - -IUSE="${IUSE_DOVECOT_AUTH_DICT} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_FTS} ${IUSE_DOVECOT_OTHER}" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -DEPEND=" - app-arch/bzip2 - dev-libs/icu:= - dev-libs/openssl:0= - net-libs/libtirpc:= - net-libs/rpcsvc-proto - sys-libs/libcap - sys-libs/zlib:= - virtual/libiconv - argon2? ( dev-libs/libsodium:= ) - cdb? ( dev-db/tinycdb ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap:= ) - lua? ( ${LUA_DEPS} ) - xapian? ( dev-libs/xapian:= ) - lz4? ( app-arch/lz4 ) - mysql? ( dev-db/mysql-connector-c:0= ) - pam? ( sys-libs/pam:= ) - postgres? ( dev-db/postgresql:* ) - 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:= ) - 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[pam?] - " - -BDEPEND="virtual/pkgconfig - test? ( - lua? ( - $(lua_gen_cond_dep ' - dev-lua/luajson[${LUA_USEDEP}] - ') - ) - ) - " - -PATCHES=( - "${FILESDIR}/${PN}-autoconf-lua-version-v3.patch" - "${FILESDIR}/${PN}-2.4.1-gssapi-regression.patch" - "${FILESDIR}/${PN}-2.4.1-fix-hardened-crash.patch" - "${FILESDIR}/${PN}-2.4.1-fix-musl-build.patch" - "${FILESDIR}/${PN}-2.4.1-crash-on-arm.patch" - "${FILESDIR}/${PN}-2.4.1-trivial-auto-var-init-attrib.patch" - "${FILESDIR}/${PN}-2.4.1-fix-ldap-sasl.patch" - "${FILESDIR}/${PN}-2.4.1-anvil-group.patch" - "${FILESDIR}/${PN}-2.4.1-config-crash.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 - if use sieve || use managesieve; then - pushd "${PIEGONHOLE_S}" > /dev/null || die - eapply "${FILESDIR}/${PN}-2.4.1-fix-ldap-build.patch" - popd > /dev/null || die - fi - - # rename default cert files - sed -i -e "s:ssl-cert.pem:server.pem:" \ - -e "s:ssl-key.pem:server.key:" \ - doc/dovecot.conf.in || die "sed failed" - - # bug 657108, 782631 - #elibtoolize - eautoreconf - - # Bug #727244 - append-cflags -fasynchronous-unwind-tables -} - -src_configure() { - # --disable-hardening because our toolchain already defaults to - # these bits on, and it actually regresses the default _FORTIFY_SOURCE - # level for hardened at least from 3 to 2. - # - # 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-hardening \ - --disable-rpath \ - --with-bzlib \ - --without-libbsd \ - --with-libcap \ - --with-icu \ - --enable-experimental-mail-utf8 \ - $( use_with argon2 sodium ) \ - $( use_with cdb) \ - $( use_with kerberos gssapi ) \ - $( use_with lua ) \ - $( use_with ldap ) \ - $( use_with xapian flatcurve ) \ - $( 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 textcat ) \ - $( use_with unwind libunwind ) \ - $( use_with zstd ) \ - $( use_enable static-libs static ) - - 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 - pushd "${PIEGONHOLE_S}" > /dev/null || die - econf \ - $( use_enable static-libs static ) \ - --localstatedir="${EPREFIX}/var" \ - --enable-shared \ - --disable-hardening \ - --with-dovecot="${S}" \ - $( use_with ldap ) \ - $( use_with managesieve ) - popd > /dev/null || die - fi -} - -src_compile() { - default - if use sieve || use managesieve; then - pushd "${PIEGONHOLE_S}" > /dev/null || die - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" - popd > /dev/null || die - fi -} - -src_test() { - # bug #340791 and bug #807178 - local -x NOVALGRIND=true - - default - if use sieve || use managesieve; then - pushd "${PIEGONHOLE_S}" > /dev/null || die - default - popd > /dev/null || die - 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 - - use pam && dosym imap /etc/pam.d/dovecot - - insinto /etc/dovecot/conf.d - doins "${FILESDIR}/50-misc.conf" - - dodoc AUTHORS NEWS README.md TODO - docinto stopwords - dodoc src/lib-language/stopwords/stopwords*.txt - - if use sieve || use managesieve; then - pushd "${PIEGONHOLE_S}" > /dev/null || die - emake DESTDIR="${ED}" install - - newdoc README README.pigeonhole - 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 - popd > /dev/null || die - fi - - rm -r "${ED}"/usr/share/dovecot - use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete -} - -pkg_postinst() { - if ver_replacing -lt 2.4 ; then - # This is an upgrade which requires user review - ewarn "Dovecot-2.4.x has new settings and WILL NOT work" - ewarn "unless the configuration files are updated." - ewarn "Please read the migration guide at:" - ewarn " https://doc.dovecot.org/2.4.1/installation/upgrade/2.3-to-2.4.html"; - fi - - # 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/dovecot/server - fi -} diff --git a/net-mail/dovecot/files/dovecot-2.4.1-anvil-group.patch b/net-mail/dovecot/files/dovecot-2.4.1-anvil-group.patch deleted file mode 100644 index 44941357f275..000000000000 --- a/net-mail/dovecot/files/dovecot-2.4.1-anvil-group.patch +++ /dev/null @@ -1,26 +0,0 @@ -# bug 962939 -diff --git a/src/anvil/anvil-settings.c b/src/anvil/anvil-settings.c -index cf96ae7e1f4..15cd03957a1 100644 ---- a/src/anvil/anvil-settings.c -+++ b/src/anvil/anvil-settings.c -@@ -33,7 +33,8 @@ const struct setting_keyvalue anvil_service_settings_defaults[] = { - { "unix_listener", "anvil anvil-auth-penalty" }, - - { "unix_listener/anvil/path", "anvil" }, -- { "unix_listener/anvil/mode", "0600" }, -+ { "unix_listener/anvil/mode", "0660" }, -+ { "unix_listener/anvil/group", "$SET:default_internal_group" }, - - { "unix_listener/anvil-auth-penalty/path", "anvil-auth-penalty" }, - #ifdef DOVECOT_PRO_EDITION -diff --git a/src/lib-settings/settings-history-core.txt b/src/lib-settings/settings-history-core.txt -index 2e0a9f6062d..71d08ffaaa5 100644 ---- a/src/lib-settings/settings-history-core.txt -+++ b/src/lib-settings/settings-history-core.txt -@@ -1,4 +1,6 @@ - default service/lmtp/service_restart_request_count unlimited 2.4.1 - default service/auth/unix_listener/auth-userdb/unix_listener_group 2.4.1 -+default service/anvil/unix_listener/anvil/unix_listener_mode 0600 2.4.1 -+default service/anvil/unix_listener/anvil/unix_listener_group 2.4.1 - default mail_cache_fields flags 2.4.1 - default lmtp_user_concurrency_limit 0 2.4.1 diff --git a/net-mail/dovecot/files/dovecot-2.4.1-config-crash.patch b/net-mail/dovecot/files/dovecot-2.4.1-config-crash.patch deleted file mode 100644 index d5897c942fb6..000000000000 --- a/net-mail/dovecot/files/dovecot-2.4.1-config-crash.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9240e3a4386808789d593537a8ebe3e873e89683 Mon Sep 17 00:00:00 2001 -From: Timo Sirainen <[email protected]> -Date: Tue, 15 Jul 2025 12:32:23 +0300 -Subject: [PATCH] lib: Fix crash when config is reloaded and logging to syslog - -openlog() was called with a string pointing to settings. When settings were -reloaded, the pointer became invalid, causing syslog() to crash. ---- - src/lib/failures.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/lib/failures.c b/src/lib/failures.c -index eae2d8ddf88..49b0681607e 100644 ---- a/src/lib/failures.c -+++ b/src/lib/failures.c -@@ -56,6 +56,7 @@ static struct failure_context failure_ctx_error = { .type = LOG_TYPE_ERROR }; - - static int log_fd = STDERR_FILENO, log_info_fd = STDERR_FILENO, - log_debug_fd = STDERR_FILENO; -+static char *syslog_ident = NULL; - static char *log_prefix = NULL; - static char *log_stamp_format = NULL, *log_stamp_format_suffix = NULL; - static bool failure_ignore_errors = FALSE, log_prefix_sent = FALSE; -@@ -657,7 +658,11 @@ void i_syslog_error_handler(const struct failure_context *ctx, - - void i_set_failure_syslog(const char *ident, int options, int facility) - { -- openlog(ident, options, facility); -+ /* openlog() keeps using the pointer directly. Duplicate it in case -+ caller frees the string. */ -+ i_free(syslog_ident); -+ syslog_ident = i_strdup(ident); -+ openlog(syslog_ident, options, facility); - - i_set_fatal_handler(i_syslog_fatal_handler); - i_set_error_handler(i_syslog_error_handler); -@@ -1006,6 +1011,7 @@ void failures_deinit(void) - i_free_and_null(log_prefix); - i_free_and_null(log_stamp_format); - i_free_and_null(log_stamp_format_suffix); -+ i_free(syslog_ident); - } - - #undef i_unreached diff --git a/net-mail/dovecot/files/dovecot-2.4.1-crash-on-arm.patch b/net-mail/dovecot/files/dovecot-2.4.1-crash-on-arm.patch deleted file mode 100644 index cdec9ff306f2..000000000000 --- a/net-mail/dovecot/files/dovecot-2.4.1-crash-on-arm.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e546239af593dfd0722bea9ff169b60006e219f9 Mon Sep 17 00:00:00 2001 -From: Timo Sirainen <[email protected]> -Date: Thu, 15 May 2025 13:06:56 +0300 -Subject: [PATCH] auth: Terminate properly auth_oauth2_post_setting_defines - list - -Fixes: -Error: xoauth2: oauth2 failed: Local validation failed: auth_oauth2_fields settings: Failed to parse configuration: settings struct auth_oauth2_fields #1 key mismatch ---- - src/auth/db-oauth2.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/auth/db-oauth2.c b/src/auth/db-oauth2.c -index bd807e30b5..230c6cf767 100644 ---- a/src/auth/db-oauth2.c -+++ b/src/auth/db-oauth2.c -@@ -134,6 +134,8 @@ const struct setting_parser_info auth_oauth2_setting_parser_info = { - static const struct setting_define auth_oauth2_post_setting_defines[] = { - { .type = SET_STRLIST, .key = "oauth2_fields", - .offset = offsetof(struct auth_oauth2_post_settings, fields) }, -+ -+ SETTING_DEFINE_LIST_END - }; - - static const struct auth_oauth2_post_settings auth_oauth2_post_default_settings = { diff --git a/net-mail/dovecot/files/dovecot-2.4.1-fix-hardened-crash.patch b/net-mail/dovecot/files/dovecot-2.4.1-fix-hardened-crash.patch deleted file mode 100644 index 08caab9bbaac..000000000000 --- a/net-mail/dovecot/files/dovecot-2.4.1-fix-hardened-crash.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9f3430be9133efe74e6f0c4943abc52b5a0ef789 Mon Sep 17 00:00:00 2001 -From: Timo Sirainen <[email protected]> -Date: Thu, 15 May 2025 09:54:18 +0300 -Subject: [PATCH] config: Fix config filter sorting order - -It was somewhat luckily working in glibc, but broke with e.g. musl libc. -This caused a crash at startup. - -Broken by 5acdd2b97ed6092d1f0204bdeb3e418180519370 ---- - src/config/config-parser.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/config/config-parser.c b/src/config/config-parser.c -index 7b95c31f94..0ae5e46ddb 100644 ---- a/src/config/config-parser.c -+++ b/src/config/config-parser.c -@@ -2318,7 +2318,7 @@ static int config_parser_filter_cmp(struct config_filter_parser *const *f1, - return -1; - } - if ((*f2)->create_order <= 1) -- return -1; -+ return 1; - - /* Next, order by the number of named list filters, so more specific - filters are applied before less specific ones. (Applying is done in diff --git a/net-mail/dovecot/files/dovecot-2.4.1-fix-ldap-build.patch b/net-mail/dovecot/files/dovecot-2.4.1-fix-ldap-build.patch deleted file mode 100644 index 23e78ff47d67..000000000000 --- a/net-mail/dovecot/files/dovecot-2.4.1-fix-ldap-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b37322a8d338bf999bc9774154dce79c4857d622 Mon Sep 17 00:00:00 2001 -From: Aki Tuomi <[email protected]> -Date: Mon, 26 May 2025 09:12:52 +0300 -Subject: [PATCH] sieve-ldap-storage: Only include LDAP when it's used - ---- - src/lib-sieve/storage/ldap/sieve-ldap-storage.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-storage.c b/src/lib-sieve/storage/ldap/sieve-ldap-storage.c -index ecf2724c..715572c7 100644 ---- a/src/lib-sieve/storage/ldap/sieve-ldap-storage.c -+++ b/src/lib-sieve/storage/ldap/sieve-ldap-storage.c -@@ -3,7 +3,6 @@ - - #include "lib.h" - #include "settings.h" --#include "ldap-utils.h" - #include "iostream-ssl.h" - - #include "sieve-common.h" -@@ -13,6 +12,7 @@ - - #if defined(SIEVE_BUILTIN_LDAP) || defined(PLUGIN_BUILD) - -+#include "ldap-utils.h" - #include "sieve-error.h" - - #ifndef PLUGIN_BUILD diff --git a/net-mail/dovecot/files/dovecot-2.4.1-fix-ldap-sasl.patch b/net-mail/dovecot/files/dovecot-2.4.1-fix-ldap-sasl.patch deleted file mode 100644 index 7afea282486c..000000000000 --- a/net-mail/dovecot/files/dovecot-2.4.1-fix-ldap-sasl.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 431e328b3b035ddb187526cd13bccf29833aed90 Mon Sep 17 00:00:00 2001 -From: Timo Sirainen <[email protected]> -Date: Mon, 2 Jun 2025 20:42:03 +0300 -Subject: [PATCH] auth: Fix LDAP SASL support - -The settings code didn't see the necessary defines. - -Based on patch by Jakob Haufe - -Broken by 961275fdb54878fdfa4ee1b9f1a4f00e82bf4a83 ---- - src/auth/db-ldap-settings.h | 14 ++++++++++++++ - src/auth/db-ldap.c | 11 ----------- - 2 files changed, 14 insertions(+), 11 deletions(-) - -diff --git a/src/auth/db-ldap-settings.h b/src/auth/db-ldap-settings.h -index dc341dd3943..a5f2d09fa38 100644 ---- a/src/auth/db-ldap-settings.h -+++ b/src/auth/db-ldap-settings.h -@@ -1,6 +1,20 @@ - #ifndef DB_LDAP_SETTINGS_H - #define DB_LDAP_SETTINGS_H - -+/* <settings checks> */ -+#define HAVE_LDAP_SASL -+#ifdef HAVE_SASL_SASL_H -+# include <sasl/sasl.h> -+#elif defined (HAVE_SASL_H) -+# include <sasl.h> -+#else -+# undef HAVE_LDAP_SASL -+#endif -+#if !defined(SASL_VERSION_MAJOR) || SASL_VERSION_MAJOR < 2 -+# undef HAVE_LDAP_SASL -+#endif -+/* </settings checks> */ -+ - enum db_ldap_lookup_type { - DB_LDAP_LOOKUP_TYPE_PASSDB, - DB_LDAP_LOOKUP_TYPE_USERDB, -diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c -index 9dcebedd57e..302faf38f43 100644 ---- a/src/auth/db-ldap.c -+++ b/src/auth/db-ldap.c -@@ -22,20 +22,9 @@ - - #include <unistd.h> - --#define HAVE_LDAP_SASL --#ifdef HAVE_SASL_SASL_H --# include <sasl/sasl.h> --#elif defined (HAVE_SASL_H) --# include <sasl.h> --#else --# undef HAVE_LDAP_SASL --#endif - #ifdef LDAP_OPT_X_TLS - # define OPENLDAP_TLS_OPTIONS - #endif --#if !defined(SASL_VERSION_MAJOR) || SASL_VERSION_MAJOR < 2 --# undef HAVE_LDAP_SASL --#endif - - #ifndef LDAP_SASL_QUIET - # define LDAP_SASL_QUIET 0 /* Doesn't exist in Solaris LDAP */ diff --git a/net-mail/dovecot/files/dovecot-2.4.1-fix-musl-build.patch b/net-mail/dovecot/files/dovecot-2.4.1-fix-musl-build.patch deleted file mode 100644 index 7444d0008b2a..000000000000 --- a/net-mail/dovecot/files/dovecot-2.4.1-fix-musl-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 75fa589cb292133c4b5f47566c1b4de4b7bc4e35 Mon Sep 17 00:00:00 2001 -From: Fabian Groffen <[email protected]> -Date: Sat, 31 May 2025 10:49:28 +0200 -Subject: [PATCH] lib: cpu-count - fix compilation using musl - -The macros, types and symbols CPU_* and cpuset_t are not exposed in -musl's sched.h unless _GNU_SOURCE is set. - -Signed-off-by: Fabian Groffen <[email protected]> ---- - src/lib/cpu-count.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/lib/cpu-count.c b/src/lib/cpu-count.c -index 3eb38fa47d..a3e80e6c15 100644 ---- a/src/lib/cpu-count.c -+++ b/src/lib/cpu-count.c -@@ -3,6 +3,8 @@ - - #ifdef HAVE_SCHED_H - # define __USE_GNU -+/* _GNU_SOURCE: for musl's sched.h to expose cpuset/CPU_* */ -+# define _GNU_SOURCE - # include <sched.h> - # ifdef HAVE_SYS_CPUSET_H - # include <sys/cpuset.h> diff --git a/net-mail/dovecot/files/dovecot-2.4.1-gssapi-regression.patch b/net-mail/dovecot/files/dovecot-2.4.1-gssapi-regression.patch deleted file mode 100644 index 1f810c2b0e48..000000000000 --- a/net-mail/dovecot/files/dovecot-2.4.1-gssapi-regression.patch +++ /dev/null @@ -1,14 +0,0 @@ -#see https://dovecot.org/mailman3/archives/list/[email protected]/message/O54EAGLIXXHMOH7BQCCKHHB3Z32HDWVR/ -diff --git a/src/auth/mech-gssapi.c b/src/auth/mech-gssapi.c -index 57a2b125b2..4ff5716528 100644 ---- a/src/auth/mech-gssapi.c -+++ b/src/auth/mech-gssapi.c -@@ -672,7 +672,7 @@ mech_gssapi_auth_initial(struct auth_req - - if (data_size == 0) { - /* The client should go first */ -- auth_request_handler_reply_continue(request, NULL, 0); -+ auth_request_handler_reply_continue(request, uchar_empty_ptr, 0); - } else { - mech_gssapi_auth_continue(request, data, data_size); - } diff --git a/net-mail/dovecot/files/dovecot-2.4.1-trivial-auto-var-init-attrib.patch b/net-mail/dovecot/files/dovecot-2.4.1-trivial-auto-var-init-attrib.patch deleted file mode 100644 index 3f07e39bc5ee..000000000000 --- a/net-mail/dovecot/files/dovecot-2.4.1-trivial-auto-var-init-attrib.patch +++ /dev/null @@ -1,60 +0,0 @@ -https://bugs.gentoo.org/959838 -https://github.com/dovecot/core/pull/248 -https://github.com/dovecot/core/commit/a60ada751a827f73c3f0d0c0059f340918e981ad - -From a60ada751a827f73c3f0d0c0059f340918e981ad Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Mon, 30 Jun 2025 04:51:19 +0100 -Subject: [PATCH] lib-json: drop invalid ATTR_PURE - -Several functions in json-types.h mutate one of their arguments (usually *size_r) -and hence aren't eligible for __attribute__((pure)) which promises that -the function has no side-effects. - -This manifests as a test failure in test-json-istream.c when building -Dovecot with -ftrivial-auto-var-init=zero (or =pattern). ---- - src/lib-json/json-types.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/lib-json/json-types.h b/src/lib-json/json-types.h -index caa27193c3c..6ce966883c7 100644 ---- a/src/lib-json/json-types.h -+++ b/src/lib-json/json-types.h -@@ -176,7 +176,7 @@ json_value_as_str(const struct json_value *jvalue) - } - return jvalue->content.str; - } --static inline ATTR_PURE const unsigned char * -+static inline const unsigned char * - json_value_get_data(const struct json_value *jvalue, size_t *size_r) - { - switch (jvalue->content_type) { -@@ -192,7 +192,7 @@ json_value_get_data(const struct json_value *jvalue, size_t *size_r) - i_unreached(); - } - --static inline ATTR_PURE int -+static inline int - json_value_get_stream(const struct json_value *jvalue, - struct istream **stream_r) - { -@@ -314,7 +314,7 @@ json_node_as_str(const struct json_node *jnode) - return json_value_as_str(&jnode->value); - } - --static inline ATTR_PURE const unsigned char * -+static inline const unsigned char * - json_node_get_data(const struct json_node *jnode, size_t *size_r) - { - const char *literal; -@@ -497,7 +497,7 @@ json_node_is_boolean(const struct json_node *jnode) - return FALSE; - } - --static inline ATTR_PURE int -+static inline int - json_node_get_boolean(const struct json_node *jnode, bool *bool_r) - { - switch (jnode->type) { -
