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

update to 1.6.2.9; various crash fixes (including one with dtmf detection)

Browse Source
This commit is contained in:
sthen 2010-06-18 22:10:44 +00:00
parent 56f09cbf4d
commit e4fd3edfac
10 changed files with 45 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/asterisk/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.87 2010/06/07 20:03:55 sthen Exp $
# $OpenBSD: Makefile,v 1.88 2010/06/18 22:10:44 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit
VER= 1.6.2.8
CORESOUNDS= 1.4.18
VER= 1.6.2.9
CORESOUNDS= 1.4.19
DISTNAME= asterisk-${VER:S/rc/-rc/}
# XXX if bumping subpackages, override FULLPKGNAME
PKGNAME-main= asterisk-${VER}p0
# XXX if bumping subpackages, override FULLPKGNAME-sub not just PKGNAME-sub
PKGNAME-main= asterisk-${VER}
CATEGORIES= telephony

10
telephony/asterisk/distinfo
View File

@ -1,5 +1,5 @@
MD5 (asterisk-1.6.2.8.tar.gz) = LuW7uRdxx8mxMdpHOXG8Lw==
RMD160 (asterisk-1.6.2.8.tar.gz) = TUnA5mTKibQXiFcCK+SPPQe9UDo=
SHA1 (asterisk-1.6.2.8.tar.gz) = fdeCPwaY/1CVCf5uKejZvbnoVXA=
SHA256 (asterisk-1.6.2.8.tar.gz) = EVQY4Ct3M16cHdQ5hS1zc9NxULWH6t/KLO/IsrHJ120=
SIZE (asterisk-1.6.2.8.tar.gz) = 23565401
MD5 (asterisk-1.6.2.9.tar.gz) = H5R9lRxBm4A51TpuYWj9aQ==
RMD160 (asterisk-1.6.2.9.tar.gz) = yvUr5xU2pkI3PN0UwPVfSJ7xhWs=
SHA1 (asterisk-1.6.2.9.tar.gz) = L3NfZApVpLXe174YOUbauzAC1TE=
SHA256 (asterisk-1.6.2.9.tar.gz) = EJqPKb0IhE2TEENfuUSQjmraYONpF/Kj7YAMJmoIvBw=
SIZE (asterisk-1.6.2.9.tar.gz) = 23607389

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

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.26 2010/06/02 13:18:56 sthen Exp $
--- Makefile.orig Mon May 3 18:42:36 2010
+++ Makefile Tue Jun 1 22:23:41 2010
$OpenBSD: patch-Makefile,v 1.27 2010/06/18 22:10:44 sthen Exp $
--- Makefile.orig Tue May 25 00:52:48 2010
+++ Makefile Wed Jun 9 21:31:32 2010
@@ -121,7 +121,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
OVERWRITE=y
@ -41,14 +41,14 @@ $OpenBSD: patch-Makefile,v 1.26 2010/06/02 13:18:56 sthen Exp $
endif
endif
@@ -730,18 +736,18 @@ samples: adsi
echo " ; to the device. It is for this reason that this is optional, as it may result in requiring a" ; \
@@ -731,18 +737,18 @@ samples: adsi
echo " ; temporary codec translation path for a channel that may not otherwise require one." ; \
echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \
echo ";sendfullybooted = yes ; Send the FullyBooted AMI event on AMI login and when all modules are finished loading" ; \
- echo ";runuser = asterisk ; The user to run as" ; \
- echo ";rungroup = asterisk ; The group to run as" ; \
+ echo "runuser = _asterisk ; The user to run as" ; \
+ echo "rungroup = _asterisk ; The group to run as" ; \
+ echo "runuser = asterisk ; The user to run as" ; \
+ echo "rungroup = asterisk ; The group to run as" ; \
echo ";lightbackground = yes ; If your terminal is set for a light-colored background" ; \
echo "documentation_language = en_US ; Set the Language you want Documentation displayed in. Value is in the same format as locale names" ; \
echo ";hideconnect = yes ; Hide messages displayed when a remote console connects and disconnects" ; \

16
telephony/asterisk/patches/patch-UPGRADE-1_6_txt
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-UPGRADE-1_6_txt,v 1.1 2010/05/04 14:41:48 sthen Exp $
--- UPGRADE-1.6.txt.orig Tue May 4 15:34:30 2010
+++ UPGRADE-1.6.txt Tue May 4 15:39:38 2010
@@ -209,6 +209,12 @@ Channel Drivers:
The "username" setting still work, but is deprecated and will not work in
the next version of Asterisk.
+* SIP: The old "insecure" options, deprecated in 1.4, have been removed.
+ "insecure=very" should be changed to "insecure=port,invite"
+ "insecure=yes" should be changed to "insecure=port"
+ Be aware that some telephony providers show the invalid syntax in their
+ sample configurations.
+
* chan_local.c: the comma delimiter inside the channel name has been changed to a
semicolon, in order to make the Local channel driver compatible with the comma
delimiter change in applications.

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

@ -1,14 +0,0 @@
$OpenBSD: patch-channels_chan_sip_c,v 1.6 2010/06/02 13:18:56 sthen Exp $
https://issues.asterisk.org/view.php?id=15827
--- channels/chan_sip.c.orig Wed May 5 20:08:42 2010
+++ channels/chan_sip.c Tue Jun 1 22:23:41 2010
@@ -3333,6 +3333,7 @@ static struct sip_proxy *proxy_allocate(char *name, ch
proxy->force = force;
ast_copy_string(proxy->name, name, sizeof(proxy->name));
proxy->ip.sin_port = htons(port_str2int(port, STANDARD_SIP_PORT));
+ proxy->ip.sin_family = AF_INET;
proxy_update(proxy);
return proxy;
}

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

@ -1,7 +1,7 @@
$OpenBSD: patch-channels_h323_ast_h323_cxx,v 1.5 2010/04/08 16:18:00 sthen Exp $
--- channels/h323/ast_h323.cxx.orig Thu Jun 18 17:44:37 2009
+++ channels/h323/ast_h323.cxx Thu Apr 1 02:57:26 2010
@@ -2365,6 +2365,7 @@ int h323_start_listener(int listenPort, struct sockadd
$OpenBSD: patch-channels_h323_ast_h323_cxx,v 1.6 2010/06/18 22:10:44 sthen Exp $
--- channels/h323/ast_h323.cxx.orig Mon May 24 23:07:11 2010
+++ channels/h323/ast_h323.cxx Wed Jun 9 15:03:28 2010
@@ -2366,6 +2366,7 @@ int h323_start_listener(int listenPort, struct sockadd
return 0;
};
@ -9,7 +9,7 @@ $OpenBSD: patch-channels_h323_ast_h323_cxx,v 1.5 2010/04/08 16:18:00 sthen Exp $
/* Addition of functions just to make the channel driver compile with H323Plus */
#if VERSION(OPENH323_MAJOR, OPENH323_MINOR, OPENH323_BUILD) > VERSION(1,19,4)
/* Alternate RTP port information for Same NAT */
@@ -2390,6 +2391,7 @@ BOOL MyH323_ExternalRTPChannel::OnReceivedAckAltPDU(co
@@ -2391,6 +2392,7 @@ BOOL MyH323_ExternalRTPChannel::OnReceivedAckAltPDU(co
return TRUE;
}
#endif

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

@ -1,24 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.9 2010/06/02 13:18:56 sthen Exp $
--- configure.ac.orig Wed Apr 28 21:34:07 2010
+++ configure.ac Tue Jun 1 22:23:41 2010
@@ -528,6 +528,8 @@ AC_MSG_RESULT(no)
)
AC_MSG_CHECKING(for pthread_rwlock_timedwrlock() in pthread.h)
+saved_LIBS="${LIBS}"
+LIBS="${PTHREAD_CFLAGS}"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[#include <pthread.h>
@@ -541,6 +543,7 @@ AC_LINK_IFELSE(
ac_cv_pthread_rwlock_timedwrlock="no"
]
)
+LIBS="${saved_LIBS}"
if test "${ac_cv_pthread_rwlock_timedwrlock}" = "yes"; then
AC_DEFINE([HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK], 1, [Define if your system has pthread_rwlock_timedwrlock()])
fi
@@ -1415,7 +1418,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp], , [--agent-l
$OpenBSD: patch-configure_ac,v 1.10 2010/06/18 22:10:44 sthen Exp $
--- configure.ac.orig Wed May 26 01:33:49 2010
+++ configure.ac Wed Jun 9 15:03:28 2010
@@ -1423,7 +1423,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp], , [--agent-l
AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])
@ -27,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.9 2010/06/02 13:18:56 sthen Exp $
AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], [])
@@ -1540,7 +1543,8 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "
@@ -1548,7 +1548,8 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "
AST_CHECK_OPENH323()
AST_CHECK_PWLIB_VERSION([OpenH323], [OPENH323], [openh323buildopts.h], [1], [17], [3])
AST_CHECK_OPENH323_BUILD()
@ -37,7 +20,7 @@ $OpenBSD: patch-configure_ac,v 1.9 2010/06/02 13:18:56 sthen Exp $
AST_CHECK_PWLIB_BUILD([OpenH323], [OPENH323],
[Define if your system has the OpenH323 libraries.],
[#include "ptlib.h"
@@ -1639,7 +1643,8 @@ AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [
@@ -1651,7 +1652,8 @@ AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [
if test "${OSARCH}" = "OpenBSD";
then

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

@ -1,12 +1,12 @@
$OpenBSD: patch-main_asterisk_c,v 1.13 2010/04/08 16:18:00 sthen Exp $
$OpenBSD: patch-main_asterisk_c,v 1.14 2010/06/18 22:10:44 sthen Exp $
from upstream ticket #17076; don't chgrp /var/run/asterisk
unless it was automatically created
--- main/asterisk.c.orig Thu Feb 25 21:25:05 2010
+++ main/asterisk.c Thu Apr 1 02:57:26 2010
@@ -3103,7 +3103,7 @@ int main(int argc, char *argv[])
--- main/asterisk.c.orig Tue Jun 1 16:20:14 2010
+++ main/asterisk.c Wed Jun 9 15:03:29 2010
@@ -3130,7 +3130,7 @@ int main(int argc, char *argv[])
FILE *f;
sigset_t sigs;
int num;
@ -15,7 +15,7 @@ unless it was automatically created
char *buf;
const char *runuser = NULL, *rungroup = NULL;
char *remotesock = NULL;
@@ -3303,8 +3303,12 @@ int main(int argc, char *argv[])
@@ -3330,8 +3330,12 @@ int main(int argc, char *argv[])
/* It's common on some platforms to clear /var/run at boot. Create the
* socket file directory before we drop privileges. */
@ -30,7 +30,7 @@ unless it was automatically created
}
#ifndef __CYGWIN__
@@ -3320,7 +3324,7 @@ int main(int argc, char *argv[])
@@ -3347,7 +3351,7 @@ int main(int argc, char *argv[])
ast_log(LOG_WARNING, "No such group '%s'!\n", rungroup);
exit(1);
}

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

@ -1,7 +1,7 @@
$OpenBSD: patch-sounds_Makefile,v 1.2 2010/04/08 16:18:00 sthen Exp $
--- sounds/Makefile.orig Thu Feb 18 04:21:31 2010
+++ sounds/Makefile Thu Apr 1 02:57:26 2010
@@ -68,6 +68,8 @@ endif
$OpenBSD: patch-sounds_Makefile,v 1.3 2010/06/18 22:10:44 sthen Exp $
--- sounds/Makefile.orig Mon May 17 15:11:48 2010
+++ sounds/Makefile Wed Jun 9 15:03:29 2010
@@ -69,6 +69,8 @@ endif
all: $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
have_download:

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.29 2010/06/02 13:18:56 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.30 2010/06/18 22:10:44 sthen Exp $
@conflict asterisk-sounds-<=1.2.1p2
@conflict asterisk-ogg-*
@conflict chan_unistim-*
@ -317,7 +317,7 @@ share/asterisk/keys/
share/asterisk/keys/freeworlddialup.pub
share/asterisk/keys/iaxtel.pub
share/asterisk/moh/
share/asterisk/moh/.asterisk-moh-opsound-wav
share/asterisk/moh/.asterisk-moh-opsound-wav-2.03
share/asterisk/moh/CHANGES-asterisk-moh-opsound-wav
share/asterisk/moh/CREDITS-asterisk-moh-opsound-wav
share/asterisk/moh/LICENSE-asterisk-moh-opsound-wav
@ -345,6 +345,7 @@ share/asterisk/sounds/en/agent-loginok.gsm
share/asterisk/sounds/en/agent-newlocation.gsm
share/asterisk/sounds/en/agent-pass.gsm
share/asterisk/sounds/en/agent-user.gsm
share/asterisk/sounds/en/ascending-2tone.gsm
share/asterisk/sounds/en/auth-incorrect.gsm
share/asterisk/sounds/en/auth-thankyou.gsm
share/asterisk/sounds/en/beep.gsm
@ -395,6 +396,7 @@ share/asterisk/sounds/en/demo-moreinfo.gsm
share/asterisk/sounds/en/demo-nogo.gsm
share/asterisk/sounds/en/demo-nomatch.gsm
share/asterisk/sounds/en/demo-thanks.gsm
share/asterisk/sounds/en/descending-2tone.gsm
share/asterisk/sounds/en/dictate/
share/asterisk/sounds/en/dictate/both_help.gsm
share/asterisk/sounds/en/dictate/enter_filename.gsm
@ -634,6 +636,7 @@ share/asterisk/sounds/en/privacy-unident.gsm
share/asterisk/sounds/en/queue-callswaiting.gsm
share/asterisk/sounds/en/queue-holdtime.gsm
share/asterisk/sounds/en/queue-less-than.gsm
share/asterisk/sounds/en/queue-minute.gsm
share/asterisk/sounds/en/queue-minutes.gsm
share/asterisk/sounds/en/queue-periodic-announce.gsm
share/asterisk/sounds/en/queue-quantity1.gsm
@ -1025,6 +1028,7 @@ share/asterisk/static-http/docs/node280.html
share/asterisk/static-http/docs/node281.html
share/asterisk/static-http/docs/node282.html
share/asterisk/static-http/docs/node283.html
share/asterisk/static-http/docs/node284.html
share/asterisk/static-http/docs/node29.html
share/asterisk/static-http/docs/node3.html
share/asterisk/static-http/docs/node30.html
@ -1406,6 +1410,7 @@ share/doc/asterisk/node280.html
share/doc/asterisk/node281.html
share/doc/asterisk/node282.html
share/doc/asterisk/node283.html
share/doc/asterisk/node284.html
share/doc/asterisk/node29.html
share/doc/asterisk/node3.html
share/doc/asterisk/node30.html