commit: 416a8ad88987bf8480d2c5afc9db8af864b21e98 Author: Eray Aslan <eras <AT> gentoo <DOT> org> AuthorDate: Wed Feb 10 15:42:40 2021 +0000 Commit: Eray Aslan <eras <AT> gentoo <DOT> org> CommitDate: Wed Feb 10 15:42:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=416a8ad8
net-mail/dovecot: cleanup Bug: https://bugs.gentoo.org/763525 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Eray Aslan <eras <AT> gentoo.org> net-mail/dovecot/Manifest | 2 - net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild | 296 -------------------- net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild | 297 --------------------- net-mail/dovecot/dovecot-2.3.11.3.ebuild | 290 -------------------- net-mail/dovecot/dovecot-2.3.13.ebuild | 293 -------------------- .../dovecot/files/dovecot-2.3.11.3-apop-fix.patch | 60 ----- .../dovecot/files/dovecot-fix-search-crash.patch | 91 ------- net-mail/dovecot/metadata.xml | 1 - 8 files changed, 1330 deletions(-) diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index 6a734d6a21c..4e94ee8000e 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -1,4 +1,2 @@ -DIST dovecot-2.3-pigeonhole-0.5.11.tar.gz 1912411 BLAKE2B ed35cbae5ea2c1da24a1a255c1fc943b9a8c35280840ea42c1b5f83ea327872bb83ae8901696abfe3b0d27dfd6c11d3fb1661614fad54eeab9d700b5f0b7b13a SHA512 793d93edc50192c52654e2f7244d3e01aaa4e69f786e3ecfcd658a4ab26a5099cc5319cb93221150db4ce94bc4515ffb38115b1d0eeb6e052b956efec680b33d DIST dovecot-2.3-pigeonhole-0.5.13.tar.gz 1908839 BLAKE2B 37fbd9d9b41ca1893c19ac546dd9b272b361752c70eed0596bbb743cd8c30d942427d5814ab551bb39eb844c7bd05074bb49b11a6b81747e2fc535b0f9993f14 SHA512 fcbc13d71af4e6dd4e34192484e203d755e5015da76a4774b11a79182b2baad36cab5a471346093111ace36a7775dfe8294555f8b777786dde386820b3ec5cd3 -DIST dovecot-2.3.11.3.tar.gz 7353412 BLAKE2B 0067989b35fe29c0d23f6ca25712a87fa69608cc4ee6081d9eb929d63e7a586ccc0d86fcdbe1aac67aea9f2678ab0e150f053667817b08f4a7246947bb812fdb SHA512 d83e52a7faab918a8e6f6257acc5936b81733c10489affd042c3a043cb842db060286cba9978be378e4958e9ac2e60b55ce289d7f3a88df08e7637e4785e23bb DIST dovecot-2.3.13.tar.gz 7456073 BLAKE2B 6cf3e7d9c6cf90279e0d72782cca88a11617f3f08e3c27da7948f46b8796575e42c776323cd56bc4208474831d4480afcac35ebe0b74d99db40acd4cda2279be SHA512 758a169fba8925637ed18fa7522a6f06c9fe01a1707b1ca0d0a4d8757c578a8e117c91733e8314403839f9a484bbcac71ce3532c82379eb583b480756d556a95 diff --git a/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild b/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild deleted file mode 100644 index 9712daf5d27..00000000000 --- a/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild +++ /dev/null @@ -1,296 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# do not add a ssl USE flag. ssl is mandatory -SSL_DEPS_SKIP=1 -inherit autotools ssl-cert systemd toolchain-funcs - -MY_P="${P/_/.}" -#MY_S="${PN}-ce-${PV}" -major_minor="$(ver_cut 1-2)" -sieve_version="0.5.11" -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 ~s390 ~sparc ~x86" - -IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail" -IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd" -IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind" - -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" - -DEPEND="argon2? ( dev-libs/libsodium ) - bzip2? ( app-arch/bzip2 ) - caps? ( sys-libs/libcap ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - lua? ( dev-lang/lua:0= ) - lucene? ( >=dev-cpp/clucene-2.3 ) - lzma? ( app-arch/xz-utils ) - lz4? ( app-arch/lz4 ) - mysql? ( dev-db/mysql-connector-c:0= ) - pam? ( sys-libs/pam ) - postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) - rpc? ( net-libs/libtirpc net-libs/rpcsvc-proto ) - selinux? ( sec-policy/selinux-dovecot ) - solr? ( net-misc/curl dev-libs/expat ) - sqlite? ( dev-db/sqlite:* ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - suid? ( acct-group/mail ) - tcpd? ( sys-apps/tcp-wrappers ) - textcat? ( app-text/libexttextcat ) - unwind? ( sys-libs/libunwind ) - vpopmail? ( net-mail/vpopmail ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd ) - virtual/libiconv - dev-libs/icu:=" - -RDEPEND="${DEPEND} - acct-group/dovecot - acct-group/dovenull - acct-user/dovecot - acct-user/dovenull - net-mail/mailbase" - -PATCHES=( - "${FILESDIR}/${P}"-apop-fix.patch - "${FILESDIR}/${PN}"-unwind-generic.patch - ) - -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 -} - -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 econf \ - --with-rundir="${EPREFIX}/run/dovecot" \ - --with-statedir="${EPREFIX}/var/lib/dovecot" \ - --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ - --without-stemmer \ - --disable-rpath \ - --without-libbsd \ - --with-icu \ - --with-ssl \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - $( use_with argon2 sodium ) \ - $( use_with bzip2 bzlib ) \ - $( use_with caps libcap ) \ - $( use_with kerberos gssapi ) \ - $( use_with lua ) \ - $( use_with ldap ) \ - $( use_with lucene ) \ - $( use_with lz4 ) \ - $( use_with lzma ) \ - $( use_with mysql ) \ - $( use_with pam ) \ - $( use_with postgres pgsql ) \ - $( use_with sqlite ) \ - $( use_with solr ) \ - $( use_with tcpd libwrap ) \ - $( use_with textcat ) \ - $( use_with unwind libunwind ) \ - $( use_with vpopmail ) \ - $( use_with zlib ) \ - $( 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 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 vpopmail; then - sed -i -e \ - 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \ - "${confd}/10-auth.conf" \ - || die "failed to update vpopmail 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.11.3-r2.ebuild b/net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild deleted file mode 100644 index 8c6836bd9cb..00000000000 --- a/net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild +++ /dev/null @@ -1,297 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# do not add a ssl USE flag. ssl is mandatory -SSL_DEPS_SKIP=1 -inherit autotools ssl-cert systemd toolchain-funcs - -MY_P="${P/_/.}" -#MY_S="${PN}-ce-${PV}" -major_minor="$(ver_cut 1-2)" -sieve_version="0.5.11" -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 s390 ~sparc x86" - -IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail" -IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd" -IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind" - -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" - -DEPEND="argon2? ( dev-libs/libsodium ) - bzip2? ( app-arch/bzip2 ) - caps? ( sys-libs/libcap ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - lua? ( dev-lang/lua:0= ) - lucene? ( >=dev-cpp/clucene-2.3 ) - lzma? ( app-arch/xz-utils ) - lz4? ( app-arch/lz4 ) - mysql? ( dev-db/mysql-connector-c:0= ) - pam? ( sys-libs/pam ) - postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) - rpc? ( net-libs/libtirpc net-libs/rpcsvc-proto ) - selinux? ( sec-policy/selinux-dovecot ) - solr? ( net-misc/curl dev-libs/expat ) - sqlite? ( dev-db/sqlite:* ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - suid? ( acct-group/mail ) - tcpd? ( sys-apps/tcp-wrappers ) - textcat? ( app-text/libexttextcat ) - unwind? ( sys-libs/libunwind ) - vpopmail? ( net-mail/vpopmail ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd ) - virtual/libiconv - dev-libs/icu:=" - -RDEPEND="${DEPEND} - acct-group/dovecot - acct-group/dovenull - acct-user/dovecot - acct-user/dovenull - net-mail/mailbase" - -PATCHES=( - "${FILESDIR}/${P}"-apop-fix.patch - "${FILESDIR}/${PN}"-unwind-generic.patch - "${FILESDIR}/${PN}"-fix-search-crash.patch - ) - -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 -} - -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 econf \ - --with-rundir="${EPREFIX}/run/dovecot" \ - --with-statedir="${EPREFIX}/var/lib/dovecot" \ - --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ - --without-stemmer \ - --disable-rpath \ - --without-libbsd \ - --with-icu \ - --with-ssl \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - $( use_with argon2 sodium ) \ - $( use_with bzip2 bzlib ) \ - $( use_with caps libcap ) \ - $( use_with kerberos gssapi ) \ - $( use_with lua ) \ - $( use_with ldap ) \ - $( use_with lucene ) \ - $( use_with lz4 ) \ - $( use_with lzma ) \ - $( use_with mysql ) \ - $( use_with pam ) \ - $( use_with postgres pgsql ) \ - $( use_with sqlite ) \ - $( use_with solr ) \ - $( use_with tcpd libwrap ) \ - $( use_with textcat ) \ - $( use_with unwind libunwind ) \ - $( use_with vpopmail ) \ - $( use_with zlib ) \ - $( 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 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 vpopmail; then - sed -i -e \ - 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \ - "${confd}/10-auth.conf" \ - || die "failed to update vpopmail 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.11.3.ebuild b/net-mail/dovecot/dovecot-2.3.11.3.ebuild deleted file mode 100644 index a698c9698b9..00000000000 --- a/net-mail/dovecot/dovecot-2.3.11.3.ebuild +++ /dev/null @@ -1,290 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# do not add a ssl USE flag. ssl is mandatory -SSL_DEPS_SKIP=1 -inherit autotools ssl-cert systemd toolchain-funcs - -MY_P="${P/_/.}" -#MY_S="${PN}-ce-${PV}" -major_minor="$(ver_cut 1-2)" -sieve_version="0.5.11" -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 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86" - -IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail" -IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib" -IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat unwind" - -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" - -DEPEND="argon2? ( dev-libs/libsodium ) - bzip2? ( app-arch/bzip2 ) - caps? ( sys-libs/libcap ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - lua? ( dev-lang/lua:0= ) - lucene? ( >=dev-cpp/clucene-2.3 ) - lzma? ( app-arch/xz-utils ) - lz4? ( app-arch/lz4 ) - mysql? ( dev-db/mysql-connector-c:0= ) - pam? ( sys-libs/pam ) - postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) - selinux? ( sec-policy/selinux-dovecot ) - solr? ( net-misc/curl dev-libs/expat ) - sqlite? ( dev-db/sqlite:* ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - suid? ( acct-group/mail ) - tcpd? ( sys-apps/tcp-wrappers ) - textcat? ( app-text/libexttextcat ) - unwind? ( sys-libs/libunwind ) - vpopmail? ( net-mail/vpopmail ) - zlib? ( sys-libs/zlib ) - virtual/libiconv - dev-libs/icu:=" - -RDEPEND="${DEPEND} - acct-group/dovecot - acct-group/dovenull - acct-user/dovecot - acct-user/dovenull - net-mail/mailbase" - -PATCHES=( "${FILESDIR}"/${P}-apop-fix.patch ) - -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 -} - -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 econf \ - --with-rundir="${EPREFIX}/run/dovecot" \ - --with-statedir="${EPREFIX}/var/lib/dovecot" \ - --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ - --without-stemmer \ - --disable-rpath \ - --without-libbsd \ - --with-icu \ - --with-ssl \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - $( use_with argon2 sodium ) \ - $( use_with bzip2 bzlib ) \ - $( use_with caps libcap ) \ - $( use_with kerberos gssapi ) \ - $( use_with lua ) \ - $( use_with ldap ) \ - $( use_with lucene ) \ - $( use_with lz4 ) \ - $( use_with lzma ) \ - $( use_with mysql ) \ - $( use_with pam ) \ - $( use_with postgres pgsql ) \ - $( use_with sqlite ) \ - $( use_with solr ) \ - $( use_with tcpd libwrap ) \ - $( use_with textcat ) \ - $( use_with unwind libunwind ) \ - $( use_with vpopmail ) \ - $( use_with zlib ) \ - $( 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 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 vpopmail; then - sed -i -e \ - 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \ - "${confd}/10-auth.conf" \ - || die "failed to update vpopmail 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.13.ebuild b/net-mail/dovecot/dovecot-2.3.13.ebuild deleted file mode 100644 index cfaa9df4477..00000000000 --- a/net-mail/dovecot/dovecot-2.3.13.ebuild +++ /dev/null @@ -1,293 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..3} ) - -# do not add a ssl USE flag. ssl is mandatory -SSL_DEPS_SKIP=1 -inherit autotools 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.13" -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 ~s390 ~sparc ~x86" - -IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite" -IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd" -IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind" - -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -DEPEND="argon2? ( dev-libs/libsodium ) - bzip2? ( app-arch/bzip2 ) - caps? ( sys-libs/libcap ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - lua? ( ${LUA_DEPS} ) - lucene? ( >=dev-cpp/clucene-2.3 ) - lzma? ( app-arch/xz-utils ) - lz4? ( app-arch/lz4 ) - mysql? ( dev-db/mysql-connector-c:0= ) - pam? ( sys-libs/pam ) - postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) - rpc? ( net-libs/libtirpc net-libs/rpcsvc-proto ) - selinux? ( sec-policy/selinux-dovecot ) - solr? ( net-misc/curl dev-libs/expat ) - sqlite? ( dev-db/sqlite:* ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - suid? ( acct-group/mail ) - tcpd? ( sys-apps/tcp-wrappers ) - textcat? ( app-text/libexttextcat ) - unwind? ( sys-libs/libunwind ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd ) - virtual/libiconv - dev-libs/icu:=" - -RDEPEND="${DEPEND} - acct-group/dovecot - acct-group/dovenull - acct-user/dovecot - acct-user/dovenull - net-mail/mailbase" - -PATCHES=( - "${FILESDIR}/${PN}"-autoconf-lua-version.patch - "${FILESDIR}/${PN}"-unwind-generic.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 -} - -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}" econf \ - --with-rundir="${EPREFIX}/run/dovecot" \ - --with-statedir="${EPREFIX}/var/lib/dovecot" \ - --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ - --without-stemmer \ - --disable-rpath \ - --without-libbsd \ - --with-icu \ - --with-ssl \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - $( use_with argon2 sodium ) \ - $( use_with bzip2 bzlib ) \ - $( use_with caps libcap ) \ - $( use_with kerberos gssapi ) \ - $( use_with lua ) \ - $( use_with ldap ) \ - $( use_with lucene ) \ - $( use_with lz4 ) \ - $( use_with lzma ) \ - $( use_with mysql ) \ - $( use_with pam ) \ - $( use_with postgres pgsql ) \ - $( use_with sqlite ) \ - $( use_with solr ) \ - $( use_with tcpd libwrap ) \ - $( use_with textcat ) \ - $( use_with unwind libunwind ) \ - $( use_with zlib ) \ - $( 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 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/files/dovecot-2.3.11.3-apop-fix.patch b/net-mail/dovecot/files/dovecot-2.3.11.3-apop-fix.patch deleted file mode 100644 index 667b4829f1c..00000000000 --- a/net-mail/dovecot/files/dovecot-2.3.11.3-apop-fix.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 3c5917d1abee8f4af43b5016ddb897154912eb8d Mon Sep 17 00:00:00 2001 -From: Aki Tuomi <[email protected]> -Date: Thu, 13 Aug 2020 19:13:49 +0300 -Subject: [PATCH 2/2] auth: test-mech - Fix type mismatch - ---- - src/auth/test-mech.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/auth/test-mech.c b/src/auth/test-mech.c -index 0a030a2be0..0a22ff46d0 100644 ---- a/src/auth/test-mech.c -+++ b/src/auth/test-mech.c -@@ -192,7 +192,7 @@ static void test_mech_handle_challenge(struct auth_request *request, - } - - static inline const unsigned char * --test_mech_construct_apop_challenge(unsigned int connect_uid, unsigned long *len_r) -+test_mech_construct_apop_challenge(unsigned int connect_uid, size_t *len_r) - { - string_t *apop_challenge = t_str_new(128); - -@@ -323,7 +323,7 @@ static void test_mechs(void) - struct test_case *test_case = &tests[running_test]; - const struct mech_module *mech = test_case->mech; - struct auth_request *request; -- const char *testname = t_strdup_printf("auth mech %s %d/%lu", -+ const char *testname = t_strdup_printf("auth mech %s %d/%zu", - mech->mech_name, - running_test+1, - N_ELEMENTS(tests)); --- -2.11.0 - -From 47ebfeef07d0908ba6b66344b0f630a21b81bcab Mon Sep 17 00:00:00 2001 -From: Aki Tuomi <[email protected]> -Date: Thu, 13 Aug 2020 19:13:04 +0300 -Subject: [PATCH 1/2] auth: test-mech - Fix APOP challenge format - ---- - src/auth/test-mech.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/auth/test-mech.c b/src/auth/test-mech.c -index cf05370035..0a030a2be0 100644 ---- a/src/auth/test-mech.c -+++ b/src/auth/test-mech.c -@@ -196,8 +196,8 @@ test_mech_construct_apop_challenge(unsigned int connect_uid, unsigned long *len_ - { - string_t *apop_challenge = t_str_new(128); - -- str_printfa(apop_challenge,"<%lx.%u.%"PRIdTIME_T"", (unsigned long) getpid(), -- connect_uid, process_start_time+10); -+ str_printfa(apop_challenge,"<%lx.%lx.%"PRIxTIME_T".", (unsigned long)getpid(), -+ (unsigned long)connect_uid, process_start_time+10); - str_append_data(apop_challenge, "\0testuser\0responseoflen16-", 26); - *len_r = apop_challenge->used; - return apop_challenge->data; --- -2.11.0 diff --git a/net-mail/dovecot/files/dovecot-fix-search-crash.patch b/net-mail/dovecot/files/dovecot-fix-search-crash.patch deleted file mode 100644 index 860c070a433..00000000000 --- a/net-mail/dovecot/files/dovecot-fix-search-crash.patch +++ /dev/null @@ -1,91 +0,0 @@ -gentoo bug #756094 - -From a668d767a710ca18ab6e7177d8e8be22a6b024fb Mon Sep 17 00:00:00 2001 -From: Timo Sirainen <[email protected]> -Date: Mon, 31 Aug 2020 20:38:42 +0300 -Subject: [PATCH] lib-mail: message_parser_init_from_parts() - Fix crash if - MIME boundaries don't end - -If the last "boundary--" doens't exist, the parsing assert-crashed at -deinit. This mainly happened when searching mails. - -Fixes: -Panic: file message-parser.c: line 175 (message_part_finish): assertion failed: (ctx->nested_parts_count > 0) ---- - src/lib-mail/message-parser.c | 13 ++++++++----- - src/lib-mail/test-message-parser.c | 21 ++++++++++++++++++++- - 2 files changed, 28 insertions(+), 6 deletions(-) - -diff --git a/src/lib-mail/message-parser.c b/src/lib-mail/message-parser.c -index 011dea9050..8baf622e59 100644 ---- a/src/lib-mail/message-parser.c -+++ b/src/lib-mail/message-parser.c -@@ -138,6 +138,7 @@ message_part_append(struct message_parser_ctx *ctx) - struct message_part *parent = ctx->part; - struct message_part *part; - -+ i_assert(!ctx->preparsed); - i_assert(parent != NULL); - i_assert((parent->flags & (MESSAGE_PART_FLAG_MULTIPART | - MESSAGE_PART_FLAG_MESSAGE_RFC822)) != 0); -@@ -171,12 +172,14 @@ static void message_part_finish(struct message_parser_ctx *ctx) - { - struct message_part **const *parent_next_partp; - -- i_assert(ctx->nested_parts_count > 0); -- ctx->nested_parts_count--; -+ if (!ctx->preparsed) { -+ i_assert(ctx->nested_parts_count > 0); -+ ctx->nested_parts_count--; - -- parent_next_partp = array_back(&ctx->next_part_stack); -- array_pop_back(&ctx->next_part_stack); -- ctx->next_part = *parent_next_partp; -+ parent_next_partp = array_back(&ctx->next_part_stack); -+ array_pop_back(&ctx->next_part_stack); -+ ctx->next_part = *parent_next_partp; -+ } - - message_size_add(&ctx->part->parent->body_size, &ctx->part->body_size); - message_size_add(&ctx->part->parent->body_size, &ctx->part->header_size); -diff --git a/src/lib-mail/test-message-parser.c b/src/lib-mail/test-message-parser.c -index 13984f939e..a00f0d6200 100644 ---- a/src/lib-mail/test-message-parser.c -+++ b/src/lib-mail/test-message-parser.c -@@ -178,9 +178,10 @@ static void test_message_parser_small_blocks(void) - static void test_message_parser_stop_early(void) - { - struct message_parser_ctx *parser; -- struct istream *input; -+ struct istream *input, *input2; - struct message_part *parts; - struct message_block block; -+ const char *error; - unsigned int i; - pool_t pool; - int ret; -@@ -198,6 +199,24 @@ static void test_message_parser_stop_early(void) - &block)) > 0) ; - test_assert(ret == 0); - message_parser_deinit(&parser, &parts); -+ -+ /* test preparsed - first re-parse everything with a stream -+ that sees EOF at this position */ -+ input2 = i_stream_create_from_data(test_msg, i); -+ parser = message_parser_init(pool, input2, &set_empty); -+ while ((ret = message_parser_parse_next_block(parser, -+ &block)) > 0) ; -+ test_assert(ret == -1); -+ message_parser_deinit(&parser, &parts); -+ -+ /* now parse from the parts */ -+ i_stream_seek(input2, 0); -+ parser = message_parser_init_from_parts(parts, input2, &set_empty); -+ while ((ret = message_parser_parse_next_block(parser, -+ &block)) > 0) ; -+ test_assert(ret == -1); -+ test_assert(message_parser_deinit_from_parts(&parser, &parts, &error) == 0); -+ i_stream_unref(&input2); - } - - i_stream_unref(&input); diff --git a/net-mail/dovecot/metadata.xml b/net-mail/dovecot/metadata.xml index cf7190b460e..ba9b0131ea1 100644 --- a/net-mail/dovecot/metadata.xml +++ b/net-mail/dovecot/metadata.xml @@ -9,7 +9,6 @@ <flag name="argon2">Add support for ARGON2 password schemes</flag> <flag name="managesieve">Add managesieve protocol support</flag> <flag name="sieve">Add sieve support</flag> - <flag name="vpopmail">Add vpopmail support</flag> <flag name="lucene">Add lucene full text search (FTS) support using <pkg>dev-cpp/clucene</pkg></flag> <flag name="lzma">Add support for lzma (de)compression</flag> <flag name="rpc">Add support for NFS quotas</flag>
