Forgot to credit Erik Wallin; adding credit & bug number accordingly. No ebuild changes.

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

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 666c63f146005fed68286f39292aee65db8c5137..fdd7154c93acdaed9394129a2e5d794258af7c5d 100644 (file)
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.336 2011/07/26 13:37:11 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.337 2011/07/26 13:53:33 chainsaw Exp $
 
 *asterisk-1.8.5.0-r3 (26 Jul 2011)
 
@@ -8,7 +8,8 @@
   Patch from Jaco Kroon allows setvar from users.conf to work for chan_dahdi
   again, closes bug #374195. Patch from upstream bug #ASTERISK-18082 resolves a
   segmentation fault or deadlock that can occur for multiple simultaneous
-  attended transfers.
+  attended transfers. The pri-missing-keyword.patch was already applied upstream 
+  but in a different location; dropped as per Erik Wallin in bug #375291.
 
 *asterisk-1.8.5.0-r2 (14 Jul 2011)
 

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 155d4618fab342ab8387a36116bdad5d8efc957c..a7fb4e2a4e8bf47305b8e5eb25e6c4fde3c289c3 100644 (file)
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -25,12 +25,12 @@ EBUILD asterisk-1.6.2.19-r2.ebuild 5828 RMD160 70d8188d88d2269e19567797211a626d3
 EBUILD asterisk-1.8.4.4-r1.ebuild 14632 RMD160 0492acdd869b59f3c6f1a0efb7e9168d24b2231e SHA1 8c68dec416669bc0d5f9675288743294d30538cd SHA256 99c30aec8a536d63e192d5949828e77050ad3a8a7c2777e77a3106c887e476a3
 EBUILD asterisk-1.8.5.0-r2.ebuild 14630 RMD160 5e626841eb6a00acad0332f17024e80a9b219cbb SHA1 305e33c58a30d382b975864a1493633edb533c11 SHA256 9806128e78bdc39d847e9c3c08dfc8747a89b9eb4422e581c964cc674ec101e6
 EBUILD asterisk-1.8.5.0-r3.ebuild 14630 RMD160 f78ab899ef3e68e18c0fbf97fa6e6682a71cb425 SHA1 fe7d6b30fbd03193227edb813b54032fa889002e SHA256 688a30736e079409f513c90cecf84a144f4394c1f892e6f31d49ae2f05bb1103
-MISC ChangeLog 85371 RMD160 c9e63e4fb75e94c2bfcc3861f2f33767dc1c313d SHA1 7b3de35f168f0ed261ce6bb861cd4f9417c8a8d3 SHA256 6c2ad7d90a75ef60ad33d64ebec6a21f6c841b80285b53f8ca1aeab1d4de2cd2
+MISC ChangeLog 85505 RMD160 59a0520826698f646da8eb2dd742b10784d27fb0 SHA1 0cf3712e5e5ac8fac70b527cf8233c677e332658 SHA256 c7e4257c88e7ba1effcd83ebc30aed26f9b05467af2899466a2303347279205c
 MISC metadata.xml 1104 RMD160 5b90405c685bc1c0ee173b3024afab5bc849bf40 SHA1 bf76dd265acf32efba9e4e8189ae154a4b9ebd40 SHA256 17e96f326cd60399fb217025567ae4c80f1b9b12418f1bf5b41c8fa4c49598ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4uww0ACgkQp5vW4rUFj5qb3wCfXlJvs9injmRdXbR7Lp07qyPQ
-RvgAn32icBrJDU4bLM4qmZBXXJzDDyMq
-=r2Yb
+iEYEARECAAYFAk4uxuMACgkQp5vW4rUFj5qKowCdESStyPmMPhQ4uA4IDW8y7IUB
+6SsAnRagCpDzv9D3ygsoxUGuz7mI0W3w
+=v/of
 -----END PGP SIGNATURE-----