diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
commit | b7ebc951da8800f711142f69d9d958bde67a112d (patch) | |
tree | e318514216845acb8f2e49fff7a5cba4027e9d91 /net-mail/dovecot | |
parent | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff) |
gentoo resync : 28.04.2019
Diffstat (limited to 'net-mail/dovecot')
-rw-r--r-- | net-mail/dovecot/Manifest | 37 | ||||
-rw-r--r-- | net-mail/dovecot/dovecot-2.2.19.ebuild | 305 | ||||
-rw-r--r-- | net-mail/dovecot/dovecot-2.2.34.ebuild | 290 | ||||
-rw-r--r-- | net-mail/dovecot/dovecot-2.2.36.3.ebuild (renamed from net-mail/dovecot/dovecot-2.3.4.1.ebuild) | 36 | ||||
-rw-r--r-- | net-mail/dovecot/dovecot-2.2.36.ebuild | 290 | ||||
-rw-r--r-- | net-mail/dovecot/dovecot-2.3.2.1.ebuild | 291 | ||||
-rw-r--r-- | net-mail/dovecot/dovecot-2.3.3-r1.ebuild | 294 | ||||
-rw-r--r-- | net-mail/dovecot/dovecot-2.3.3.ebuild | 291 | ||||
-rw-r--r-- | net-mail/dovecot/dovecot-2.3.4.ebuild | 293 | ||||
-rw-r--r-- | net-mail/dovecot/dovecot-2.3.5.1.ebuild | 2 | ||||
-rw-r--r-- | net-mail/dovecot/dovecot-2.3.5.2.ebuild (renamed from net-mail/dovecot/dovecot-2.3.5.ebuild) | 10 | ||||
-rw-r--r-- | net-mail/dovecot/files/dovecot-10-ssl.patch | 15 | ||||
-rw-r--r-- | net-mail/dovecot/files/dovecot-glibc226.patch | 84 | ||||
-rw-r--r-- | net-mail/dovecot/files/dovecot-glibc228.patch | 44 | ||||
-rw-r--r-- | net-mail/dovecot/files/dovecot.init-r4 | 57 | ||||
-rw-r--r-- | net-mail/dovecot/files/dovecot.init-r5 | 57 | ||||
-rw-r--r-- | net-mail/dovecot/metadata.xml | 5 |
17 files changed, 28 insertions, 2373 deletions
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index 86c01f16a5c0..6d9cdf1ac555 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -1,34 +1,11 @@ -AUX dovecot-10-ssl.patch 550 BLAKE2B 5317b802113e6dd711056684bb2de8167113c95ea28ea805fd3a1f688878505d02d85bd9ab69fc222cb2debdc1b5186f48f3c2cbea2f1df24714482939284f46 SHA512 7acc31dd4a3f51a9c13d590fd2803c2cb98c281e0595ca2a800539a143f89b95f923a3678beb0aa2b254a54385522329e0f3e1e8ba4c5852e7b51f8f111122a9 -AUX dovecot-glibc226.patch 2838 BLAKE2B 522fd7552faf88cba7c48f5074d264ca4450d1f72113eba9a7cf23317402b76a53874998bc0eb6cadb4580935dca061314b7c6bd355a6ce618c43465a7c8c5d2 SHA512 5ed7a19941cec35a8edace588bedac7d6d12903bf5ece2a224a61f021ae663352dd668c81cebe2c9b132fd0614998c77f1d19de2f48b2d3794c453b9ae333693 -AUX dovecot-glibc228.patch 1375 BLAKE2B 737b631f7171f265d8d549fe549785bf381de8d954b79193b0405d9ecde27078df77fa56be062c8160f803bc8e3806f6b4763e31a9b1642d00e14a6ad9c6c22b SHA512 1d49c173115dbf76936a2071918249a4909833a8f2fe852f0e1257e58d4b938894abf62d9f305f7008f2d180b827a7e8313f24375116369f6ed644e26fff4de8 AUX dovecot-userdb-passwd-fix.patch 500 BLAKE2B 133e7b13cf3dd1515db5694945abd2d00ecd89c4a766ea873099ebbdd450700e70b80696ba58b21cc4f7160fa3becde6453c9334d41cdad426e3f59bd9e5491e SHA512 18a26eed0c793b0ccee828dc5eafc6448dda94d705597b19c3333f21944e838b677af2884f5fb65eb2f6dc79158ad8b3143b24d3788d841038de6dd24885fc0d -AUX dovecot.init-r4 1499 BLAKE2B 9c05fd7da0409b0944b0204bdcd683ab889190effc8cb7b072dcab140f52e2f39336a344deb74b63ef184152604412ca4c2b3d79c3d63341386e7952c54b0a26 SHA512 8fbc80bc0efa6b83685da19b6a5c2a2d2ca7e59be7f1f7352984fe30004175330e53f3db1c4c2471f1d7d5e088bef0b4dced97d29d32be8b50d000987b6eeb09 -AUX dovecot.init-r5 1461 BLAKE2B 9ac7c6503f1e97c25e69d3be3e105d66fa16a63896adbf8042a0752204cff84a7f123b8706df6683f4c1bb019b02282642765c911f65c5427cc07fd824509a67 SHA512 7a092a92346854a4bfb8bd4a0b935e2a1c3fb3fd27be000b72e8963b435095ee6ae71e582927c9dac8efd842a1814a38d27ce3df04a8a9e5579a7345d9bac9b0 AUX dovecot.init-r6 1573 BLAKE2B 7565a20d0677d6e380756627360e65703cd6a29982cb7e1c1d6ae51fe99ec33c00c1f04c471bb5741321369b8c0e4767eb69a83b9d38e2789bb3d7a79630ea04 SHA512 488a1213514f066fdc7b97e69a1a8336eb4c83054d138d94a63bc733a2163d0b316a6485bf1dde6c4caae92c7dc8d9bd58a4c723b6c0e81d4b130ebd91875baa -DIST dovecot-2.2-pigeonhole-0.4.21.tar.gz 1774887 BLAKE2B ebf2601e7b087d655713f985b72442496e36543ec32881d3bc84d2c6b132f58082aee6c5fae3747f756b72a3c9a2e11f78350bc34c398214de13dfc83cffdef1 SHA512 4751f449ede1b05173c706b414ebf9f7f670ff78589ce6f0b687c32c9abe6dae8b3064ed1b20e893d9ec0147b0139ce479e1d74ebe94747c33f2d8ca177912de -DIST dovecot-2.2-pigeonhole-0.4.24.tar.gz 1808131 BLAKE2B e8a19b5c3b4876e71556e52ba6a984f6ed0abe93a222f692303fd41cd7a1e6e4e8fd0e5ab0821e9e179b595694752813689a07b428b2590582c3ca7dbb99a08f SHA512 2e21c95ece475ffcb78e5b5d4efa29e61471faf90b80b44a49963fb287de2784ebfb4c2b7ddfc66732fd073e9f02995d5950840336f6babe618b3d7d5166059f -DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 BLAKE2B 7e6f11bf74d56887b640ab5ebffd6e2ad7878d47da808f81b2f21ab4de02495f6ca79453ab5867568afee7f2d9a0915601ceccf5c6a9581d38994c4d35f692e7 SHA512 9e7a18b43d59ed955b142d16696ca221822a547ea59ac70c1bb374eedb28b6ed99ea49f34ead1f9a16ded4573605e410a5cc8e038e1bdf5f943a65588b5d3af2 -DIST dovecot-2.2.19.tar.gz 5256627 BLAKE2B 0b7fe57ced1b1f7eb5e29e8d6723d237cc107752286995d8e5f6857f24b45ab40c4a38b03935b228e8530c3b254509124a7b6ce4e0a8a9be0ea87f0c529db935 SHA512 1b9d605a6a5862ade9d1ca634a9e0171b7c212ab025fc2059051c3795470685b66516fa9fbe5ad91d84388268ea15795f2dcd70ffdf81736ce4d80fd284835e9 -DIST dovecot-2.2.34.tar.gz 6181270 BLAKE2B dfdb1e6812574e79595202e830167400569adf61155aa5ddaae443e798c4a05ccec2acd2975e00e9e7ffc63ee1dcf7e4e2a9288b1e6e1e1427d1e89790a8fa13 SHA512 9f08a7116a08a08495aa0e7b4cb6b11a924ea61006970487946e338bc79bba7fd7619c345cbf278a74de285d548af04fc66eaaee508185b8b9d7335cf5612055 -DIST dovecot-2.2.36.tar.gz 6239707 BLAKE2B 702bb24265b5fefec9c484b3cca890fb1536ff94d1f2d6c99ee8c294ee4e38091eef5a727f0d4bd03700263286361f55747a22fa74def350710f9e49a4b10580 SHA512 327c50971e276f6013ca7f7bb59498ee88d76c9f8419bd18ee531cf10142214350fb81c6d64eaef73ee01765dd0fcf4142ab146ed67d9d7d86d5a58d41cf8db5 -DIST dovecot-2.3-pigeonhole-0.5.2.tar.gz 1814618 BLAKE2B b1187021673429bee1b45a1f657bea995e9881257919ff55bac63106d65963294ee2b3829167c6d50e351c4bc3c7e88a5ccfb757308d2500c5d4146246145074 SHA512 6bc24d9241f94db795a012346d9bc94b5cc7d7ce0175c03213c2b5d179d80dec95e9bdbd50bed628c8f9f7c51639e692ba5e429212a3b4a654c1e4764ac4f11c -DIST dovecot-2.3-pigeonhole-0.5.3.tar.gz 1827329 BLAKE2B 0d484906022217b1082233e6a3a20c17bafc68b90ce1c5c956c714d111ffb9ab49a3794e199695bb61a1f3ad6bd46e56e63ee3c140cb01eaa7589ef7bd754b19 SHA512 8403b1976a915836ba875b96825446d46e0d8c7ff245ed1f2b014347fdc78a81f9ed6dbd05bd3b4f1f7072edc5e9a302201cdb375de44436adcbb83919f203f5 -DIST dovecot-2.3-pigeonhole-0.5.4.tar.gz 1831570 BLAKE2B d3e7dea3cdcc2b44476401046f6bd6a110a026d523ada2a898b5c99f509cfe37771dcfd31990139f5f4c1c6b405a9f27359cfd27a6e95525515a3aabb71538f8 SHA512 9c82cce7540f8ab66e2e370e0220c99048d6ac53ed680cd763e0b03d0200e2451cee4303ef97b87a16e7248e1c73b92ba91b47a2a20c75cb2cd62695a28046f3 +DIST dovecot-2.2-pigeonhole-0.4.24.1.tar.gz 1810959 BLAKE2B f24b28dc7422ea4f379e372adf33ebbf7cbb146d55b01dbf40580767a14adf695b0a2726f591c0c34436bd93a8b48ee8a8c4307fffc6b082d9c028ce93e29a0a SHA512 99af8a1f4588d821c7000133c5c173ab05640d3411b826a0978db2d60c9a59d5b330ca2d38aa25aa1163f6d1b669dc97b8303e2bceda554f67d0029d5d0b34fd +DIST dovecot-2.2.36.3.tar.gz 6270735 BLAKE2B 90bd6f7cd3769040215f574bb368c1ad835041fff54273e2477be2d2e057c1700472b08a24ed3a7cad469bd39449d94986bc6801373bb97a63975ddbb54cefa5 SHA512 47611dbde7ee854ad323dcdb726757c7172376761fa774f28fce3f9d74ed590319d812f0555abed5f8178c326c3cb7661ac0b708ca5982914e255cec60f72e35 DIST dovecot-2.3-pigeonhole-0.5.5.tar.gz 1847487 BLAKE2B 9574388566778a4011ce6546021675ed9e07ba0d874dc4163e4cea10096f3bb8a434f198c3bb446b628ee18402afe94bd90b7123b3cf4d47e4095ddad12d9bfc SHA512 21519fc9b1152a947b64ce4251e1a4bdbe003b48233b1856a32696f9c1e29f730268c56eb38f9431bbfac345e6cd42e8c78c87d0702f39ebf20c6d326dcdbb94 -DIST dovecot-2.3.2.1.tar.gz 6797491 BLAKE2B 92b88fd0f0cb8ed6c418bf27c2e1fc4efe13f1ccfb4948ce5eed1a4e76a4e96f0d6770d9841026ec5a515310ebaa4b335063e3516de454db8ba06cc4ee5a00ec SHA512 c085a0d04925485423086736a3c7d919ad0ca9efeff005890382da5333edb68c7d23ccb89fbe2ac44f8f016fc993bf2c669e450794c3ab13463676cbb47c7bf7 -DIST dovecot-2.3.3.tar.gz 6851107 BLAKE2B 87d6e11c8ff59cfe0b49d3561c307535efb09296af617530a4d5a89b4fc12055d006d1b283a4de076f27d59deb64324b96f28620958ad85c38197710c5decdf7 SHA512 8666c4f92f7df883067540f85be9d03dbe6815b58a7f5de55b4292e986e9a2a1ef52c7e0c72dde2bc781fe40d57488b78a99b6b813745b8e4683f1a2fdc1f2ff -DIST dovecot-2.3.4.1.tar.gz 6925073 BLAKE2B d8143bad01c107b68525d0cfc110e5bf4e3ffa0af49e7cafdfef263374e146a7ef6ed7107a7c5216c4b52da3640d7a9a80931c01d125d3852fa265171e4d4e09 SHA512 ff21aa0f0cae17dfa66617291688856727412defa48bad2b6be057cb509fbec1c2e134afbfee69929d06b8692a0fcbd8451671ba02860e1673ae1c9483c2c17e -DIST dovecot-2.3.4.tar.gz 6924178 BLAKE2B 13e52a1b04036d58e68d762c9330dd5efedbf2421d658a8b657ca59e311b899a9b4a84fd754678ee67cd5b60f47b5a5ccd6a3fa08fafca7413c8b1e6ecd2fb51 SHA512 9e97eb08c319c417e8abcb430b3e6c87ed5aa820d6288656fdfd958ff34664f67202a66e4846763bfc85b309b116cea8012e49dab98b478c57974cc178a37a5a DIST dovecot-2.3.5.1.tar.gz 6953150 BLAKE2B 04484325e7b87f78c0aa6e3c769bc921e9dc62562cd8705b99166b7291b794f434b088dcf6512bc21c96d8937475cafa4d49c6ac611cb07f74a0d20e15e185c7 SHA512 e87754461fb0b065acd0ff10dc955000a2fe5baffed69efaf328ce9268f90140e9de444bc68e0bd48b565c7622885a79b1f90ff3dd2335c0c2362d05d9e73e8a -DIST dovecot-2.3.5.tar.gz 6970480 BLAKE2B 006f64ce87e3eff04f3df7689ba9caed0b6b4f83eef28ee8fc2bafcf4a90b0255bf3d0d5d6b32571de8eb339f720a4d7b6de7dd5e3bcf6d03ecc5d6fa679799c SHA512 10513c371aeadd52184daaf8dbb9a7559c6db55e34182bbb2c9539dae0897ddcc76f6fe2ce6a81c7ce0cb94c7f79438ae3bb0e7db8ed46615feb337b4078ecc6 -EBUILD dovecot-2.2.19.ebuild 9072 BLAKE2B 27ccb93298e73d91e8402b6fa0666a35d0cc4c59ff5ea5a5b5a8c1e421b75bb29d6ded7d0a8ae3128a59ab39c88ca89dffc383bb85353e4236174397e119a8a5 SHA512 46683dd02f04b8c03a6261983e89ac0b3bf1b80ba05e7a574c0275f0699ab6c85a0f44cb4106b1d967a83f8f92aa4b8a74eced4054e7e14ee128a08ee118c3d4 -EBUILD dovecot-2.2.34.ebuild 8652 BLAKE2B 473b843fa61c17b3ce4474175aca83e9b5c76641853475de27a87b4a84f8101a5dea4c22a6aac0eb21b253ba9dcc8e139eec3283629f2f672d350144f71d3fdd SHA512 0eed64f5d2841aa46c727ed75ba5ff7ac4da8b3bee056990d327e36a8e951e85b70822271dc30dbb3ba80b599dd5442c4ad5efe7cd00440795437ba7218b47dc -EBUILD dovecot-2.2.36.ebuild 8680 BLAKE2B 72a70c2452e8bfd0364abafe74c6adaf466ef8ff1b73fee0738e75584515ec934ea13b00db597fc69aa9a42f3b0857321efc426f02a828adad8a31165eabbd1e SHA512 186ff159dbee204d75df7acf04001aa7c10c11ce87a05e89aff4d010233b9da27b51f59b0eec4a0535d3f404fcf330c391eb0e843d1d6de4d1bb73a9ce7f8740 -EBUILD dovecot-2.3.2.1.ebuild 8781 BLAKE2B 8941937ad0e2351d3cbe5a0a0c9c213f4834dc521da6d3b4cdc89ae84c68de021675a9e5431bf397fd0e4bdc783ab4e9a5bc9f175670362bbef5e87be04f23b7 SHA512 1946fa62f751322c817c57eae7784ef9680a5a53da33785916fc3cfada3e67553153ba46caad9f38f3f654008bcf7d8f9098c250c8d750d1c7bcebad6dc8e98f -EBUILD dovecot-2.3.3-r1.ebuild 8836 BLAKE2B 214e3df6d39beb54d30fb794b97368bea7555ec0e198a4d8d7f3379ad3a46514ee4bb326e33a853fc186c9ae88ea42d1870ef3a0ad0bff59ffe893d1a0bc9bdc SHA512 f83c6b24371de82172e256cd9f0f70ffcb903495316519eb9b4c1419b9d7d794749abcf0e8ad37fb9f96454f95d9d0743fffe8ced9513382c6413971eaae4c2b -EBUILD dovecot-2.3.3.ebuild 8789 BLAKE2B 6ab8548635742ba2dc82fe4b06ee4438840ebcd1e2d4cbef4662e3fb42a74a10aed252e6e28ac6f56b60006f44c1fcd823373f86d4b06245e06a8ae3cb7b6cbd SHA512 466b7ef0098884c9ef885048337ac68aa9aa3f40ad9a2c5fa6231f3dfbc5909fa97128c2872c8e9fde6a9a2129a096cabb1e681e2dd5fa0ac3d9cf89912d2445 -EBUILD dovecot-2.3.4.1.ebuild 8799 BLAKE2B d5b1129e0f7c6563682e345a5d7575761b5a206caa2aca36c4e002b51e4357980a2f93ecbe3974b220b00b04dab49f141580d77825c2850fd2cc4ffe089c1fee SHA512 a164ab663313a9b8334112377349a2ae807140a27d5c618d5d69c30a926d2d2854696516a4f1d59f9d4b8154ccd116213ccf0f9aeb7e1ddc1ba6717e0c744978 -EBUILD dovecot-2.3.4.ebuild 8799 BLAKE2B c80a46f994df324b88f35b9e6514742d12b93aa49016c9b655d3ee90ac5d27d14d3e26da9dce440dd19b59f3dde9d115f9cc6fe90dc48f7800ecc9bfa3ae0987 SHA512 2d4f00a1ab7dcd716141df08002251f26571d153ef58036de0dba6f828f96b48c9402b91fd4dcb2f5310332ad9bd7b8596b334df348ab7365a75a957e82c8c57 -EBUILD dovecot-2.3.5.1.ebuild 8790 BLAKE2B 7934d5a974c8c1f1d238edb02fbaff82df00b740a5400057d1d4f4de505932c1e9ff245687a2742558c54b697ab35b9e366f2abbc9e1c528426c07766976d175 SHA512 3d5b366b16f8df9ba24902180eecffe4ef4b09a27186190dc8e5b81d7f14c9e54a9b0917cdaefe81ee80283b0784dd9474ab58a262fb0ae059d2364fb22a2fb9 -EBUILD dovecot-2.3.5.ebuild 8814 BLAKE2B 20510b5b6c93dcf98b396bba828d646e2957be0da1dd626fc8483fbfd5709ff5ce284bae6e2303c8441eb585a96f9656d0511fa288ce759dc959bd3ef8c90f0b SHA512 538968024f28527c502d6f4da58a46c938d65294f0191ff9af7237604db852f031fa1f6dd6cd81cd7e20d4eee401d536262618939d55ab6a887eaa0de4f2ba62 -MISC metadata.xml 1233 BLAKE2B 2b9193a6d3a417f28ab0ac92ed03315f2f97a43102ab9744e227d5054919b2f6be1b7073dfd50bcc88760a6e4854a16f12ed4fdb962c56491f4ac2147b2216af SHA512 4b73eee6867e764bb94a30cd05ee7bcac75f97eb623bc457d811a71d12ed500ac198acaba784c200f103179a58beb804796bf048c220ad7fcef4dc4d28a0b026 +DIST dovecot-2.3.5.2.tar.gz 6953228 BLAKE2B d3634ca0621349ed82c552b416bd633497ce9e4bdd5df30c2e35da1ab70a5934e2dda2b88ac6bbebeebc23918d9dcfb7a0976b1b51fba5eefd14327b2b2ea734 SHA512 041ec1c33c6accb5c89d96d7ab2f7dd59795f496c17faea1906e7977983e4a387aa855a238376515c09532731634d9d42e6d6be22659062855241847ea0213d5 +EBUILD dovecot-2.2.36.3.ebuild 8599 BLAKE2B ce60439de2676ad168bbb8355f61072019ea6ad4ef9e357b401bfced19b4d0d0f842926d83cf8e2348db460b1bb3dc7a5537b457835eedfe16e03a024fdfa65c SHA512 ed5940edaa0c1bf67065354f9e433901bc556a2c3db071d8c9d1c6a9ed02b86f151729c6ec5ece5a2924662d3ed8eaf1df19ce1979d325c03b932751b3921afe +EBUILD dovecot-2.3.5.1.ebuild 8783 BLAKE2B d09a7e8b2545522a8f48939f46c586e537abcbe683f0ff790d82aae7d9be942dad171b5f6d94f3c8e9d85f1d0096f9c487cb4538297d0356fa20d2dc0f2abf76 SHA512 9b2a1a7dfedc3fb372b712ca0c0231ff2077632a42ce9722c4d369ffdaabd61b538e34da5523c5902f7a0f2d291d17c3739a0acfe19dba8b67e234b9df6d7b50 +EBUILD dovecot-2.3.5.2.ebuild 8785 BLAKE2B e733265849c5d7451f286d46ebee4c062b25f6b99d07928e9167a1c245ae203d9e0caf21bd51b9554e8079a503d977327ebddee23092e965493fac14f35c760d SHA512 5368dcc2ce883f5a7f13e45dfbc0dc1226827c851500f304dd9871f22a3ebb76d04d94c4472c2b535af9353291b394f9e97a5007883c8a35639a8c3604aa6fea +MISC metadata.xml 941 BLAKE2B 8432d32315ba8c4ad55cdbc6cdfc85b9cbd2aab5928f8f3fbaa1e33093a272ee36abfaeb8d4e6f2a7658bdf9a9f481efe3ac18e5b5b901c74addc63979bcc312 SHA512 f8347117eb6039d0340ab53e0ccd82cd269a3f50d2747a780ccfee26b6e598347337f73b75c1e6f4f814c86918c4d0325c4c784a04a86b3d66ceb58bfe94d98d diff --git a/net-mail/dovecot/dovecot-2.2.19.ebuild b/net-mail/dovecot/dovecot-2.2.19.ebuild deleted file mode 100644 index 0ce65014c0c1..000000000000 --- a/net-mail/dovecot/dovecot-2.2.19.ebuild +++ /dev/null @@ -1,305 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils multilib ssl-cert systemd user versionator - -MY_P="${P/_/.}" -major_minor="$(get_version_component_range 1-2)" -sieve_version="0.4.9" -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="~sh" - -IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail" -IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox" -IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib" -IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd" - -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 ) - vpopmail? ( net-mail/vpopmail ) - zlib? ( sys-libs/zlib ) - virtual/libiconv - dev-libs/icu:=" - -RDEPEND="${DEPEND} - net-mail/mailbase" - -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() { - epatch "${FILESDIR}/${PN}-10-ssl.patch" - epatch_user -} - -src_configure() { - local conf="" - - if use postgres || use mysql || use sqlite; then - conf="${conf} --with-sql" - fi - - local storages="" - for storage in ${IUSE_DOVECOT_STORAGE//+/}; do - use ${storage} && storages="${storage} ${storages}" - done - [ "${storages}" ] || storages="maildir" - - # turn valgrind tests off. Bug #340791 - VALGRIND=no econf \ - --localstatedir="${EPREFIX}/var" \ - --runstatedir="${EPREFIX}/run" \ - --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ - --without-stemmer \ - --with-storages="${storages}" \ - --disable-rpath \ - --with-icu \ - $( systemd_with_unitdir ) \ - $( 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 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" - if ! use maildir; then - if use mbox; then - mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u" - keepdir /var/dovecot - sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \ - "${confd}/10-mail.conf" || die "sed failed" - elif use mdbox ; then - mail_location="mdbox:~/.mdbox" - elif use sdbox ; then - mail_location="sdbox:~/.sdbox" - fi - fi - 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 = </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" - fi - - # 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() { - if use ssl; then - # 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 - fi - - elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes." -} diff --git a/net-mail/dovecot/dovecot-2.2.34.ebuild b/net-mail/dovecot/dovecot-2.2.34.ebuild deleted file mode 100644 index 653f87bf402f..000000000000 --- a/net-mail/dovecot/dovecot-2.2.34.ebuild +++ /dev/null @@ -1,290 +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_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 = </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" - fi - - # 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() { - if use ssl; then - # 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 - fi - - elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes." -} diff --git a/net-mail/dovecot/dovecot-2.3.4.1.ebuild b/net-mail/dovecot/dovecot-2.2.36.3.ebuild index 8bb0af3db632..9e06b4534ad0 100644 --- a/net-mail/dovecot/dovecot-2.3.4.1.ebuild +++ b/net-mail/dovecot/dovecot-2.2.36.3.ebuild @@ -2,14 +2,14 @@ # 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 ssl-cert systemd user versionator +inherit autotools eapi7-ver ssl-cert systemd user versionator MY_P="${P/_/.}" -#MY_S="${PN}-ce-${PV}" -major_minor="$(get_version_component_range 1-2)" -sieve_version="0.5.4" +major_minor="$(ver_cut 1-2)" +sieve_version="0.4.24.1" if [[ ${PV} == *_rc* ]] ; then rc_dir="rc/" else @@ -17,34 +17,32 @@ else 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 + https://pigeonhole.dovecot.org/releases/${major_minor}/${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 + 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail" +IUSE_DOVECOT_AUTH="kerberos ldap 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" +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="argon2? ( dev-libs/libsodium ) - bzip2? ( app-arch/bzip2 ) +DEPEND="bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) - lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) - mysql? ( virtual/mysql ) + mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) @@ -85,8 +83,7 @@ pkg_setup() { src_prepare() { default # bug 657108 - # elibtoolize - eautoreconf + elibtoolize } src_configure() { @@ -98,20 +95,17 @@ src_configure() { # turn valgrind tests off. Bug #340791 VALGRIND=no econf \ - --with-rundir="${EPREFIX}/run/dovecot" \ --with-statedir="${EPREFIX}/var/lib/dovecot" \ + --with-rundir="${EPREFIX}/run/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 ) \ @@ -135,7 +129,7 @@ src_configure() { cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" econf \ $( use_enable static-libs static ) \ - --localstatedir="${EPREFIX%/}/var" \ + --localstatedir="${EPREFIX}/var" \ --enable-shared \ --with-dovecot="${S}" \ $( use_with managesieve ) @@ -283,7 +277,7 @@ src_install () { 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 + -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 diff --git a/net-mail/dovecot/dovecot-2.2.36.ebuild b/net-mail/dovecot/dovecot-2.2.36.ebuild deleted file mode 100644 index 86321f4a85d5..000000000000 --- a/net-mail/dovecot/dovecot-2.2.36.ebuild +++ /dev/null @@ -1,290 +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.24" -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_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 \ - --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-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 = </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" - fi - - # 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() { - if use ssl; then - # 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 - fi - - elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes." -} diff --git a/net-mail/dovecot/dovecot-2.3.2.1.ebuild b/net-mail/dovecot/dovecot-2.3.2.1.ebuild deleted file mode 100644 index 34b3f7e9aae7..000000000000 --- a/net-mail/dovecot/dovecot-2.3.2.1.ebuild +++ /dev/null @@ -1,291 +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 ssl-cert systemd user versionator - -MY_P="${P/_/.}" -#MY_S="${PN}-ce-${PV}" -major_minor="$(get_version_component_range 1-2)" -sieve_version="0.5.2" -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" - -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${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:* ) - 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:* ) - !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}-glibc226.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 - 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 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-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 - 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 http://wiki2.dovecot.org/Upgrading/ for upgrade notes." -} diff --git a/net-mail/dovecot/dovecot-2.3.3-r1.ebuild b/net-mail/dovecot/dovecot-2.3.3-r1.ebuild deleted file mode 100644 index 120949b5d430..000000000000 --- a/net-mail/dovecot/dovecot-2.3.3-r1.ebuild +++ /dev/null @@ -1,294 +0,0 @@ -# Copyright 1999-2018 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 ssl-cert systemd user versionator - -MY_P="${P/_/.}" -#MY_S="${PN}-ce-${PV}" -major_minor="$(get_version_component_range 1-2)" -sieve_version="0.5.3" -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" - -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${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:* ) - 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:* ) - !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}-glibc228.patch" - "${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 - 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 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-r5 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 = </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 http://wiki2.dovecot.org/Upgrading/ for upgrade notes." -} diff --git a/net-mail/dovecot/dovecot-2.3.3.ebuild b/net-mail/dovecot/dovecot-2.3.3.ebuild deleted file mode 100644 index 9d28a2916e95..000000000000 --- a/net-mail/dovecot/dovecot-2.3.3.ebuild +++ /dev/null @@ -1,291 +0,0 @@ -# Copyright 1999-2018 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 ssl-cert systemd user versionator - -MY_P="${P/_/.}" -#MY_S="${PN}-ce-${PV}" -major_minor="$(get_version_component_range 1-2)" -sieve_version="0.5.3" -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" - -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${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:* ) - 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:* ) - !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}-glibc228.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 - 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 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-r5 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 = </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 http://wiki2.dovecot.org/Upgrading/ for upgrade notes." -} diff --git a/net-mail/dovecot/dovecot-2.3.4.ebuild b/net-mail/dovecot/dovecot-2.3.4.ebuild deleted file mode 100644 index 3a9711794cda..000000000000 --- a/net-mail/dovecot/dovecot-2.3.4.ebuild +++ /dev/null @@ -1,293 +0,0 @@ -# Copyright 1999-2018 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 ssl-cert systemd user versionator - -MY_P="${P/_/.}" -#MY_S="${PN}-ce-${PV}" -major_minor="$(get_version_component_range 1-2)" -sieve_version="0.5.4" -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" - -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${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:* ) - 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:* ) - !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 - 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 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 = </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 http://wiki2.dovecot.org/Upgrading/ for upgrade notes." -} diff --git a/net-mail/dovecot/dovecot-2.3.5.1.ebuild b/net-mail/dovecot/dovecot-2.3.5.1.ebuild index de094d57b6f8..f708782a71c8 100644 --- a/net-mail/dovecot/dovecot-2.3.5.1.ebuild +++ b/net-mail/dovecot/dovecot-2.3.5.1.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://www.dovecot.org/" SLOT="0" LICENSE="LGPL-2.1 MIT" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86" +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" diff --git a/net-mail/dovecot/dovecot-2.3.5.ebuild b/net-mail/dovecot/dovecot-2.3.5.2.ebuild index 0cac1f64056e..d180d778f29e 100644 --- a/net-mail/dovecot/dovecot-2.3.5.ebuild +++ b/net-mail/dovecot/dovecot-2.3.5.2.ebuild @@ -5,11 +5,11 @@ EAPI=6 # do not add a ssl USE flag. ssl is mandatory SSL_DEPS_SKIP=1 -inherit autotools ssl-cert systemd user versionator +inherit autotools eapi7-ver ssl-cert systemd user MY_P="${P/_/.}" #MY_S="${PN}-ce-${PV}" -major_minor="$(get_version_component_range 1-2)" +major_minor="$(ver_cut 1-2)" sieve_version="0.5.5" if [[ ${PV} == *_rc* ]] ; then rc_dir="rc/" @@ -28,7 +28,7 @@ HOMEPAGE="https://www.dovecot.org/" SLOT="0" LICENSE="LGPL-2.1 MIT" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +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" @@ -86,8 +86,8 @@ pkg_setup() { src_prepare() { default # bug 657108 - # elibtoolize - eautoreconf + elibtoolize + #eautoreconf } src_configure() { diff --git a/net-mail/dovecot/files/dovecot-10-ssl.patch b/net-mail/dovecot/files/dovecot-10-ssl.patch deleted file mode 100644 index 8173bacc0bc5..000000000000 --- a/net-mail/dovecot/files/dovecot-10-ssl.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- doc/example-config/conf.d/10-ssl.conf 2014-12-08 07:58:21.000000000 +0000 -+++ doc/example-config/conf.d/10-ssl.conf 2014-12-08 08:02:19.000000000 +0000 -@@ -49,6 +49,12 @@ - #ssl_protocols = !SSLv2 - - # SSL ciphers to use -+# ############### -+# Added by Gentoo -+# You are encouraged to change the cipher list to -+#ssl_cipher_list = DEFAULT:!EXPORT:!LOW:!MEDIUM:!MD5 -+# if you are not required to support legacy mail clients. -+# ############### - #ssl_cipher_list = ALL:!LOW:!SSLv2:!EXP:!aNULL - - # Prefer the server's order of ciphers over client's. diff --git a/net-mail/dovecot/files/dovecot-glibc226.patch b/net-mail/dovecot/files/dovecot-glibc226.patch deleted file mode 100644 index adf1dd99aac8..000000000000 --- a/net-mail/dovecot/files/dovecot-glibc226.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 9a58361b08e1858e3bc7ea93934b7613261da476 Mon Sep 17 00:00:00 2001 -From: Timo Sirainen <timo.sirainen@dovecot.fi> -Date: Mon, 9 Jul 2018 11:33:23 +0300 -Subject: [PATCH] m4: Enable rquota only if rpc/rpc.h exists - -It's been removed in glibc 2.26 ---- - m4/quota.m4 | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/m4/quota.m4 b/m4/quota.m4 -index 5840e3af89..0695b1e021 100644 ---- a/m4/quota.m4 -+++ b/m4/quota.m4 -@@ -7,8 +7,10 @@ AC_DEFUN([DOVECOT_RPCGEN], [ - - have_rquota=no - if test -f /usr/include/rpcsvc/rquota.x && test -n "$RPCGEN"; then -- AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes]) -- have_rquota=yes -+ AC_CHECK_HEADER([rpc/rpc.h], [ -+ AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes]) -+ have_rquota=yes -+ ]) - fi - AM_CONDITIONAL(HAVE_RQUOTA, test "$have_rquota" = "yes") - ]) -From 5803ae4bbd420def0072e1660ea7061c0e5dbcb9 Mon Sep 17 00:00:00 2001 -From: Timo Sirainen <timo.sirainen@dovecot.fi> -Date: Mon, 9 Jul 2018 11:39:59 +0300 -Subject: [PATCH] m4, quota: Support rquota using libtirpc - ---- - m4/quota.m4 | 13 ++++++++++--- - src/plugins/quota/Makefile.am | 3 ++- - 2 files changed, 12 insertions(+), 4 deletions(-) - -diff --git a/m4/quota.m4 b/m4/quota.m4 -index 0695b1e021..d75af447e1 100644 ---- a/m4/quota.m4 -+++ b/m4/quota.m4 -@@ -7,18 +7,25 @@ AC_DEFUN([DOVECOT_RPCGEN], [ - - have_rquota=no - if test -f /usr/include/rpcsvc/rquota.x && test -n "$RPCGEN"; then -- AC_CHECK_HEADER([rpc/rpc.h], [ -- AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes]) -+ PKG_CHECK_MODULES(LIBTIRPC, libtirpc, [ - have_rquota=yes -+ QUOTA_LIBS="$QUOTA_LIBS \$(LIBTIRPC_LIBS)" -+ ], [ -+ AC_CHECK_HEADER([rpc/rpc.h], [ -+ have_rquota=yes -+ ]) - ]) - fi -+ if test "$have_rquota" = yes; then -+ AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes]) -+ fi - AM_CONDITIONAL(HAVE_RQUOTA, test "$have_rquota" = "yes") - ]) - - AC_DEFUN([DOVECOT_QUOTA], [ - AC_SEARCH_LIBS(quota_open, quota, [ - AC_DEFINE(HAVE_QUOTA_OPEN,, [Define if you have quota_open()]) -- QUOTA_LIBS="-lquota" -+ QUOTA_LIBS="$QUOTA_LIBS -lquota" - ]) - AC_SUBST(QUOTA_LIBS) - ]) -diff --git a/src/plugins/quota/Makefile.am b/src/plugins/quota/Makefile.am -index f220d4f075..ffebc67404 100644 ---- a/src/plugins/quota/Makefile.am -+++ b/src/plugins/quota/Makefile.am -@@ -19,7 +19,8 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src/lib-storage/index/imapc \ - -I$(top_srcdir)/src/lib-storage/index/maildir \ - -I$(top_srcdir)/src/lib-program-client \ -- -I$(top_srcdir)/src/doveadm -+ -I$(top_srcdir)/src/doveadm \ -+ $(LIBTIRPC_CFLAGS) - - NOPLUGIN_LDFLAGS = - lib10_doveadm_quota_plugin_la_LDFLAGS = -module -avoid-version diff --git a/net-mail/dovecot/files/dovecot-glibc228.patch b/net-mail/dovecot/files/dovecot-glibc228.patch deleted file mode 100644 index 9549c12f6e8f..000000000000 --- a/net-mail/dovecot/files/dovecot-glibc228.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 63a74b9e8e0604486a15a879e7f1a27257322400 Mon Sep 17 00:00:00 2001 -From: Aki Tuomi <aki.tuomi@dovecot.fi> -Date: Wed, 8 Aug 2018 12:33:20 +0300 -Subject: [PATCH] auth: mycrypt - include crypt.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes crypt usage on glibc-2.28 - -Reported by Reuben Farrelly -Patch provided by Thore Bödecker ---- - configure.ac | 2 +- - src/auth/mycrypt.c | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index dd545ebfdc..c5d8fae666 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -315,7 +315,7 @@ AC_CHECK_HEADERS(strings.h stdint.h unistd.h dirent.h malloc.h \ - quota.h sys/fs/quota_common.h \ - mntent.h sys/mnttab.h sys/event.h sys/time.h sys/mkdev.h linux/dqblk_xfs.h \ - xfs/xqm.h execinfo.h ucontext.h malloc_np.h sys/utsname.h sys/vmount.h \ -- sys/utsname.h glob.h linux/falloc.h ucred.h sys/ucred.h) -+ sys/utsname.h glob.h linux/falloc.h ucred.h sys/ucred.h crypt.h) - - CC_CLANG - AC_CC_PIE -diff --git a/src/auth/mycrypt.c b/src/auth/mycrypt.c -index c49fcf842e..0bd00bc238 100644 ---- a/src/auth/mycrypt.c -+++ b/src/auth/mycrypt.c -@@ -14,6 +14,9 @@ - # define _XPG6 /* Some Solaris versions require this, some break with this */ - #endif - #include <unistd.h> -+#ifdef HAVE_CRYPT_H -+# include <crypt.h> -+#endif - - #include "mycrypt.h" - diff --git a/net-mail/dovecot/files/dovecot.init-r4 b/net-mail/dovecot/files/dovecot.init-r4 deleted file mode 100644 index 665aa0dc7333..000000000000 --- a/net-mail/dovecot/files/dovecot.init-r4 +++ /dev/null @@ -1,57 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later - -extra_started_commands="reload" - -depend() { - need localmount - before postfix - after bootmisc ldap mysql ntp-client ntpd postgresql saslauthd slapd - use logger net -} - -checkconfig() { - DOVECOT_INSTANCE=${SVCNAME##*.} - if [ -n "${DOVECOT_INSTANCE}" -a "${SVCNAME}" != "dovecot" ]; then - DOVECOT_CONF=/etc/dovecot/dovecot.${DOVECOT_INSTANCE}.conf - else - DOVECOT_CONF=/etc/dovecot/dovecot.conf - fi - if [ ! -e ${DOVECOT_CONF} ]; then - eerror "You will need an ${DOVECOT_CONF} first" - return 1 - fi - if [ -x /usr/sbin/dovecot ]; then - DOVECOT_BASEDIR=$(/usr/sbin/dovecot -c ${DOVECOT_CONF} -a | grep '^base_dir = ' | sed 's/^base_dir = //') - else - eerror "dovecot not executable" - return 1 - fi - DOVECOT_BASEDIR=${DOVECOT_BASEDIR:-/var/run/dovecot} - DOVECOT_PIDFILE=${DOVECOT_BASEDIR}/master.pid -} - -start() { - checkconfig || return 1 - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec /usr/sbin/dovecot \ - --pidfile "${DOVECOT_PIDFILE}" -- -c "${DOVECOT_CONF}" - eend $? -} - -stop() { - checkconfig || return 1 - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --exec /usr/sbin/dovecot \ - --pidfile "${DOVECOT_PIDFILE}" - eend $? -} - -reload() { - checkconfig || return 1 - ebegin "Reloading ${SVCNAME} configs and restarting auth/login processes" - start-stop-daemon --signal HUP --exec /usr/sbin/dovecot \ - --pidfile "${DOVECOT_PIDFILE}" - eend $? -} diff --git a/net-mail/dovecot/files/dovecot.init-r5 b/net-mail/dovecot/files/dovecot.init-r5 deleted file mode 100644 index 8a98603d4b42..000000000000 --- a/net-mail/dovecot/files/dovecot.init-r5 +++ /dev/null @@ -1,57 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License, v2 or later - -extra_started_commands="reload" - -depend() { - need localmount - before postfix - after bootmisc ldap mysql ntp-client ntpd postgresql saslauthd slapd - use logger net -} - -checkconfig() { - DOVECOT_INSTANCE=${SVCNAME##*.} - if [ -n "${DOVECOT_INSTANCE}" -a "${SVCNAME}" != "dovecot" ]; then - DOVECOT_CONF=/etc/dovecot/dovecot.${DOVECOT_INSTANCE}.conf - else - DOVECOT_CONF=/etc/dovecot/dovecot.conf - fi - if [ ! -e ${DOVECOT_CONF} ]; then - eerror "You will need an ${DOVECOT_CONF} first" - return 1 - fi - if [ -x /usr/sbin/dovecot ]; then - DOVECOT_BASEDIR=$(/usr/sbin/dovecot -c ${DOVECOT_CONF} config -h base_dir) - else - eerror "dovecot not executable" - return 1 - fi - DOVECOT_BASEDIR=${DOVECOT_BASEDIR:-/run/dovecot} - DOVECOT_PIDFILE=${DOVECOT_BASEDIR}/master.pid -} - -start() { - checkconfig || return 1 - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec /usr/sbin/dovecot \ - --pidfile "${DOVECOT_PIDFILE}" -- -c "${DOVECOT_CONF}" - eend $? -} - -stop() { - checkconfig || return 1 - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --exec /usr/sbin/dovecot \ - --pidfile "${DOVECOT_PIDFILE}" - eend $? -} - -reload() { - checkconfig || return 1 - ebegin "Reloading ${SVCNAME} configs and restarting auth/login processes" - start-stop-daemon --signal HUP --exec /usr/sbin/dovecot \ - --pidfile "${DOVECOT_PIDFILE}" - eend $? -} diff --git a/net-mail/dovecot/metadata.xml b/net-mail/dovecot/metadata.xml index 496575228ba5..d8223dea238d 100644 --- a/net-mail/dovecot/metadata.xml +++ b/net-mail/dovecot/metadata.xml @@ -7,14 +7,9 @@ </maintainer> <use> <flag name="argon2">Add support for ARGON2 password schemes</flag> - <flag name="cydir">Add cydir storage support</flag> <flag name="managesieve">Add managesieve protocol support</flag> - <flag name="mdbox">Add mdbox storage support</flag> - <flag name="sdbox">Add sdbox storage support</flag> <flag name="sieve">Add sieve support</flag> <flag name="vpopmail">Add vpopmail support</flag> - <flag name="imapc">Add imap client storage support</flag> - <flag name="pop3c">Add pop3 client storage 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="lz4">Add support for lz4 (de)compression</flag> |