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

update to asterisk-11.18.0

Browse Source
This commit is contained in:
sthen 2015-06-08 08:44:52 +00:00
parent ecb2da87e6
commit a7b01e47e2
9 changed files with 28 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/asterisk/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.217 2015/05/08 09:08:44 espie Exp $
# $OpenBSD: Makefile,v 1.218 2015/06/08 08:44:52 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit
VER= 11.17.0
REVISION-main= 0
VER= 11.18.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.17.0.tar.gz) = bGaAU5xfowwVWEzMABf5b0t3Lil9iYTi2hM46AdvQTI=
SIZE (asterisk-11.17.0.tar.gz) = 35008465
SHA256 (asterisk-11.18.0.tar.gz) = YFuCPiNixUNRKgr3Qn2xI8O4Ru30W+1yIjLMNciCSxA=
SIZE (asterisk-11.18.0.tar.gz) = 34831035

19
telephony/asterisk/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.35 2013/05/17 22:57:50 sthen Exp $
--- Makefile.orig Mon Feb 4 19:50:52 2013
+++ Makefile Tue Apr 9 15:46:38 2013
$OpenBSD: patch-Makefile,v 1.36 2015/06/08 08:44:52 sthen Exp $
--- Makefile.orig Thu Jun 4 01:44:42 2015
+++ Makefile Fri Jun 5 10:41:19 2015
@@ -126,7 +126,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
OVERWRITE=y
@ -10,18 +10,7 @@ $OpenBSD: patch-Makefile,v 1.35 2013/05/17 22:57:50 sthen Exp $
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
@@ -155,8 +155,10 @@ LINKER_SYMBOL_PREFIX=
# The file /etc/asterisk.makeopts will also be included but can be overridden
# by the file in your home directory.
+ifneq ($(OSARCH),OpenBSD)
GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
+endif
MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
@@ -171,7 +173,9 @@ endif
@@ -178,7 +178,9 @@ endif
ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),)
ifeq ($(findstring -pipe,$(_ASTCFLAGS) $(ASTCFLAGS)),)

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

@ -1,9 +1,9 @@
$OpenBSD: patch-channels_chan_sip_c,v 1.23 2015/04/02 17:09:30 sthen Exp $
$OpenBSD: patch-channels_chan_sip_c,v 1.24 2015/06/08 08:44:52 sthen Exp $
https://issues.asterisk.org/jira/secure/attachment/46850/fax-deadlock-v2.patch-11.3.0
--- channels/chan_sip.c.orig Thu Mar 19 09:39:28 2015
+++ channels/chan_sip.c Thu Apr 2 17:41:56 2015
--- channels/chan_sip.c.orig Thu Jun 4 01:44:42 2015
+++ channels/chan_sip.c Fri Jun 5 10:41:19 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,
@ -26,7 +26,7 @@ https://issues.asterisk.org/jira/secure/attachment/46850/fax-deadlock-v2.patch-1
}
}
@@ -10631,6 +10629,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_r
@@ -10632,6 +10630,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.37 2015/04/02 17:09:30 sthen Exp $
$OpenBSD: patch-configure_ac,v 1.38 2015/06/08 08:44:52 sthen Exp $
c-client requires both kerbV libs *and* (separately) libssl.
--- configure.ac.orig Thu Mar 12 12:26:57 2015
+++ configure.ac Thu Apr 2 17:41:56 2015
--- configure.ac.orig Thu Jun 4 01:44:42 2015
+++ configure.ac Fri Jun 5 10:41:19 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
@@ -1772,7 +1772,7 @@ if test "${USE_IMAP_TK}" != "no"; then
@@ -1739,7 +1739,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}"
@@ -1958,7 +1958,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
@@ -1925,7 +1925,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])

17
telephony/asterisk/patches/patch-menuselect_mxml_Makefile_in
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-menuselect_mxml_Makefile_in,v 1.1 2011/09/16 12:49:21 naddy Exp $
--- menuselect/mxml/Makefile.in.orig Thu Sep 15 19:04:42 2011
+++ menuselect/mxml/Makefile.in Thu Sep 15 19:05:02 2011
@@ -23,11 +23,11 @@
AR = @AR@
ARFLAGS = @ARFLAGS@
CC = @CC@
-CFLAGS = $(OPTIM) @CFLAGS@ @CPPFLAGS@
+CFLAGS = @CFLAGS@ @CPPFLAGS@
CP = @CP@
DSO = @DSO@
DSOFLAGS = @DSOFLAGS@
-LDFLAGS = $(OPTIM) @LDFLAGS@
+LDFLAGS = @LDFLAGS@
INSTALL = @INSTALL@
LIBMXML = @LIBMXML@
LN = @LN@ -s

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

@ -1,10 +1,10 @@
$OpenBSD: patch-res_res_fax_c,v 1.4 2015/02/06 23:27:51 sthen Exp $
$OpenBSD: patch-res_res_fax_c,v 1.5 2015/06/08 08:44:52 sthen Exp $
https://issues.asterisk.org/jira/secure/attachment/46850/fax-deadlock-v2.patch-11.3.0
--- res/res_fax.c.orig Fri Jan 23 14:51:03 2015
+++ res/res_fax.c Fri Feb 6 23:03:35 2015
@@ -3406,10 +3406,13 @@ static struct ast_frame *fax_detect_framehook(struct a
--- res/res_fax.c.orig Thu Jun 4 01:44:42 2015
+++ res/res_fax.c Fri Jun 5 10:41:19 2015
@@ -3398,10 +3398,13 @@ static struct ast_frame *fax_detect_framehook(struct a
switch (result) {
case 'f':
case 't':
@ -19,7 +19,7 @@ https://issues.asterisk.org/jira/secure/attachment/46850/fax-deadlock-v2.patch-1
ast_verb(2, "Redirecting '%s' to fax extension due to %s detection\n",
ast_channel_name(chan), (result == 'f') ? "CNG" : "T38");
pbx_builtin_setvar_helper(chan, "FAXEXTEN", ast_channel_exten(chan));
@@ -3419,10 +3422,10 @@ static struct ast_frame *fax_detect_framehook(struct a
@@ -3411,10 +3414,10 @@ static struct ast_frame *fax_detect_framehook(struct a
ast_frfree(f);
f = &ast_null_frame;
} else {

8
telephony/asterisk/patches/patch-sounds_sounds_xml
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sounds_sounds_xml,v 1.4 2014/09/30 00:19:18 sthen Exp $
--- sounds/sounds.xml.orig Sun Sep 7 01:08:48 2014
+++ sounds/sounds.xml Mon Sep 29 11:49:58 2014
$OpenBSD: patch-sounds_sounds_xml,v 1.5 2015/06/08 08:44:52 sthen Exp $
--- sounds/sounds.xml.orig Thu Jun 4 01:44:42 2015
+++ sounds/sounds.xml Fri Jun 5 10:41:19 2015
@@ -10,7 +10,6 @@
</member>
<member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
@ -9,7 +9,7 @@ $OpenBSD: patch-sounds_sounds_xml,v 1.4 2014/09/30 00:19:18 sthen Exp $
</member>
<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
<support_level>core</support_level>
@@ -219,7 +218,6 @@
@@ -246,7 +245,6 @@
</category>
<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
<member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" >

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.56 2014/09/20 20:37:44 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.57 2015/06/08 08:44:52 sthen Exp $
@conflict asterisk-sounds-<=1.2.1p2
@conflict asterisk-curl-*
@conflict asterisk-fax-*
@ -162,6 +162,7 @@ include/asterisk/udptl.h
include/asterisk/ulaw.h
include/asterisk/unaligned.h
include/asterisk/utils.h
include/asterisk/vector.h
include/asterisk/version.h
include/asterisk/xml.h
include/asterisk/xmldoc.h