cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to asterisk 11.7.0

Browse Source
This commit is contained in:
sthen 2013-12-20 12:37:05 +00:00
parent aae9a5a103
commit 0faeb0f87c
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/asterisk/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.189 2013/12/16 23:16:01 sthen Exp $
# $OpenBSD: Makefile,v 1.190 2013/12/20 12:37:05 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit
VER= 11.6.1
VER= 11.7.0
DISTNAME= asterisk-${VER:S/beta/-beta/:S/rc/-rc/}
PKGNAME-main= asterisk-${VER}

4
telephony/asterisk/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (asterisk-11.6.1.tar.gz) = e0Wn++iYjRkwcPbF9nMPwbqCbE8EtgdHYjtnN9KZsBY=
SIZE (asterisk-11.6.1.tar.gz) = 34759138
SHA256 (asterisk-11.7.0.tar.gz) = T7KDuWRH9dhxYyoUBp81ZDyMNNCNbsX+3wrj3zDgw5c=
SIZE (asterisk-11.7.0.tar.gz) = 34779538

14
telephony/asterisk/patches/patch-channels_chan_sip_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-channels_chan_sip_c,v 1.11 2013/10/21 23:38:45 sthen Exp $
$OpenBSD: patch-channels_chan_sip_c,v 1.12 2013/12/20 12:37:05 sthen Exp $
https://issues.asterisk.org/jira/secure/attachment/46850/fax-deadlock-v2.patch-11.3.0
and add a bit more randomness for digest auth
--- channels/chan_sip.c.orig Fri Oct 18 17:38:45 2013
+++ channels/chan_sip.c Mon Oct 21 20:23:44 2013
@@ -8436,8 +8436,6 @@ static struct ast_frame *sip_read(struct ast_channel *
--- channels/chan_sip.c.orig Fri Oct 25 17:05:55 2013
+++ channels/chan_sip.c Tue Dec 17 23:12:01 2013
@@ -8442,8 +8442,6 @@ static struct ast_frame *sip_read(struct ast_channel *
ast_channel_unlock(ast);
if (ast_exists_extension(ast, target_context, "fax", 1,
S_COR(ast_channel_caller(ast)->id.number.valid, ast_channel_caller(ast)->id.number.str, NULL))) {
@ -14,7 +14,7 @@ and add a bit more randomness for digest auth
ast_verb(2, "Redirecting '%s' to fax extension due to CNG detection\n", ast_channel_name(ast));
pbx_builtin_setvar_helper(ast, "FAXEXTEN", ast_channel_exten(ast));
if (ast_async_goto(ast, target_context, "fax", 1)) {
@@ -8446,10 +8444,10 @@ static struct ast_frame *sip_read(struct ast_channel *
@@ -8452,10 +8450,10 @@ static struct ast_frame *sip_read(struct ast_channel *
ast_frfree(fr);
fr = &ast_null_frame;
} else {
@ -27,7 +27,7 @@ and add a bit more randomness for digest auth
}
}
@@ -10689,6 +10687,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_r
@@ -10722,6 +10720,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_r
ast_channel_unlock(p->owner);
if (ast_exists_extension(p->owner, target_context, "fax", 1,
S_COR(ast_channel_caller(p->owner)->id.number.valid, ast_channel_caller(p->owner)->id.number.str, NULL))) {
@ -35,7 +35,7 @@ and add a bit more randomness for digest auth
ast_verb(2, "Redirecting '%s' to fax extension due to peer T.38 re-INVITE\n", ast_channel_name(p->owner));
pbx_builtin_setvar_helper(p->owner, "FAXEXTEN", ast_channel_exten(p->owner));
if (ast_async_goto(p->owner, target_context, "fax", 1)) {
@@ -16245,7 +16244,7 @@ static void build_route(struct sip_pvt *p, struct sip_
@@ -16274,7 +16273,7 @@ static void build_route(struct sip_pvt *p, struct sip_
static void build_nonce(struct sip_pvt *p, int forceupdate)
{
if (p->stalenonce || forceupdate || ast_strlen_zero(p->nonce)) {

10
telephony/asterisk/patches/patch-configure_ac
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-configure_ac,v 1.31 2013/07/16 13:03:19 sthen Exp $
$OpenBSD: patch-configure_ac,v 1.32 2013/12/20 12:37:05 sthen Exp $
c-client requires both kerbV libs *and* (separately) libssl.
--- configure.ac.orig Wed May 15 13:39:55 2013
+++ configure.ac Tue Jul 16 10:37:02 2013
--- configure.ac.orig Tue Oct 8 23:27:59 2013
+++ configure.ac Tue Dec 17 23:12:01 2013
@@ -60,7 +60,7 @@ AC_SUBST([astvarrundir], ['${localstatedir}/run/a
case "${host_os}" in
@ -13,7 +13,7 @@ c-client requires both kerbV libs *and* (separately) libssl.
astvarlibdir='${prefix}/share/asterisk'
astdbdir='${localstatedir}/db/asterisk'
fi
@@ -1735,7 +1735,7 @@ if test "${USE_IMAP_TK}" != "no"; then
@@ -1740,7 +1740,7 @@ if test "${USE_IMAP_TK}" != "no"; then
)
else #looking in imap directory didn't work, try c-client
imap_ldflags=""
@ -22,7 +22,7 @@ c-client requires both kerbV libs *and* (separately) libssl.
imap_include="-DUSE_SYSTEM_CCLIENT"
CPPFLAGS="${saved_cppflags}"
LIBS="${saved_libs}"
@@ -1921,7 +1921,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
@@ -1926,7 +1926,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])

4
telephony/asterisk/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.51 2013/12/11 16:00:43 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.52 2013/12/20 12:37:06 sthen Exp $
@conflict asterisk-sounds-<=1.2.1p2
@conflict asterisk-curl-*
@conflict asterisk-fax-*
@ -367,6 +367,8 @@ lib/asterisk/modules/res_timing_pthread.so
lib/asterisk/modules/res_xmpp.so
@comment lib/libasteriskssl.so
@lib lib/libasteriskssl.so.${LIBasteriskssl_VERSION}
@man man/man8/astdb2bdb.8
@man man/man8/astdb2sqlite3.8
@man man/man8/asterisk.8
@man man/man8/astgenkey.8
@man man/man8/autosupport.8