Remove old
authorEray Aslan <eras@gentoo.org>
Fri, 10 Apr 2015 07:27:30 +0000 (07:27 +0000)
committerEray Aslan <eras@gentoo.org>
Fri, 10 Apr 2015 07:27:30 +0000 (07:27 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

dev-libs/cyrus-sasl/ChangeLog
dev-libs/cyrus-sasl/Manifest
dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r3.ebuild [deleted file]
dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r4.ebuild [deleted file]
dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r5.ebuild [deleted file]
dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild [deleted file]
dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r8.ebuild [deleted file]
dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-db4.patch [deleted file]
dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-get_fqhostname.patch [deleted file]
dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-gssapi.patch [deleted file]
dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-lib_before_plugin.patch [deleted file]

index f9230c1e37eea3c7e9e2250a6fc3fb77c7be8795..b4098ea7d6658c66fb80acc8be109d119e1a25da 100644 (file)
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.317 2015/04/09 23:39:04 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.318 2015/04/10 07:27:16 eras Exp $
+
+  10 Apr 2015; Eray Aslan <eras@gentoo.org> -cyrus-sasl-2.1.26-r3.ebuild,
+  -cyrus-sasl-2.1.26-r4.ebuild, -cyrus-sasl-2.1.26-r5.ebuild,
+  -cyrus-sasl-2.1.26-r7.ebuild, -cyrus-sasl-2.1.26-r8.ebuild,
+  -files/cyrus-sasl-2.1.22-db4.patch,
+  -files/cyrus-sasl-2.1.25-get_fqhostname.patch,
+  -files/cyrus-sasl-2.1.25-gssapi.patch,
+  -files/cyrus-sasl-2.1.25-lib_before_plugin.patch:
+  Remove old
 
   09 Apr 2015; Anthony G. Basile <blueness@gentoo.org>
   cyrus-sasl-2.1.26-r9.ebuild:
index 1da82a2820dd48d73a1e9ffaab2808e93ee4217f..e9857a415f72a20e1de3a7a55fd736bc27fe2ccc 100644 (file)
@@ -16,7 +16,6 @@ AUX cyrus-sasl-2.1.19-checkpw.c.patch 4657 SHA256 5bdb8b3525429696a391d95c89faa5
 AUX cyrus-sasl-2.1.21-keytab.patch 1460 SHA256 51f0098f1293981cbea57c7c8fdb0ba7622e9b26404fe1a92bdfcdbad1526269 SHA512 d178025761273fd51a3d15fea0a44a2e66b4bd764a904a2b8cde00a77b5a13a9237bab60c0848e971613f26fc394efaf1de31246f4ebcd4990326420945f88a3 WHIRLPOOL c83731aa78604025f5f56339fcbeef56e57d2b92af269facf9beb3e9cf085abb4f1a2c4791612c47e787b7643791e681f45a40d910dd8b513da9e5dc33e7045c
 AUX cyrus-sasl-2.1.22-as-needed.patch 463 SHA256 bc26996cbafb59f4daf1d7acc077bae9a60e4746109a9ec4a580eaba5cb9ca78 SHA512 e6abc938ca36435bc1bc9df2b996b4533fcc16bd4ab154aec3f747bb9d383fed23617f097c9c665f53cd35067d0f74e991c867d5029f787479d6b90869ffa8fb WHIRLPOOL c3db46be4a373adcf629f41ca742e0652ab64d32db42de47c9bb9145975f93ee79a7fdd0fb191809f11ca5343e0177d8a2b8d024f2dedc2c2ca499d39405ca79
 AUX cyrus-sasl-2.1.22-crypt.patch 2892 SHA256 cad92b50aabbf2bcfdbd8169949a85a75c96e12ad43fcd4aaf89d6d7482210bf SHA512 c3fc240e049e359c00077681dcaf58be1817a01d8588e161f65a5cfa65c132d7f72f5cc58c5d24747f3b7a7ead758dd2c5eb8462b72e1e3cf13f447c1bae8279 WHIRLPOOL c1dd99b303ab41c5d845c2f697222bc9a18a014cdfd8aa4fea66faf04922a8a113f785e597a408eb2b04a66a7fdfc3eb4906244acaf986c798571e78570d0c24
-AUX cyrus-sasl-2.1.22-db4.patch 684 SHA256 2d2459cd54edcd0f0fc85af6bd95a9c057599af5862f257dd2d01b5796bc02f0 SHA512 b1df6bff8ead44f1d58be81a1e5ca81b218c06e6cd680f5d41dbe1c0afd788ab1e619375b6b86a004c6407549948531ce7a81588b352b45a9653f360ddb21b5d WHIRLPOOL d11e712cc0707dd28ad2e98262b0faacd73eda2b1a83f8d30d4d1fc9650873de1c6c87d0de74073c3137770b18e04f29a2ebc24262096dd721c6b2aa84b4c285
 AUX cyrus-sasl-2.1.22-gcc44.patch 540 SHA256 d803266d96bb3b9f46bc2ce4ec280509d769bbf9c1a226e20c13803db398a113 SHA512 ffaf7d469b049a41ca776d61b945a3adaba6eebb0e7836fa913f2d6999fda1e95d6b0ec9bb0dfa8a4809a8f865c8eef64806f43627081be6d30142e96a99724d WHIRLPOOL 78f3b53da149f045a2bc51939c63f28560e8b2926e5ab8e775e4129dff367c016f1efd83d84aa4540303e884f3f32a31306796b84112bd37a14cf1f89bcb9b4f
 AUX cyrus-sasl-2.1.22-qa.patch 525 SHA256 56dbdc290871f3a42e507fe0be90431de15a832da7cf99bf3c21fb5aef05c8ac SHA512 228c9e035a29f4cf82b640f0cb16d947a43d1a95445929ea866c1a39763b8eded66dccbbdcf40e9753c7ab4da1b427c5311bcd1df5b13bbd439cd21483add5aa WHIRLPOOL 88319337100ef306b91ac768306cfef4be0eeebd193f3a35c202dc554010dfa2216fb246588b5f7526d0e2ff2551f3149b8158a1bd90592eb4444921a1e62e6f
 AUX cyrus-sasl-2.1.23+db-5.0.patch 1009 SHA256 6570d4ff7668a7df47b457ebf38c232bcd9b7034db37d23effa5a18b735dc38e SHA512 da52efef06b3d43c88b1edbc16609e8db3440b39f9f515c5b16e510a83b0b5764b5b79733b68ce98b8da08d0dde43ed058ccd70b6d28593ad4c881a9f223fe36 WHIRLPOOL c2e7ae6a02fde77a562d7b9bf7732829bd6b94a525b0f30c3f7fe72053f22d1fc5d26795323f224bef09d1b3d22ef43f6d3f8d11ae6bdfef5cb1251e7646fa8e
@@ -29,9 +28,6 @@ AUX cyrus-sasl-2.1.25-autotools_fixes.patch 3926 SHA256 390aef512c359ae3eee9d1c7
 AUX cyrus-sasl-2.1.25-auxprop.patch 552 SHA256 d9f63e60aa664f064755151fb5aa442ed52a3053057b5a63f2d88c937906dc7c SHA512 73ae914e684ae698eb56a1579ba9a477a946625a3b079e2b400d88583074f1701d8a6926ed17dea36b923050f21c04fbf746d54284568bd21c14be3d10283b6f WHIRLPOOL 899e41790b71a55983fa99c09e3b9b28667e2e7f457bdc39028ad705883676f4363bbd968c04b35fe2ce84fd08c1b5daad73b988f6e2299f1c129e59bc65f93f
 AUX cyrus-sasl-2.1.25-avoid_pic_overwrite.patch 1076 SHA256 80cb9cf22b0507b503ff0cf6c5946a44eb5c3808e0a77e66d56d5a53e5e76fa7 SHA512 033e3634116e1d3b316052dbe0b671cca0fcfb6063fca1a97d990c422c2ce05109a1e424e84ed9928dc0312a325a7248f2d2e3f9547f84453b36331c01f63be5 WHIRLPOOL c5d502cf80f298771331660fd3806685cee47c128be4cdffd603c44b5cc04adccf4f459b354cb30f1e05acf8be76cb1e3b76a22c09f1b3b873cc13b683608607
 AUX cyrus-sasl-2.1.25-fix_heimdal.patch 601 SHA256 6285b2a9c0b9ab2590a4225ac1eb8d01678e6b0559141c274d4451def65b5283 SHA512 80a5181a3c324551ae64ead2d6199691ac9994653e4b86de21852d2caf201b5fccde6464af4189351edcad4b87dc60cab5f1c03148db77f90c6c52a16465045a WHIRLPOOL cc1adba84e09ef37ac4102b2da7c45eff9c496ca2cdb680e76b287a104e5ad039bca0b1bf319a6c5bfaa2e57cb6e5c8c4b93a8682ebac01bcb18a3b82cecac16
-AUX cyrus-sasl-2.1.25-get_fqhostname.patch 1638 SHA256 72487eb691fd23acf5b5e8e72fe409df89e35d720e5eaafb4c8b0715e34ec1eb SHA512 1017c94e3966eed3ab996d83b3aa64e542e98913cb71a17a347054ce0c6360adefdf3e648490ca8a1b30878db8e3d739d074fbbfccfc749a2075a49a9f81c6d7 WHIRLPOOL abc113b2b2c0c1a5ab7c46b216125f87da93141a3a5b33a5d449fbc48eaa926f9da0daf8a61e721da18ed34a17a9002253479d96136aa5512043f42eab6096a8
-AUX cyrus-sasl-2.1.25-gssapi.patch 747 SHA256 0fc1bab93c3f5e2ead98f1ba480be776640f2e74b1908d8f8fa1936908e8dbec SHA512 2d0b3044f3a3b72f2c00be5a404a5cb7ef545b0de9b78f11c04b1f643ff178e445c6bd9b5d438e7b1a8e7bd706ed258cc26ab691f62f037ac74157656dcdb7af WHIRLPOOL d50ec4f0530cbf0819e32c87bc1a5a265bbf32ed053cdc0d680a2a77fa862334508354fc04e50f9714901fe0f1a1feff68fc2fea720d07c16c8c8afbb59f668b
-AUX cyrus-sasl-2.1.25-lib_before_plugin.patch 776 SHA256 278418f8942450bbbfb86672cc88e5d745736d59e601b1435273719069790640 SHA512 64a529f5d97bbbc510ab2bb288b864068c508928fb95ebb30fc7b82845f07b2c67a7ae0d0b56322c1a6efede2a0d447e02eeae75f17c9f73fd024e53c673dbb8 WHIRLPOOL eac991d0e18dab3208b92c2637491a593478eef31fea403c6512fd4e01bd85690a6f4fbfb4b24ffc86d99fa76d8e012af998e6b944d249d4783f568dafeb4910
 AUX cyrus-sasl-2.1.25-missing_header.patch 292 SHA256 a83296e782a6137b0f687491314af7a82a37296729af42ca11d1f3667f7320b3 SHA512 b1dc1fa2663c5bd9b051353e6c18ece48460c2de4aff3b6f13672e0aa08e651462af4dae38a2821367728e503ade577218d2645f8c0a96c85e77226ee77ac1a6 WHIRLPOOL 859f6c1f8a864083b163f1c95431c633b9ca6d75a72bae14ce526cca0525ef2c4f0bb2760792baeb228fcb2b64126685d918012574f6a23ebc6b4a580245f77f
 AUX cyrus-sasl-2.1.25-saslauthd_libtool.patch 280 SHA256 76ba2532083630a05ed0e3a5f2976eef6ec62e0fc1782bfee6147aee749e2ce8 SHA512 1e79230a3891f1492c7d6f5969f6a4890aaae2f488e9f3942cafeda574bf8810c4fb3e004836f769244db02bae663fa3ac1eeca19658e6fd3c94f2a891ed2653 WHIRLPOOL 0ac53b59da7a22e93c489e3bc62b0db83f14953cacf6c79c806feaeb33186e4b8f747c58faf49c514df2daba2580326db2c59c576bca3ae192fc210915d93aad
 AUX cyrus-sasl-2.1.25-sasldb_al.patch 555 SHA256 3885246eda016e7a6d273305b2a011770465e8324d1774ef0d021e3def3008d5 SHA512 2da553298b482ca3115294de7264428925911f8d1b6a15ae1af38ee7e0a3191a0f4ad90bcbaeef599c994842a86eea5157b663cb6944f035d9a377dba91dbbf0 WHIRLPOOL d248eae3c8e0e313c0047d0bfbf6e4dd1341afdd4b525138827148517e8cc3847f4c134cd1639be1734c60c5fde922e8bd759895de55b268c2bc9fd54994bda9
@@ -55,28 +51,25 @@ DIST cyrus-sasl-2.1.23-ntlm_impl-spnego.patch.gz 7462 SHA256 9514a7436b11184cfd7
 DIST cyrus-sasl-2.1.23.tar.gz 1613642 SHA256 20efcc4040cbab6e89a636a07dcf5720ee07b5c62359a4e7bf2500ef6020b136 SHA512 bf72db55fefe9eccfe4a12caf1160efc80aba98f8acc2743af360fda96659a3ee1fc3a5af6104b3dfc8fc4571f4e98526b9719a6cdf0948980cf76a9cb1a2b0e WHIRLPOOL 36e0b85228105186160ac8f8751137a067bca0cf6e219dda527808cb04ae597273c97b9d8cd3c1e3b900787a70ad67e5395127ab5107ef0e8ac0100b04612673
 DIST cyrus-sasl-2.1.26.tar.gz 5220231 SHA256 8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3 SHA512 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0 WHIRLPOOL bcba17705d5d7ef9a03802d6a0c3a887bba0473605a3a48d2672aeac187193f2488f28ab01bdf659d7a68b94b4c74e36428ca4b5be840fbed2968f1592534b33
 EBUILD cyrus-sasl-2.1.23-r7.ebuild 8977 SHA256 2e110fa3167f7e63832afdd0461dddf0de192c466a6e2aa39c47ba13e87dc56f SHA512 771667e352d23f054acd1a45c09e4e5a30f054a4b16dcf43516d2c87d74221ae477287d36cd076301d2ed1f63112d07234c49a6773cd581a2e2b4694222c3243 WHIRLPOOL 49ae7804e841f9c75444f5e32dab5d83d9d243ad26067c2a96480ab9594043694b1612dc7039ea75efb27360abc25045955383de33a0fef0df27662db3da5622
-EBUILD cyrus-sasl-2.1.26-r3.ebuild 7256 SHA256 13954f56c1dc7e8f8fc12f887bc33c6430f396d6260e233b28f5e6b535e63ceb SHA512 ab6b3251a2715f8ecbfa5efc0ed0ffe8a5a0bbf09bba1259f2864e934bfafe5691d1ddf74795e8ada0da585e2f3d2093df7d48a006073953933105193f862306 WHIRLPOOL a5cc16b4814666f43dd137c073c43bb140650f5398cbd5229e18a54f2b19bfcdb011aad2e364c8ef86be82ace07d3d691b65a684730c668e68b1a185f65ebad6
-EBUILD cyrus-sasl-2.1.26-r4.ebuild 7303 SHA256 54c1de72eb907e165a272baa70958d2acd643cc7bf85db3c8186fcd70d19eeea SHA512 c8242a82de8b9edb24c26768ffe23419ebe07007cbac141dc9e2beefc57a20819230d130a91f06ccf7631cf007ed10df62433c03522b20c36f069aa07e384f6c WHIRLPOOL 43cee18c7b621f34dabfbf7e2120b64f837e286c6571799adeed008c9af8aa1a4e86c4e41695f954fac3ff2c4d37ebfcbaea3bfc212c78212201ff7294fd9dc7
-EBUILD cyrus-sasl-2.1.26-r5.ebuild 7242 SHA256 b975cea1cb83850f785bbc7f2cb84ab38b4112e59a13984506c1166fc7697334 SHA512 4a37c3895b1c9cb4278a9f91deaab04dae3749dfc4768dae800227efaf007b87aa811afdefb808e3139b4967b82923e1a0194b76fd431b3c6551b63f757a3541 WHIRLPOOL 3c90615056064ff1fa40e10d46a8059e11d024cbad3e252b31b7bcf9764ff99f6ff42b6f3b9e5f260d3e9c6db43881cc188344820bf3977c9862c23bb227288f
-EBUILD cyrus-sasl-2.1.26-r7.ebuild 7734 SHA256 6386d9a76e945c0d339b1de918da4083523d04261c659af0043086084962f51c SHA512 6e7aa39ee010ee22f7d74c34dadcc128d157e643550579f611a3cffbf38e9c86cbb64275769a9a379521c45c9a402994dd231c0d11544e868be40f09557ce0eb WHIRLPOOL 3afdeb0ba269491573170104333cdd7b9418ca7bce41a2e5551dde6285e8e82ce1d4797df4b62157d672c1f54985d3d5769bc0f91ee574dd33f1333bfb1cfc6f
-EBUILD cyrus-sasl-2.1.26-r8.ebuild 7745 SHA256 03248a85ff1802aad6ed0162c2f949d282cc3b2c4b29a45ea18b2e653a97d849 SHA512 18b5442b820c95df9a468cb951fa3e34d5468ec26611623424b10db793e793d9232e33d73a26d3f59fe76b81ea92893116707ed0568b76772430b89fc75d01a3 WHIRLPOOL b6a87c8595853114a11d4fa469e22ccf8af5da88684ed2e2734385a44084a85bcfb620350917778155117f0fc8598a76c7a73a8fae516ae0685f9109c1da5efd
 EBUILD cyrus-sasl-2.1.26-r9.ebuild 7740 SHA256 ded2033ee7be0f225a2d2de9bb05e4f5d8ee0e156fd256acee30dbecaa2e9289 SHA512 e265fcc512823a7fe37f00689c1fac3d2c3f31a7de11e00c01830407795a1e38012f8afca9d54cfbb6b98153617b44aa6689ab068b441a883ffd8ee16961f586 WHIRLPOOL 16e85506f98912b093af640266ba115c2a72999cc9b55e46d9ba67f410ee4694d52324d9df462412512f5f69dda805ef4ecb4871a1fbcfd32da37e2fe4135be6
-MISC ChangeLog 52005 SHA256 d1334298db4355c109122c99f401ac6be8f9ffb62d4c69361a651542195cab6e SHA512 e5b755044e728303b141206ac7fe19efac49ac7227a1fad0698f6b786023346fd99ae460985214ebf5558a73a44529b71f58ebe798023013ff226c7bd8a19729 WHIRLPOOL c43cadad1686b8e33f575b2e0a66be1af093894996f06ef0ce0739decb276c0cd736dc04a4d6e354fae96406dfc617d93dcbe2955d80f6d929618b674cbba661
+MISC ChangeLog 52393 SHA256 0358a377b10b4b9fc2db72a6a72e90370d39ad40bca7fbe732d014c1b736ea37 SHA512 39535a27a230788dc58e3c50f1b4984b8473ab45d3732284bc8a93904cbdcff11396b0f7587aa6cc68db68ad85e55237823665941d38a805f744930a1a9153ab WHIRLPOOL fce37c0b9962bc8d98ee271087ba662a9a48c6958f737d94a83d2308d96850f5a0630f2df9eeb53380ae4438d6dbf8a2c7f9a48b23620091ad57d602171f700d
 MISC metadata.xml 727 SHA256 6b9f368b484972e833084dba4aedf70c09767b816b57cb43a7c0945b8b11b497 SHA512 8b6c6556dd9adff73a6f0bc40fd8064cae8ce8b45734ab0a30b7611be9f226144403fa0dbcf6d3965bd03e12b7c36848c91937bd8133a5581bd296d741a013c7 WHIRLPOOL 5e24419ac72d0ef8591de06c7ab4d95435234e8d894ee31b2015e6465d15a777919c714aae4e3293e194ccfcb505cf0d77f2565959d5e9ecf41c1cbb7b9ff1c5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVJw4sAAoJEJOE+m71LUu67vkP/1HJOLJ8/mURZeP+yOQzmKAE
-XyEnoAi3HJYTCGmEUxwq2P9YvaIWmLU4nGNL/te4BxwfEPmoAH31z9P9hZniV1C5
-doNN6LLOWeJ7GPZVt/ICKiSkGky+Xze493yvYSUcDm1fP34X4ezcI2z+fW70Kywn
-ztpZc3yzCakBCLSXedTAWlsNjTykkHZwf4+73scidBxAHbyjmfzBR0PlZ6c6wtA7
-UiebSSaFy6/nM57p89CrWUMCtr0CUA0g+r6jPLEl6f25XLrk05NM5KqAG4ON6VMs
-bNlxewvfKEpMQZ0kSgfLKxUHc+N0MhcJ/CwBEMzLLfJbmzej7CrJJ6sGR7tkxw3Y
-SyxqWWAOyijv1BoUuWR/b1YR5YrjGzAJBag3eISzK+NfGoauTjEuk7LAFlhOHpEC
-jArsDND+GovVvyJqKyNuNGgxngvepE6L3BC8Sck3IVTaEMvFp6KBemGrbB+2KOXr
-sJjUoZ7sGivW8LraetFLpxgj00C/5QZNmbs7iGL84VWAbOIXTfePvK44YzhwKenY
-Wg9j3QmSLltJ9DAaLIfxN1QYp6n5F9+SIWueznhrd5YoRtQMQW21n8wh56r1/k/V
-Fw7fn3HVQ7qYNX/jyVIWWbEmnrLJCx5M404nC3TaUBABdzjYSVxElioLUOFYm57E
-TVPItp6cJZUxkgb+NQmR
-=Onhe
+iQJ8BAEBCABmBQJVJ3umXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQjk1NkM0NUMxNzFCRTY4Rjk4NENDMDk3
+N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsfqWUP/335Ai07S9Vqjgo0M8eUmkZY
+RwPtXdugh4BD8RynaU62+EyHXkVn0GP5aRRn1o+g1JikFdnDFqtQ80bTSKaUcnya
+Cn0y5gNYD51R9BJFb1XbVECW7ol006g3t93MlJDBeJXNYKWFp1SGXaw99n7O5iFp
+Og56iqmXyG43pSui+Wpz90UiN0DckqAWjdKn+4yCPI7ZaNOhBJXW5h4CHdIlP1fe
+UH/DsizY8aJvtANglgrYBkBIwcwU4tMQ6//3v5sOdM/bCl57HSB61GwAzrU9M510
+H3hsQi6QFBtcDJHHjHTLacbr3HgzlM2CTu5+P2HOe45nRQf00kkBZYfq8wPwn+Jq
+eb1r+2FE74B5rJuxgCNjKNjrM4RB3P/51t0SbvmtcGy++9NHmS/DjbJXSp7bYzas
+N1cLxfbxA66HsJG6jmkEY7UQYb5PjdIBiEtUUT5S4kVFIh3GgFk9W8bGvqWrOpQC
+28r559Xawcb5855lAhQ4ZdodKLJS37A0sXCkzLeIjHcMo1+4VpAg1UnvwZMDi+oQ
+KpswXabsWw5PcaQ4PAXAxNjasoIerqbYzPyraDdih+P3cF5TBXRhSNJzgZW653/O
+PaS5HPgu5JLy9ontDL+fuejYAQkwqAUhr+4Sn4QQ6eCSzE4DhOzj19Pvrn/d9Wp8
+kUxhwgzgQxjfJZ/xbA7i
+=q5pT
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r3.ebuild
deleted file mode 100644 (file)
index 3ff539d..0000000
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r3.ebuild,v 1.16 2014/12/28 15:30:29 titanofold Exp $
-
-EAPI=5
-
-# should be fixed in automake-1.13.2(?).  Please test when released.
-# See automake bug #13514
-WANT_AUTOMAKE="1.12"
-
-inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
-       authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-       berkdb? ( >=sys-libs/db-3.2 )
-       gdbm? ( >=sys-libs/gdbm-1.8.0 )
-       kerberos? ( virtual/krb5 )
-       openldap? ( net-nds/openldap )
-       mysql? ( virtual/mysql )
-       pam? ( virtual/pam )
-       postgres? ( dev-db/postgresql )
-       sqlite? ( dev-db/sqlite:3 )
-       ssl? ( dev-libs/openssl )
-       java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-       java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
-       epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-CVE-2013-4122.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-send-imap-logout.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
-
-       # Get rid of the -R switch (runpath_switch for Sun)
-       # >=gcc-4.6 errors out with unknown option
-       sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-               configure.in || die
-
-       # Use plugindir for sasldir
-       sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-               "${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-       sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-               configure.in || die
-
-       eautoreconf
-}
-
-src_configure() {
-       append-flags -fno-strict-aliasing
-       append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-       # Java support.
-       use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-       local myconf
-
-       # Add authdaemond support (bug #56523).
-       if use authdaemond ; then
-               myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
-       fi
-
-       # Fix for bug #59634.
-       if ! use ssl ; then
-               myconf="${myconf} --without-des"
-       fi
-
-       if use mysql || use postgres || use sqlite ; then
-               myconf="${myconf} --enable-sql"
-       else
-               myconf="${myconf} --disable-sql"
-       fi
-
-       # Default to GDBM if both 'gdbm' and 'berkdb' are present.
-       if use gdbm ; then
-               einfo "Building with GNU DB as database backend for your SASLdb"
-               myconf="${myconf} --with-dblib=gdbm"
-       elif use berkdb ; then
-               einfo "Building with BerkeleyDB as database backend for your SASLdb"
-               myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
-       else
-               einfo "Building without SASLdb support"
-               myconf="${myconf} --with-dblib=none"
-       fi
-
-       # Use /dev/urandom instead of /dev/random (bug #46038).
-       if use urandom ; then
-               myconf="${myconf} --with-devrandom=/dev/urandom"
-       fi
-
-       econf \
-               --enable-login \
-               --enable-ntlm \
-               --enable-auth-sasldb \
-               --disable-cmulocal \
-               --disable-krb4 \
-               --enable-otp \
-               --without-sqlite \
-               --with-saslauthd=/run/saslauthd \
-               --with-pwcheck=/run/saslauthd \
-               --with-configdir=/etc/sasl2 \
-               --with-plugindir=/usr/$(get_libdir)/sasl2 \
-               --with-dbpath=/etc/sasl2/sasldb2 \
-               $(use_with ssl openssl) \
-               $(use_with pam) \
-               $(use_with openldap ldap) \
-               $(use_enable ldapdb) \
-               $(use_enable sample) \
-               $(use_enable kerberos gssapi) \
-               $(use_enable java) \
-               $(use_with java javahome ${JAVA_HOME}) \
-               $(use_with mysql mysql /usr) \
-               $(use_with postgres pgsql) \
-               $(use_with sqlite sqlite3 /usr/$(get_libdir)) \
-               $(use_enable srp) \
-               $(use_enable static-libs static) \
-               ${myconf}
-}
-
-src_compile() {
-       emake
-
-       # Default location for java classes breaks OpenOffice (bug #60769).
-       # Thanks to axxo@gentoo.org for the solution.
-       cd "${S}"
-       if use java ; then
-               jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-       fi
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-       keepdir /etc/sasl2
-
-       if use sample ; then
-               docinto sample
-               dodoc sample/*.c
-               exeinto /usr/share/doc/${P}/sample
-               doexe sample/client sample/server
-       fi
-
-       # Default location for java classes breaks OpenOffice (bug #60769).
-       if use java ; then
-               java-pkg_dojar ${PN}.jar
-               java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-               # hackish, don't wanna dig through makefile
-               rm -Rf "${D}/usr/$(get_libdir)/java"
-               docinto "java"
-               dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-               dodir "/usr/share/doc/${PF}/java/Test"
-               insinto "/usr/share/doc/${PF}/java/Test"
-               doins "${S}"/java/Test/*.java
-       fi
-
-       docinto ""
-       dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-       newdoc pwcheck/README README.pwcheck
-       dohtml doc/*.html
-
-       docinto "saslauthd"
-       dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-       newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-       newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-       systemd_dounit "${FILESDIR}/pwcheck.service"
-
-       newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-       newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-       systemd_dounit "${FILESDIR}/saslauthd.service"
-       systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-       newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
-
-       use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
-}
-
-pkg_preinst() {
-       preserve_old_lib /usr/$(get_libdir)/libsasl2.so.2
-}
-
-pkg_postinst () {
-       # Generate an empty sasldb2 with correct permissions.
-       if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-               einfo "Generating an empty sasldb2 with correct permissions ..."
-               echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-                       || die "Failed to generate sasldb2"
-               "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-                       || die "Failed to delete temp user"
-               chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-                       || die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-               chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-                       || die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-       fi
-
-       if use authdaemond ; then
-               elog "You need to add a user running a service using Courier's"
-               elog "authdaemon to the 'mail' group. For example, do:"
-               elog "  gpasswd -a postfix mail"
-               elog "to add the 'postfix' user to the 'mail' group."
-       fi
-
-       elog "pwcheck and saslauthd home directories have moved to:"
-       elog "  /run/saslauthd, using tmpfiles.d"
-
-       preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r4.ebuild
deleted file mode 100644 (file)
index ab7b696..0000000
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r4.ebuild,v 1.4 2014/12/28 15:30:29 titanofold Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
-       authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-       berkdb? ( >=sys-libs/db-3.2 )
-       gdbm? ( >=sys-libs/gdbm-1.8.0 )
-       kerberos? ( virtual/krb5 )
-       openldap? ( net-nds/openldap )
-       mysql? ( virtual/mysql )
-       pam? ( virtual/pam )
-       postgres? ( dev-db/postgresql )
-       sqlite? ( dev-db/sqlite:3 )
-       ssl? ( dev-libs/openssl )
-       java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-       java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
-       epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-CVE-2013-4122.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-send-imap-logout.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
-
-       # Get rid of the -R switch (runpath_switch for Sun)
-       # >=gcc-4.6 errors out with unknown option
-       sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-               configure.in || die
-
-       # Use plugindir for sasldir
-       sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-               "${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-       # #486740 #468556
-       sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-               -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-               configure.in || die
-       sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-               saslauthd/configure.in || die
-
-       eautoreconf
-}
-
-src_configure() {
-       append-flags -fno-strict-aliasing
-       append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-       # Java support.
-       use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-       local myconf
-
-       # Add authdaemond support (bug #56523).
-       if use authdaemond ; then
-               myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
-       fi
-
-       # Fix for bug #59634.
-       if ! use ssl ; then
-               myconf="${myconf} --without-des"
-       fi
-
-       if use mysql || use postgres || use sqlite ; then
-               myconf="${myconf} --enable-sql"
-       else
-               myconf="${myconf} --disable-sql"
-       fi
-
-       # Default to GDBM if both 'gdbm' and 'berkdb' are present.
-       if use gdbm ; then
-               einfo "Building with GNU DB as database backend for your SASLdb"
-               myconf="${myconf} --with-dblib=gdbm"
-       elif use berkdb ; then
-               einfo "Building with BerkeleyDB as database backend for your SASLdb"
-               myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
-       else
-               einfo "Building without SASLdb support"
-               myconf="${myconf} --with-dblib=none"
-       fi
-
-       # Use /dev/urandom instead of /dev/random (bug #46038).
-       if use urandom ; then
-               myconf="${myconf} --with-devrandom=/dev/urandom"
-       fi
-
-       econf \
-               --enable-login \
-               --enable-ntlm \
-               --enable-auth-sasldb \
-               --disable-cmulocal \
-               --disable-krb4 \
-               --enable-otp \
-               --without-sqlite \
-               --with-saslauthd=/run/saslauthd \
-               --with-pwcheck=/run/saslauthd \
-               --with-configdir=/etc/sasl2 \
-               --with-plugindir=/usr/$(get_libdir)/sasl2 \
-               --with-dbpath=/etc/sasl2/sasldb2 \
-               $(use_with ssl openssl) \
-               $(use_with pam) \
-               $(use_with openldap ldap) \
-               $(use_enable ldapdb) \
-               $(use_enable sample) \
-               $(use_enable kerberos gssapi) \
-               $(use_enable java) \
-               $(use_with java javahome ${JAVA_HOME}) \
-               $(use_with mysql) \
-               $(use_with postgres pgsql) \
-               $(use_with sqlite sqlite3 /usr/$(get_libdir)) \
-               $(use_enable srp) \
-               $(use_enable static-libs static) \
-               ${myconf}
-}
-
-src_compile() {
-       emake
-
-       # Default location for java classes breaks OpenOffice (bug #60769).
-       # Thanks to axxo@gentoo.org for the solution.
-       cd "${S}"
-       if use java ; then
-               jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-       fi
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-       keepdir /etc/sasl2
-
-       if use sample ; then
-               docinto sample
-               dodoc sample/*.c
-               exeinto /usr/share/doc/${P}/sample
-               doexe sample/client sample/server
-       fi
-
-       # Default location for java classes breaks OpenOffice (bug #60769).
-       if use java ; then
-               java-pkg_dojar ${PN}.jar
-               java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-               # hackish, don't wanna dig through makefile
-               rm -Rf "${D}/usr/$(get_libdir)/java"
-               docinto "java"
-               dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-               dodir "/usr/share/doc/${PF}/java/Test"
-               insinto "/usr/share/doc/${PF}/java/Test"
-               doins "${S}"/java/Test/*.java
-       fi
-
-       docinto ""
-       dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-       newdoc pwcheck/README README.pwcheck
-       dohtml doc/*.html
-
-       docinto "saslauthd"
-       dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-       newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-       newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-       systemd_dounit "${FILESDIR}/pwcheck.service"
-
-       newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-       newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-       systemd_dounit "${FILESDIR}/saslauthd.service"
-       systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-       newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
-
-       use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
-}
-
-pkg_preinst() {
-       preserve_old_lib /usr/$(get_libdir)/libsasl2.so.2
-}
-
-pkg_postinst () {
-       # Generate an empty sasldb2 with correct permissions.
-       if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-               einfo "Generating an empty sasldb2 with correct permissions ..."
-               echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-                       || die "Failed to generate sasldb2"
-               "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-                       || die "Failed to delete temp user"
-               chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-                       || die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-               chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-                       || die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-       fi
-
-       if use authdaemond ; then
-               elog "You need to add a user running a service using Courier's"
-               elog "authdaemon to the 'mail' group. For example, do:"
-               elog "  gpasswd -a postfix mail"
-               elog "to add the 'postfix' user to the 'mail' group."
-       fi
-
-       elog "pwcheck and saslauthd home directories have moved to:"
-       elog "  /run/saslauthd, using tmpfiles.d"
-
-       preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r5.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r5.ebuild
deleted file mode 100644 (file)
index 569aee6..0000000
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r5.ebuild,v 1.4 2014/12/28 15:30:29 titanofold Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
-       authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-       berkdb? ( >=sys-libs/db-3.2 )
-       gdbm? ( >=sys-libs/gdbm-1.8.0 )
-       kerberos? ( virtual/krb5 )
-       openldap? ( net-nds/openldap )
-       mysql? ( virtual/mysql )
-       pam? ( virtual/pam )
-       postgres? ( dev-db/postgresql )
-       sqlite? ( dev-db/sqlite:3 )
-       ssl? ( dev-libs/openssl )
-       java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-       java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
-       epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-CVE-2013-4122.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-send-imap-logout.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-fix_dovecot_authentication.patch
-
-       # Get rid of the -R switch (runpath_switch for Sun)
-       # >=gcc-4.6 errors out with unknown option
-       sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-               configure.in || die
-
-       # Use plugindir for sasldir
-       sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-               "${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-       # #486740 #468556
-       sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-               -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-               configure.in || die
-       sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-               saslauthd/configure.in || die
-
-       eautoreconf
-}
-
-src_configure() {
-       append-flags -fno-strict-aliasing
-       append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-       # Java support.
-       use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-       local myconf
-
-       # Add authdaemond support (bug #56523).
-       if use authdaemond ; then
-               myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
-       fi
-
-       # Fix for bug #59634.
-       if ! use ssl ; then
-               myconf="${myconf} --without-des"
-       fi
-
-       if use mysql || use postgres || use sqlite ; then
-               myconf="${myconf} --enable-sql"
-       else
-               myconf="${myconf} --disable-sql"
-       fi
-
-       # Default to GDBM if both 'gdbm' and 'berkdb' are present.
-       if use gdbm ; then
-               einfo "Building with GNU DB as database backend for your SASLdb"
-               myconf="${myconf} --with-dblib=gdbm"
-       elif use berkdb ; then
-               einfo "Building with BerkeleyDB as database backend for your SASLdb"
-               myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
-       else
-               einfo "Building without SASLdb support"
-               myconf="${myconf} --with-dblib=none"
-       fi
-
-       # Use /dev/urandom instead of /dev/random (bug #46038).
-       if use urandom ; then
-               myconf="${myconf} --with-devrandom=/dev/urandom"
-       fi
-
-       econf \
-               --enable-login \
-               --enable-ntlm \
-               --enable-auth-sasldb \
-               --disable-cmulocal \
-               --disable-krb4 \
-               --enable-otp \
-               --without-sqlite \
-               --with-saslauthd=/run/saslauthd \
-               --with-pwcheck=/run/saslauthd \
-               --with-configdir=/etc/sasl2 \
-               --with-plugindir=/usr/$(get_libdir)/sasl2 \
-               --with-dbpath=/etc/sasl2/sasldb2 \
-               $(use_with ssl openssl) \
-               $(use_with pam) \
-               $(use_with openldap ldap) \
-               $(use_enable ldapdb) \
-               $(use_enable sample) \
-               $(use_enable kerberos gssapi) \
-               $(use_enable java) \
-               $(use_with java javahome ${JAVA_HOME}) \
-               $(use_with mysql) \
-               $(use_with postgres pgsql) \
-               $(use_with sqlite sqlite3 /usr/$(get_libdir)) \
-               $(use_enable srp) \
-               $(use_enable static-libs static) \
-               ${myconf}
-}
-
-src_compile() {
-       emake
-
-       # Default location for java classes breaks OpenOffice (bug #60769).
-       # Thanks to axxo@gentoo.org for the solution.
-       cd "${S}"
-       if use java ; then
-               jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-       fi
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-       keepdir /etc/sasl2
-
-       if use sample ; then
-               docinto sample
-               dodoc sample/*.c
-               exeinto /usr/share/doc/${P}/sample
-               doexe sample/client sample/server
-       fi
-
-       # Default location for java classes breaks OpenOffice (bug #60769).
-       if use java ; then
-               java-pkg_dojar ${PN}.jar
-               java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-               # hackish, don't wanna dig through makefile
-               rm -Rf "${D}/usr/$(get_libdir)/java"
-               docinto "java"
-               dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-               dodir "/usr/share/doc/${PF}/java/Test"
-               insinto "/usr/share/doc/${PF}/java/Test"
-               doins "${S}"/java/Test/*.java
-       fi
-
-       docinto ""
-       dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-       newdoc pwcheck/README README.pwcheck
-       dohtml doc/*.html
-
-       docinto "saslauthd"
-       dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-       newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-       newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-       systemd_dounit "${FILESDIR}/pwcheck.service"
-
-       newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-       newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-       systemd_dounit "${FILESDIR}/saslauthd.service"
-       systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-       newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
-
-       use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
-}
-
-pkg_postinst () {
-       # Generate an empty sasldb2 with correct permissions.
-       if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-               einfo "Generating an empty sasldb2 with correct permissions ..."
-               echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-                       || die "Failed to generate sasldb2"
-               "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-                       || die "Failed to delete temp user"
-               chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-                       || die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-               chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-                       || die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-       fi
-
-       if use authdaemond ; then
-               elog "You need to add a user running a service using Courier's"
-               elog "authdaemon to the 'mail' group. For example, do:"
-               elog "  gpasswd -a postfix mail"
-               elog "to add the 'postfix' user to the 'mail' group."
-       fi
-
-       elog "pwcheck and saslauthd home directories have moved to:"
-       elog "  /run/saslauthd, using tmpfiles.d"
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild
deleted file mode 100644 (file)
index 72d262f..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild,v 1.6 2014/12/28 15:30:29 titanofold Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
-       authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-       berkdb? ( >=sys-libs/db-4.8.30-r1[${MULTILIB_USEDEP}] )
-       gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
-       kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-       openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-       mysql? ( virtual/mysql )
-       pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
-       postgres? ( dev-db/postgresql )
-       sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
-       ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-       java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/sasl/md5global.h
-)
-
-pkg_setup() {
-       java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
-       epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-CVE-2013-4122.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-send-imap-logout.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-fix_dovecot_authentication.patch
-
-       # Get rid of the -R switch (runpath_switch for Sun)
-       # >=gcc-4.6 errors out with unknown option
-       sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-               configure.in || die
-
-       # Use plugindir for sasldir
-       sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-               "${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-       # #486740 #468556
-       sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-               -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-               configure.in || die
-       sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-               saslauthd/configure.in || die
-
-       eautoreconf
-}
-
-src_configure() {
-       append-flags -fno-strict-aliasing
-       append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       # Java support.
-       multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-       local myconf=()
-
-       # Add authdaemond support (bug #56523).
-       if use authdaemond ; then
-               myconf+=( --with-authdaemond=/var/lib/courier/authdaemon/socket )
-       fi
-
-       # Fix for bug #59634.
-       if ! use ssl ; then
-               myconf+=( --without-des )
-       fi
-
-       if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
-               myconf+=( --enable-sql )
-       else
-               myconf+=( --disable-sql )
-       fi
-
-       # Default to GDBM if both 'gdbm' and 'berkdb' are present.
-       if use gdbm ; then
-               einfo "Building with GNU DB as database backend for your SASLdb"
-               myconf+=( --with-dblib=gdbm )
-       elif use berkdb ; then
-               einfo "Building with BerkeleyDB as database backend for your SASLdb"
-               myconf+=(
-                       --with-dblib=berkeley
-                       --with-bdb-incdir="$(db_includedir)"
-               )
-       else
-               einfo "Building without SASLdb support"
-               myconf+=( --with-dblib=none )
-       fi
-
-       # Use /dev/urandom instead of /dev/random (bug #46038).
-       if use urandom ; then
-               myconf+=( --with-devrandom=/dev/urandom )
-       fi
-
-       ECONF_SOURCE=${S} \
-       econf \
-               --enable-login \
-               --enable-ntlm \
-               --enable-auth-sasldb \
-               --disable-cmulocal \
-               --disable-krb4 \
-               --enable-otp \
-               --without-sqlite \
-               --with-saslauthd=/run/saslauthd \
-               --with-pwcheck=/run/saslauthd \
-               --with-configdir=/etc/sasl2 \
-               --with-plugindir=/usr/$(get_libdir)/sasl2 \
-               --with-dbpath=/etc/sasl2/sasldb2 \
-               $(use_with ssl openssl) \
-               $(use_with pam) \
-               $(use_with openldap ldap) \
-               $(use_enable ldapdb) \
-               $(multilib_native_use_enable sample) \
-               $(use_enable kerberos gssapi) \
-               $(multilib_native_use_enable java) \
-               $(multilib_native_use_with java javahome ${JAVA_HOME}) \
-               $(multilib_native_use_with mysql) \
-               $(multilib_native_use_with postgres pgsql) \
-               $(use_with sqlite sqlite3 /usr/$(get_libdir)) \
-               $(use_enable srp) \
-               $(use_enable static-libs static) \
-               "${myconf[@]}"
-}
-
-multilib_src_compile() {
-       emake
-
-       # Default location for java classes breaks OpenOffice (bug #60769).
-       # Thanks to axxo@gentoo.org for the solution.
-       if multilib_is_native_abi && use java ; then
-               jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-       fi
-}
-
-multilib_src_install() {
-       default
-
-       if multilib_is_native_abi; then
-               if use sample ; then
-                       docinto sample
-                       dodoc "${S}"/sample/*.c
-                       exeinto /usr/share/doc/${P}/sample
-                       doexe sample/client sample/server
-               fi
-
-               # Default location for java classes breaks OpenOffice (bug #60769).
-               if use java ; then
-                       java-pkg_dojar ${PN}.jar
-                       java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-                       # hackish, don't wanna dig through makefile
-                       rm -Rf "${D}/usr/$(get_libdir)/java"
-                       docinto "java"
-                       dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-                       dodir "/usr/share/doc/${PF}/java/Test"
-                       insinto "/usr/share/doc/${PF}/java/Test"
-                       doins "${S}"/java/Test/*.java
-               fi
-
-               dosbin saslauthd/testsaslauthd
-       fi
-}
-
-multilib_src_install_all() {
-       keepdir /etc/sasl2
-
-       dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-       newdoc pwcheck/README README.pwcheck
-       dohtml doc/*.html
-
-       docinto "saslauthd"
-       dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-       newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-       newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-       systemd_dounit "${FILESDIR}/pwcheck.service"
-
-       newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-       newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-       systemd_dounit "${FILESDIR}/saslauthd.service"
-       systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-       prune_libtool_files --modules
-}
-
-pkg_postinst () {
-       # Generate an empty sasldb2 with correct permissions.
-       if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-               einfo "Generating an empty sasldb2 with correct permissions ..."
-               echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-                       || die "Failed to generate sasldb2"
-               "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-                       || die "Failed to delete temp user"
-               chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-                       || die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-               chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-                       || die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-       fi
-
-       if use authdaemond ; then
-               elog "You need to add a user running a service using Courier's"
-               elog "authdaemon to the 'mail' group. For example, do:"
-               elog "  gpasswd -a postfix mail"
-               elog "to add the 'postfix' user to the 'mail' group."
-       fi
-
-       elog "pwcheck and saslauthd home directories have moved to:"
-       elog "  /run/saslauthd, using tmpfiles.d"
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r8.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r8.ebuild
deleted file mode 100644 (file)
index c8a3de8..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r8.ebuild,v 1.3 2014/12/28 15:30:29 titanofold Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
-       authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-       berkdb? ( >=sys-libs/db-4.8.30-r1[${MULTILIB_USEDEP}] )
-       gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
-       kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-       openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-       mysql? ( virtual/mysql )
-       pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
-       postgres? ( dev-db/postgresql )
-       sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
-       ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-       java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/sasl/md5global.h
-)
-
-pkg_setup() {
-       java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
-       epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-       epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-CVE-2013-4122.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-send-imap-logout.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
-       epatch "${FILESDIR}"/${PN}-2.1.26-fix_dovecot_authentication.patch
-
-       # Get rid of the -R switch (runpath_switch for Sun)
-       # >=gcc-4.6 errors out with unknown option
-       sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-               configure.in || die
-
-       # Use plugindir for sasldir
-       sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-               "${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-       # #486740 #468556
-       sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-               -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-               configure.in || die
-       sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-               saslauthd/configure.in || die
-
-       eautoreconf
-}
-
-src_configure() {
-       append-flags -fno-strict-aliasing
-       append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       # Java support.
-       multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-       local myconf=()
-
-       # Add authdaemond support (bug #56523).
-       if use authdaemond ; then
-               myconf+=( --with-authdaemond=/var/lib/courier/authdaemon/socket )
-       fi
-
-       # Fix for bug #59634.
-       if ! use ssl ; then
-               myconf+=( --without-des )
-       fi
-
-       if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
-               myconf+=( --enable-sql )
-       else
-               myconf+=( --disable-sql )
-       fi
-
-       # Default to GDBM if both 'gdbm' and 'berkdb' are present.
-       if use gdbm ; then
-               einfo "Building with GNU DB as database backend for your SASLdb"
-               myconf+=( --with-dblib=gdbm )
-       elif use berkdb ; then
-               einfo "Building with BerkeleyDB as database backend for your SASLdb"
-               myconf+=(
-                       --with-dblib=berkeley
-                       --with-bdb-incdir="$(db_includedir)"
-               )
-       else
-               einfo "Building without SASLdb support"
-               myconf+=( --with-dblib=none )
-       fi
-
-       # Use /dev/urandom instead of /dev/random (bug #46038).
-       if use urandom ; then
-               myconf+=( --with-devrandom=/dev/urandom )
-       fi
-
-       ECONF_SOURCE=${S} \
-       econf \
-               --enable-login \
-               --enable-ntlm \
-               --enable-auth-sasldb \
-               --disable-cmulocal \
-               --disable-krb4 \
-               --enable-otp \
-               --without-sqlite \
-               --with-saslauthd=/run/saslauthd \
-               --with-pwcheck=/run/saslauthd \
-               --with-configdir=/etc/sasl2 \
-               --with-plugindir=/usr/$(get_libdir)/sasl2 \
-               --with-dbpath=/etc/sasl2/sasldb2 \
-               $(use_with ssl openssl) \
-               $(use_with pam) \
-               $(use_with openldap ldap) \
-               $(use_enable ldapdb) \
-               $(multilib_native_use_enable sample) \
-               $(use_enable kerberos gssapi) \
-               $(multilib_native_use_enable java) \
-               $(multilib_native_use_with java javahome ${JAVA_HOME}) \
-               $(multilib_native_use_with mysql mysql /usr) \
-               $(multilib_native_use_with postgres pgsql) \
-               $(use_with sqlite sqlite3 /usr/$(get_libdir)) \
-               $(use_enable srp) \
-               $(use_enable static-libs static) \
-               "${myconf[@]}"
-}
-
-multilib_src_compile() {
-       emake
-
-       # Default location for java classes breaks OpenOffice (bug #60769).
-       # Thanks to axxo@gentoo.org for the solution.
-       if multilib_is_native_abi && use java ; then
-               jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-       fi
-}
-
-multilib_src_install() {
-       default
-
-       if multilib_is_native_abi; then
-               if use sample ; then
-                       docinto sample
-                       dodoc "${S}"/sample/*.c
-                       exeinto /usr/share/doc/${P}/sample
-                       doexe sample/client sample/server
-               fi
-
-               # Default location for java classes breaks OpenOffice (bug #60769).
-               if use java ; then
-                       java-pkg_dojar ${PN}.jar
-                       java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-                       # hackish, don't wanna dig through makefile
-                       rm -Rf "${D}/usr/$(get_libdir)/java"
-                       docinto "java"
-                       dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-                       dodir "/usr/share/doc/${PF}/java/Test"
-                       insinto "/usr/share/doc/${PF}/java/Test"
-                       doins "${S}"/java/Test/*.java
-               fi
-
-               dosbin saslauthd/testsaslauthd
-       fi
-}
-
-multilib_src_install_all() {
-       keepdir /etc/sasl2
-
-       dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-       newdoc pwcheck/README README.pwcheck
-       dohtml doc/*.html
-
-       docinto "saslauthd"
-       dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-       newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-       newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-       systemd_dounit "${FILESDIR}/pwcheck.service"
-
-       newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-       newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-       systemd_dounit "${FILESDIR}/saslauthd.service"
-       systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-       prune_libtool_files --modules
-}
-
-pkg_postinst () {
-       # Generate an empty sasldb2 with correct permissions.
-       if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-               einfo "Generating an empty sasldb2 with correct permissions ..."
-               echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-                       || die "Failed to generate sasldb2"
-               "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-                       || die "Failed to delete temp user"
-               chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-                       || die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-               chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-                       || die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-       fi
-
-       if use authdaemond ; then
-               elog "You need to add a user running a service using Courier's"
-               elog "authdaemon to the 'mail' group. For example, do:"
-               elog "  gpasswd -a postfix mail"
-               elog "to add the 'postfix' user to the 'mail' group."
-       fi
-
-       elog "pwcheck and saslauthd home directories have moved to:"
-       elog "  /run/saslauthd, using tmpfiles.d"
-}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-db4.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-db4.patch
deleted file mode 100644 (file)
index dbe3f09..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-support new db versions
-
-http://bugs.gentoo.org/192753
-
---- cyrus-sasl-2.1.22/cmulocal/berkdb.m4
-+++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4
-@@ -213,7 +213,7 @@
-       fi
- 
-       saved_LIBS=$LIBS
--        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-           do
-           LIBS="$saved_LIBS -l$dbname"
-           AC_TRY_LINK([#include <db.h>],
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-get_fqhostname.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-get_fqhostname.patch
deleted file mode 100644 (file)
index 68fb75b..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-https://bugzilla.cyrusimap.org/show_bug.cgi?id=3589
-Gentoo bug #405097
---- cyrus-sasl-2.1.25/lib/saslutil.c.orig      2011-10-21 13:59:59.354462366 +0200
-+++ cyrus-sasl-2.1.25/lib/saslutil.c   2011-10-21 14:10:55.849675881 +0200
-@@ -555,32 +555,44 @@
-                 NULL,         /* don't care abour service/port */
-                 &hints,
-                 &result) != 0) {
--      /* errno on Unix, WSASetLastError on Windows are already done by the function */
--      return (-1);
-+        if (abort_if_no_fqdn) {
-+          /* errno on Unix, WSASetLastError on Windows are already done by the function */
-+          return (-1);
-+      } else {
-+          goto LOWERCASE;
-+      }
-     }
- 
--    if (abort_if_no_fqdn && (result == NULL || result->ai_canonname == NULL)) {
-+    if (result == NULL || result->ai_canonname == NULL) {
-       freeaddrinfo (result);
-+        if (abort_if_no_fqdn) {
- #ifdef WIN32
--      WSASetLastError (WSANO_DATA);
-+          WSASetLastError (WSANO_DATA);
- #elif defined(ENODATA)
--      errno = ENODATA;
-+          errno = ENODATA;
- #elif defined(EADDRNOTAVAIL)
--      errno = EADDRNOTAVAIL;
-+          errno = EADDRNOTAVAIL;
- #endif
--      return (-1);
-+          return (-1);
-+      } else {
-+          goto LOWERCASE;
-+      }
-     }
- 
--    if (abort_if_no_fqdn && strchr (result->ai_canonname, '.') == NULL) {
-+    if (strchr (result->ai_canonname, '.') == NULL) {
-       freeaddrinfo (result);
-+        if (abort_if_no_fqdn) {
- #ifdef WIN32
--      WSASetLastError (WSANO_DATA);
-+          WSASetLastError (WSANO_DATA);
- #elif defined(ENODATA)
--      errno = ENODATA;
-+          errno = ENODATA;
- #elif defined(EADDRNOTAVAIL)
--      errno = EADDRNOTAVAIL;
-+          errno = EADDRNOTAVAIL;
- #endif
--      return (-1);
-+          return (-1);
-+      } else {
-+          goto LOWERCASE;
-+      }
-     }
- 
- 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-gssapi.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-gssapi.patch
deleted file mode 100644 (file)
index 3fe193c..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix segfault in gssapi.
-
---- a/plugins/gssapi.c
-+++ b/plugins/gssapi.c
-@@ -370,7 +370,7 @@ sasl_gss_encode(void *context, const str
-     }
-     
-     if (output_token->value && output) {
--      unsigned char * p = (unsigned char *) text->encode_buf;
-+      int len;
-       
-       ret = _plug_buf_alloc(text->utils,
-                             &(text->encode_buf),
-@@ -384,11 +384,8 @@ sasl_gss_encode(void *context, const str
-           return ret;
-       }
-       
--      p[0] = (output_token->length>>24) & 0xFF;
--      p[1] = (output_token->length>>16) & 0xFF;
--      p[2] = (output_token->length>>8) & 0xFF;
--      p[3] = output_token->length & 0xFF;
--
-+      len = htonl(output_token->length);
-+      memcpy(text->encode_buf, &len, 4);
-       memcpy(text->encode_buf + 4, output_token->value, output_token->length);
-     }
-     
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-lib_before_plugin.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-lib_before_plugin.patch
deleted file mode 100644 (file)
index 6c79bb0..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-Fixes parallel make
-http://git.cyrusimap.org/cyrus-sasl/commit/?id=5611d43e27098f659f84155271cf42f46aab1caf
-
-From 5611d43e27098f659f84155271cf42f46aab1caf Mon Sep 17 00:00:00 2001
-From: Alexey Melnikov <alexey.melnikov@isode.com>
-Date: Thu, 22 Sep 2011 14:41:12 +0000
-Subject: lib should be built before plugins (Patch from marcandre.lureau@redhat.com)
-
----
-diff --git a/Makefile.am b/Makefile.am
-index d6005fb..b35164e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -69,7 +69,7 @@ else
- INSTALLOSX = 
- endif
- 
--SUBDIRS=include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD)
-+SUBDIRS=include sasldb lib plugins utils doc man $(PWC) $(SAM) $(JAV) $(SAD)
- EXTRA_DIST=config cmulocal win32 mac dlcompat-20010505 NTMakefile INSTALL.TXT
- 
- dist-hook:
---
-cgit v0.9.0.2