summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2010-01-04 15:11:51 +0000
committerTony Vroon <chainsaw@gentoo.org>2010-01-04 15:11:51 +0000
commit470661eaa4b2582fa577ecdf749ee4a7fe05cf92 (patch)
tree3098ec91d157836cc22b0b736f202c6969d20729 /net-misc/asterisk/files
parentamd64 stable wrt #299412 (diff)
downloadgentoo-2-470661eaa4b2582fa577ecdf749ee4a7fe05cf92.tar.gz
gentoo-2-470661eaa4b2582fa577ecdf749ee4a7fe05cf92.tar.bz2
gentoo-2-470661eaa4b2582fa577ecdf749ee4a7fe05cf92.zip
Version bump to new branch. Rundir patch no longer required, upstream now follows our convention. ODBC disable flag has vanished, dropped USE-flag. BT line test patch rebased as it it still not upstream.
(Portage version: 2.1.7.16/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/asterisk/files')
-rw-r--r--net-misc/asterisk/files/1.6.2/asterisk-1.6.2.0-bt-line-test.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.0-bt-line-test.patch b/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.0-bt-line-test.patch
new file mode 100644
index 000000000000..2b38e3ed891a
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/asterisk-1.6.2.0-bt-line-test.patch
@@ -0,0 +1,35 @@
+diff -uNr asterisk-1.6.2.0.ORIG/channels/chan_dahdi.c asterisk-1.6.2.0/channels/chan_dahdi.c
+--- asterisk-1.6.2.0.ORIG/channels/chan_dahdi.c 2010-01-04 13:57:12.000000000 +0000
++++ asterisk-1.6.2.0/channels/chan_dahdi.c 2010-01-04 14:08:54.000000000 +0000
+@@ -8419,6 +8419,7 @@
+ }
+ if (i & DAHDI_IOMUX_SIGEVENT) {
+ res = dahdi_get_event(p->subs[idx].dfd);
++ if (res == DAHDI_EVENT_NOALARM) p->inalarm = 0;
+ ast_log(LOG_NOTICE, "Got event %d (%s)...\n", res, event2str(res));
+
+ if (p->cid_signalling == CID_SIG_V23_JP) {
+@@ -8521,6 +8522,7 @@
+ if (i & DAHDI_IOMUX_SIGEVENT) {
+ res = dahdi_get_event(p->subs[idx].dfd);
+ ast_log(LOG_NOTICE, "Got event %d (%s)...\n", res, event2str(res));
++ if (res == DAHDI_EVENT_NOALARM) p->inalarm = 0;
+ res = 0;
+ /* Let us detect distinctive ring */
+
+@@ -8670,6 +8672,7 @@
+ if (i & DAHDI_IOMUX_SIGEVENT) {
+ res = dahdi_get_event(p->subs[idx].dfd);
+ ast_log(LOG_NOTICE, "Got event %d (%s)...\n", res, event2str(res));
++ if (res == DAHDI_EVENT_NOALARM) p->inalarm = 0;
+ /* If we get a PR event, they hung up while processing calerid */
+ if ( res == DAHDI_EVENT_POLARITY && p->hanguponpolarityswitch && p->polarity == POLARITY_REV) {
+ ast_log(LOG_DEBUG, "Hanging up due to polarity reversal on channel %d while detecting callerid\n", p->channel);
+@@ -8739,6 +8742,7 @@
+ if (i & DAHDI_IOMUX_SIGEVENT) {
+ res = dahdi_get_event(p->subs[idx].dfd);
+ ast_log(LOG_NOTICE, "Got event %d (%s)...\n", res, event2str(res));
++ if (res == DAHDI_EVENT_NOALARM) p->inalarm = 0;
+ res = 0;
+ /* Let us detect callerid when the telco uses distinctive ring */
+