new diff for vmail.cgi to fully fix bug #111836.

(Portage version: 2.1_pre5-r3)

13 files changed, 1360 insertions, 19 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 614f99a4ca37..9e44911acc66 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.104 2006/03/06 03:45:05 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.105 2006/03/06 04:41:15 rajiv Exp $
+
+*asterisk-1.0.10-r1 (06 Mar 2006)
+*asterisk-1.0.9-r3 (06 Mar 2006)
+*asterisk-1.0.8-r2 (06 Mar 2006)
+*asterisk-1.0.7-r3 (06 Mar 2006)
+
+  06 Mar 2006; Rajiv Aaron Manglani <rajiv@gentoo.org>
+  +files/1.0.0/asterisk-1.0.10-vmail.cgi.patch, +asterisk-1.0.7-r3.ebuild,
+  +asterisk-1.0.8-r2.ebuild, -asterisk-1.0.9-r2.ebuild,
+  +asterisk-1.0.9-r3.ebuild, -asterisk-1.0.10.ebuild,
+  +asterisk-1.0.10-r1.ebuild:
+  new diff for vmail.cgi to fully fix bug #111836.
 
   06 Mar 2006; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.8-r1.ebuild,
   asterisk-1.0.9-r2.ebuild, asterisk-1.0.10.ebuild:
@@ -88,7 +100,7 @@
   +asterisk-1.0.8-r1.ebuild, -asterisk-1.0.9.ebuild,
   -asterisk-1.0.9-r1.ebuild, +asterisk-1.0.9-r2.ebuild,
   -asterisk-1.2.0_beta1.ebuild, +asterisk-1.2.0_beta1-r1.ebuild:
-  Security revbump, fixes #11836. Removed old insecure versions. Thanks to
+  Security revbump, fixes #111836. Removed old insecure versions. Thanks to
   Rajiv Manglani <rajiv@gentoo.org> for reporting this one.
 
   29 Oct 2005; Stefan Knoblich <stkn@gentoo.org>
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 34c4b1e40fb1..22750ea43980 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,41 +1,138 @@
-MD5 effea6a1ff95c949874bc6479d679202 ChangeLog 20758
-MD5 08b022f4df749905671bdcd37a04a022 asterisk-1.0.10.ebuild 14657
+MD5 b408c05c90643e2b0a1160b3c27fc6f0 ChangeLog 21215
+RMD160 b4647bf705744752944e4950969a926e67605eba ChangeLog 21215
+SHA256 5606c97b20035021a1d2b0df6b7ad868db0e5ea03fd43687602f4f7367dddaea ChangeLog 21215
+MD5 4dc42d894ff975e9a4389bc2c43455bd asterisk-1.0.10-r1.ebuild 14659
+RMD160 b2734220dcdb57f0a54fb2188558b2a64df107c9 asterisk-1.0.10-r1.ebuild 14659
+SHA256 dd5246d22cc3589d82bd6acd2b4b3be8ab77d76835e00b176a01e4ea0c4265c6 asterisk-1.0.10-r1.ebuild 14659
 MD5 5a641e52c52eded4766e31c8520fe83b asterisk-1.0.7-r2.ebuild 13672
+RMD160 c1c04e5dce4554a13ce211db3c34947ec8b7964b asterisk-1.0.7-r2.ebuild 13672
+SHA256 a0cc1eec14c06bf72775182a8431d20a91e92d38f899262fcb5c2a1514097403 asterisk-1.0.7-r2.ebuild 13672
+MD5 fe89c0817e53606b9530e53a4af4381a asterisk-1.0.7-r3.ebuild 13675
+RMD160 bb34311d83d7a52fd201abe46f9bccf492db02a7 asterisk-1.0.7-r3.ebuild 13675
+SHA256 434b86627025b092d35f314ba877b9750146421613178cfb889f4c0911cd29f7 asterisk-1.0.7-r3.ebuild 13675
 MD5 dab2abf3ef2e4b6f44e833df1ecb0f77 asterisk-1.0.8-r1.ebuild 13808
-MD5 7770ae1389e218daed88753c7bf5f973 asterisk-1.0.9-r2.ebuild 13838
+RMD160 c3b72a43d7e5b3cfc652209751ada75273142cfb asterisk-1.0.8-r1.ebuild 13808
+SHA256 f2c4f26687634d83d652f462eb26dd319c2fff952a887daf37b0229d67158f9e asterisk-1.0.8-r1.ebuild 13808
+MD5 7cd102504a50d9a72b9275a435beca2b asterisk-1.0.8-r2.ebuild 13811
+RMD160 2a1a6ea82efbd0e3e0aaef2c40036e8bfd7b87d1 asterisk-1.0.8-r2.ebuild 13811
+SHA256 919012406402ac89c4b0109b90ae6dd0e3b14b3a740b939a6227f9b723580537 asterisk-1.0.8-r2.ebuild 13811
+MD5 1727def6abb375feb6e154c19d563674 asterisk-1.0.9-r3.ebuild 13840
+RMD160 054e4008e27257c49e85a3e7bcd17d0d6a7930a9 asterisk-1.0.9-r3.ebuild 13840
+SHA256 711f015ef0b834c9cc73bf92ef9de6c529813c9220c2047811d5f67359ae1f6e asterisk-1.0.9-r3.ebuild 13840
 MD5 ccf3f74b0df577c747f8f1c51846f3e2 asterisk-1.2.0.ebuild 8468
+RMD160 a7e5631a62e83a1769df9ed23e462654e674483a asterisk-1.2.0.ebuild 8468
+SHA256 8eba757bcb883cbb8f45ff0926bf55ce1725cd5bff7083eeb6a65f2368bde2f4 asterisk-1.2.0.ebuild 8468
 MD5 725495d05db613d568e01624e2bc9736 asterisk-1.2.1.ebuild 9907
+RMD160 095e89999b9f728578c0c4111be9c174cd9c54a9 asterisk-1.2.1.ebuild 9907
+SHA256 40e84489fc23b702d83cb107fd458270ffe6d2243b6c32f92c529de903b7b2b4 asterisk-1.2.1.ebuild 9907
 MD5 f45b86e97d6d2da410636006917147b9 asterisk-1.2.4.ebuild 10071
+RMD160 156d59f3ada258686475103303c70ec48c3cbef1 asterisk-1.2.4.ebuild 10071
+SHA256 1b325f6ee0c7ead41a9181786f746ae8e3b8d018516dcc18ffe0fbe024eb1167 asterisk-1.2.4.ebuild 10071
 MD5 88e8cfc364e9767f104159b374eb5bea files/1.0.0/asterisk-1.0.10-misdn.patch 607
+RMD160 f1f61d81efe5d69464b774c6b920e51a525d179e files/1.0.0/asterisk-1.0.10-misdn.patch 607
+SHA256 7eb86812c3b6f41dad6d09a69b3883911b9a3792791c5ad3dfd521e996c5e6b4 files/1.0.0/asterisk-1.0.10-misdn.patch 607
+MD5 e53fcb073e317364213099fe6a00b7b9 files/1.0.0/asterisk-1.0.10-vmail.cgi.patch 9038
+RMD160 6119ddcdc7d39e6594f7422dc2aa7171a6b2be5a files/1.0.0/asterisk-1.0.10-vmail.cgi.patch 9038
+SHA256 12fd512f2a79ed370ef41a4927222423bebb75042e980ccb84055fae98add307 files/1.0.0/asterisk-1.0.10-vmail.cgi.patch 9038
 MD5 27bf961621fb1f521bc11293df8b5ec9 files/1.0.0/asterisk-1.0.10-weak-references.diff 8579
+RMD160 7d4421d18b256531ddbc351ba6b4a8a94604017c files/1.0.0/asterisk-1.0.10-weak-references.diff 8579
+SHA256 61f9ce3a15dc904e73ea426c0ad928f201b9101c585195a7feb554548c1a861a files/1.0.0/asterisk-1.0.10-weak-references.diff 8579
 MD5 f20e5b869d5e221194187dd7f504d38b files/1.0.0/asterisk-1.0.5-astcfg-0.0.2.diff 5829
+RMD160 2983d78f8a1dd8768da919ddb3282511ebdb915c files/1.0.0/asterisk-1.0.5-astcfg-0.0.2.diff 5829
+SHA256 b5787fa77d4ad0786ce9d243d597b1129f214f4e376c6e1b79929633ef6f35d1 files/1.0.0/asterisk-1.0.5-astcfg-0.0.2.diff 5829
 MD5 a839d8b6b55e3b6ad17b9a7f4be2e6ba files/1.0.0/asterisk-1.0.5-hppa.patch 909
+RMD160 1acb35521c186b696b6cf80f9809803f5a9946b6 files/1.0.0/asterisk-1.0.5-hppa.patch 909
+SHA256 34ec67f93df6917ad6d3c13a1b596f560e704638c7de851c4ff9502abd6618f9 files/1.0.0/asterisk-1.0.5-hppa.patch 909
 MD5 ed3f8c9cd712391f76700827322a7aeb files/1.0.0/asterisk-1.0.5-lpc10flags.diff 1254
+RMD160 9b23b999e4f65b60a2097678a710636af8e91078 files/1.0.0/asterisk-1.0.5-lpc10flags.diff 1254
+SHA256 ae8b7972afdfd3bd0bbdf9653a61f5f7c81a95e6e6b4815271cd8f446f11ce90 files/1.0.0/asterisk-1.0.5-lpc10flags.diff 1254
 MD5 93d2e0533a32a38e21f99f278f635266 files/1.0.0/asterisk-1.0.5-speex.diff 1214
+RMD160 64cd32b6f8e3b3051099783ce6926da7f6ce1c56 files/1.0.0/asterisk-1.0.5-speex.diff 1214
+SHA256 bf8ac453fc4f803679a52a03882e1829736b6d59e33451b6f17e94d309c66713 files/1.0.0/asterisk-1.0.5-speex.diff 1214
 MD5 08d718c04e911f465f867577d649d204 files/1.0.0/asterisk-1.0.5-uclibc-dns.diff 304
+RMD160 6d58a0fdad04f5105c1b8f8bb3e2058b4f97f12f files/1.0.0/asterisk-1.0.5-uclibc-dns.diff 304
+SHA256 e4de36e528b7d1a7941689d530d93f1ffd41a2f863a856e612e3637f78ea4890 files/1.0.0/asterisk-1.0.5-uclibc-dns.diff 304
 MD5 0c31aac944f4fdff2b26b446d0d0eef4 files/1.0.0/asterisk-1.0.7-initgroups.diff 1826
+RMD160 16edba2e58ebb1df9b88b6b87437a26d3475122c files/1.0.0/asterisk-1.0.7-initgroups.diff 1826
+SHA256 1b06d035f00df921fc52800e9aa763c7c4d9d274ac8f23c77a1ed410dd470859 files/1.0.0/asterisk-1.0.7-initgroups.diff 1826
 MD5 d8501003cf3148ae662a03866e734481 files/1.0.0/asterisk-1.0.7-manager-cli-segv.patch 4008
+RMD160 ec7cbdde0f5a7c638517158e2ff767e9c13fab15 files/1.0.0/asterisk-1.0.7-manager-cli-segv.patch 4008
+SHA256 28291967c187c3bc71fe2f8efca3f2ea2910b3b5912a2dca469188b1716555fc files/1.0.0/asterisk-1.0.7-manager-cli-segv.patch 4008
 MD5 b2446878d3b46ea595a7994ae8de0499 files/1.0.0/asterisk-1.0.7-scripts.diff 1629
+RMD160 2477f11481929f4610be056e4acf6e9f1b3ec39f files/1.0.0/asterisk-1.0.7-scripts.diff 1629
+SHA256 6c9dd67cf704081a96ea0b70e289a3781409d1cdbfac539fd70ef23d7ea0d323 files/1.0.0/asterisk-1.0.7-scripts.diff 1629
 MD5 18fb1b2e1fbf2f19e8a9a600eab4c5c8 files/1.0.0/asterisk-1.0.8-callerid.patch 631
+RMD160 38c4e497df1cbfaeeca3c432220f1887af233042 files/1.0.0/asterisk-1.0.8-callerid.patch 631
+SHA256 91bd550306b6d2e7144ac02818948ac8f807b2d096e0fe0e89ec269b502ef107 files/1.0.0/asterisk-1.0.8-callerid.patch 631
 MD5 38064faca1838d7c57bb26293741f31b files/1.0.0/asterisk-1.0.8-hppa.patch 1274
+RMD160 b7e4bb8f387e166d8a1045dd387263e4987ab782 files/1.0.0/asterisk-1.0.8-hppa.patch 1274
+SHA256 3380c6a7d6d9019d62a9882b8acfd1f846dc8212adcf175c28649da33b0d75a8 files/1.0.0/asterisk-1.0.8-hppa.patch 1274
 MD5 5e1e00b71a830e487787ce48be04ccdc files/1.0.0/asterisk-1.0.8-initgroups.diff 1558
+RMD160 337677aad8842f22779ab0de03f88eff7e714ccb files/1.0.0/asterisk-1.0.8-initgroups.diff 1558
+SHA256 a9643f0b8a8aa0bbcd6c5dd3707a8335885a3b491cb80a53cf1160cbe69d33d4 files/1.0.0/asterisk-1.0.8-initgroups.diff 1558
 MD5 517587756c674978b1b24891c34564fc files/1.0.0/asterisk-1.0.8-ptr64fix.diff 485
+RMD160 8b26ff5f76afd0d03bccf17070b47339771f0d7e files/1.0.0/asterisk-1.0.8-ptr64fix.diff 485
+SHA256 b3d4b307059e61204dd3c006d912ece9ab7a5b1b675d9a571c0861e1e2bf746b files/1.0.0/asterisk-1.0.8-ptr64fix.diff 485
 MD5 e993bfc45e54507214329e00b3a66966 files/1.0.0/asterisk-1.0.9-freetds.diff 854
+RMD160 eef8cd1e4563d3b41c99513ed6f8081d0461cb2d files/1.0.0/asterisk-1.0.9-freetds.diff 854
+SHA256 8adb853ba920f994f158616246d8a138c1da90f2f3085e9430fccb49a7dd81fe files/1.0.0/asterisk-1.0.9-freetds.diff 854
 MD5 c25cdb98ebd69a740014cd45bea1c9ba files/1.0.0/asterisk-1.0.9-vmail.cgi.patch 770
+RMD160 e8c31ee58ae4d458fa4c7a31aa2e86831ba99926 files/1.0.0/asterisk-1.0.9-vmail.cgi.patch 770
+SHA256 bdfde3722ef0e5d1a65e7c2cd21134a0c3d5fb27148f3abbbcfc660526cb17f6 files/1.0.0/asterisk-1.0.9-vmail.cgi.patch 770
 MD5 8929203070b56a9d9204423cc5b3349a files/1.0.0/asterisk-1.0.9-weak-references.diff 8406
+RMD160 b9037c8c049f6ae88c832928db6f7ed95356ecaf files/1.0.0/asterisk-1.0.9-weak-references.diff 8406
+SHA256 621226b1bf41037230f44bd6fc88c58c31034ee2bf989a4dbffd838d47c5f2dd files/1.0.0/asterisk-1.0.9-weak-references.diff 8406
 MD5 6a50db2ee46d4139128d0c4225ac071f files/1.0.0/asterisk-uclibc-dns.diff 433
+RMD160 a26b718a886978282732e4f2b761a9709744f147 files/1.0.0/asterisk-uclibc-dns.diff 433
+SHA256 7c284638da4a120ba09d3eea920b76bb603fb2f1017d41f9f284080eec779fc8 files/1.0.0/asterisk-uclibc-dns.diff 433
 MD5 85e291d6eb70a24fdc82469ed53bfe54 files/1.0.0/asterisk.confd 283
+RMD160 f4624afe9a36b1647281ce2501e6bd807127a96b files/1.0.0/asterisk.confd 283
+SHA256 f8aeb5dcd354aaa2adbcea404ec6a0734c23e67f8accc2c15ec8e8d55a9582c9 files/1.0.0/asterisk.confd 283
 MD5 1d5c7f8847a95005af3ffb0699bba20f files/1.0.0/asterisk.confd.sec 528
+RMD160 ad7e867724c91442c67baf4913fe89e2b9b20d25 files/1.0.0/asterisk.confd.sec 528
+SHA256 8602b5c340233e10f3cf681839ea9083f4f895b185c133c157f5e1471e50d244 files/1.0.0/asterisk.confd.sec 528
 MD5 920f8ae54f895cfa46a8a037c865e59a files/1.0.0/asterisk.rc6 517
+RMD160 8af810ba9e28eae30870cbc1fbc714ee79f29f3b files/1.0.0/asterisk.rc6 517
+SHA256 d65a410287129d858abb84a7b2b2891508b8d7d849f7cc46f26c27037c636e2a files/1.0.0/asterisk.rc6 517
 MD5 fe0af9ff2c4dea24a7c1d62754dee092 files/1.0.0/asterisk.rc6.sec 1230
+RMD160 414acc156c3ccd28046cb6f02eeea50ba0c5051f files/1.0.0/asterisk.rc6.sec 1230
+SHA256 ecab0a240b91a1ea422fc0222b93f102ab0925b193613828f24a3cb9768a9107 files/1.0.0/asterisk.rc6.sec 1230
 MD5 ab552fbbe803766b5291d61942dbcd9f files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff 860
+RMD160 d6d9f684daa1eedb4318e88714084bd57faebf90 files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff 860
+SHA256 0f9a5b563a76b31c83f47a4d711afc2a6c2bd420eaf04def103dafa095253357 files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff 860
 MD5 3932983fb155e026eb10533425174f59 files/1.2.0/asterisk-1.2.0_beta-ukcid.patch 5787
+RMD160 f42b214375f0e10cfacb6b54699b9b27d6c129cb files/1.2.0/asterisk-1.2.0_beta-ukcid.patch 5787
+SHA256 dbd919646fd851b07da9d3d4f6a0412d654318ec0dd39523362aa45516b51e1b files/1.2.0/asterisk-1.2.0_beta-ukcid.patch 5787
 MD5 18c24f2fcea3594b683d1c23643ad7b1 files/1.2.0/asterisk-1.2.1-uclibc-getloadavg.diff 317
-MD5 df9171e8435eddc50bfc453940e88053 files/digest-asterisk-1.0.10 211
+RMD160 f598d94a52cec83fefdafdce0694049c657e09e0 files/1.2.0/asterisk-1.2.1-uclibc-getloadavg.diff 317
+SHA256 61daa70727418dbaf232fc5d1eaddd20a8505b943b8fb724a1b63170edfe88cc files/1.2.0/asterisk-1.2.1-uclibc-getloadavg.diff 317
+MD5 c4df1f7c307b1ed6df4b93df7c307e51 files/digest-asterisk-1.0.10-r1 771
+RMD160 60a2e12b251bdb8a705ca7ea8ee72722354c9a30 files/digest-asterisk-1.0.10-r1 771
+SHA256 6c71c00347d2cacf6f8e95659172808b3c9b318a0545bea3cbb6810a431cc933 files/digest-asterisk-1.0.10-r1 771
 MD5 48a3518349e2abfe20fa918a9db5eea2 files/digest-asterisk-1.0.7-r2 210
+RMD160 1d41f7ee01879736454df21d922757c6a58c59c0 files/digest-asterisk-1.0.7-r2 210
+SHA256 3225fc016399d2e8d9ddbf7159492aad84a88fc06a01354daa184d5cac9360c0 files/digest-asterisk-1.0.7-r2 210
+MD5 225681e768dff47ab88ef2cec2e4bac8 files/digest-asterisk-1.0.7-r3 768
+RMD160 9e242d71839e4b588bcfbe34eab4c68016d30e4f files/digest-asterisk-1.0.7-r3 768
+SHA256 74a99fd42f3e18b7cd55e8f17c38d03128aeb6590b2cd5070e8f52e7cf987294 files/digest-asterisk-1.0.7-r3 768
 MD5 b3bbedde09faea609a0357b21eafa596 files/digest-asterisk-1.0.8-r1 210
-MD5 58b3329253168e6dfb4c8ecbb98aeecd files/digest-asterisk-1.0.9-r2 210
+RMD160 d8f1857559d0e1b6904b05b4dc54340c54f05ffc files/digest-asterisk-1.0.8-r1 210
+SHA256 2be540e9bffe173142fb51bf39be32c654ddd6bd1d31bcc32c13155c2731db75 files/digest-asterisk-1.0.8-r1 210
+MD5 c3c4ac188c4448a2f681a43f882d50b2 files/digest-asterisk-1.0.8-r2 768
+RMD160 9e9ae7b4c200e294ec3c2a47b8f2337d3bc6190c files/digest-asterisk-1.0.8-r2 768
+SHA256 c9c331989779b72908a891abb8204fe36a9294c6100480446e417f5110e5fd65 files/digest-asterisk-1.0.8-r2 768
+MD5 e9e9701fad77824bcfdff1f02b9634e3 files/digest-asterisk-1.0.9-r3 768
+RMD160 a3a8772f22b856f9f1cea758a10caecca24c326f files/digest-asterisk-1.0.9-r3 768
+SHA256 4a05fc2f217e415d6c30a83923be93e674c46727935eaa9abcdb72220b8cdd43 files/digest-asterisk-1.0.9-r3 768
 MD5 770c431ec679210d12c9e486a2fc2e92 files/digest-asterisk-1.2.0 217
+RMD160 d9849c05846010c0f1ff21ccb1e3652fa79c4522 files/digest-asterisk-1.2.0 217
+SHA256 21b2bbdfb79fc0b75046aac56fdf9383e8fce8284ab16fbb237771c5cb0578d2 files/digest-asterisk-1.2.0 217
 MD5 a129c7144790bae1af36d42252618118 files/digest-asterisk-1.2.1 306
+RMD160 f221ca8b18452286280e029a645d5f64fd5d9a28 files/digest-asterisk-1.2.1 306
+SHA256 383f1128b68a96aed0d9d24a949f9fdec347a16aca801e8942bc6775b807b87d files/digest-asterisk-1.2.1 306
 MD5 f69ef36e0e37920142654d01e205cf28 files/digest-asterisk-1.2.4 306
+RMD160 1f0c54d0ab57bffa63014cd6d4bde789e37d73b6 files/digest-asterisk-1.2.4 306
+SHA256 23c46c6e5d868b74308abc934ad8e693b55e6a832b15eb6505ff4a82eaed72c6 files/digest-asterisk-1.2.4 306
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
+RMD160 a989fff0cebc82a58a75fb3a2eec8da0712ad57e metadata.xml 248
+SHA256 d0e3ab77a8a7b859511b8d5fda83dc018351e6367724b097dcc13c4aa0a3ee6b metadata.xml 248
diff --git a/net-misc/asterisk/asterisk-1.0.10.ebuild b/net-misc/asterisk/asterisk-1.0.10-r1.ebuild
index ca1558629504..7c157a975d85 100644
--- a/net-misc/asterisk/asterisk-1.0.10.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.10.ebuild,v 1.3 2006/03/06 03:45:05 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.10-r1.ebuild,v 1.1 2006/03/06 04:41:15 rajiv Exp $
 
 inherit eutils perl-app
 
@@ -306,8 +306,8 @@ src_unpack() {
 		epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-freetds.diff
 	fi
 
-	# security fix, bug #11836
-	epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
+	# security fix, bug #111836
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.10-vmail.cgi.patch
 
 	# patch for mISDN
 	epatch ${FILESDIR}/1.0.0/${PN}-1.0.10-misdn.patch
diff --git a/net-misc/asterisk/asterisk-1.0.7-r3.ebuild b/net-misc/asterisk/asterisk-1.0.7-r3.ebuild
new file mode 100644
index 000000000000..4d22eb581425
--- /dev/null
+++ b/net-misc/asterisk/asterisk-1.0.7-r3.ebuild
@@ -0,0 +1,469 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.7-r3.ebuild,v 1.1 2006/03/06 04:41:15 rajiv Exp $
+
+inherit eutils perl-app
+
+ADDONS_VERSION="1.0.7"
+BRI_VERSION="0.2.0-RC8g"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="ftp://ftp.digium.com/pub/telephony/${PN}/old-releases/${P}.tar.gz
+	 ftp://ftp.digium.com/pub/telephony/${PN}/old-releases/${PN}-addons-${ADDONS_VERSION}.tar.gz
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
+
+S_ADDONS=${WORKDIR}/${PN}-addons-${ADDONS_VERSION}
+
+IUSE="alsa doc gtk mmx mysql pri zaptel debug postgres vmdbmysql vmdbpostgres bri hardened speex resperl"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+
+DEPEND="dev-libs/newt
+	dev-libs/openssl
+	media-sound/mpg123
+	media-sound/sox
+	doc? ( app-doc/doxygen )
+	gtk? ( =x11-libs/gtk+-1.2* )
+	pri? ( >=net-libs/libpri-1.0.7-r1 )
+	bri? ( >=net-libs/libpri-1.0.7-r1
+		>=net-misc/zaptel-1.0.7-r1 )
+	alsa? ( media-libs/alsa-lib )
+	mysql? ( dev-db/mysql )
+	speex? ( media-libs/speex )
+	zaptel? ( >=net-misc/zaptel-1.0.7-r1 )
+	postgres? ( dev-db/postgresql )
+	vmdbmysql? ( dev-db/mysql )
+	vmdbpostgres? ( dev-db/postgresql )
+	resperl? ( dev-lang/perl
+		   >=net-misc/zaptel-1.0.7-r1 )"
+
+pkg_setup() {
+	local n
+
+	#
+	# Warning about security changes...
+	#
+	ewarn "****************** Important changes warning! *********************"
+	ewarn
+	ewarn "- Asterisk runs as user asterisk, group asterisk by default"
+	ewarn
+	ewarn "- Permissions of /etc/asterisk have been changed to root:asterisk"
+	ewarn "  750 (directories) / 640 (files)"
+	ewarn
+	ewarn "- Permissions of /var/{log,lib,run,spool}/asterisk have been changed"
+	ewarn "  to asterisk:asterisk 750 (directories) / 640 (files)"
+	ewarn
+	ewarn "- Asterisk's unix socket and pidfile are now in /var/run/asterisk"
+	ewarn
+	ewarn "- More information at the end of this emerge"
+	ewarn
+	ewarn "     http://bugs.gentoo.org/show_bug.cgi?id=88732"
+	ewarn "     http://www.voip-info.org/wiki-Asterisk+non-root"
+	ewarn
+	einfo "Press Ctrl+C to abort"
+	echo
+	ebeep
+
+	n=15
+	while [[ $n -gt 0 ]]; do
+		echo -en "  Waiting $n seconds...\r"
+		sleep 1
+		(( n-- ))
+	done
+
+	#
+	# Regular checks
+	#
+	einfo "Running some pre-flight checks..."
+	if use resperl; then
+		# res_perl pre-flight check...
+		if ! $(perl -V | grep -q "usemultiplicity=define") ||\
+		   ! built_with_use dev-lang/perl ithreads || ! built_with_use sys-devel/libperl ithreads
+		then
+			eerror "Embedded perl add-on needs Perl and libperl with built-in threads support"
+			eerror "(rebuild perl and libperl with ithreads use-flag enabled)"
+			die "Perl w/o threads support..."
+		fi
+		einfo "Perl with ithreads support found"
+	fi
+
+
+	# mysql and postgres voicemail support are mutually exclusive..
+	if use vmdbmysql && use vmdbpostgres; then
+		eerror "MySQL and PostgreSQL Voicemail support are mutually exclusive... choose one!"
+		die "Conflicting use-flags"
+	fi
+
+	# check if zaptel and libpri have been built with bri enabled
+	if use bri; then
+		if ! built_with_use net-misc/zaptel bri; then
+			eerror "Re-emerge zaptel with bri use-flag enabled!"
+			die "Zaptel without bri support detected"
+		fi
+
+		if ! built_with_use net-libs/libpri bri; then
+			eerror "Re-emerge libpri with bri use-flag enabled!"
+			die "Libpri without bri support detected"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# set cflags & mmx optimization
+	sed -i  -e "s:^\(OPTIMIZE+=\).*:\1 ${CFLAGS}:" \
+		-e "s:^\(CFLAGS+=\$(shell if \$(CC)\):#\1:" \
+		Makefile
+
+	# gsm codec still uses -fomit-frame-pointer, and other codecs have their
+	# own flags. We only change the arch.
+	sed -i  -e "s:^OPTIMIZE+=.*:OPTIMIZE=${CFLAGS}:" \
+		-e "s:^CFLAGS[\t ]\++=:CFLAGS =:" \
+		codecs/gsm/Makefile
+
+	# hppa patch for gsm codec
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-hppa.patch
+
+	if use mmx; then
+		if ! use hardened; then
+			einfo "Enabling mmx optimization"
+			sed -i  -e "s:^#\(K6OPT[\t ]\+= -DK6OPT\):\1:" \
+				codecs/gsm/Makefile
+		else
+			ewarn "Hardened use-flag is set, not enabling mmx optimization for codec_gsm!"
+
+		fi
+	fi
+	if ! use mmx || use hardened; then
+		# don't build + link asm mmx object file
+		# without this codec_gsm.so will include text relocations
+		sed -i  -e "/k6opt\.\(s\|o\)/ d" \
+			codecs/gsm/Makefile
+	fi
+
+	if ! use debug; then
+		einfo "Disabling debugging"
+		sed -i -e "s:^\(DEBUG=\):#\1:" Makefile
+	fi
+
+	# change image path in voicemail cgi
+	sed -i -e "s:^\(\$astpath = \).*:\1 \"/asterisk\";:" contrib/scripts/vmail.cgi
+
+	#
+	# embedded perl
+	#
+	if use resperl; then
+		einfo "Patching asterisk for embedded perl support..."
+		epatch ${S_ADDONS}/res_perl/astmake.diff
+
+		# create necessary .c file
+		/usr/bin/perl -MExtUtils::Embed -e xsinit || die "Could not create perlxsi.c"
+
+		cd ${S_ADDONS}
+
+		# fix perl path, source location and remove res_musiconhold
+		sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:" \
+			res_perl/Makefile \
+			${S}/Makefile \
+			res_perl/INC/*.pm
+		sed -i -e "s:^ASTSRC.*:ASTSRC = ${S}:" \
+			-e "s:\$(ASTLIBDIR)/modules/res_musiconhold.so::" \
+			res_perl/Makefile
+
+		if use bri; then
+			epatch ${FILESDIR}/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff
+		fi
+
+		cd ${S}
+	fi
+
+	#
+	# uclibc patch
+	#
+	if use elibc_uclibc; then
+		einfo "Patching asterisk for uclibc..."
+		epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-uclibc-dns.diff
+	fi
+
+	#
+	# other patches
+	#
+
+	# fix lpc10 Makefile, remove the
+	# CFLAGS+=-march=$(shell uname -m) part
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-lpc10flags.diff
+
+	# asterisk-config
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-astcfg-0.0.2.diff
+
+	#
+	# database voicemail support
+	#
+	if use postgres; then
+		sed -i  -e "s:^#\(APPS+=app_sql_postgres.so\):\1:" \
+			-e "s:/usr/local/pgsql/include:/usr/include/postgresql/pgsql:" \
+			-e "s:/usr/local/pgsql/lib:/usr/lib/postgresql:" \
+			apps/Makefile
+	fi
+
+	if use vmdbpostgres; then
+		einfo "Enabling PostgreSQL voicemail support"
+		sed -i  -e "s:^\(USE_POSTGRES_VM_INTERFACE\).*:\1=1:" \
+			-e "s:/usr/local/pgsql/include:/usr/include/postgresql/pgsql:" \
+			-e "s:/usr/local/pgsql/lib:/usr/lib/postgresql:" \
+			apps/Makefile
+
+		# patch app_voicemail.c
+		sed -i -e "s:^#include <postgresql/libpq-fe\.h>:#include \"libpq-fe\.h\":" \
+			apps/app_voicemail.c
+
+	elif use vmdbmysql; then
+		einfo "Enabling MySQL voicemail support"
+		sed -i  -e "s:^\(USE_MYSQL_VM_INTERFACE\).*:\1=1:" \
+			-e "s:^\(CFLAGS+=-DUSEMYSQLVM\):\1 -I${S_ADDONS}:" \
+			apps/Makefile
+	fi
+
+	#
+	# asterisk add-ons
+	#
+	cd ${S_ADDONS}
+	sed -i -e "s:-I../asterisk:-I${S} -I${S}/include:" Makefile
+	sed -i  -e "s:^OPTIMIZE+=.*:OPTIMIZE+=${CFLAGS}:" \
+		-e "s:^\(CFLAGS=\)\(.*\):\1-I${S}/include -fPIC \2:" \
+		format_mp3/Makefile
+
+
+	#
+	# BRI patches
+	#
+	if use bri; then
+		cd ${S}
+		einfo "Patching asterisk w/ BRI stuff"
+
+		epatch ${WORKDIR}/bristuff-${BRI_VERSION}/patches/asterisk.patch
+	fi
+
+	#
+	# Revived snmp plugin support
+	#
+#	if use snmp; then
+#		cd ${S}
+#		einfo "Patching snmp plugin helper functions"
+#		epatch ${FILESDIR}/1.0.0/ast-ax-snmp-1.0.6.diff
+#	fi
+
+	# fix path for non-root
+	cd ${S}
+	sed -i -e "s:^\(ASTVARRUNDIR=\).*:\1\$(INSTALL_PREFIX)/var/run/asterisk:" \
+		Makefile
+
+	# fix contrib scripts for non-root
+	epatch ${FILESDIR}/1.0.0/${P}-scripts.diff
+
+	# add initgroups support to asterisk, this is needed
+	# to support supplementary groups for the asterisk
+	# user (start-stop-daemons --chguid breaks realtime priority support)
+	epatch ${FILESDIR}/1.0.0/${P}-initgroups.diff
+
+	# security fix (www.portcullis-security.com/advisory/advisory-05-013.txt)
+	epatch ${FILESDIR}/1.0.0/${P}-manager-cli-segv.patch
+
+	# fix segfault on amd64 and possibly other 64bit systems (#105762)
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
+
+	# security fix, bug #111836
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.10-vmail.cgi.patch
+}
+
+src_compile() {
+	# build asterisk first...
+	einfo "Building Asterisk..."
+	cd ${S}
+	emake -j1 || die "Make failed"
+
+	# create api docs
+	use doc && \
+		emake -j1 progdocs
+
+	#
+	# add-ons
+	#
+	einfo "Building additional stuff..."
+	cd ${S_ADDONS}
+	emake -j1 || die "Make failed"
+
+	if use resperl; then
+		cd ${S_ADDONS}/res_perl
+		emake -j1 || die "Building embedded perl failed"
+	fi
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "Make install failed"
+	make DESTDIR=${D} samples || die "Make install samples failed"
+
+	# install astconf.h, a lot of external modules need this
+	insinto /usr/include/asterisk
+	doins	astconf.h
+
+	# install addmailbox and astgenkey
+	dosbin contrib/scripts/addmailbox
+	dosbin contrib/scripts/astgenkey
+
+	newinitd ${FILESDIR}/1.0.0/asterisk.rc6.sec asterisk
+	newconfd ${FILESDIR}/1.0.0/asterisk.confd.sec asterisk
+
+	# don't delete these, even if they are empty
+	keepdir /var/spool/asterisk/voicemail/default/1234/INBOX
+	keepdir /var/spool/asterisk/tmp
+	keepdir /var/log/asterisk/cdr-csv
+	keepdir /var/run/asterisk
+
+	# install standard docs...
+	dodoc BUGS CREDITS LICENSE ChangeLog HARDWARE README README.fpm
+	dodoc SECURITY doc/CODING-GUIDELINES doc/linkedlists.README
+	dodoc doc/README.*
+	dodoc doc/*.txt
+
+	docinto scripts
+	dodoc contrib/scripts/*
+	docinto firmware/iax
+	dodoc contrib/firmware/iax/*
+
+	# install api docs
+	if use doc; then
+		insinto /usr/share/doc/${PF}/api/html
+		doins doc/api/html/*
+	fi
+
+	insinto /usr/share/doc/${PF}/cgi
+	doins contrib/scripts/vmail.cgi
+	doins images/*.gif
+
+	#
+	# add-ons
+	#
+
+	# install additional modules...
+	einfo "Installing additional modules..."
+	cd ${S_ADDONS}
+	make INSTALL_PREFIX=${D} install || die "Make install failed"
+
+	if use resperl; then
+		perlinfo
+
+		cd ${S_ADDONS}/res_perl
+		make INSTALL_PREFIX=${D} install || die "Installation of perl AST_API failed"
+
+		# move AstApiBase.so to a proper place
+		dodir ${VENDOR_LIB}/auto/AstAPIBase
+		mv ${D}/etc/asterisk/perl/AstAPIBase.so ${D}${VENDOR_LIB}/auto/AstAPIBase
+
+		# move *.pm files to other location
+		dodir ${VENDOR_LIB}/AstAPI
+		dodir ${VENDOR_LIB}/AstAPIBase
+		for x in AstAPI.pm AstConfig.pm LoadFile.pm PerlSwitch.pm WebServer.pm; do
+			mv ${D}/etc/asterisk/perl/${x} ${D}${VENDOR_LIB}/AstAPI
+			dosed "s/^use[\t ]\+${x/.pm/};/use AstAPI::${x/.pm/};/" /etc/asterisk/perl/asterisk_init.pm
+		done
+		mv ${D}/etc/asterisk/perl/AstAPIBase.pm ${D}${VENDOR_LIB}/AstAPIBase
+		dosed "s/^use[\t ]\+AstAPI;/use AstAPI::AstAPI;/" /etc/asterisk/perl/asterisk_init.pm
+		dosed "s/^use[\t ]\+AstAPIBase;/use AstAPIBase::AstAPIBase;/" ${VENDOR_LIB}/AstAPI/AstAPI.pm
+
+		# move apps + htdocs to a proper place
+		dodir /var/lib/asterisk/perl
+		mv ${D}/etc/asterisk/perl/{apps,htdocs} ${D}/var/lib/asterisk/perl
+
+		# fix locations
+		sed -i -e "s:/etc/asterisk/perl:/var/lib/asterisk/perl:" \
+			${D}${VENDOR_LIB}/AstAPI/LoadFile.pm ${D}${VENDOR_LIB}/AstAPI/WebServer.pm
+	fi
+}
+
+pkg_preinst() {
+	einfo "Adding asterisk user and group"
+	enewgroup asterisk
+	enewuser asterisk -1 -1 /var/lib/asterisk asterisk
+}
+
+pkg_postinst() {
+	#
+	# Change permissions and ownerships of asterisk
+	# directories and files
+	#
+	einfo "Fixing permissions and ownerships"
+	# fix permissions in /var/...
+	for x in spool run lib log; do
+		chown -R asterisk:asterisk ${ROOT}var/${x}/asterisk
+		chmod -R u=rwX,g=rX,o=     ${ROOT}var/${x}/asterisk
+	done
+
+	chown -R root:asterisk ${ROOT}etc/asterisk
+	chmod -R u=rwX,g=rX,o= ${ROOT}etc/asterisk
+
+	#
+	# Fix locations of old installations (pre-non-root versions)
+	#
+	if [[ -z "$(grep "/var/run/asterisk" ${ROOT}etc/asterisk/asterisk.conf)" ]]
+	then
+		einfo "Fixing astrundir in ${ROOT}etc/asterisk/asterisk.conf"
+		mv -f ${ROOT}etc/asterisk/asterisk.conf \
+			${ROOT}etc/asterisk/asterisk.conf.bak
+		sed -e "s:^\(astrundir[\t ]=>\).*:\1 /var/run/asterisk:" \
+			${ROOT}etc/asterisk/asterisk.conf.bak >\
+			${ROOT}etc/asterisk/asterisk.conf
+		einfo "Backup has been saved as ${ROOT}etc/asterisk/asterisk.conf.bak"
+	fi
+
+	#
+	# Some messages
+	#
+	einfo "Asterisk has been installed"
+	einfo ""
+	einfo "to add new Mailboxes use: /usr/sbin/addmailbox"
+	einfo ""
+	einfo "If you want to know more about asterisk, visit these sites:"
+	einfo "http://www.asteriskdocs.org/"
+	einfo "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	einfo "http://asterisk.xvoip.com/"
+	einfo "http://junghanns.net/asterisk/"
+	einfo "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	einfo "Gentoo VoIP IRC Channel:"
+	einfo "#gentoo-voip @ irc.freenode.net"
+
+	#
+	# Warning about security changes...
+	#
+	ewarn "*********************** Important changes **************************"
+	ewarn
+	ewarn "- Asterisk runs as user asterisk, group asterisk by default"
+	ewarn
+	ewarn "- Make sure the asterisk user is a member of the proper groups if you want it"
+	ewarn "  to have access to hardware devices, e.g. \"audio\" for Alsa and OSS sound or"
+	ewarn "  \"dialout\" for zaptel!"
+	ewarn
+	ewarn "- Permissions of /etc/asterisk have been changed to root:asterisk"
+	ewarn "  750 (rwxr-x--- directories) / 640 (rw-r----- files)"
+	ewarn
+	ewarn "- Permissions of /var/{log,lib,run,spool}/asterisk have been changed"
+	ewarn "  to asterisk:asterisk 750 / 640"
+	ewarn
+	ewarn "- Asterisk's unix socket and pidfile are now in /var/run/astrisk"
+	ewarn
+	ewarn "- Asterisk cannot set the IP ToS bits when run as user,"
+	ewarn "  use something like this to make iptables set them for you:"
+	ewarn "  \"iptables -A OUTPUT -t mangle -p udp -m udp --dport 5060 -j DSCP --set-dscp 0x28\""
+	ewarn "  \"iptables -A OUTPUT -t mangle -p udp -m udp --sport 10000:20000 -j DSCP --set-dscp 0x28\""
+	ewarn "  (taken from voip-info.org comments (see below), thanks andrewid)"
+	ewarn
+	ewarn "For more details:"
+	ewarn "     http://bugs.gentoo.org/show_bug.cgi?id=88732"
+	ewarn "     http://www.voip-info.org/wiki-Asterisk+non-root"
+}
diff --git a/net-misc/asterisk/asterisk-1.0.8-r2.ebuild b/net-misc/asterisk/asterisk-1.0.8-r2.ebuild
new file mode 100644
index 000000000000..d77a6552efcf
--- /dev/null
+++ b/net-misc/asterisk/asterisk-1.0.8-r2.ebuild
@@ -0,0 +1,473 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.8-r2.ebuild,v 1.1 2006/03/06 04:41:15 rajiv Exp $
+
+inherit eutils perl-app
+
+ADDONS_VERSION="1.0.8"
+BRI_VERSION="0.2.0-RC8h"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="ftp://ftp.digium.com/pub/telephony/${PN}/old-releases/${P}.tar.gz
+	 ftp://ftp.digium.com/pub/telephony/${PN}/old-releases/${PN}-addons-${ADDONS_VERSION}.tar.gz
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
+
+S_ADDONS=${WORKDIR}/${PN}-addons-${ADDONS_VERSION}
+
+IUSE="alsa doc gtk mmx mysql pri zaptel debug postgres vmdbmysql vmdbpostgres bri hardened speex resperl"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 sparc ~hppa ~amd64 ~ppc"
+
+DEPEND="dev-libs/newt
+	dev-libs/openssl
+	media-sound/mpg123
+	media-sound/sox
+	doc? ( app-doc/doxygen )
+	gtk? ( =x11-libs/gtk+-1.2* )
+	pri? ( >=net-libs/libpri-1.0.8 )
+	bri? ( >=net-libs/libpri-1.0.8
+		>=net-misc/zaptel-1.0.8 )
+	alsa? ( media-libs/alsa-lib )
+	mysql? ( dev-db/mysql )
+	speex? ( media-libs/speex )
+	zaptel? ( >=net-misc/zaptel-1.0.8 )
+	postgres? ( dev-db/postgresql )
+	vmdbmysql? ( dev-db/mysql )
+	vmdbpostgres? ( dev-db/postgresql )
+	resperl? ( dev-lang/perl
+		   >=net-misc/zaptel-1.0.8 )"
+
+pkg_setup() {
+	local n
+
+	#
+	# Warning about security changes...
+	#
+	ewarn "****************** Important changes warning! *********************"
+	ewarn
+	ewarn "- Asterisk runs as user asterisk, group asterisk by default"
+	ewarn
+	ewarn "- Permissions of /etc/asterisk have been changed to root:asterisk"
+	ewarn "  750 (directories) / 640 (files)"
+	ewarn
+	ewarn "- Permissions of /var/{log,lib,run,spool}/asterisk have been changed"
+	ewarn "  to asterisk:asterisk 750 (directories) / 640 (files)"
+	ewarn
+	ewarn "- Asterisk's unix socket and pidfile are now in /var/run/asterisk"
+	ewarn
+	ewarn "- More information at the end of this emerge"
+	ewarn
+	ewarn "     http://bugs.gentoo.org/show_bug.cgi?id=88732"
+	ewarn "     http://www.voip-info.org/wiki-Asterisk+non-root"
+	ewarn
+	einfo "Press Ctrl+C to abort"
+	echo
+	ebeep
+
+	n=15
+	while [[ $n -gt 0 ]]; do
+		echo -en "  Waiting $n seconds...\r"
+		sleep 1
+		(( n-- ))
+	done
+
+	#
+	# Regular checks
+	#
+	einfo "Running some pre-flight checks..."
+	if use resperl; then
+		# res_perl pre-flight check...
+		if ! $(perl -V | grep -q "usemultiplicity=define") ||\
+		   ! built_with_use dev-lang/perl ithreads || ! built_with_use sys-devel/libperl ithreads
+		then
+			eerror "Embedded perl add-on needs Perl and libperl with built-in threads support"
+			eerror "(rebuild perl and libperl with ithreads use-flag enabled)"
+			die "Perl w/o threads support..."
+		fi
+		einfo "Perl with ithreads support found"
+	fi
+
+
+	# mysql and postgres voicemail support are mutually exclusive..
+	if use vmdbmysql && use vmdbpostgres; then
+		eerror "MySQL and PostgreSQL Voicemail support are mutually exclusive... choose one!"
+		die "Conflicting use-flags"
+	fi
+
+	# check if zaptel and libpri have been built with bri enabled
+	if use bri; then
+		if ! built_with_use net-misc/zaptel bri; then
+			eerror "Re-emerge zaptel with bri use-flag enabled!"
+			die "Zaptel without bri support detected"
+		fi
+
+		if ! built_with_use net-libs/libpri bri; then
+			eerror "Re-emerge libpri with bri use-flag enabled!"
+			die "Libpri without bri support detected"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# set cflags & mmx optimization
+	sed -i  -e "s:^\(OPTIMIZE+=\).*:\1 ${CFLAGS}:" \
+		-e "s:^\(CFLAGS+=\$(shell if \$(CC)\):#\1:" \
+		Makefile
+
+	# hppa patch for gsm codec
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-hppa.patch
+
+	# mark adsi functions as weak references, things will blow
+	# on hardened otherwise (bug #100697 and possibly #85655)
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-weak-references.diff
+
+	# gsm codec still uses -fomit-frame-pointer, and other codecs have their
+	# own flags. We only change the arch.
+	sed -i  -e "s:^OPTIMIZE+=.*:OPTIMIZE=${CFLAGS}:" \
+		-e "s:^CFLAGS[\t ]\++=:CFLAGS =:" \
+		codecs/gsm/Makefile
+
+	if use mmx; then
+		if ! use hardened; then
+			einfo "Enabling mmx optimization"
+			sed -i  -e "s:^#\(K6OPT[\t ]\+= -DK6OPT\):\1:" \
+				codecs/gsm/Makefile
+		else
+			ewarn "Hardened use-flag is set, not enabling mmx optimization for codec_gsm!"
+
+		fi
+	fi
+	if ! use mmx || use hardened; then
+		# don't build + link asm mmx object file
+		# without this codec_gsm.so will include text relocations
+		sed -i  -e "/k6opt\.\(s\|o\)/ d" \
+			codecs/gsm/Makefile
+	fi
+
+	if ! use debug; then
+		einfo "Disabling debugging"
+		sed -i -e "s:^\(DEBUG=\):#\1:" Makefile
+	fi
+
+	# change image path in voicemail cgi
+	sed -i -e "s:^\(\$astpath = \).*:\1 \"/asterisk\";:" contrib/scripts/vmail.cgi
+
+	#
+	# embedded perl
+	#
+	if use resperl; then
+		einfo "Patching asterisk for embedded perl support..."
+		epatch ${S_ADDONS}/res_perl/astmake.diff
+
+		# create necessary .c file
+		/usr/bin/perl -MExtUtils::Embed -e xsinit || die "Could not create perlxsi.c"
+
+		cd ${S_ADDONS}
+
+		# fix perl path, source location and remove res_musiconhold
+		sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:" \
+			res_perl/Makefile \
+			${S}/Makefile \
+			res_perl/INC/*.pm
+		sed -i -e "s:^ASTSRC.*:ASTSRC = ${S}:" \
+			-e "s:\$(ASTLIBDIR)/modules/res_musiconhold.so::" \
+			res_perl/Makefile
+
+		if use bri; then
+			epatch ${FILESDIR}/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff
+		fi
+
+		cd ${S}
+	fi
+
+	#
+	# uclibc patch
+	#
+	if use elibc_uclibc; then
+		einfo "Patching asterisk for uclibc..."
+		epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-uclibc-dns.diff
+	fi
+
+	#
+	# other patches
+	#
+
+	# fix lpc10 Makefile, remove the
+	# CFLAGS+=-march=$(shell uname -m) part
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-lpc10flags.diff
+
+	# asterisk-config
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-astcfg-0.0.2.diff
+
+	#
+	# database voicemail support
+	#
+	if use postgres; then
+		sed -i  -e "s:^#\(APPS+=app_sql_postgres.so\):\1:" \
+			-e "s:/usr/local/pgsql/include:/usr/include/postgresql/pgsql:" \
+			-e "s:/usr/local/pgsql/lib:/usr/lib/postgresql:" \
+			apps/Makefile
+	fi
+
+	if use vmdbpostgres; then
+		einfo "Enabling PostgreSQL voicemail support"
+		sed -i  -e "s:^\(USE_POSTGRES_VM_INTERFACE\).*:\1=1:" \
+			-e "s:/usr/local/pgsql/include:/usr/include/postgresql/pgsql:" \
+			-e "s:/usr/local/pgsql/lib:/usr/lib/postgresql:" \
+			apps/Makefile
+
+		# patch app_voicemail.c
+		sed -i -e "s:^#include <postgresql/libpq-fe\.h>:#include \"libpq-fe\.h\":" \
+			apps/app_voicemail.c
+
+	elif use vmdbmysql; then
+		einfo "Enabling MySQL voicemail support"
+		sed -i  -e "s:^\(USE_MYSQL_VM_INTERFACE\).*:\1=1:" \
+			-e "s:^\(CFLAGS+=-DUSEMYSQLVM\):\1 -I${S_ADDONS}:" \
+			apps/Makefile
+	fi
+
+	#
+	# asterisk add-ons
+	#
+	cd ${S_ADDONS}
+	sed -i -e "s:-I../asterisk:-I${S} -I${S}/include:" Makefile
+	sed -i  -e "s:^OPTIMIZE+=.*:OPTIMIZE+=${CFLAGS}:" \
+		-e "s:^\(CFLAGS=\)\(.*\):\1-I${S}/include -fPIC \2:" \
+		format_mp3/Makefile
+
+
+	#
+	# BRI patches
+	#
+	if use bri; then
+		cd ${S}
+		einfo "Patching asterisk w/ BRI stuff"
+
+		epatch ${WORKDIR}/bristuff-${BRI_VERSION}/patches/asterisk.patch
+	fi
+
+	#
+	# Revived snmp plugin support
+	#
+#	if use snmp; then
+#		cd ${S}
+#		einfo "Patching snmp plugin helper functions"
+#		epatch ${FILESDIR}/1.0.0/ast-ax-snmp-1.0.6.diff
+#	fi
+
+	# fix path for non-root
+	cd ${S}
+	sed -i -e "s:^\(ASTVARRUNDIR=\).*:\1\$(INSTALL_PREFIX)/var/run/asterisk:" \
+		Makefile
+
+	# fix contrib scripts for non-root
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.7-scripts.diff
+
+	# add initgroups support to asterisk, this is needed
+	# to support supplementary groups for the asterisk
+	# user (start-stop-daemons --chguid breaks realtime priority support)
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-initgroups.diff
+
+	# fix callerid matching bug in dialplan
+	epatch ${FILESDIR}/1.0.0/${P}-callerid.patch
+
+	# fix segfault on amd64 and possibly other 64bit systems (#105762)
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
+
+	# security fix, bug #111836
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.10-vmail.cgi.patch
+}
+
+src_compile() {
+	# build asterisk first...
+	einfo "Building Asterisk..."
+	cd ${S}
+	emake -j1 || die "Make failed"
+
+	# create api docs
+	use doc && \
+		emake -j1 progdocs
+
+	#
+	# add-ons
+	#
+	einfo "Building additional stuff..."
+	cd ${S_ADDONS}
+	emake -j1 || die "Make failed"
+
+	if use resperl; then
+		cd ${S_ADDONS}/res_perl
+		emake -j1 || die "Building embedded perl failed"
+	fi
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "Make install failed"
+	make DESTDIR=${D} samples || die "Make install samples failed"
+
+	# install astconf.h, a lot of external modules need this
+	insinto /usr/include/asterisk
+	doins	astconf.h
+
+	# install addmailbox and astgenkey
+	dosbin contrib/scripts/addmailbox
+	dosbin contrib/scripts/astgenkey
+
+	newinitd ${FILESDIR}/1.0.0/asterisk.rc6.sec asterisk
+	newconfd ${FILESDIR}/1.0.0/asterisk.confd.sec asterisk
+
+	# don't delete these, even if they are empty
+	keepdir /var/spool/asterisk/voicemail/default/1234/INBOX
+	keepdir /var/spool/asterisk/tmp
+	keepdir /var/log/asterisk/cdr-csv
+	keepdir /var/run/asterisk
+
+	# install standard docs...
+	dodoc BUGS CREDITS LICENSE ChangeLog HARDWARE README README.fpm
+	dodoc SECURITY doc/CODING-GUIDELINES doc/linkedlists.README
+	dodoc doc/README.*
+	dodoc doc/*.txt
+
+	docinto scripts
+	dodoc contrib/scripts/*
+	docinto firmware/iax
+	dodoc contrib/firmware/iax/*
+
+	# install api docs
+	if use doc; then
+		insinto /usr/share/doc/${PF}/api/html
+		doins doc/api/html/*
+	fi
+
+	insinto /usr/share/doc/${PF}/cgi
+	doins contrib/scripts/vmail.cgi
+	doins images/*.gif
+
+	#
+	# add-ons
+	#
+
+	# install additional modules...
+	einfo "Installing additional modules..."
+	cd ${S_ADDONS}
+	make INSTALL_PREFIX=${D} install || die "Make install failed"
+
+	if use resperl; then
+		perlinfo
+
+		cd ${S_ADDONS}/res_perl
+		make INSTALL_PREFIX=${D} install || die "Installation of perl AST_API failed"
+
+		# move AstApiBase.so to a proper place
+		dodir ${VENDOR_LIB}/auto/AstAPIBase
+		mv ${D}/etc/asterisk/perl/AstAPIBase.so ${D}${VENDOR_LIB}/auto/AstAPIBase
+
+		# move *.pm files to other location
+		dodir ${VENDOR_LIB}/AstAPI
+		dodir ${VENDOR_LIB}/AstAPIBase
+		for x in AstAPI.pm AstConfig.pm LoadFile.pm PerlSwitch.pm WebServer.pm; do
+			mv ${D}/etc/asterisk/perl/${x} ${D}${VENDOR_LIB}/AstAPI
+			dosed "s/^use[\t ]\+${x/.pm/};/use AstAPI::${x/.pm/};/" /etc/asterisk/perl/asterisk_init.pm
+		done
+		mv ${D}/etc/asterisk/perl/AstAPIBase.pm ${D}${VENDOR_LIB}/AstAPIBase
+		dosed "s/^use[\t ]\+AstAPI;/use AstAPI::AstAPI;/" /etc/asterisk/perl/asterisk_init.pm
+		dosed "s/^use[\t ]\+AstAPIBase;/use AstAPIBase::AstAPIBase;/" ${VENDOR_LIB}/AstAPI/AstAPI.pm
+
+		# move apps + htdocs to a proper place
+		dodir /var/lib/asterisk/perl
+		mv ${D}/etc/asterisk/perl/{apps,htdocs} ${D}/var/lib/asterisk/perl
+
+		# fix locations
+		sed -i -e "s:/etc/asterisk/perl:/var/lib/asterisk/perl:" \
+			${D}${VENDOR_LIB}/AstAPI/LoadFile.pm ${D}${VENDOR_LIB}/AstAPI/WebServer.pm
+	fi
+}
+
+pkg_preinst() {
+	einfo "Adding asterisk user and group"
+	enewgroup asterisk
+	enewuser asterisk -1 -1 /var/lib/asterisk asterisk
+}
+
+pkg_postinst() {
+	#
+	# Change permissions and ownerships of asterisk
+	# directories and files
+	#
+	einfo "Fixing permissions and ownerships"
+	# fix permissions in /var/...
+	for x in spool run lib log; do
+		chown -R asterisk:asterisk ${ROOT}var/${x}/asterisk
+		chmod -R u=rwX,g=rX,o=     ${ROOT}var/${x}/asterisk
+	done
+
+	chown -R root:asterisk ${ROOT}etc/asterisk
+	chmod -R u=rwX,g=rX,o= ${ROOT}etc/asterisk
+
+	#
+	# Fix locations for old installations (pre-non-root versions)
+	#
+	if [[ -z "$(grep "/var/run/asterisk" ${ROOT}etc/asterisk/asterisk.conf)" ]]
+	then
+		einfo "Fixing astrundir in ${ROOT}etc/asterisk/asterisk.conf"
+		mv -f ${ROOT}etc/asterisk/asterisk.conf \
+			${ROOT}etc/asterisk/asterisk.conf.bak
+		sed -e "s:^\(astrundir[\t ]=>\).*:\1 /var/run/asterisk:" \
+			${ROOT}etc/asterisk/asterisk.conf.bak >\
+			${ROOT}etc/asterisk/asterisk.conf
+		einfo "Backup has been saved as ${ROOT}etc/asterisk/asterisk.conf.bak"
+	fi
+
+	#
+	# Some messages
+	#
+	einfo "Asterisk has been installed"
+	einfo ""
+	einfo "to add new Mailboxes use: /usr/sbin/addmailbox"
+	einfo ""
+	einfo "If you want to know more about asterisk, visit these sites:"
+	einfo "http://www.asteriskdocs.org/"
+	einfo "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	einfo "http://asterisk.xvoip.com/"
+	einfo "http://junghanns.net/asterisk/"
+	einfo "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	einfo "Gentoo VoIP IRC Channel:"
+	einfo "#gentoo-voip @ irc.freenode.net"
+
+	#
+	# Warning about security changes...
+	#
+	ewarn "*********************** Important changes **************************"
+	ewarn
+	ewarn "- Asterisk runs as user asterisk, group asterisk by default"
+	ewarn
+	ewarn "- Make sure the asterisk user is a member of the proper groups if you want it"
+	ewarn "  to have access to hardware devices, e.g. \"audio\" for Alsa and OSS sound or"
+	ewarn "  \"dialout\" for zaptel!"
+	ewarn
+	ewarn "- Permissions of /etc/asterisk have been changed to root:asterisk"
+	ewarn "  750 (rwxr-x--- directories) / 640 (rw-r----- files)"
+	ewarn
+	ewarn "- Permissions of /var/{log,lib,run,spool}/asterisk have been changed"
+	ewarn "  to asterisk:asterisk 750 / 640"
+	ewarn
+	ewarn "- Asterisk's unix socket and pidfile are now in /var/run/astrisk"
+	ewarn
+	ewarn "- Asterisk cannot set the IP ToS bits when run as user,"
+	ewarn "  use something like this to make iptables set them for you:"
+	ewarn "  \"iptables -A OUTPUT -t mangle -p udp -m udp --dport 5060 -j DSCP --set-dscp 0x28\""
+	ewarn "  \"iptables -A OUTPUT -t mangle -p udp -m udp --sport 10000:20000 -j DSCP --set-dscp 0x28\""
+	ewarn "  (taken from voip-info.org comments (see below), thanks andrewid)"
+	ewarn
+	ewarn "For more details:"
+	ewarn "     http://bugs.gentoo.org/show_bug.cgi?id=88732"
+	ewarn "     http://www.voip-info.org/wiki-Asterisk+non-root"
+}
diff --git a/net-misc/asterisk/asterisk-1.0.9-r2.ebuild b/net-misc/asterisk/asterisk-1.0.9-r3.ebuild
index 92462748c4e1..9e21dd77a636 100644
--- a/net-misc/asterisk/asterisk-1.0.9-r2.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9-r2.ebuild,v 1.4 2006/03/06 03:45:05 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9-r3.ebuild,v 1.1 2006/03/06 04:41:15 rajiv Exp $
 
 inherit eutils perl-app
 
@@ -282,8 +282,8 @@ src_unpack() {
 		epatch ${FILESDIR}/1.0.0/${P}-freetds.diff
 	fi
 
-	# security fix, bug #11836
-	epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
+	# security fix, bug #111836
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.10-vmail.cgi.patch
 }
 
 src_compile() {
diff --git a/net-misc/asterisk/files/1.0.0/asterisk-1.0.10-vmail.cgi.patch b/net-misc/asterisk/files/1.0.0/asterisk-1.0.10-vmail.cgi.patch
new file mode 100644
index 000000000000..a441ee0b2eae
--- /dev/null
+++ b/net-misc/asterisk/files/1.0.0/asterisk-1.0.10-vmail.cgi.patch
@@ -0,0 +1,260 @@
+--- trunk/contrib/scripts/vmail.cgi	2004/09/15 05:11:41	3781
++++ trunk/contrib/scripts/vmail.cgi	2005/10/30 16:30:35	6896
+@@ -11,10 +11,15 @@
+ # (icky, I know....  if you know better perl please help!)
+ #
+ #
++# Synchronization added by GDS Partners (www.gdspartners.com)
++#			 Stojan Sljivic (stojan.sljivic@gdspartners.com)
++#
+ use CGI qw/:standard/;
+ use Carp::Heavy;
+ use CGI::Carp qw(fatalsToBrowser);
+ use DBI;
++use Fcntl qw ( O_WRONLY O_CREAT O_EXCL );
++use Time::HiRes qw ( usleep );
+ 
+ $context=""; # Define here your by default context (so you dont need to put voicemail@context in the login
+ 
+@@ -44,6 +49,57 @@
+ $footer = "<hr><font size=-1><a href=\"http://www.asterisk.org\">The Asterisk Open Source PBX</a> Copyright 2004, <a href=\"http://www.digium.com\">Digium, Inc.</a></a>";
+ $stdcontainerend = "</td></tr><tr><td align=right>$footer</td></tr></table>\n";
+ 
++sub lock_path() {
++
++	my($path) = @_;
++	my $rand;
++	my $rfile;
++	my $start;
++	my $res;
++	
++	$rand = rand 99999999;	
++	$rfile = "$path/.lock-$rand";
++	
++	sysopen(RFILE, $rfile, O_WRONLY | O_CREAT | O_EXCL, 0666) or return -1;
++	close(RFILE);
++	
++	$res = link($rfile, "$path/.lock");
++	$start = time;
++	if ($res == 0) {
++	while (($res == 0) && (time - $start <= 5)) {
++		$res = link($rfile, "$path/.lock");
++		usleep(1);
++	}
++	}
++	unlink($rfile);
++	
++	if ($res == 0) {
++		return -1;
++	} else {
++		return 0;
++	}
++}
++
++sub unlock_path() {
++
++	my($path) = @_;
++	
++	unlink("$path/.lock");
++}
++
++sub untaint() {
++
++	my($data) = @_;
++	
++	if ($data =~ /^([-\@\w.]+)$/) {
++		$data = $1;
++	} else {
++		die "Security violation.";
++	}
++	
++	return $data;
++}
++
+ sub login_screen() {
+ 	print header;
+ 	my ($message) = @_;
+@@ -120,7 +176,7 @@
+ 
+                                 # db variables are present.  Use db for authentication.
+                                 my $dbh = DBI->connect("DBI:mysql:$dbname:$dbhost",$dbuser,$dbpass);
+-                                my $sth = $dbh->prepare(qq{select fullname,context from users where mailbox='$mbox' and password='$pass' and context='$context'});
++                                my $sth = $dbh->prepare(qq{select fullname,context from voicemail where mailbox='$mbox' and password='$pass' and context='$context'});
+                                 $sth->execute();
+                                 if (($fullname, $category) = $sth->fetchrow_array()) {;
+                                         return ($fullname ? $fullname : "Extension $mbox in $context",$category);
+@@ -184,7 +240,7 @@
+ 
+                                 # db variables are present.  Use db for authentication.
+                                 my $dbh = DBI->connect("DBI:mysql:$dbname:$dbhost",$dbuser,$dbpass);
+-                                my $sth = $dbh->prepare(qq{select fullname,context from users where mailbox='$mbox' and password='$pass' and context='$context'});
++                                my $sth = $dbh->prepare(qq{select fullname,context from voicemail where mailbox='$mbox' and password='$pass' and context='$context'});
+                                 $sth->execute();
+ 				if (($fullname, $category) = $sth->fetchrow_array()) {;
+                                         return ($fullname ? $fullname : "unknown", $category);
+@@ -242,7 +298,7 @@
+ 
+                                 # db variables are present.  Use db for authentication.
+                                 my $dbh = DBI->connect("DBI:mysql:$dbname:$dbhost",$dbuser,$dbpass);
+-                                my $sth = $dbh->prepare(qq{select mailbox,fullname,context from users where context='$context' order by mailbox});
++                                my $sth = $dbh->prepare(qq{select mailbox,fullname,context from voicemail where context='$context' order by mailbox});
+                                 $sth->execute();
+                                 while (($mailbox, $fullname, $category) = $sth->fetchrow_array()) {
+                                         $text = $mailbox;
+@@ -489,14 +545,16 @@
+ sub message_audio()
+ {
+ 	my ($forcedownload) = @_;
+-	my $folder = param('folder');
+-	my $msgid = param('msgid');
+-	my $mailbox = param('mailbox');
+-	my $context = param('context');
++	my $folder = &untaint(param('folder'));
++	my $msgid = &untaint(param('msgid'));
++	my $mailbox = &untaint(param('mailbox'));
++	my $context = &untaint(param('context'));
+ 	my $format = param('format');
+ 	if (!$format) {
+ 		$format = &getcookie('format');
+ 	}
++	&untaint($format);
++
+ 	my $path = "/var/spool/asterisk/voicemail/$context/$mailbox/$folder/msg${msgid}.$format";
+ 
+ 	$msgid =~ /^\d\d\d\d$/ || die("Msgid Liar ($msgid)!");
+@@ -719,6 +777,8 @@
+ 	}
+ 	
+ 	my $path = "/var/spool/asterisk/voicemail/$context/$mbox/$newfolder";
++	$path =~ /^(.*)$/;
++	$path = $1;
+ 	mkdir $path, 0770;
+ 	my $path = "/var/spool/asterisk/voicemail/$context/$mbox/$oldfolder";
+ 	opendir(DIR, $path) || die("Unable to open directory\n");
+@@ -742,6 +802,10 @@
+ 	my ($orig, $new) = @_;
+ 	my $res;
+ 	my $data;
++	$orig =~ /^(.*)$/;
++	$orig = $1;
++	$new =~ /^(.*)$/;
++	$new = $1;
+ 	open(IN, "<$orig") || die("Unable to open '$orig'\n");
+ 	open(OUT, ">$new") || DIE("Unable to open '$new'\n");
+ 	while(($res = sysread(IN, $data, 4096)) > 0) {
+@@ -788,8 +852,12 @@
+ 	}
+ 	
+ 	my $path = "/var/spool/asterisk/voicemail/$context/$newmbox";
++	$path =~ /^(.*)$/;
++	$path = $1;
+ 	mkdir $path, 0770;
+ 	my $path = "/var/spool/asterisk/voicemail/$context/$newmbox/INBOX";
++	$path =~ /^(.*)$/;
++	$path = $1;
+ 	mkdir $path, 0770;
+ 	my $path = "/var/spool/asterisk/voicemail/$context/$mbox/$oldfolder";
+ 	opendir(DIR, $path) || die("Unable to open directory\n");
+@@ -863,19 +931,29 @@
+ 		die("Bah! Not a valid mailbox '$newmbox'\n");
+ 		return "";
+ 	}
+-	$msgcount = &msgcount($context, $newmbox, "INBOX");
++	
+ 	my $txt;
+-	if ($newmbox ne $mbox) {
+-#		print header;
+-		foreach $msg (@msgs) {
+-#			print "Forwarding $msg from $mbox to $newmbox<BR>\n";
+-			&message_copy($context, $mbox, $newmbox, $folder, $msg, sprintf "%04d", $msgcount);
+-			$msgcount++;
++	$context = &untaint($context);
++	$newmbox = &untaint($newmbox);
++	my $path = "/var/spool/asterisk/voicemail/$context/$newmbox/INBOX";
++	if (&lock_path($path) == 0) {
++		$msgcount = &msgcount($context, $newmbox, "INBOX");
++		
++		if ($newmbox ne $mbox) {
++#			print header;
++			foreach $msg (@msgs) {
++#				print "Forwarding $msg from $mbox to $newmbox<BR>\n";
++				&message_copy($context, $mbox, $newmbox, $folder, $msg, sprintf "%04d", $msgcount);
++				$msgcount++;
++			}
++			$txt = "Forwarded messages " . join(', ', @msgs) . "to $newmbox";
++		} else {
++			$txt = "Can't forward messages to yourself!\n";
+ 		}
+-		$txt = "Forwarded messages " . join(', ', @msgs) . "to $newmbox";
++		&unlock_path($path); 
+ 	} else {
+-		$txt = "Can't forward messages to yourself!\n";
+-	} 
++		$txt = "Cannot forward messages: Unable to lock path.\n";
++	}
+ 	if ($toindex) {
+ 		&message_index($folder, $txt);
+ 	} else {
+@@ -900,33 +978,42 @@
+ 		$context = "default";
+ 	}
+ 	my $passwd = param('password');
+-	my $msgcount = &msgcount($context, $mbox, $folder);
+-	my $omsgcount = &msgcount($context, $mbox, $newfolder) if $newfolder;
+-#	print header;
+-	if ($newfolder ne $folder) {
+-		$y = 0;
+-		for ($x=0;$x<$msgcount;$x++) {
+-			my $msg = sprintf "%04d", $x;
+-			my $newmsg = sprintf "%04d", $y;
+-			if (grep(/^$msg$/, @msgs)) {
+-				if ($newfolder) {
+-					&message_rename($context, $mbox, $folder, $msg, $newfolder, sprintf "%04d", $omsgcount);
+-					$omsgcount++;
++	$context = &untaint($context);
++	$mbox = &untaint($mbox);
++	$folder = &untaint($folder);
++	my $path = "/var/spool/asterisk/voicemail/$context/$mbox/$folder";
++	if (&lock_path($path) == 0) {
++		my $msgcount = &msgcount($context, $mbox, $folder);
++		my $omsgcount = &msgcount($context, $mbox, $newfolder) if $newfolder;
++	#	print header;
++		if ($newfolder ne $folder) {
++			$y = 0;
++			for ($x=0;$x<$msgcount;$x++) {
++				my $msg = sprintf "%04d", $x;
++				my $newmsg = sprintf "%04d", $y;
++				if (grep(/^$msg$/, @msgs)) {
++					if ($newfolder) {
++						&message_rename($context, $mbox, $folder, $msg, $newfolder, sprintf "%04d", $omsgcount);
++						$omsgcount++;
++					} else {
++						&message_delete($context, $mbox, $folder, $msg);
++					}
+ 				} else {
+-					&message_delete($context, $mbox, $folder, $msg);
++					&message_rename($context, $mbox, $folder, $msg, $folder, $newmsg);
++					$y++;
+ 				}
++			}
++			if ($del) {
++				$txt = "Deleted messages "  . join (', ', @msgs);
+ 			} else {
+-				&message_rename($context, $mbox, $folder, $msg, $folder, $newmsg);
+-				$y++;
++				$txt = "Moved messages "  . join (', ', @msgs) . " to $newfolder";
+ 			}
+-		}
+-		if ($del) {
+-			$txt = "Deleted messages "  . join (', ', @msgs);
+ 		} else {
+-			$txt = "Moved messages "  . join (', ', @msgs) . " to $newfolder";
++			$txt = "Can't move a message to the same folder they're in already";
+ 		}
++		&unlock_path($path);
+ 	} else {
+-		$txt = "Can't move a message to the same folder they're in already";
++		$txt = "Cannot move/delete messages: Unable to lock path.\n";
+ 	}
+ 	# Not as many messages now
+ 	$msgcount--;
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.10 b/net-misc/asterisk/files/digest-asterisk-1.0.10
deleted file mode 100644
index 56aaf160ad19..000000000000
--- a/net-misc/asterisk/files/digest-asterisk-1.0.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f60f4c4edc36fa61dc55a5385fd82e71 asterisk-1.0.10.tar.gz 9609302
-MD5 2b6e1da3ff097f9792d3123e7e5a0059 asterisk-addons-1.0.9.tar.gz 73716
-MD5 215dd795ce8ea72370b2e9d1bb7d8f6a bristuff-0.2.0-RC8q.tar.gz 152037
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.10-r1 b/net-misc/asterisk/files/digest-asterisk-1.0.10-r1
new file mode 100644
index 000000000000..bf20f71508db
--- /dev/null
+++ b/net-misc/asterisk/files/digest-asterisk-1.0.10-r1
@@ -0,0 +1,9 @@
+MD5 f60f4c4edc36fa61dc55a5385fd82e71 asterisk-1.0.10.tar.gz 9609302
+RMD160 fa85ccd0a84de0eb4596dcc97ddd680b9aa72e1c asterisk-1.0.10.tar.gz 9609302
+SHA256 3f10fe074fe1469b13046493ee43efc2c9b2e1fa0896abeb2eb09e381d7c9f92 asterisk-1.0.10.tar.gz 9609302
+MD5 2b6e1da3ff097f9792d3123e7e5a0059 asterisk-addons-1.0.9.tar.gz 73716
+RMD160 98156861f790987fb4bf86b14c902aeca90b380b asterisk-addons-1.0.9.tar.gz 73716
+SHA256 4c878a4e5b5aabbdd93116ccbca5cf6465d55f480f4aa1e6438e9fc49c1f11fe asterisk-addons-1.0.9.tar.gz 73716
+MD5 4d8cc1e10d94f373e6dfd4cea2928ad2 bristuff-0.2.0-RC8q.tar.gz 152018
+RMD160 98b1328d4618ade310a5312d71ec0f1e27507a37 bristuff-0.2.0-RC8q.tar.gz 152018
+SHA256 03cf1f5920aa023f6a449da473159b4b447d3940d74590cbad95304a4fbcb1c4 bristuff-0.2.0-RC8q.tar.gz 152018
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.7-r3 b/net-misc/asterisk/files/digest-asterisk-1.0.7-r3
new file mode 100644
index 000000000000..6de4491b805b
--- /dev/null
+++ b/net-misc/asterisk/files/digest-asterisk-1.0.7-r3
@@ -0,0 +1,9 @@
+MD5 4cc3c1e4a1b12e0e4c748326ad153291 asterisk-1.0.7.tar.gz 9591705
+RMD160 bb738f0e3d100314fa7497c9ee81f8a022e536bb asterisk-1.0.7.tar.gz 9591705
+SHA256 552dd71917475eaf1866665d091909c2c50865d84c62ab35383f443141e08a74 asterisk-1.0.7.tar.gz 9591705
+MD5 e2a94a7c2e97de18b3cdc4dd42709c11 asterisk-addons-1.0.7.tar.gz 73646
+RMD160 52d73f32bcd1717b5cf057c5930a9aefae1040cf asterisk-addons-1.0.7.tar.gz 73646
+SHA256 22d5839b851ed83590bf670f0c958ec5103178f80706ce4b4b235c837adf0433 asterisk-addons-1.0.7.tar.gz 73646
+MD5 7a5ff01d3befff1fbd3de1c303cb10d1 bristuff-0.2.0-RC8g.tar.gz 139013
+RMD160 c0a037e0819b8985be2df60a010309335527f203 bristuff-0.2.0-RC8g.tar.gz 139013
+SHA256 19a0a7fdbb192fed4ea086251d5653abbe8525232dd5b613f9366400c97b213b bristuff-0.2.0-RC8g.tar.gz 139013
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.8-r2 b/net-misc/asterisk/files/digest-asterisk-1.0.8-r2
new file mode 100644
index 000000000000..88ae55242b46
--- /dev/null
+++ b/net-misc/asterisk/files/digest-asterisk-1.0.8-r2
@@ -0,0 +1,9 @@
+MD5 8400ebbd46e41cd772c7814b361de05a asterisk-1.0.8.tar.gz 9604563
+RMD160 6f1e63804ce4a2ec90a61571bf946d6b64dcea76 asterisk-1.0.8.tar.gz 9604563
+SHA256 26807ac82aa45758e538276301273c4493e1f4fdb2ba433bd732ab21d2340e9a asterisk-1.0.8.tar.gz 9604563
+MD5 07af0488fde431278fc840f39a9b38f2 asterisk-addons-1.0.8.tar.gz 73702
+RMD160 66c6ab0ab2941cb657828d45ab379ecbfb385a5d asterisk-addons-1.0.8.tar.gz 73702
+SHA256 3f5c9d03fd257781ec6c59189d37c492fbdf457a1d267bb509f3c852693a7dae asterisk-addons-1.0.8.tar.gz 73702
+MD5 3b264a75b1a17735572920655bf1a0f8 bristuff-0.2.0-RC8h.tar.gz 150270
+RMD160 a958bc8418618ca892f0fbdb8d8cf203375d3865 bristuff-0.2.0-RC8h.tar.gz 150270
+SHA256 74c2e40cd665a2a9ac29d5ddd31892c8ca15ca9b55e2a08523e9db5ca75ba207 bristuff-0.2.0-RC8h.tar.gz 150270
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.9-r2 b/net-misc/asterisk/files/digest-asterisk-1.0.9-r2
deleted file mode 100644
index 33f5aed3f4de..000000000000
--- a/net-misc/asterisk/files/digest-asterisk-1.0.9-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0d7f1c680ae53a739f26a069ef8b580a asterisk-1.0.9.tar.gz 9604582
-MD5 2b6e1da3ff097f9792d3123e7e5a0059 asterisk-addons-1.0.9.tar.gz 73716
-MD5 a6b5c61c16b35f02c616c8abadb9999d bristuff-0.2.0-RC8n.tar.gz 143979
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.9-r3 b/net-misc/asterisk/files/digest-asterisk-1.0.9-r3
new file mode 100644
index 000000000000..a1637fb67395
--- /dev/null
+++ b/net-misc/asterisk/files/digest-asterisk-1.0.9-r3
@@ -0,0 +1,9 @@
+MD5 0d7f1c680ae53a739f26a069ef8b580a asterisk-1.0.9.tar.gz 9604582
+RMD160 2e48dc00a3c290cc6b418ab0aee42feb93d9e76a asterisk-1.0.9.tar.gz 9604582
+SHA256 27e9437b3e6297f1a5e171b96e818c1ffa51dba78afe61277f5c3540809d2653 asterisk-1.0.9.tar.gz 9604582
+MD5 2b6e1da3ff097f9792d3123e7e5a0059 asterisk-addons-1.0.9.tar.gz 73716
+RMD160 98156861f790987fb4bf86b14c902aeca90b380b asterisk-addons-1.0.9.tar.gz 73716
+SHA256 4c878a4e5b5aabbdd93116ccbca5cf6465d55f480f4aa1e6438e9fc49c1f11fe asterisk-addons-1.0.9.tar.gz 73716
+MD5 a6b5c61c16b35f02c616c8abadb9999d bristuff-0.2.0-RC8n.tar.gz 143979
+RMD160 922b6b807bb48aa690412de3916eeb54c1454486 bristuff-0.2.0-RC8n.tar.gz 143979
+SHA256 a92d9d8e9777c0637d2db0375794fe011fd8ecf1461f0b8e6587c74670da637c bristuff-0.2.0-RC8n.tar.gz 143979