commit:     d09b9dbdfbe3ca50758ff429c50c72d59359b583
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  3 14:09:17 2022 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Thu Feb  3 14:14:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d09b9dbd

net-mail/dovecot: bump to 2.3.18

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>

 net-mail/dovecot/Manifest              |   2 +
 net-mail/dovecot/dovecot-2.3.18.ebuild | 307 +++++++++++++++++++++++++++++++++
 2 files changed, 309 insertions(+)

diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 8dfa58821de7..851978963a99 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -3,8 +3,10 @@ DIST dovecot-2.3-pigeonhole-0.5.15.tar.gz 1935601 BLAKE2B 
e26405cc9a93681206e27c
 DIST dovecot-2.3-pigeonhole-0.5.16.tar.gz 1944573 BLAKE2B 
a859c396126132669793c73c695380f24f1ca205b8153cb5f60f3be37194c48ae7d0dd6a7bd37fafdd9e95dbcdc2ab341146883013c63c1b5ccb5a9bb4b7b9ae
 SHA512 
880e00654eab85cc41b27ac470cce6011991e3cdb005642f495c2297fd9492bfb2b6b4ef63c88c2ac10bec870ad69b8bee6b11dd1bc5099e16c3cc2857312543
 DIST dovecot-2.3-pigeonhole-0.5.17.1.tar.gz 1952704 BLAKE2B 
7dfc6b5bdb82bcaa60e0f41722f9a884edee7853ce09c9391d4c610be16728f58cc7095b8dd2d47e89296ff36aa926c687b39a418bc74ca0bfc3c4eab98156df
 SHA512 
632a963d90a3fa052f314360d59ff25274d80952307ab5dd9193a2713ebf686500a7b2559b56f04b07e0a261066eed9b8525b14197f3be51728af09acb76e894
 DIST dovecot-2.3-pigeonhole-0.5.17.tar.gz 1951089 BLAKE2B 
fb91e668cf56632b749fed6e9c620b591bee82b19e928dd4cd3dca657dff6938ba4ae4776713a98b0ae38c17e3d6a613b35971cdbae792e18d4563f5f7efaaff
 SHA512 
c4bf69504ec22de53bfeffb55fc95438fb0f648390ca6e6485f652e2e74a34cd7508390bb595b958cbabc53f0e20fbc42e163b2682dc65159fae2acafbd94bad
+DIST dovecot-2.3-pigeonhole-0.5.18.tar.gz 1953892 BLAKE2B 
478da07a2f507a3322c6b6035f8cb74a720c030cc9413496f90a793d165178617207e26b0b57f710a9b9c7671be3fffdbaccaacb8747198abf82943dcb4a24df
 SHA512 
44c3d945a5aebb8935e6e46751e44f505f2abd529c31e3efb689d3b5b9cdf9bca4f5231fc42a8d19837cb95c7618f5b64dfdf5964f40a0a6987144a37cdbaaec
 DIST dovecot-2.3.14.1.tar.gz 7534719 BLAKE2B 
1ba5143711fe340b9fad61db41ba658485e42be52f3b0f196eeb9b8e4b7c1b865b6a08f879dadeb2db3979b17be34699ce5febc4545887307f62bd5b72076f86
 SHA512 
b71b82c2918ac9940ef6bc274bc9c2b3e56a08cf5054244d80547ad89c421b9180c5afa8b5b140831239fbe2cbeeceb83a0052e037eb198d8fc27d07cba4ba35
 DIST dovecot-2.3.15.tar.gz 7608561 BLAKE2B 
85134064dbff0b4f50831a835fb6eafc92081d75d91ab331fa0ae79c453382a88485bad8c774491968b879478dc66841a9c6170e5931d562cf5eaa6af755440b
 SHA512 
75bbdbeac663da109f78dba06c42bb5193e911c6b3c64f055fc4473ae9afaf0c8304c49fc7f06c5c6b61e67dd13dc21fbed6ff160a99f38f547c88ba05e6b03a
 DIST dovecot-2.3.16.tar.gz 7650008 BLAKE2B 
682067330e94a51a6bc6c82444a5e29a08d6382652a531597bd8c3eecf0bd86f6d4d1bc20e0467c36d5285e9df5ba25aee7dd6db727d195f8f67ac403becfcf0
 SHA512 
31a9d352c7ead466d65ee0535b1fbd9138e35235f1ebfeedc4eef54cba450663c59708d162eaf0712af1c40f23526ac86aab2eece8cefde3edf690127472fd1e
 DIST dovecot-2.3.17.1.tar.gz 7700848 BLAKE2B 
adf12c84def899795d8446766b5c88fd5c68a5969a1807b4dd9c2e4894ddc0693a771ce4d4c0c72b0b03501903c39c650eace97b6708114b7fe038b62ea2ecce
 SHA512 
976aa4f68e86f401e5766017e1702740d5b03892aff98f31f9ef0c6d242311d0f4b50d7faa426306bf1c902d7fc6d021438977bc887fa66ee360b069ec32ad79
 DIST dovecot-2.3.17.tar.gz 7699294 BLAKE2B 
1dd044abc9cf27aa8ced5595d875a2b08abba93b43727db6ab1508ae4a841cada57a53d76bf318f497b61f0dbefad66091e652e4b73a4b25d37a763e31a2241b
 SHA512 
5b45d0f2f8af5cf095aff35f8e6a74bbbfd153b6e4596510eade671507d77476544e3a012087b4d4432c0399601f29a49cdf8b34249438f440031c8d027d1cd3
+DIST dovecot-2.3.18.tar.gz 7763230 BLAKE2B 
ff3e0c2cad87d2e2632345a25825eebd0a6c1520376d85286453bde7505f22410d03911cd588a0d102b75f22cc1de051b01c43a57c90138340186e8cb024247a
 SHA512 
b5eccf790a3960614876f122efb6296fe49ab7c523b08c10347fd4d10ed293fbd327279511c227b420f7c0786975186157eaa0fb5cd3aab1f3be9a4c5c3ad233

diff --git a/net-mail/dovecot/dovecot-2.3.18.ebuild 
b/net-mail/dovecot/dovecot-2.3.18.ebuild
new file mode 100644
index 000000000000..6f392a3d5527
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.18.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 lua5-3 )
+# do not add a ssl USE flag.  ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.5.18"
+if [[ ${PV} == *_rc* ]]; then
+       rc_dir="rc/"
+else
+       rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+       sieve? (
+       
https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+       )
+       managesieve? (
+       
https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+       ) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="https://www.dovecot.org/";
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
+IUSE_DOVECOT_COMPRESS="lz4 zstd"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc
+       selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="
+       app-arch/bzip2
+       app-arch/xz-utils
+       dev-libs/icu:=
+       dev-libs/openssl:0=
+       sys-libs/zlib:=
+       virtual/libiconv
+       argon2? ( dev-libs/libsodium:= )
+       caps? ( sys-libs/libcap )
+       kerberos? ( virtual/krb5 )
+       ldap? ( net-nds/openldap )
+       lua? ( ${LUA_DEPS} )
+       lucene? ( >=dev-cpp/clucene-2.3 )
+       lz4? ( app-arch/lz4 )
+       mysql? ( dev-db/mysql-connector-c:0= )
+       pam? ( sys-libs/pam:= )
+       postgres? ( dev-db/postgresql:* !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:* )
+       stemmer? ( dev-libs/snowball-stemmer:= )
+       suid? ( acct-group/mail )
+       systemd? ( sys-apps/systemd:= )
+       tcpd? ( sys-apps/tcp-wrappers )
+       textcat? ( app-text/libexttextcat )
+       unwind? ( sys-libs/libunwind:= )
+       zstd? ( app-arch/zstd:= )
+       virtual/libcrypt:=
+       "
+
+RDEPEND="
+       ${DEPEND}
+       acct-group/dovecot
+       acct-group/dovenull
+       acct-user/dovecot
+       acct-user/dovenull
+       net-mail/mailbase
+       "
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+       "${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch
+       "${FILESDIR}/${PN}"-socket-name-too-long.patch
+)
+
+pkg_setup() {
+       use lua && lua-single_pkg_setup
+       if use managesieve && ! use sieve; then
+               ewarn "managesieve USE flag selected but sieve USE flag 
unselected"
+               ewarn "sieve USE flag will be turned on"
+       fi
+}
+
+src_prepare() {
+       default
+       # bug 657108
+       #elibtoolize
+       eautoreconf
+
+       # Bug #727244
+       append-cflags -fasynchronous-unwind-tables
+}
+
+src_configure() {
+       local conf=""
+
+       if use postgres || use mysql || use sqlite; then
+               conf="${conf} --with-sql"
+       fi
+
+       # turn valgrind tests off. Bug #340791
+       VALGRIND=no \
+       LUAPC="${ELUA}" \
+       systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+       econf \
+               --with-rundir="${EPREFIX}/run/dovecot" \
+               --with-statedir="${EPREFIX}/var/lib/dovecot" \
+               --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+               --disable-rpath \
+               --with-bzlib \
+               --without-libbsd \
+               --with-lzma \
+               --with-icu \
+               --with-ssl \
+               --with-zlib \
+               $( use_with argon2 sodium ) \
+               $( use_with caps libcap ) \
+               $( use_with kerberos gssapi ) \
+               $( use_with lua ) \
+               $( use_with ldap ) \
+               $( use_with lucene ) \
+               $( use_with lz4 ) \
+               $( use_with mysql ) \
+               $( use_with pam ) \
+               $( use_with postgres pgsql ) \
+               $( use_with sqlite ) \
+               $( use_with solr ) \
+               $( use_with stemmer ) \
+               $( use_with systemd ) \
+               $( use_with tcpd libwrap ) \
+               $( use_with textcat ) \
+               $( use_with unwind libunwind ) \
+               $( use_with zstd ) \
+               $( use_enable static-libs static ) \
+               ${conf}
+
+       if use sieve || use managesieve; then
+               # The sieve plugin needs this file to be build to determine the 
plugin
+               # directory and the list of libraries to link to.
+               emake dovecot-config
+               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
+               econf \
+                       $( use_enable static-libs static ) \
+                       --localstatedir="${EPREFIX}/var" \
+                       --enable-shared \
+                       --with-dovecot="${S}" \
+                       $( use_with ldap ) \
+                       $( use_with managesieve )
+       fi
+}
+
+src_compile() {
+       default
+       if use sieve || use managesieve; then
+               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
+               emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+       fi
+}
+
+src_test() {
+       default
+       if use sieve || use managesieve; then
+               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
+               default
+       fi
+}
+
+src_install() {
+       default
+
+       # insecure:
+       # use suid && fperms u+s /usr/libexec/dovecot/deliver
+       # better:
+       if use suid; then
+               einfo "Changing perms to allow deliver to be suided"
+               fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
+               fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
+       fi
+
+       newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
+
+       rm -rf "${ED}"/usr/share/doc/dovecot
+
+       dodoc AUTHORS NEWS README TODO
+       dodoc doc/*.{txt,cnf,xml,sh}
+       docinto example-config
+       dodoc doc/example-config/*.{conf,ext}
+       docinto example-config/conf.d
+       dodoc doc/example-config/conf.d/*.{conf,ext}
+       docinto wiki
+       dodoc doc/wiki/*
+       doman doc/man/*.{1,7}
+
+       # Create the dovecot.conf file from the dovecot-example.conf file that
+       # the dovecot folks nicely left for us....
+       local conf="${ED}/etc/dovecot/dovecot.conf"
+       local confd="${ED}/etc/dovecot/conf.d"
+
+       insinto /etc/dovecot
+       doins doc/example-config/*.{conf,ext}
+       insinto /etc/dovecot/conf.d
+       doins doc/example-config/conf.d/*.{conf,ext}
+       fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
+       rm -f "${confd}/../README"
+
+       # .maildir is the Gentoo default
+       local mail_location="maildir:~/.maildir"
+       sed -i -e \
+               "s|#mail_location =|mail_location = ${mail_location}|" \
+               "${confd}/10-mail.conf" \
+               || die "failed to update mail location settings in 10-mail.conf"
+
+       # We're using pam files (imap and pop3) provided by mailbase
+       if use pam; then
+               sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = 
"\*"|' \
+                       "${confd}/auth-system.conf.ext" \
+                       || die "failed to update PAM settings in 
auth-system.conf.ext"
+               # mailbase does not provide a sieve pam file
+               use managesieve && dosym imap /etc/pam.d/sieve
+               sed -i -e \
+                       's/#!include auth-system.conf.ext/!include 
auth-system.conf.ext/' \
+                       "${confd}/10-auth.conf" \
+                       || die "failed to update PAM settings in 10-auth.conf"
+       fi
+
+       # Disable ipv6 if necessary
+       if ! use ipv6; then
+               sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+                       || die "failed to update listen settings in 
dovecot.conf"
+       fi
+
+       # Update ssl cert locations
+       sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+               || die "ssl conf failed"
+       sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+               -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+               "${confd}/10-ssl.conf" || die "failed to update SSL settings in 
10-ssl.conf"
+
+       # Install SQL configuration
+       if use mysql || use postgres; then
+               sed -i -e \
+                       's/#!include auth-sql.conf.ext/!include 
auth-sql.conf.ext/' \
+                       "${confd}/10-auth.conf" || die "failed to update SQL 
settings in \
+                       10-auth.conf"
+       fi
+
+       # Install LDAP configuration
+       if use ldap; then
+               sed -i -e \
+                       's/#!include auth-ldap.conf.ext/!include 
auth-ldap.conf.ext/' \
+                       "${confd}/10-auth.conf" \
+                       || die "failed to update ldap settings in 10-auth.conf"
+       fi
+
+       if use sieve || use managesieve; then
+               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
+               emake DESTDIR="${ED}" install
+               sed -i -e \
+                       's/^[[:space:]]*#mail_plugins = 
$mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+                       || die "failed to update sieve settings in 15-lda.conf"
+               rm -rf "${ED}"/usr/share/doc/dovecot
+               docinto example-config/conf.d
+               dodoc doc/example-config/conf.d/*.conf
+               insinto /etc/dovecot/conf.d
+               doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+               use managesieve && doins 
doc/example-config/conf.d/20-managesieve.conf
+               docinto sieve/rfc
+               dodoc doc/rfc/*.txt
+               docinto sieve/devel
+               dodoc doc/devel/DESIGN
+               docinto plugins
+               dodoc doc/plugins/*.txt
+               docinto extensions
+               dodoc doc/extensions/*.txt
+               docinto locations
+               dodoc doc/locations/*.txt
+               doman doc/man/*.{1,7}
+       fi
+
+       use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+       # Let's not make a new certificate if we already have one
+       if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+               -e "${ROOT}"/etc/ssl/dovecot/server.key ]];     then
+               einfo "Creating SSL     certificate"
+               SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+               install_cert /etc/ssl/dovecot/server
+       fi
+
+       elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ 
for upgrade notes."
+}

Reply via email to