summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2011-07-26 13:53:33 +0000
committerTony Vroon <chainsaw@gentoo.org>2011-07-26 13:53:33 +0000
commit25ca81ce46420adc9e961338947dc0b4d7dfd0bb (patch)
tree3ab4e72b4152e184d324d7039bdb18241e5e466c /net-misc/asterisk
parentVersion bump. (diff)
downloadgentoo-2-25ca81ce46420adc9e961338947dc0b4d7dfd0bb.tar.gz
gentoo-2-25ca81ce46420adc9e961338947dc0b4d7dfd0bb.tar.bz2
gentoo-2-25ca81ce46420adc9e961338947dc0b4d7dfd0bb.zip
Forgot to credit Erik Wallin; adding credit & bug number accordingly. No ebuild changes.
(Portage version: 2.1.10.7/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/asterisk')
-rw-r--r--net-misc/asterisk/ChangeLog5
1 files changed, 3 insertions, 2 deletions
diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 666c63f14600..fdd7154c93ac 100644
--- 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)