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

update to asterisk-11.17.0, which includes a fix from Ed Hynan for an

Browse Source 
FD exhaustion problem he was seeing on OpenBSD.
This commit is contained in:
sthen 2015-04-02 17:09:30 +00:00
parent d35886f083
commit 62b322e875
5 changed files with 15 additions and 30 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.214 2015/02/06 23:27:51 sthen Exp $
# $OpenBSD: Makefile,v 1.215 2015/04/02 17:09:30 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit
VER= 11.16.0
VER= 11.17.0
PORTROACH= limitw:0,odd
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.16.0.tar.gz) = +Y2pPtD/vd37wwE1HqMuWmPS2+zwWk+X+3lKaKO9vk0=
SIZE (asterisk-11.16.0.tar.gz) = 34995495
SHA256 (asterisk-11.17.0.tar.gz) = bGaAU5xfowwVWEzMABf5b0t3Lil9iYTi2hM46AdvQTI=
SIZE (asterisk-11.17.0.tar.gz) = 35008465

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

@ -1,10 +1,10 @@
$OpenBSD: patch-channels_chan_sip_c,v 1.22 2015/02/06 23:27:51 sthen Exp $
$OpenBSD: patch-channels_chan_sip_c,v 1.23 2015/04/02 17:09:30 sthen Exp $
https://issues.asterisk.org/jira/secure/attachment/46850/fax-deadlock-v2.patch-11.3.0
--- channels/chan_sip.c.orig Thu Jan 29 20:40:04 2015
+++ channels/chan_sip.c Fri Feb 6 23:03:35 2015
@@ -8302,8 +8302,6 @@ static struct ast_frame *sip_read(struct ast_channel *
--- channels/chan_sip.c.orig Thu Mar 19 09:39:28 2015
+++ channels/chan_sip.c Thu Apr 2 17:41:56 2015
@@ -8306,8 +8306,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))) {
@ -13,7 +13,7 @@ https://issues.asterisk.org/jira/secure/attachment/46850/fax-deadlock-v2.patch-1
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)) {
@@ -8312,10 +8310,10 @@ static struct ast_frame *sip_read(struct ast_channel *
@@ -8316,10 +8314,10 @@ static struct ast_frame *sip_read(struct ast_channel *
ast_frfree(fr);
fr = &ast_null_frame;
} else {
@ -26,7 +26,7 @@ https://issues.asterisk.org/jira/secure/attachment/46850/fax-deadlock-v2.patch-1
}
}
@@ -10626,6 +10624,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_r
@@ -10631,6 +10629,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))) {

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

@ -1,9 +1,9 @@
$OpenBSD: patch-configure_ac,v 1.36 2014/05/31 00:35:31 sthen Exp $
$OpenBSD: patch-configure_ac,v 1.37 2015/04/02 17:09:30 sthen Exp $
c-client requires both kerbV libs *and* (separately) libssl.
--- configure.ac.orig Tue May 13 00:48:13 2014
+++ configure.ac Thu May 29 21:32:09 2014
--- configure.ac.orig Thu Mar 12 12:26:57 2015
+++ configure.ac Thu Apr 2 17:41:56 2015
@@ -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
@@ -1747,7 +1747,7 @@ if test "${USE_IMAP_TK}" != "no"; then
@@ -1772,7 +1772,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}"
@@ -1933,7 +1933,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
@@ -1958,7 +1958,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])

15
telephony/asterisk/patches/patch-main_asterisk_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-main_asterisk_c,v 1.26 2015/02/06 23:27:51 sthen Exp $
--- main/asterisk.c.orig Mon Dec 22 19:38:58 2014
+++ main/asterisk.c Fri Feb 6 23:03:35 2015
@@ -87,11 +87,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.26 $")
#elif defined(HAVE_SYSCTL)
#include <sys/param.h>
#include <sys/sysctl.h>
-#if !defined(__OpenBSD__)
#include <sys/vmmeter.h>
#if defined(__FreeBSD__)
#include <vm/vm_param.h>
-#endif
#endif
#if defined(HAVE_SWAPCTL)
#include <sys/swap.h>