Upgrades on the 1.8 & 10 branches to address a potential resource leak when a re-invite transaction is not completed (AST-2012-010) and on the 1.8 branch only for a remote crash vulnerability in the voicemail application (AST-2012-011). Both covered under CVE-2012-3812. Removed any non-stable vulnerable ebuild.

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

5 files changed, 40 insertions, 319 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 3a59d7117b12..9d6e8c4403cf 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.400 2012/06/22 10:51:26 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.401 2012/07/06 13:27:13 chainsaw Exp $
+
+*asterisk-10.5.2 (06 Jul 2012)
+*asterisk-1.8.13.1 (06 Jul 2012)
+
+  06 Jul 2012; Tony Vroon <chainsaw@gentoo.org> -asterisk-1.8.13.0.ebuild,
+  -asterisk-1.8.13.0-r1.ebuild, +asterisk-1.8.13.1.ebuild,
+  -asterisk-10.5.1.ebuild, +asterisk-10.5.2.ebuild:
+  Upgrades on the 1.8 & 10 branches to address a potential resource leak when a
+  re-invite transaction is not completed (AST-2012-010) and on the 1.8 branch
+  only for a remote crash vulnerability in the voicemail application
+  (AST-2012-011). Both covered under CVE-2012-3812. Removed any non-stable
+  vulnerable ebuild.
 
 *asterisk-1.8.13.0-r1 (22 Jun 2012)
 
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index a9003702d438..b0a34c4f91eb 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,34 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1.6.0/asterisk.confd 2204 RMD160 31bceebfa535e97cb2634e313678cc42186d4750 SHA1 748c623cea238cd9b322672d5ebcfe214a4f0463 SHA256 daec84c58e0ef6cbd71a6fc62cb83129b1bcffdfdd619ebbd62a642f0cd1eee7
-AUX 1.6.2/asterisk.logrotate3 436 RMD160 06a98d2a908464a951e3386a2681f5829dcb0220 SHA1 31331f8fabc643f722a1c12cee0557e0268019ea SHA256 675705506d1adf7ec8c278581412a7ed69eed2735fea6c5f2faf368fb4ad9a26
-AUX 1.6.2/call_data.txt 1120 RMD160 cee46a6b1e11b19cd0f9ce78e550373f480731b0 SHA1 fd9520418c36cfc740043bfab51f39e22eb07313 SHA256 24a5b8dab0f46ffff6dddc50d4ab8d498ec90bc2a0977249f65471b3f0948a0b
-AUX 1.6.2/find_call_ids.sh 446 RMD160 e3e46295e7a4b7fdc2364c5ddfbe76290311a6fd SHA1 a1fd3e1a62e93c2cf41e9eb50ed0b95b6c666ba8 SHA256 742289cc719fbf0f119e05516b20da3fef78908f5dd08f56eaa49abe10104e77
-AUX 1.6.2/find_call_sip_trace.sh 530 RMD160 a45c1710a159dd5e7f9dfba51e92981ebb2ab035 SHA1 1e221f910625ce47ad9c84937d8160fdeedb713d SHA256 6818f5cde5f99b7c9be35d20e2c84c61cf0d14f63aa1e3952d0dc91ecb93e3a4
-AUX 1.6.2/sip_calc_auth 493 RMD160 1813bd5aecbb60b38c20752050e6be44cca10f47 SHA1 139db5af00790f7b18e9a3e14948edc683e7e03f SHA256 18590fd24d6fa0b7392228695b764351ac9af25482e22247bf80471858a90c4c
-AUX 1.8.0/asterisk.confd 2203 RMD160 00d92671d00ff495d1651ec064fec8c790f94f6c SHA1 3da25f263e8bdeda7130ed03f9aced379591875f SHA256 32f60bc5ff42edb1ecda236f6e87d67fd723533658bd1efb6085e87736536969
-AUX 1.8.0/asterisk.initd 6511 RMD160 183128f493953a1dc9241e2966398c6e5f3e1365 SHA1 13ff4c28dc86d5bd534b43b2b08763f8ec19baa1 SHA256 88028e2c8cf78414725697c2121bbb861a18869f7675d4b814fcb8fecfe71586
-AUX 1.8.0/asterisk.initd2 6522 RMD160 7c472eff7ee817dd3d8b3d228f66b27f2341fb91 SHA1 aa30a4b18e0952f68263493f25947caeff6aa514 SHA256 77db24b411744ea7897c3609c116315b3c71c24281012eea4f79f996df58e747
-AUX 1.8.0/find_call_ids.sh 1078 RMD160 094d2f014fa6570aaab2eecf3e20bb89788b0f22 SHA1 3c240ab995c37bd502c454ce21c412628e3f103c SHA256 185d0f55f54d044eb4b4dc64954e5191f8b993d139749bfe869e34f3ecff9d09
-AUX 1.8.0/find_call_sip_trace.sh 1115 RMD160 a9f2782feabc2866bd8476779f69d3d97aa0a7c0 SHA1 69f323eb23db20feec17e5d6dba8861d52856d14 SHA256 e1ebeb1dab05f552f89f380719d319cdf579cb6aeb86a9010e13e14c57f55985
-DIST asterisk-1.8.12.1.tar.gz 25089535 RMD160 7dfacbdcc178100e71d39ea3157b81b7b4bf2ae8 SHA1 b09fb86bfb6f157e65c892da794e07111240ad73 SHA256 413d65f5a647b8dd946cdedb1a835cea5f898f67157615ff159f5f64d8e90faf
-DIST asterisk-1.8.13.0.tar.gz 25059587 RMD160 f1ce05e56a61e3b4215dd7b9fc3f8331bf70486b SHA1 9c45a16d99a5ea1d73e88b3556d9ee5b2afa594b SHA256 578c46cef13ccc17e201e4cce50b21bf9e2fbd9516c69e7529ac0b43b1c041e1
-DIST asterisk-10.5.1.tar.gz 24970486 RMD160 3e4e371a7bd533242c806bf683f0d1ad9afdeb70 SHA1 f927384456aaadc6990730927644f162b7e50536 SHA256 2d75184a25fc1cac80c1eacdb1cec3f1538cc7be16f1601daa46f06994f01ce5
-DIST gentoo-asterisk-patchset-1.12.tar.bz2 30340 RMD160 b4e65e60f98cb5d125ecf6ca44c0526ebfc7c8d2 SHA1 213a501b3d0c08b48e545fe91c9282c79f3aa33d SHA256 42540637a94c127aee5028650c6f8695a30930d074a4ec25214c17053e35c257
-DIST gentoo-asterisk-patchset-1.13.tar.bz2 30353 RMD160 8649e15f7bf3766e4aaf5426559f71673d8a52b3 SHA1 873a8b80f670c7889271fc838e64988e654a78b8 SHA256 de4d9b4ab9c2d403077cb575e08c33d7320a38da48e1af1cbc545fea34f5c7f5
-DIST gentoo-asterisk-patchset-2.5.tar.bz2 5839 RMD160 b3f226d89c39f4a0ca769618bc7cd06419fe8be7 SHA1 a7cbb5f8ab8f908c81bc22ef6cd1caa5e4d91949 SHA256 f67f262ab907213e6ae355923cc57d2065029f216ccebf18044ffb7f31303ced
-EBUILD asterisk-1.8.12.1.ebuild 8502 RMD160 29cffb42bd275f35e9f52a85c91e4c49f1bfd79f SHA1 03f67abcd328f4a1f4e29a1b2433fc83513dfe57 SHA256 9841979a176814a61223cc7904709a26031eeb2e6fa0eae655dc1be993c6574c
-EBUILD asterisk-1.8.13.0-r1.ebuild 9038 RMD160 76ae925fc9c4477138f5d0bb92835d787a8f3ba4 SHA1 ee4602250b74248a0ce3c5d48218f72674460877 SHA256 f058675c259cc1da68b505b4532c7a58c4e712338c73bd51fb22022d5b530719
-EBUILD asterisk-1.8.13.0.ebuild 8520 RMD160 9f2dbad9a6eb9cb204faa62dfaa8d46839d565eb SHA1 42c0d0e426fc2b87688fb3e1b68e23547f759c42 SHA256 c105b6aaf990e8a9831d5b8f3f352374083af7e83663a5433fec8db4d04fd9e6
-EBUILD asterisk-10.5.1.ebuild 8584 RMD160 5732f9ba409d8409f9a66753799919130bbf1a5e SHA1 011acca2a13c406c9ede3ecac34c7854e8dfd849 SHA256 6d781516ff77a4f6318734a49907ff531aaa7aff21e773532caa9d5eb78e80c8
-MISC ChangeLog 103625 RMD160 6416029f08852c124cadbdc1b6882c508e8110b8 SHA1 eccd638b55ed90f484fd140bd2baa4b998c5dea6 SHA256 77b5f77e43a5fe97e38f319dd5656ebbe3d1c31c43c908f953dba0280c32d285
-MISC asterisk-1.8.13.0-r1.ebuild.orig 8520 RMD160 9f2dbad9a6eb9cb204faa62dfaa8d46839d565eb SHA1 42c0d0e426fc2b87688fb3e1b68e23547f759c42 SHA256 c105b6aaf990e8a9831d5b8f3f352374083af7e83663a5433fec8db4d04fd9e6
-MISC metadata.xml 1028 RMD160 5b59e20d3efbe652abf786d05a7b9744105a088b SHA1 e718c3ce0210047b34a05c92ff8a7b4707316e17 SHA256 63267079fefbcc798d902e6b9822609df79c756a9934c3ad3abdabfbad357de5
+AUX 1.6.0/asterisk.confd 2204 SHA256 daec84c58e0ef6cbd71a6fc62cb83129b1bcffdfdd619ebbd62a642f0cd1eee7 SHA512 4d8998be5032203d693096d7940b4aeca71345b23544ef3c645f47aa617cc775da7b013f364ef90fd0abdd86976235bb4fcd463a055250b8072efc181e325466 WHIRLPOOL dc423607cda205913e034f4b6c10b20463eff12bb0c1f41813deade9cd887e3abaafa6eeab6c39064c3da242e50859e293165a9818eee867ecf832d9d1f88a8d
+AUX 1.6.2/asterisk.logrotate3 436 SHA256 675705506d1adf7ec8c278581412a7ed69eed2735fea6c5f2faf368fb4ad9a26 SHA512 de9893ce0b460e711cc107779afd40150398ef53f901923a7378757df2936c1bde43c39ba50924f913db81ce66550a9d2e1bb66c5712021b5f8c652d3b3740c4 WHIRLPOOL 34606860de1f8d7f45165035a4d3c0ff8726843508f0664a77db90d90556166dd3d6909dfe0f1b616e239c182e3b97f2e9a224e76628312a5e0d2a6e6a1259e7
+AUX 1.6.2/call_data.txt 1120 SHA256 24a5b8dab0f46ffff6dddc50d4ab8d498ec90bc2a0977249f65471b3f0948a0b SHA512 0bc4ab49d3a7493d1871c63234fb4c4ec6725491d350e28836f1220d1c17097974d47afcf19265348215d3076e12266688df513614f595cbae8f996cbb6fc7cb WHIRLPOOL e28db9b7c11e9106edc3d00f611960ea3290c442607c14b0d30ba2ab773deea6b70ab37f88b60f559062b18364d7d142526d045280ff8559acf560163a9a04b7
+AUX 1.6.2/find_call_ids.sh 446 SHA256 742289cc719fbf0f119e05516b20da3fef78908f5dd08f56eaa49abe10104e77 SHA512 b3998652fa93b0cb9cf2b1a495e9d02ea4a1a0c82f6fd812df8e47d58c9da89fd8537632936b43ac72165ba38c9844ba721198a823f954feb0c7ea8a7221893b WHIRLPOOL eba7c3e8a8c2acee276177daf3649c34a8d863116c96f23ee8b377968d5ad13da16389e2881299b59270afe7cc961c8b1852d4aad13c02734bf96cd84a3ce604
+AUX 1.6.2/find_call_sip_trace.sh 530 SHA256 6818f5cde5f99b7c9be35d20e2c84c61cf0d14f63aa1e3952d0dc91ecb93e3a4 SHA512 bfff2511fd2cb9fae443c58dd627c96d831e6d5412f19fc172de1621ce031bbac2851250a2886565019f3aa5484ba41358ffdb003a6be05ed40022d30d7a3c55 WHIRLPOOL 098d8556779b2c053f8bb808354ee9f90e92a63fda99b5eb405407a90889247fa413f964261622f2749a0860bbc2b08b25c3d823d2f014b7c17cdc578ade475d
+AUX 1.6.2/sip_calc_auth 493 SHA256 18590fd24d6fa0b7392228695b764351ac9af25482e22247bf80471858a90c4c SHA512 07f11ac176206c81d491be8014436058196fcb21e5cefff1aa039c23df0c002d252d381c4bf1a55f6c7ceb5a58baa50282493c8c62e4ed8f77716da2ac7a0186 WHIRLPOOL 637cbad803360a4f7d2a5aa85b689fd072f6af7592e440025013e47cad77e1f54d614c15194511e37ba1e57630db97982a368cfdfc80264e8733d897a3aa0a10
+AUX 1.8.0/asterisk.confd 2203 SHA256 32f60bc5ff42edb1ecda236f6e87d67fd723533658bd1efb6085e87736536969 SHA512 53219b410f29f9974fa2ec33ffb0aa914735e4a0897eed0f20a0cd740701757e56f48d0a954a1955cca7c94b2a17cd62dd494ba89a84c8a29312cb633288eee1 WHIRLPOOL 17fef9b012a13529864295629068d034bdd78bba3fc6211e5c2a888097614510c159747768ebb54e6e59999a5254353592f0da665541e82f4fdb2283f0d8dcc1
+AUX 1.8.0/asterisk.initd 6511 SHA256 88028e2c8cf78414725697c2121bbb861a18869f7675d4b814fcb8fecfe71586 SHA512 03d31365a4b68f4974a253a6311b9857a4e95f3f9f838c68c3f2515fa48a769bfa2bc1e33012ea53090403b9f0b7afae5864d441f31746489af10fde244eedbb WHIRLPOOL 145499e94525dee95984c7b623c6e347296035485fb3a1d2cc565d248e50ade55177537f44a558cfc9ca5b1eb26ffd9563bb88bf7aae0b562174c5cfbfda4150
+AUX 1.8.0/asterisk.initd2 6522 SHA256 77db24b411744ea7897c3609c116315b3c71c24281012eea4f79f996df58e747 SHA512 242797fddc59f2325e3f79ca3fc614f797f35ca16ab066d83e2549db4b4b64cf701528553f5c8bbfc216e86ff7f2ab638287cef2603649e485ec3bfc968aa380 WHIRLPOOL 9cea3b87799388199903b7fa454ce61832677a1da0ec89255b76a461fd9904695e2792814e7bfa455cd782260712f8ea5a300d69d851d009a06994dcc3128b95
+AUX 1.8.0/find_call_ids.sh 1078 SHA256 185d0f55f54d044eb4b4dc64954e5191f8b993d139749bfe869e34f3ecff9d09 SHA512 1690eb3ea9eb51711df9fd7c121dbc520a2a15870fa06523f096968386ca68a132a46e361b9d19367c7089cd9ad18132ed02ef0aedd990d5939550182a3366c9 WHIRLPOOL f123f60557066707d0c276451af32f5561abb8db7e8d4eeb3a2da871ae0245108e42d28c7ff77d228a963e5f5326f7382b0ac54f92fc1bfeec2c085b9b237a15
+AUX 1.8.0/find_call_sip_trace.sh 1115 SHA256 e1ebeb1dab05f552f89f380719d319cdf579cb6aeb86a9010e13e14c57f55985 SHA512 e679f3953b2e397d7c80bb2f0ca3db848f07ba97ca139c87224de4467f8172034eb4372e5ddd68116774a7b9d5fd48aa30d809e2af2c6e6e0747762c69090b6a WHIRLPOOL 8c30be245556b37dd45dd5ff5cf5c3141050f60c3e286631520f8114e167c6bd4f7930be21e57e93fd183ab65dfbd3b95b8e342808870979b67977f3ce189ebf
+DIST asterisk-1.8.12.1.tar.gz 25089535 SHA256 413d65f5a647b8dd946cdedb1a835cea5f898f67157615ff159f5f64d8e90faf
+DIST asterisk-1.8.13.1.tar.gz 25049076 SHA256 78e41c7a6b55e4989a8398472575bfc43e6a2e8b82825ff93aa39ab0d332cef6 SHA512 fc11bce31696146f857a77dacf5b5163026521d78acbbe8f027c11afa6944fea28012c14aacaa0551906b3115d3cf2a15d7d88542f84432ea3586e6432697c1a WHIRLPOOL 66a60625fb17e1261973e33c2baa434d545cce1b98ceb816983271851d0780ae42c73e5d9a6c9bbaf3c8ee1e6688a561eb941ff2b4124e567345fea7bb12a904
+DIST asterisk-10.5.2.tar.gz 24971040 SHA256 8484b1bddfb019cc9204b04cc4adbd194232ed46235df6e9d3f4fa543e3b6920 SHA512 3f3fae5fd0e13fdc16130a600d71899712ce564353b7d3908cc73b2f90031cb91802b53de4e63aa8bd5fbc1f0920eaae351c7a8dde50428c4e55d1ab8e7de1db WHIRLPOOL 043392ba575347e847c9de2cb4cc5f1e0b1ad4f90067c3ec052b3dfd2b54459c7b0aed5cad23b37c5a21745305c03430a16072ddfdf121825a8abe48f9e8892d
+DIST gentoo-asterisk-patchset-1.12.tar.bz2 30340 SHA256 42540637a94c127aee5028650c6f8695a30930d074a4ec25214c17053e35c257 SHA512 3f331c5fd23989779c5d964cbd06313775697aec6dc0d95d4438a47043be802c366f0977cfe7e996395af7ff07cf85dd9620008c7108e82ad14547b89174ee6f WHIRLPOOL 12f67ce19fc1643ca7547ef4250e1671cc5edc53438ffe209850f57085bd88d11592ffd4285a75b1fdadf03b8e521fd0ca3a8102691fb30658c413e2ed260d03
+DIST gentoo-asterisk-patchset-1.13.tar.bz2 30353 SHA256 de4d9b4ab9c2d403077cb575e08c33d7320a38da48e1af1cbc545fea34f5c7f5 SHA512 5b558ed1405b4b18efdaf52571341b66f5caf6e1a91b2c72a0af0cade516029849c818e450586e7e35423f9ae4444880609ae992b5f87990a4e1b165bedd6ad9 WHIRLPOOL 5b5f1657bdcda2cdf1711828f38f01476ac55a407423f6eda52829e6714f13bd9d3e71ddc62efc3f918b398e235d876cc7826063355ab28f5d43927c9aea6e16
+DIST gentoo-asterisk-patchset-2.5.tar.bz2 5839 SHA256 f67f262ab907213e6ae355923cc57d2065029f216ccebf18044ffb7f31303ced SHA512 bcb312ad345151d7ee4c76c23fa4570bc97ccdfb4715425c6969d14d2c94f1b1f0c63b0749e144d53996ff7515ea69e961e0de429443fbda62b17c8af28f6b05 WHIRLPOOL b1a48a9552fa48a86f8dbf10a9801f7edd5dcf7376ff5ea553ea334a0aa9a73f3320ed83636999c07fb6edd7eab340a394fdb19a707708915b10df41413a8688
+EBUILD asterisk-1.8.12.1.ebuild 8502 SHA256 9841979a176814a61223cc7904709a26031eeb2e6fa0eae655dc1be993c6574c SHA512 b6a8e87ddaf857508d20ca5d1b449912d67949de685cd052715dba5aa1ddb8a6e3f41b919fd763bbac3bfb573e1ef6eb18be03721fe064d869142c07fa936bbb WHIRLPOOL 78578b30eab2071dee0225d4e441a0e49e5d87e9466190e40fe82266a9681bad7dcff2162587a4c3151480bfec555ab9b9c64ec28fec508aa87b0a4c53f9e896
+EBUILD asterisk-1.8.13.1.ebuild 9035 SHA256 9ec64c752e14eac959e6e041e607045e47e5d5493f6703f95f7f2c137eeef0a7 SHA512 76d779eb82ad20aa94a176550cd81024971c15ed7bdbc0d3bdfe73ae26e1e3004a88b6f531130ed9ad147a9dde33bd47f5536edab010405424fde39b61743d02 WHIRLPOOL a406033d64f283da2c54a3a5c81329411edc5234414b9f260968cf772ae299dff4f65f2fb20f8102dc8fda44beb3c71d19c38075e52f48bb7cfb6af3463e4677
+EBUILD asterisk-10.5.2.ebuild 8584 SHA256 f954f340bfc86164a1f5f252e66663d50a8caa41a2a654675c70edb610bd7802 SHA512 42cac3e66db8ade3941be7641615dfe730e913a48a0a21e81e46733c43f08494a421a2effbb21c0cc1617e0b78ddd9516b6c7a1f67333777e805bb5fe6d9528b WHIRLPOOL 91fd6b3a37ad08d54dfd694e2a6909c1c88aa85fea10f9b67d0b1c5f5e7e97ea71bb6d15e9661810f6f141fba8563d72362b6779554ea4b7c3b30b882a80988f
+MISC ChangeLog 104200 SHA256 7a1c78fdaddb9965aa907f7f496c3f69fccc5ed1b4df12c1776d5425c0f3ae24 SHA512 97496c9ac54dd4e7e40d5b9041162081bb3cdb1ed50a01da1782c3bdae18604f5252374575ac34759f489431f0a8bb660214598a40d8f15f1c503aebcc05e2b5 WHIRLPOOL 2441b7aec2b43eee3859d5597d0a3c8f3111c238854f30fb233a88ce29add698476a02ecadde3082faccbbabf1b74712d18f61e37e53c5def3ebaddbde09ca27
+MISC metadata.xml 1028 SHA256 63267079fefbcc798d902e6b9822609df79c756a9934c3ad3abdabfbad357de5 SHA512 a88f57aba47d9d1d0e9c148279ee0f6795b7d7eccbce5b96edc539cf763ca1bbee09ddaa6c4633f0d6ad85184ec69d283be02f85ee7bf070cf9d798d9e664706 WHIRLPOOL 05de0ee36d08117223f599289974b14679efb90f248a999defcb8efa0dfa427fa4ed15da22c4b39824c7a87fb9e6e1e5732e4ab7cfa2efd123d896916b23f5b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/kTkEACgkQp5vW4rUFj5qGfACfWKztsyjcE6K1DvvwUAJiGNUO
-78cAoJnoLi6V1DmsB6wwH8F22do6JhKF
-=WE4C
+iEYEARECAAYFAk/258cACgkQp5vW4rUFj5piKQCguePwS5ALvk+UHWcVbPVHMFvY
+pCUAoIpS29LarvABjoUZtBByZlHV4IOu
+=0JAq
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-1.8.13.0.ebuild b/net-misc/asterisk/asterisk-1.8.13.0.ebuild
deleted file mode 100644
index 2935fa420117..000000000000
--- a/net-misc/asterisk/asterisk-1.8.13.0.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.13.0.ebuild,v 1.1 2012/06/06 10:07:45 chainsaw Exp $
-
-EAPI=4
-inherit autotools base eutils linux-info multilib
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-1.13.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk http iconv jabber jingle ldap lua mysql newt +samples odbc osplookup oss portaudio postgres radius snmp span speex sqlite sqlite3 srtp static syslog usb vorbis"
-REQUIRED_USE="gtalk? ( jabber )"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset" )
-
-RDEPEND="dev-libs/popt
-	dev-libs/libxml2
-	dev-libs/openssl
-	sys-libs/ncurses
-	sys-libs/zlib
-	ais? ( sys-cluster/openais )
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	calendar? ( net-libs/neon
-		 dev-libs/libical
-		 dev-libs/iksemel )
-	caps? ( sys-libs/libcap )
-	curl? ( net-misc/curl )
-	dahdi? ( >=net-libs/libpri-1.4.12_beta2
-		net-misc/dahdi-tools )
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.4 )
-	iconv? ( virtual/libiconv )
-	jabber? ( dev-libs/iksemel )
-	jingle? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua )
-	mysql? ( virtual/mysql )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql-base )
-	radius? ( net-dialup/radiusclient-ng )
-	snmp? ( net-analyzer/net-snmp )
-	span? ( media-libs/spandsp )
-	speex? ( media-libs/speex )
-	sqlite? ( dev-db/sqlite:0 )
-	sqlite3? ( dev-db/sqlite:3 )
-	srtp? ( net-libs/libsrtp )
-	usb? ( virtual/libusb:0
-		media-libs/alsa-lib )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${RDEPEND}
-	!net-libs/openh323"
-
-RDEPEND="${RDEPEND}
-	syslog? ( virtual/logger )"
-
-PDEPEND="net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	enewgroup asterisk
-	enewgroup dialout 20
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-src_prepare() {
-	base_src_prepare
-	AT_M4DIR=autoconf eautoreconf
-}
-
-src_configure() {
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-ssl \
-		--with-z \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with portaudio)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# Compile menuselect binary for optional components
-	emake menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect/menuselect --disable chan_misdn menuselect.makeopts
-	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect/menuselect --enable smsq menuselect.makeopts
-	menuselect/menuselect --enable streamplayer menuselect.makeopts
-	menuselect/menuselect --enable aelparse menuselect.makeopts
-	menuselect/menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect/menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect/menuselect --enable func_aes menuselect.makeopts
-	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect/menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select ais			res_ais
-	use_select alsa			chan_alsa
-	use_select bluetooth	chan_mobile
-	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select curl			func_curl res_config_curl res_curl
-	use_select dahdi		app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
-	use_select freetds		{cdr,cel}_tds
-	use_select gtalk		chan_gtalk
-	use_select http			res_http_post
-	use_select iconv		func_iconv
-	use_select jabber		res_jabber
-	use_select jingle		chan_jingle
-	use_select ldap			res_config_ldap
-	use_select lua			pbx_lua
-	use_select mysql		app_mysql cdr_mysql res_config_mysql
-	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup	app_osplookup
-	use_select oss			chan_oss
-	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
-	use_select radius		{cdr,cel}_radius
-	use_select snmp			res_snmp
-	use_select span			res_fax_spandsp
-	use_select speex		{codec,func}_speex
-	use_select sqlite		cdr_sqlite
-	use_select sqlite3		{cdr,cel}_sqlite3_custom
-	use_select srtp			res_srtp
-	use_select syslog		cdr_syslog
-	use_select usb			chan_usbradio
-	use_select vorbis		format_ogg_vorbis
-}
-
-src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake
-}
-
-src_install() {
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-	if use radius; then
-		insinto /etc/radiusclient-ng/
-		doins contrib/dictionary.digium
-	fi
-	if use samples; then
-		emake DESTDIR="${D}" samples
-		for conffile in "${D}"etc/asterisk/*.*
-		do
-			chown asterisk:asterisk $conffile
-			chmod 0660 $conffile
-		done
-		einfo "Sample files have been installed"
-	else
-		einfo "Skipping installation of sample files..."
-		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
-		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
-		rm -f  "${D}"etc/asterisk/* || die
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
-
-	# keep directories
-	diropts -m 0770 -o asterisk -g asterisk
-	keepdir	/etc/asterisk
-	keepdir /var/lib/asterisk
-	keepdir /var/run/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd2 asterisk
-	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-	# install the upgrade documentation
-	#
-	dodoc README UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	#
-	if use doc
-	then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install SIP scripts; bugs #300832 & #414585
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
-}
-
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	echo
-	elog "If you want to know more about asterisk, visit these sites:"
-	elog "http://www.asteriskdocs.org/"
-	elog "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	elog "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	elog "Gentoo VoIP IRC Channel:"
-	elog "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-	elog "1.6 -> 1.8 changes that you may care about:"
-	elog "http://svn.asterisk.org/svn/${PN}/tags/${PV}/UPGRADE.txt"
-	elog "or: bzless ${ROOT}usr/share/doc/${PF}/UPGRADE.txt.bz2"
-}
-
-pkg_config() {
-	einfo "Do you want to reset file permissions and ownerships (y/N)?"
-
-	read tmp
-	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
-
-	if [[ "$tmp" = "y" ]] ||\
-		[[ "$tmp" = "yes" ]]
-	then
-		einfo "Resetting permissions to defaults..."
-
-		for x in spool run lib log; do
-			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
-			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
-		done
-
-		chown -R root:asterisk  "${ROOT}"etc/asterisk
-		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
-
-		einfo "done"
-	else
-		einfo "skipping"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-1.8.13.0-r1.ebuild b/net-misc/asterisk/asterisk-1.8.13.1.ebuild
index 1aac4d5ca57c..b47a9fa24048 100644
--- a/net-misc/asterisk/asterisk-1.8.13.0-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.13.0-r1.ebuild,v 1.1 2012/06/22 10:51:26 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.13.1.ebuild,v 1.1 2012/07/06 13:27:13 chainsaw Exp $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib
diff --git a/net-misc/asterisk/asterisk-10.5.1.ebuild b/net-misc/asterisk/asterisk-10.5.2.ebuild
index e3e2c2bb0e0c..25e9dee94e24 100644
--- a/net-misc/asterisk/asterisk-10.5.1.ebuild
+++ b/net-misc/asterisk/asterisk-10.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-10.5.1.ebuild,v 1.1 2012/06/15 11:00:19 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-10.5.2.ebuild,v 1.1 2012/07/06 13:27:13 chainsaw Exp $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib