From d60cbaaa0a76ce52ffb67ee816a831e17bdc108e Mon Sep 17 00:00:00 2001 From: Eray Aslan Date: Thu, 29 Aug 2019 08:39:11 +0300 Subject: net-mail/dovecot: cleanup Package-Manager: Portage-2.3.73, Repoman-2.3.17 Signed-off-by: Eray Aslan --- net-mail/dovecot/Manifest | 2 - net-mail/dovecot/dovecot-2.2.36.3.ebuild | 287 -------------------- net-mail/dovecot/dovecot-2.3.6-r1.ebuild | 291 --------------------- .../files/dovecot-no-log-error-tcp_nodelay.patch | 31 --- 4 files changed, 611 deletions(-) delete mode 100644 net-mail/dovecot/dovecot-2.2.36.3.ebuild delete mode 100644 net-mail/dovecot/dovecot-2.3.6-r1.ebuild delete mode 100644 net-mail/dovecot/files/dovecot-no-log-error-tcp_nodelay.patch (limited to 'net-mail/dovecot') diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index 0a46bd2e5389..0c8c6cbed5c9 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -1,6 +1,4 @@ -DIST dovecot-2.2-pigeonhole-0.4.24.1.tar.gz 1810959 BLAKE2B f24b28dc7422ea4f379e372adf33ebbf7cbb146d55b01dbf40580767a14adf695b0a2726f591c0c34436bd93a8b48ee8a8c4307fffc6b082d9c028ce93e29a0a SHA512 99af8a1f4588d821c7000133c5c173ab05640d3411b826a0978db2d60c9a59d5b330ca2d38aa25aa1163f6d1b669dc97b8303e2bceda554f67d0029d5d0b34fd DIST dovecot-2.2-pigeonhole-0.4.24.2.tar.gz 1833284 BLAKE2B bee45fd129aee3d5126bd48b27829e7e266a5c1043411b6b23655bbf32e2f684763b82bff476a954bf7f0c7aae4e038c0892be70776726c7b324e409a8f89d78 SHA512 a51de88bcbac83ced7d314a560bd44f119dd80bf58f350da522501f072c0a4c02ff8c11152e2b858f14bb8ca9a9b665960cbe37a0c8ef4600b430e65ddbf3bf4 -DIST dovecot-2.2.36.3.tar.gz 6270735 BLAKE2B 90bd6f7cd3769040215f574bb368c1ad835041fff54273e2477be2d2e057c1700472b08a24ed3a7cad469bd39449d94986bc6801373bb97a63975ddbb54cefa5 SHA512 47611dbde7ee854ad323dcdb726757c7172376761fa774f28fce3f9d74ed590319d812f0555abed5f8178c326c3cb7661ac0b708ca5982914e255cec60f72e35 DIST dovecot-2.2.36.4.tar.gz 6257899 BLAKE2B 3260e96f369e85f2dfd5ece0d9b12902c7192d057369e8a151cc6ab7b4f2033d4e1029fb862d412f2837fd384d7fe729cf1ab15cac9ac335e943bb1fdb532b51 SHA512 e33ab2f6c5f7b4ffca3d57580329f1df8e1655c755a1a6b575a4e49d57ea94d1ab67df2419033c9d68acf5959c6edfa596815dc2bc43798e9aef3d17d271cc4d DIST dovecot-2.3-pigeonhole-0.5.6.tar.gz 1854287 BLAKE2B a26edf2a298d8c3de0d9977d56583bd2e0933495c5f554871a38d7b9e31701ebf3587d221c5ec398721a9c34816918c41b069de39c13f879334f9776fede1a17 SHA512 998a046d2eb5ff7bba615fd1a3efdfb1e7e1dabf191257f7fa2882074acc1735a0a4c11c5f31bab1e964b0118f1a8e9e51b3d5529b8fff6d1312c9a8257d9c20 DIST dovecot-2.3-pigeonhole-0.5.7.1.tar.gz 1857291 BLAKE2B 09763c87099ac50fbe86870855b100379a9b2a72d6077438bbf1f76ff3aed162ad781be27e6587a9742819137f6636f142a220f3b46d3c46115b10cbf4cb2efc SHA512 121eac4ad8bc1ddc55c554d00338bb553590b6aedffcb11e34f6cba102d59bd34580cb7218bd5fe820038c004d12db73f7a27ca135c3d4a12c4449bae3216355 diff --git a/net-mail/dovecot/dovecot-2.2.36.3.ebuild b/net-mail/dovecot/dovecot-2.2.36.3.ebuild deleted file mode 100644 index 9e06b4534ad0..000000000000 --- a/net-mail/dovecot/dovecot-2.2.36.3.ebuild +++ /dev/null @@ -1,287 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# do not add a ssl USE flag. ssl is mandatory -SSL_DEPS_SKIP=1 -inherit autotools eapi7-ver ssl-cert systemd user versionator - -MY_P="${P/_/.}" -major_minor="$(ver_cut 1-2)" -sieve_version="0.4.24.1" -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}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz - ) - managesieve? ( - https://pigeonhole.dovecot.org/releases/${major_minor}/${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 ~ppc ~ppc64 ~s390 ~sparc ~x86" - -IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail" -IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib" -IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat" - -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" - -DEPEND="bzip2? ( app-arch/bzip2 ) - caps? ( sys-libs/libcap ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - lucene? ( >=dev-cpp/clucene-2.3 ) - lzma? ( app-arch/xz-utils ) - lz4? ( app-arch/lz4 ) - mysql? ( dev-db/mysql-connector-c:0= ) - pam? ( virtual/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 ) - tcpd? ( sys-apps/tcp-wrappers ) - textcat? ( app-text/libexttextcat ) - vpopmail? ( net-mail/vpopmail ) - zlib? ( sys-libs/zlib ) - virtual/libiconv - dev-libs/icu:=" - -RDEPEND="${DEPEND} - net-mail/mailbase" - -PATCHES=( - "${FILESDIR}/${PN}-userdb-passwd-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 - # default internal user - enewgroup dovecot 97 - enewuser dovecot 97 -1 /dev/null dovecot - # default login user - enewuser dovenull -1 -1 /dev/null - # add "mail" group for suid'ing. Better security isolation. - if use suid; then - enewgroup mail - fi -} - -src_prepare() { - default - # bug 657108 - elibtoolize -} - -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-statedir="${EPREFIX}/var/lib/dovecot" \ - --with-rundir="${EPREFIX}/run/dovecot" \ - --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ - --without-stemmer \ - --disable-rpath \ - --with-icu \ - --with-ssl \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - $( use_with bzip2 bzlib ) \ - $( use_with caps libcap ) \ - $( use_with kerberos gssapi ) \ - $( 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 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 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda" - fperms 4750 "${EPREFIX}/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 "${EPREFIX}"/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 = fd, TRUE) < 0) { -- if (errno != ENOTSUP && errno != ENOTSOCK && -- errno != ENOPROTOOPT) { -- i_error("file_ostream.net_set_tcp_nodelay(%s, TRUE) failed: %m", -- o_stream_get_name(&fstream->ostream.ostream)); -- } -+ /* Don't bother logging errors. There are quite a lot of -+ different errors that need to be ignored, and it differs -+ between OSes. At least: -+ Linux: ENOTSUP, ENOTSOCK, ENOPROTOOPT -+ FreeBSD: EINVAL, ECONNRESET */ - fstream->no_socket_nodelay = TRUE; - } else if (net_set_tcp_nodelay(fstream->fd, FALSE) < 0) { -- /* We already successfully enabled TCP_NODELAY, so we're really -- not expecting any errors here. */ -- i_error("file_ostream.net_set_tcp_nodelay(%s, FALSE) failed: %m", -- o_stream_get_name(&fstream->ostream.ostream)); -+ /* We already successfully enabled TCP_NODELAY, so there -+ shouldn't really be errors. Except ECONNRESET can possibly -+ still happen between these two calls, so again don't log -+ errors. */ - fstream->no_socket_nodelay = TRUE; - } - } -- cgit v1.2.3-65-gdbad