summaryrefslogtreecommitdiff
path: root/comms/asterisk10/patches
diff options
context:
space:
mode:
authorjnemeth <jnemeth>2012-04-07 20:05:57 +0000
committerjnemeth <jnemeth>2012-04-07 20:05:57 +0000
commit4fdaa32c3fa6e569c8d80d3f57edd84751cc2ef5 (patch)
tree504570d7e2f49c0875e10e3c74eb546830c88679 /comms/asterisk10/patches
parent41dc7ca86620d945f0dbd14471e679a56a696b37 (diff)
downloadpkgsrc-4fdaa32c3fa6e569c8d80d3f57edd84751cc2ef5.tar.gz
Update to Asterisk 10.3.0:
pkgsrc change: eliminate ilbc option now that iLBC codec is always built The Asterisk Development Team has announced the release of Asterisk 10.3.0. The release of Asterisk 10.3.0 resolves several issues reported by the community and would have not been possible without your participation. Thank you! The following are the issues resolved in this release: * --- Fix potential buffer overrun and memory leak when executing "sip show peers" * --- Fix ACK routing for non-2xx responses. * --- Remove possible segfaults from res_odbc by adding locks around usage of odbc handle * --- Fix blind transfer parking issues if the dialed extension is not recognized as a parking extension. * --- Copy CDR variables when set during a bridge * --- push 'outgoing' flag from sig_XXX up to chan_dahdi For a full list of changes in this release, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-10.3.0 Thank you for your continued support of Asterisk!
Diffstat (limited to 'comms/asterisk10/patches')
-rw-r--r--comms/asterisk10/patches/patch-configure26
-rw-r--r--comms/asterisk10/patches/patch-main_features.c28
2 files changed, 27 insertions, 27 deletions
diff --git a/comms/asterisk10/patches/patch-configure b/comms/asterisk10/patches/patch-configure
index e41c9a413b8..556c75e6c55 100644
--- a/comms/asterisk10/patches/patch-configure
+++ b/comms/asterisk10/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.2 2012/03/25 02:17:47 jnemeth Exp $
+$NetBSD: patch-configure,v 1.3 2012/04/07 20:05:57 jnemeth Exp $
---- configure.orig 2012-01-14 16:41:55.000000000 +0000
+--- configure.orig 2012-02-16 19:44:44.000000000 +0000
+++ configure
-@@ -16480,6 +16480,148 @@ fi
+@@ -24527,6 +24527,148 @@ fi
@@ -151,21 +151,21 @@ $NetBSD: patch-configure,v 1.2 2012/03/25 02:17:47 jnemeth Exp $
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-@@ -17486,6 +17628,8 @@ $as_echo_n "checking if \"struct ifaddrs
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -28831,6 +28973,8 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-+ #include <sys/types.h>
-+ #include <sys/socket.h>
- #include <ifaddrs.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <ifaddrs.h>
int
main ()
-@@ -28858,10 +29002,9 @@ if test "x$ac_cv_file__sbin_launchd" = x
-
- $as_echo "#define HAVE_SBIN_LAUNCHD 1" >>confdefs.h
+@@ -55858,10 +56002,10 @@ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_SBIN_LAUNCHD 1
+ _ACEOF
-fi
--
+
PBX_LAUNCHD=1
fi
+fi
diff --git a/comms/asterisk10/patches/patch-main_features.c b/comms/asterisk10/patches/patch-main_features.c
index 03b99ffbea2..6e44a759040 100644
--- a/comms/asterisk10/patches/patch-main_features.c
+++ b/comms/asterisk10/patches/patch-main_features.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-main_features.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-main_features.c,v 1.2 2012/04/07 20:05:57 jnemeth Exp $
---- main/features.c.orig 2011-10-20 21:58:39.000000000 +0000
+--- main/features.c.orig 2012-02-27 16:05:24.000000000 +0000
+++ main/features.c
-@@ -1494,14 +1494,14 @@ static int park_call_full(struct ast_cha
+@@ -1493,14 +1493,14 @@ static int park_call_full(struct ast_cha
"Channel: %s\r\n"
"Parkinglot: %s\r\n"
"From: %s\r\n"
@@ -13,13 +13,13 @@ $NetBSD: patch-main_features.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
"ConnectedLineNum: %s\r\n"
"ConnectedLineName: %s\r\n"
"Uniqueid: %s\r\n",
- pu->parkingexten, pu->chan->name, pu->parkinglot->name, event_from ? event_from : "",
+ pu->parkingexten, chan->name, pu->parkinglot->name, event_from,
- (long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL),
+ (intmax_t)pu->start.tv_sec + (intmax_t)(pu->parkingtime/1000) - (intmax_t)time(NULL),
- S_COR(pu->chan->caller.id.number.valid, pu->chan->caller.id.number.str, "<unknown>"),
- S_COR(pu->chan->caller.id.name.valid, pu->chan->caller.id.name.str, "<unknown>"),
- S_COR(pu->chan->connected.id.number.valid, pu->chan->connected.id.number.str, "<unknown>"),
-@@ -2053,7 +2053,7 @@ static int builtin_automonitor(struct as
+ S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, "<unknown>"),
+ S_COR(chan->caller.id.name.valid, chan->caller.id.name.str, "<unknown>"),
+ S_COR(chan->connected.id.number.valid, chan->connected.id.number.str, "<unknown>"),
+@@ -2057,7 +2057,7 @@ static int builtin_automonitor(struct as
len = strlen(touch_monitor) + 50;
args = alloca(len);
touch_filename = alloca(len);
@@ -28,7 +28,7 @@ $NetBSD: patch-main_features.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
} else {
caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid,
-@@ -2063,7 +2063,7 @@ static int builtin_automonitor(struct as
+@@ -2067,7 +2067,7 @@ static int builtin_automonitor(struct as
len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
args = alloca(len);
touch_filename = alloca(len);
@@ -37,7 +37,7 @@ $NetBSD: patch-main_features.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
}
-@@ -2169,7 +2169,7 @@ static int builtin_automixmonitor(struct
+@@ -2173,7 +2173,7 @@ static int builtin_automixmonitor(struct
len = strlen(touch_monitor) + 50;
args = alloca(len);
touch_filename = alloca(len);
@@ -46,7 +46,7 @@ $NetBSD: patch-main_features.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
snprintf(args, len, "%s.%s,b", touch_filename, (touch_format) ? touch_format : "wav");
} else {
caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid,
-@@ -2179,7 +2179,7 @@ static int builtin_automixmonitor(struct
+@@ -2183,7 +2183,7 @@ static int builtin_automixmonitor(struct
len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
args = alloca(len);
touch_filename = alloca(len);
@@ -55,7 +55,7 @@ $NetBSD: patch-main_features.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
}
-@@ -6922,10 +6922,10 @@ static char *handle_parkedcalls(struct a
+@@ -6973,10 +6973,10 @@ static char *handle_parkedcalls(struct a
AST_LIST_LOCK(&curlot->parkings);
AST_LIST_TRAVERSE(&curlot->parkings, cur, list) {
@@ -68,7 +68,7 @@ $NetBSD: patch-main_features.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
++lotparked;
}
AST_LIST_UNLOCK(&curlot->parkings);
-@@ -6981,7 +6981,7 @@ static int manager_parking_status(struct
+@@ -7032,7 +7032,7 @@ static int manager_parking_status(struct
"Exten: %d\r\n"
"Channel: %s\r\n"
"From: %s\r\n"
@@ -77,7 +77,7 @@ $NetBSD: patch-main_features.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
"CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n"
"ConnectedLineNum: %s\r\n"
-@@ -6990,7 +6990,7 @@ static int manager_parking_status(struct
+@@ -7041,7 +7041,7 @@ static int manager_parking_status(struct
"\r\n",
curlot->name,
cur->parkingnum, cur->chan->name, cur->peername,