From 1173ad5704ce725916e0c332416aff326d850d06 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 29 Mar 2018 16:53:27 +0100 Subject: gentoo resync : 29.03.2018 --- net-mail/dovecot/Manifest | 19 +- net-mail/dovecot/dovecot-2.2.19.ebuild | 2 +- net-mail/dovecot/dovecot-2.2.33.2-r1.ebuild | 291 -------------------- net-mail/dovecot/dovecot-2.2.33.2-r2.ebuild | 292 --------------------- net-mail/dovecot/dovecot-2.2.33.2.ebuild | 290 -------------------- net-mail/dovecot/dovecot-2.3.0-r1.ebuild | 284 -------------------- net-mail/dovecot/dovecot-2.3.0-r2.ebuild | 286 -------------------- net-mail/dovecot/dovecot-2.3.0-r3.ebuild | 289 -------------------- net-mail/dovecot/dovecot-2.3.0.1.ebuild | 2 +- net-mail/dovecot/dovecot-2.3.0.ebuild | 284 -------------------- net-mail/dovecot/dovecot-2.3.1.ebuild | 284 ++++++++++++++++++++ .../dovecot-2.2.33.2-CVE-2017-15132-fixup.patch | 37 --- .../files/dovecot-2.2.33.2-CVE-2017-15132.patch | 14 - 13 files changed, 291 insertions(+), 2083 deletions(-) delete mode 100644 net-mail/dovecot/dovecot-2.2.33.2-r1.ebuild delete mode 100644 net-mail/dovecot/dovecot-2.2.33.2-r2.ebuild delete mode 100644 net-mail/dovecot/dovecot-2.2.33.2.ebuild delete mode 100644 net-mail/dovecot/dovecot-2.3.0-r1.ebuild delete mode 100644 net-mail/dovecot/dovecot-2.3.0-r2.ebuild delete mode 100644 net-mail/dovecot/dovecot-2.3.0-r3.ebuild delete mode 100644 net-mail/dovecot/dovecot-2.3.0.ebuild create mode 100644 net-mail/dovecot/dovecot-2.3.1.ebuild delete mode 100644 net-mail/dovecot/files/dovecot-2.2.33.2-CVE-2017-15132-fixup.patch delete mode 100644 net-mail/dovecot/files/dovecot-2.2.33.2-CVE-2017-15132.patch (limited to 'net-mail/dovecot') diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index b56e9d8f7a78..571ba738a9c8 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -1,6 +1,4 @@ AUX dovecot-10-ssl.patch 550 BLAKE2B 5317b802113e6dd711056684bb2de8167113c95ea28ea805fd3a1f688878505d02d85bd9ab69fc222cb2debdc1b5186f48f3c2cbea2f1df24714482939284f46 SHA512 7acc31dd4a3f51a9c13d590fd2803c2cb98c281e0595ca2a800539a143f89b95f923a3678beb0aa2b254a54385522329e0f3e1e8ba4c5852e7b51f8f111122a9 -AUX dovecot-2.2.33.2-CVE-2017-15132-fixup.patch 1471 BLAKE2B 516173162d4d43d8e9dd6db958a040e03ad20558f6e902a0264d181dd1f6cad5774de0d054b86035a10787916f19df3c97429a0701e6b3340ef0ca7e1c39917e SHA512 5a7ea9df6b7879f57d2c9a3538bfcef5c08f3ac19dbb01862b3e4822eef89f6fc2ac9e91b2dee9885b961d21b9f2f2004173bea2e0aa53e3de3fbe0fbbeff9a6 -AUX dovecot-2.2.33.2-CVE-2017-15132.patch 582 BLAKE2B fdc4cf138c3c943ed34b520a3935fc3d941063fdd64c4dd50a1d03f9374e79062a14b35b9894bd8744e640377c493fc0641c451a0da695a52f893386cbb3a443 SHA512 be433223e55859199c5dd651286a634fec03b7efcb0221297139154383dc71c30a75fa8484ae338babc8ec2f9a1a4cf0aeebc53cf1d7286272a663068537ccfd AUX dovecot.init-r4 1499 BLAKE2B 9c05fd7da0409b0944b0204bdcd683ab889190effc8cb7b072dcab140f52e2f39336a344deb74b63ef184152604412ca4c2b3d79c3d63341386e7952c54b0a26 SHA512 8fbc80bc0efa6b83685da19b6a5c2a2d2ca7e59be7f1f7352984fe30004175330e53f3db1c4c2471f1d7d5e088bef0b4dced97d29d32be8b50d000987b6eeb09 DIST dovecot-2.2-pigeonhole-0.4.18.tar.gz 1742357 BLAKE2B 8f9fc54e6effb233f7e8543a560b474dd4cd028d0a7bd1cc02e45c879bc2e7d636c2543e8aed3bd8e0b49b260703590be44fd1032ba3e1f4eb87a8e6f8ecf396 SHA512 6f49a6a6435b0e4dcbe29f852ce17c016df2f367f5460301a2a2c6bd5f5ba6260b23bfe1c5e78b91c6041554ee67d1ce14ad3adf219505f692c61681d9e70cc4 DIST dovecot-2.2-pigeonhole-0.4.20.tar.gz 1745121 BLAKE2B 4a320d7340f3a7fbb92f911c16abb49561692310c7c9224842065b9830f057e442e6ae27010232d615a06f6fdd889ef8619c555516e2d843802297644b935a27 SHA512 84a28842be206e05cb96c07cf1c1b62c9c378ba4c952caa47cf79a44b9428e076f4182eadd9c4fb8f45d3605b881f91e8e520c41705017ac4039240d4bcace39 @@ -10,24 +8,17 @@ DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 BLAKE2B 7e6f11bf74d56887b640ab5 DIST dovecot-2.2.19.tar.gz 5256627 BLAKE2B 0b7fe57ced1b1f7eb5e29e8d6723d237cc107752286995d8e5f6857f24b45ab40c4a38b03935b228e8530c3b254509124a7b6ce4e0a8a9be0ea87f0c529db935 SHA512 1b9d605a6a5862ade9d1ca634a9e0171b7c212ab025fc2059051c3795470685b66516fa9fbe5ad91d84388268ea15795f2dcd70ffdf81736ce4d80fd284835e9 DIST dovecot-2.2.29.1.tar.gz 5972119 BLAKE2B 9b05e9976369757de07471c2e499a863efbd94b51d8aefdeb2144c01596f03f9ea02670ee9cac9590615e4139dc754c11eb4777d791f87a2e6031302155d9f05 SHA512 1e5ea6080ebe7dd4afe6fcfe8e98ed6d2ad2735655a18cc96e439dd044ccc3a1a6a80428bc746b4d6250820895d6a62121562e97e4b46c8b1cf88a19443bc111 DIST dovecot-2.2.32.tar.gz 6100268 BLAKE2B e7d79f81fe06565d254c46de5cd7f4565883a029f4fa409d9f3c6ff75d599fb3f1ce5f8a32b96b9bebe4654de2be4998d0e178f1784e00d246186727324c6e80 SHA512 a26ce763fdea7d72ff9801d3b7d57a1f0d00278e4a1aa60d1be070fe5a6d2c6a15f266a519119492bee7a3e7a6b7d0732e9879e5c5841adbab8c0952cd1b7c7c -DIST dovecot-2.2.33.2.tar.gz 6131086 BLAKE2B 5bfa9f52e7263e778b717d52f540682574e4bbcb04fc003e78b9ce94562d092f1c5360f835ee8cea912afbed7351be9f06dd321df3f7893d27544ede00c682ca SHA512 028910a4d02b1630f1ada4d1c45fcc3ea2057969db7078a78d46e2a578b4dceaf8be0ac8de4a613b4890019e721871f2d366ec651db658da4cc72977d3e09931 DIST dovecot-2.2.34.tar.gz 6181270 BLAKE2B dfdb1e6812574e79595202e830167400569adf61155aa5ddaae443e798c4a05ccec2acd2975e00e9e7ffc63ee1dcf7e4e2a9288b1e6e1e1427d1e89790a8fa13 SHA512 9f08a7116a08a08495aa0e7b4cb6b11a924ea61006970487946e338bc79bba7fd7619c345cbf278a74de285d548af04fc66eaaee508185b8b9d7335cf5612055 DIST dovecot-2.2.35.tar.gz 6185237 BLAKE2B 7ad08816553683126c4c8d494770730c49c2912a5437ba6dcb21e418d636c0d03280425e8a55b420a4500ebcf459da8be11deffccefdbc60811393e2044a4e4d SHA512 002ceea7f17018bcd438edda5a36a782606f291264ef63cebb8b4f72b094e812bf5553686c9e1e0d8c1354af54c1174f3670d1b1fc498ec4cddb3f731bf00c56 DIST dovecot-2.3-pigeonhole-0.5.0.1.tar.gz 1783039 BLAKE2B 8452c11d1c5f26d2ee9a0c54a2c30642bce5117f1ad140db8a8509a2bcc03236361a99c6f622267279eb75c19c68de7d96947557b595c345db34e34a135b492c SHA512 60016145caa444eeba13b49735f87ab2ebe7f178f104ad57283b5aa7e5119920d9f579032b775547e0866e86045a4ab653fd084068187d0cbe2e088cc15fc288 -DIST dovecot-2.3-pigeonhole-0.5.0.tar.gz 1782375 BLAKE2B ecbf20ec3a12d72d6040d4d4fffc63e44dd80c28d3b5ad62a97bfefffc0d3063114cd46cacfd1e24f1000829f28d457d3b68773cdecf151ef20e5e0ccb899c3b SHA512 c338a94ff5db1cc34cac10da2854cd2905567addf5e40f36fe24958abeae1ae9900461f0aeda4f2133eecb2762005c0d6414a109538a1da7aabdd7a4a8eeb127 +DIST dovecot-2.3-pigeonhole-0.5.1.tar.gz 1792702 BLAKE2B 219bc6b3182e303b7f3784cca0fb7fcc9d9aae62e60cc490d7f0a94fa4f9b805933d9fd67c4927cd8f9c864c3b73e28bfde1866848960c71dc47d5e36196b748 SHA512 5d65c3c9f3131c4e82287d054bd8b963d7c56c3e0677d7384881cf109ca82080d6222f672d8f973447d98be823a4df5bf43760d4ba87b76447d13abab30130c4 DIST dovecot-2.3.0.1.tar.gz 6499984 BLAKE2B 4bfb38ba8bed154e58db03c53c0a6958632841fd66a118571c341be90f9d20a570a22699d4b8d117b72d4599fe074248c96cf4e7fc78ddd65c69662b4275cf97 SHA512 2b30c46c1660f425f6303a15cf638388439fd7a8065c91d28caf41d9a6403a4fccb530df3f69037a634bc3b0b9e498037da6b0b93c176f5e3b5808907d3f759d -DIST dovecot-2.3.0.tar.gz 6635541 BLAKE2B 3c76ccc0fac19511c9852aabd5d86c2fb815893b983b8bdf74a48c4c9040efe95fceff49189d6ed7eb4b1c2cbc47472630a367891950690feec68190d518a565 SHA512 8d8591e371ba2ebf8d3c1561af49b970d8351c4acdde8a97ff0ab403bf4cad6e4d96e9556c9be747a85085552449cab4c52bb41bda36e1a822594ec87661ce7f -EBUILD dovecot-2.2.19.ebuild 9089 BLAKE2B ee4b694fa7b2a86024f0e1ca16d947c627c1beb413205806b5bf916462e35c38b540c617766b1c5586871bb5c292df6c0d7f1c36afc699302e1dc219ad24cbb7 SHA512 c6384e08f23e3043d700daac5eb549476b1d65b0c4845161bec888e83bfc180c89be35ffc4eac6a003f63f70c00537403755ec53a506ce8f168727cf7880ab99 +DIST dovecot-2.3.1.tar.gz 6703089 BLAKE2B a9a021531241f86083cd5bf31f7b9211df77b2423ad213ca35904e23002121631e81a6419e3b07a838eb699faff615dcb35f3b95a1da537f74068b3c15795b35 SHA512 fe664ab771145f2390fef45839ff2756e36731c61e571dfa6975014f9cea43144e2aca0acf1a83b1dac55ad50042d0fa170b83570aa411228557861ada410b79 +EBUILD dovecot-2.2.19.ebuild 9072 BLAKE2B 27ccb93298e73d91e8402b6fa0666a35d0cc4c59ff5ea5a5b5a8c1e421b75bb29d6ded7d0a8ae3128a59ab39c88ca89dffc383bb85353e4236174397e119a8a5 SHA512 46683dd02f04b8c03a6261983e89ac0b3bf1b80ba05e7a574c0275f0699ab6c85a0f44cb4106b1d967a83f8f92aa4b8a74eced4054e7e14ee128a08ee118c3d4 EBUILD dovecot-2.2.29.1.ebuild 9215 BLAKE2B 4797bfb9f28d498d156d75e5837211ffba13f60da38990b55ef62960479af213a8a4eadb4de3b95a2d600089edccd3ec406cf97744d13918598020f18e756458 SHA512 e83a87950486c3f0b07b856b98430d99c42b42fb32fd796c1ef4ed192e05dc3d774429281e73a806855e809cec0e3ff1a7c6209de5d7608e01d17a29a3653bae EBUILD dovecot-2.2.32.ebuild 8655 BLAKE2B 9f500ad24385b63fe899c6c66e546d6e3f68f9059af9d7c10d406e3df75a4085a38ce19dfaaab7a7b1d022d07fef4bdcb033d1d20fed5752a5f864f0a0ff8a0e SHA512 f4ca664c39c32400528b5e01a8c0e58ef71d51f4ef52c827ec58b66bffd96281ddd91dad388be496ab78f887746f4c1ac9deb272ed108854e542ce5d4ae2348d -EBUILD dovecot-2.2.33.2-r1.ebuild 8714 BLAKE2B 0a7b8dda66982939f2c0ad11afbf1763fa58601343cc566e5ac747544a3ca34108c28a632e51b03c430602619c50423f3eadc287ef539d9fcc60b76308ff2fc8 SHA512 bea92573cd2c32e7d55340bf1e7208bbb1813d0d4b17db058d44dd1ca10b723abe5699f01cb0ccd8cca0b1d862b16b135d2e635efc9eaf196230bbe6d9a34715 -EBUILD dovecot-2.2.33.2-r2.ebuild 8779 BLAKE2B f88b2377e49c274e89a48c9c23fbb35e273d58a12f8c8aad042786e6bf3c91d705bc3fe12e346f07663256811167d4df1de989dea273d12f9ae0445e245882ae SHA512 b5a1cd24cd43e22c40a0ffc7a729c8434347311d3cc2d549962b19e6897b1c2133bf105e3c402d7b96ff55e9ab6d0c0b7a4783c0d1e1c03b4ca931d3184769ba -EBUILD dovecot-2.2.33.2.ebuild 8660 BLAKE2B 8beed06e576ce5594f91ca13447c84ead235075f6d12f87a9338a2e5632e5afac51d587404430284b573ec6fdcd376538c97d2d2dea794cc9fe782042161ee27 SHA512 053b31826af33a07e35ad11c7c13ec2144544005d9321ddeb8441fe18bdf9382ce9ab3654fe3db7f94e2c76301a363a485a17b7391cb56ff2779267fd2b3d664 EBUILD dovecot-2.2.34.ebuild 8655 BLAKE2B a62e6974d4c4509a8a6c0b9204680b4842131fdee081fdd9e16d32805fe0700da2505d08fba8975c1859e0ca29b450f5c1ca9d6d82529d35c84676dba2a03ecc SHA512 4184de09644d6b162f05bac3a528a72504bd44b1543eadffc5eec2c09e4eb756433f63551695d2eafb55147c2558600891927d9e14d83bdeeba74ad6567589c1 EBUILD dovecot-2.2.35.ebuild 8680 BLAKE2B ee3b5978fcda5ffe294bfa7dde81c6018a4023edaeb3d8fc74ce14edcc414ffeb41f87807cf1a25f4e07b2d563ca32e0a5fe57f565c3268455fcdee69205b74f SHA512 d65e27a65e31e9d1cbd4745c5bf46c73d0d4bd7e1d073f26490b4473ed9b4ea5b0cfaeefcf271cefe909b9a4d932d52f85b937e9a6de3430e9b20ed70c604933 -EBUILD dovecot-2.3.0-r1.ebuild 8685 BLAKE2B 8296cfaa7e412b2aa564974ada73992454c051645d43c56dda17beaa82973a60cdcbc358e1f5a032c1ae4065b7a2027139c113a7d0a4c8708cd66fbe045adacb SHA512 6953fa643b55f68bd218054a583f93896e5938c28130d6d79c568fb62d1c89f7d4a4a34e3bf893834ad54d617aa107a159a5ef310f4bb04be1d0609fdc74db6e -EBUILD dovecot-2.3.0-r2.ebuild 8748 BLAKE2B 25b7318d57283d51505243da55f5e4d3f1d93c98cebe7fc820bce2d9205369f5e00e663d2543149368db07c595f74c943882ea2de77de108229795779cc93d0f SHA512 21cc80f6f79a6fc6c593a724356c17d15efda167f8af5943f9bef3c3dd97b1493618cd100cc8fd33ebde8b357f653cfb410e6c12fb16d277257567f53e47d156 -EBUILD dovecot-2.3.0-r3.ebuild 8806 BLAKE2B 6df9cf96cd9997e8241aafa002969e161fb4069cfd1dcb17322aead6809299e10b3ed0b63432d23f2c346c4b43ac6612c1c6c3a42570b83de04539bc839e0a9d SHA512 965b36f1d7ea429fc3cf82ae7d95a50c156ca19347d5f922650b5eb028fd41dd30c0868987c211dc26d150e22588da8eedff45cc8484db2c11704b8f0ddc097f -EBUILD dovecot-2.3.0.1.ebuild 8672 BLAKE2B 677bdc5eaa099fd2fa0bf1959551cde379ab901e1055b20be783446756b51072c10053e1b8523cd8d70b7e3a1447f551fc953e1e95da768a83d2910f65157a03 SHA512 2ad2a123072ebe7a7bfc95302598b91cd5ddaac22b7139e838d74cf228e51285eed6735b64c98a64b7d9320e443cf9d6e271c37cdae4ce47a964e8d68b163a0d -EBUILD dovecot-2.3.0.ebuild 8683 BLAKE2B bbdc02688b1e65d63ae29443eec6e55e384abb06d5efec4d82dd46d8930ffb10ae3c6869a57879189889019b90137d09eec781d034b321f6d927bb7ce24b45a4 SHA512 a978815986be1adf82e0f1e84163ef7b20f536cf6fe1bc969407f756f9852e10594e98833cc2a10688e1ed5d65e0b4ca5b09d88e41de9f4b9221a38a0ea8998d +EBUILD dovecot-2.3.0.1.ebuild 8678 BLAKE2B 6ba17ac442f7d88698444bae891690e4fe840d0b3fb0ab17033639f3c38b9a7da3041fe8dfaf42dab6269519a23b0300773b89a9b5dd9129a89e02a25b9e3e6f SHA512 6f058b5793c9c1ffe2cd1894fb4f40508befd87a36a66c00d6f5d202e99b014a638ff873eb68ffd7ccf59ff3941cb27f2981a4658ce7b8402d3c24449ff1fcf5 +EBUILD dovecot-2.3.1.ebuild 8676 BLAKE2B ea98fd811bdfec3f54d867a82598c46b0853c370ee06df43aa033eb4ea272385b2783ae91a577856e3a975ffabb251ca2073789612b66259b1f0216a51297219 SHA512 aa2b5e14e32fa6392a193b987eef13dbdddd725b61aba22e45b4bc3e466086d55ebfda58bd2d8ed93dc55ec7823eccfd5de311955693e9a0c362a8723aac4a48 MISC metadata.xml 1374 BLAKE2B 629969318c5bcbdf0521d2293c6ead5e735ba5a113db3166e4df82103a3a84cbc62f3a2843082c9d5bdb635f25353ac7d3a4fcdf80d45e07b11b98754e744506 SHA512 16bdf15120dd8c957cd6e4957910acf21440dd0b8774cac9d9c5a48635cd46c7093850974b592ebbcd49085607fff2051691a42112f4ab9df44c51b9fea6d180 diff --git a/net-mail/dovecot/dovecot-2.2.19.ebuild b/net-mail/dovecot/dovecot-2.2.19.ebuild index 97989e04efa1..0ce65014c0c1 100644 --- a/net-mail/dovecot/dovecot-2.2.19.ebuild +++ b/net-mail/dovecot/dovecot-2.2.19.ebuild @@ -24,7 +24,7 @@ HOMEPAGE="https://www.dovecot.org/" SLOT="0" LICENSE="LGPL-2.1 MIT" -KEYWORDS="ia64 ~mips ~sh sparc" +KEYWORDS="~sh" IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail" IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox" diff --git a/net-mail/dovecot/dovecot-2.2.33.2-r1.ebuild b/net-mail/dovecot/dovecot-2.2.33.2-r1.ebuild deleted file mode 100644 index 219b6c0ea43d..000000000000 --- a/net-mail/dovecot/dovecot-2.2.33.2-r1.ebuild +++ /dev/null @@ -1,291 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit ssl-cert systemd user versionator - -MY_P="${P/_/.}" -major_minor="$(get_version_component_range 1-2)" -sieve_version="0.4.21" -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 +ssl 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? ( virtual/mysql ) - 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:* ) - ssl? ( - !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" - -# Dovecot does not support building without ssl. Force it for now -REQUIRED_USE="ssl" - -S=${WORKDIR}/${MY_P} - -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() { - eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch" - eapply "${FILESDIR}/${PN}-2.2.33.2-CVE-2017-15132.patch" - eapply_user -} - -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 \ - --localstatedir="${EPREFIX}/var" \ - --runstatedir="${EPREFIX}/run" \ - --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ - --without-stemmer \ - --disable-rpath \ - --with-icu \ - --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 ssl ) \ - $( 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="../${MY_P}" \ - $( 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-r4 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 - if use ssl; then - sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \ - || die "ssl conf failed" - sed -i -e 's:^ssl_cert =.*:ssl_cert = conn->client, request->id); - call_callback(request, AUTH_REQUEST_STATUS_ABORT, NULL, NULL); -+ /* remove the request */ -+ auth_server_connection_remove_request(request->conn, request->id); - pool_unref(&request->pool); - } - ---- a/src/lib-auth/auth-server-connection.c -+++ b/src/lib-auth/auth-server-connection.c -@@ -483,3 +483,10 @@ auth_server_connection_add_request(struct auth_server_connection *conn, - hash_table_insert(conn->requests, POINTER_CAST(id), request); - return id; - } -+ -+void auth_server_connection_remove_request(struct auth_server_connection *conn, -+ unsigned int id) -+{ -+ i_assert(conn->handshake_received); -+ hash_table_remove(conn->requests, POINTER_CAST(id)); -+} ---- a/src/lib-auth/auth-server-connection.h -+++ b/src/lib-auth/auth-server-connection.h -@@ -40,4 +40,6 @@ void auth_server_connection_disconnect(struct auth_server_connection *conn, - unsigned int - auth_server_connection_add_request(struct auth_server_connection *conn, - struct auth_client_request *request); -+void auth_server_connection_remove_request(struct auth_server_connection *conn, -+ unsigned int id); - #endif diff --git a/net-mail/dovecot/files/dovecot-2.2.33.2-CVE-2017-15132.patch b/net-mail/dovecot/files/dovecot-2.2.33.2-CVE-2017-15132.patch deleted file mode 100644 index 3f87e71b559a..000000000000 --- a/net-mail/dovecot/files/dovecot-2.2.33.2-CVE-2017-15132.patch +++ /dev/null @@ -1,14 +0,0 @@ -CVE-2017-15132: dovecot: auth client leaks memory if SASL authentication is aborted. - -https://github.com/dovecot/core/commit/1a29ed2f96da1be22fa5a4d96c7583aa81b8b060 - ---- a/src/lib-auth/auth-client-request.c -+++ b/src/lib-auth/auth-client-request.c -@@ -186,6 +186,7 @@ void auth_client_request_abort(struct auth_client_request **_request) - - auth_client_send_cancel(request->conn->client, request->id); - call_callback(request, AUTH_REQUEST_STATUS_ABORT, NULL, NULL); -+ pool_unref(&request->pool); - } - - unsigned int auth_client_request_get_id(struct auth_client_request *request) -- cgit v1.2.3