From cd70bb9611bf5b9341f867c34af8e4087d72e735 Mon Sep 17 00:00:00 2001 From: sthen Date: Sun, 17 Jan 2010 13:18:36 +0000 Subject: [PATCH] Update to 1.6.0.21, various bugs (including some crashes) fixed. This also has a small change in CDR generation, it's been well tested upstream but still this can be a touchy area to change, so it's going in now so the first OpenBSD release with Asterisk 1.6 packages has the change already made. ok ajacoutot@ --- telephony/asterisk/Makefile | 8 ++++---- telephony/asterisk/distinfo | 10 +++++----- telephony/asterisk/patches/patch-Makefile | 10 +++++----- telephony/asterisk/patches/patch-configure_ac | 12 ++++++------ telephony/asterisk/pkg/PLIST-main | 6 +----- 5 files changed, 21 insertions(+), 25 deletions(-) diff --git a/telephony/asterisk/Makefile b/telephony/asterisk/Makefile index 21951f7da1c..adba3abdd77 100644 --- a/telephony/asterisk/Makefile +++ b/telephony/asterisk/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.69 2009/12/21 00:19:02 fgsch Exp $ +# $OpenBSD: Makefile,v 1.70 2010/01/17 13:18:36 sthen Exp $ SHARED_ONLY= Yes COMMENT-main= open source multi-protocol PBX and telephony toolkit -VER= 1.6.0.20 +VER= 1.6.0.21 # you can set PATCHVER=p0, p1 etc to bump everything, # this takes care of the subpackage/flavor maze -PATCHVER= p0 -CORESOUNDS= 1.4.16 +#PATCHVER= p0 +CORESOUNDS= 1.4.17 DISTNAME= asterisk-${VER:S/rc/-rc/} FULLPKGNAME-main= asterisk-${VER}${PATCHVER} diff --git a/telephony/asterisk/distinfo b/telephony/asterisk/distinfo index 1058286afa5..7889fd0796d 100644 --- a/telephony/asterisk/distinfo +++ b/telephony/asterisk/distinfo @@ -1,5 +1,5 @@ -MD5 (asterisk-1.6.0.20.tar.gz) = ZJyQXIl4JM68+bws7h+TmA== -RMD160 (asterisk-1.6.0.20.tar.gz) = KSPbmyrHj3jTemG4DWkfxAM/+bc= -SHA1 (asterisk-1.6.0.20.tar.gz) = UBa0JSt+ecDeQrPqlUDr2jJrtPQ= -SHA256 (asterisk-1.6.0.20.tar.gz) = 6joBCUCIMhzxUjXGBpinjHC4sEJPvtIwzVdoX2/Hevc= -SIZE (asterisk-1.6.0.20.tar.gz) = 23065642 +MD5 (asterisk-1.6.0.21.tar.gz) = oXL7AwratQvf9q47XnZSgw== +RMD160 (asterisk-1.6.0.21.tar.gz) = bYL9BJpnRyr0JdHucOiDu24bIqk= +SHA1 (asterisk-1.6.0.21.tar.gz) = o5ST9o3BZxyyE8XaqXhhJ8Fn6Vs= +SHA256 (asterisk-1.6.0.21.tar.gz) = DUGpAzk0ZAmS2inuA66WogjrP/ikZEDjiJINRx7Luv8= +SIZE (asterisk-1.6.0.21.tar.gz) = 23145584 diff --git a/telephony/asterisk/patches/patch-Makefile b/telephony/asterisk/patches/patch-Makefile index a6ce65d30b2..afe7ceffb49 100644 --- a/telephony/asterisk/patches/patch-Makefile +++ b/telephony/asterisk/patches/patch-Makefile @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile,v 1.22 2009/12/13 12:11:29 sthen Exp $ ---- Makefile.orig Thu Sep 24 19:22:07 2009 -+++ Makefile Wed Oct 7 16:49:21 2009 +$OpenBSD: patch-Makefile,v 1.23 2010/01/17 13:18:36 sthen Exp $ +--- Makefile.orig Thu Dec 10 21:02:59 2009 ++++ Makefile Fri Jan 15 16:13:10 2010 @@ -118,7 +118,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR)) OVERWRITE=y @@ -41,7 +41,7 @@ $OpenBSD: patch-Makefile,v 1.22 2009/12/13 12:11:29 sthen Exp $ endif ifeq ($(PROC),ppc) -@@ -657,7 +663,7 @@ samples: adsi +@@ -658,7 +664,7 @@ samples: adsi echo "astrundir => $(ASTVARRUNDIR)" ; \ echo "astlogdir => $(ASTLOGDIR)" ; \ echo "" ; \ @@ -50,7 +50,7 @@ $OpenBSD: patch-Makefile,v 1.22 2009/12/13 12:11:29 sthen Exp $ echo ";verbose = 3" ; \ echo ";debug = 3" ; \ echo ";alwaysfork = yes ; same as -F at startup" ; \ -@@ -684,15 +690,15 @@ samples: adsi +@@ -685,15 +691,15 @@ samples: adsi echo ";transmit_silence_during_record = yes ; Transmit SLINEAR silence while a channel is being recorded" ; \ echo ";transmit_silence = yes ; Transmit SLINEAR silence while a channel is being recorded or DTMF is being generated" ; \ echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \ diff --git a/telephony/asterisk/patches/patch-configure_ac b/telephony/asterisk/patches/patch-configure_ac index d3bee3f1541..96d765a1d57 100644 --- a/telephony/asterisk/patches/patch-configure_ac +++ b/telephony/asterisk/patches/patch-configure_ac @@ -1,6 +1,6 @@ -$OpenBSD: patch-configure_ac,v 1.4 2009/12/13 12:11:29 sthen Exp $ ---- configure.ac.orig Mon Oct 26 23:13:28 2009 -+++ configure.ac Sun Nov 8 13:12:03 2009 +$OpenBSD: patch-configure_ac,v 1.5 2010/01/17 13:18:36 sthen Exp $ +--- configure.ac.orig Mon Dec 28 15:31:19 2009 ++++ configure.ac Fri Jan 15 16:13:27 2010 @@ -253,7 +253,7 @@ AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [n AST_EXT_LIB_SETUP([NCURSES], [ncurses], [ncurses]) AST_EXT_LIB_SETUP([NETSNMP], [Net-SNMP], [netsnmp]) @@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2009/12/13 12:11:29 sthen Exp $ AST_EXT_LIB_SETUP([OGG], [OGG], [ogg]) AST_EXT_LIB_SETUP([OSPTK], [OSP Toolkit], [osptk]) AST_EXT_LIB_SETUP([OSS], [Open Sound System], [oss]) -@@ -1258,7 +1258,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp], , [--agent-l +@@ -1278,7 +1278,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp], , [--agent-l AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h]) @@ -19,7 +19,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2009/12/13 12:11:29 sthen Exp $ AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], []) -@@ -1373,7 +1373,8 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != " +@@ -1393,7 +1393,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() @@ -29,7 +29,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2009/12/13 12:11:29 sthen Exp $ AST_CHECK_PWLIB_BUILD([OpenH323], [OPENH323], [Define if your system has the OpenH323 libraries.], [#include "ptlib.h" -@@ -1470,7 +1471,7 @@ AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_f +@@ -1490,7 +1491,7 @@ AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_f AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], []) diff --git a/telephony/asterisk/pkg/PLIST-main b/telephony/asterisk/pkg/PLIST-main index 00dc24fe154..9f4157c4a2d 100644 --- a/telephony/asterisk/pkg/PLIST-main +++ b/telephony/asterisk/pkg/PLIST-main @@ -1,10 +1,6 @@ -@comment $OpenBSD: PLIST-main,v 1.23 2009/12/21 00:19:02 fgsch Exp $ +@comment $OpenBSD: PLIST-main,v 1.24 2010/01/17 13:18:36 sthen Exp $ @conflict asterisk-sounds-<=1.2.1p2 @conflict asterisk-ogg-* -@conflict app_conference-20070809 -@conflict app_conference-20070710 -@conflict app_conference-20060201 -@conflict app_conference-20051110 @conflict chan_unistim-* @pkgpath telephony/asterisk,-ogg @pkgpath telephony/chan_unistim