From 083b487e0149e5d2ddad492b4f8f8b7109565518 Mon Sep 17 00:00:00 2001 From: sthen Date: Thu, 7 Jun 2012 10:39:25 +0000 Subject: [PATCH] bugfix update to Asterisk 1.8.13.0 --- telephony/asterisk/Makefile | 4 ++-- telephony/asterisk/distinfo | 10 ++++----- telephony/asterisk/patches/patch-Makefile | 22 +++++-------------- telephony/asterisk/patches/patch-configure_ac | 10 ++++----- .../asterisk/patches/patch-main_features_c | 8 +++---- telephony/asterisk/pkg/PLIST-main | 3 +-- 6 files changed, 23 insertions(+), 34 deletions(-) diff --git a/telephony/asterisk/Makefile b/telephony/asterisk/Makefile index 6c58b7a1999..0d3667647f3 100644 --- a/telephony/asterisk/Makefile +++ b/telephony/asterisk/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.149 2012/05/30 22:45:26 sthen Exp $ +# $OpenBSD: Makefile,v 1.150 2012/06/07 10:39:25 sthen Exp $ SHARED_ONLY= Yes COMMENT-main= open source multi-protocol PBX and telephony toolkit -VER= 1.8.12.2 +VER= 1.8.13.0 DISTNAME= asterisk-${VER:S/beta/-beta/:S/rc/-rc/} PKGNAME-main= asterisk-${VER} diff --git a/telephony/asterisk/distinfo b/telephony/asterisk/distinfo index 8540cd997fa..55d8bddf994 100644 --- a/telephony/asterisk/distinfo +++ b/telephony/asterisk/distinfo @@ -1,32 +1,32 @@ -MD5 (asterisk-1.8.12.2.tar.gz) = 2CN+Z1iqpap4fIDkoUpAsA== +MD5 (asterisk-1.8.13.0.tar.gz) = 5/LLGQaMEhHJBwYvnpbEeg== MD5 (asterisk-core-sounds-en-gsm-1.4.22.tar.gz) = KpmkXAZ1E1JVvGV5axL3xg== MD5 (asterisk-core-sounds-en-gsm-1.4.22.tar.gz.sha1) = HYpcpyg7903kHE+wo2ECgw== MD5 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = VHnLTLgdZ4ME2W815JM6EQ== MD5 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz.sha1) = euKCSaScLc2s72YD1p39Zg== MD5 (asterisk-moh-opsound-wav-2.03.tar.gz) = gnfixpP9BWdzscFeTVIHfQ== MD5 (asterisk-moh-opsound-wav-2.03.tar.gz.sha1) = AR+k3J/jXcPTTtVXuwQmPw== -RMD160 (asterisk-1.8.12.2.tar.gz) = NGtnkYvMJxmQRBaNaDAoy4+B/zs= +RMD160 (asterisk-1.8.13.0.tar.gz) = 8c4F5Wph47QhXde5/D+DMb9wSGs= RMD160 (asterisk-core-sounds-en-gsm-1.4.22.tar.gz) = AZMdzpG7rRgOiu/Do8ovCaBv4cg= RMD160 (asterisk-core-sounds-en-gsm-1.4.22.tar.gz.sha1) = joofR4GGUm1IHe89S9oTI0Bq9Ww= RMD160 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = aBcMdp1znWtbNbAPmZrWu/h2+fY= RMD160 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz.sha1) = r2FBQo0Mel1qCQPV61rbSFUnkNY= RMD160 (asterisk-moh-opsound-wav-2.03.tar.gz) = lWaXSoNgUeCPUUEt5QjZK/O+fgI= RMD160 (asterisk-moh-opsound-wav-2.03.tar.gz.sha1) = D+hFjrIugSleLHkzLWEgvA7kjfM= -SHA1 (asterisk-1.8.12.2.tar.gz) = kOQ9zX6FQ+VsrQPoAg9N+CXFHzI= +SHA1 (asterisk-1.8.13.0.tar.gz) = nEWhbZml6h1z6Is1VtnuWyr6WUs= SHA1 (asterisk-core-sounds-en-gsm-1.4.22.tar.gz) = D5xlxz37KJGWcng50puO3TExsBw= SHA1 (asterisk-core-sounds-en-gsm-1.4.22.tar.gz.sha1) = QV8/mpheMVHyXJYbazVk0OfC/rk= SHA1 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = hpL6YUI7R2nci/p4+vntXveiWbk= SHA1 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz.sha1) = 7mrmsEnCtwUNV0J+RJd/3sI3wYE= SHA1 (asterisk-moh-opsound-wav-2.03.tar.gz) = 9A/W6gPf6Ncq2iVAsiiL/cAGOB0= SHA1 (asterisk-moh-opsound-wav-2.03.tar.gz.sha1) = y7b1cl1V/jLKmqKzM+N9YSXQ9Ec= -SHA256 (asterisk-1.8.12.2.tar.gz) = dC+yH97C2uvS0mSqMJJvveGv0uRdniywJ60YUtqOk7Q= +SHA256 (asterisk-1.8.13.0.tar.gz) = V4xGzvE8zBfiAeTM5Qshv54vvZUWxp51KawLQ7HAQeE= SHA256 (asterisk-core-sounds-en-gsm-1.4.22.tar.gz) = eRdRl6ZRwlu2KYjnIQI+m7cRx+7yisouy6KR1D7j5mc= SHA256 (asterisk-core-sounds-en-gsm-1.4.22.tar.gz.sha1) = ye/FmyBQU27CFiXULLsvWqivxjKK8NIIvq0rWJ8rRzI= SHA256 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 1fAxzDHr6+yZzj/PRP+Ue9eye16VZaezphhcLRvaCUw= SHA256 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz.sha1) = a0BErk9wQ3/hT5gPUVL6uk6iqitdhAKMAhOrL2XHSR8= SHA256 (asterisk-moh-opsound-wav-2.03.tar.gz) = RJ+4ENFlAsMFL+3wL353s2IGrFoUXz2s9Bd4Q6L8tTg= SHA256 (asterisk-moh-opsound-wav-2.03.tar.gz.sha1) = Y8VUFsoRQmGrGvT9EVIyLy7GnZGrw0vEzufTKByuDZc= -SIZE (asterisk-1.8.12.2.tar.gz) = 25089098 +SIZE (asterisk-1.8.13.0.tar.gz) = 25059587 SIZE (asterisk-core-sounds-en-gsm-1.4.22.tar.gz) = 2042362 SIZE (asterisk-core-sounds-en-gsm-1.4.22.tar.gz.sha1) = 84 SIZE (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 diff --git a/telephony/asterisk/patches/patch-Makefile b/telephony/asterisk/patches/patch-Makefile index 46efa55754a..1e706c777e0 100644 --- a/telephony/asterisk/patches/patch-Makefile +++ b/telephony/asterisk/patches/patch-Makefile @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile,v 1.31 2011/09/09 15:29:21 sthen Exp $ ---- Makefile.orig Thu Aug 25 20:08:04 2011 -+++ Makefile Thu Sep 1 10:37:01 2011 -@@ -122,7 +122,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR)) +$OpenBSD: patch-Makefile,v 1.32 2012/06/07 10:39:25 sthen Exp $ +--- Makefile.orig Thu Apr 12 15:26:06 2012 ++++ Makefile Wed Jun 6 21:57:09 2012 +@@ -121,7 +121,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR)) OVERWRITE=y # Include debug and macro symbols in the executables (-g) and profiling info (-pg) @@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.31 2011/09/09 15:29:21 sthen Exp $ # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk -@@ -152,8 +152,10 @@ LINKER_SYMBOL_PREFIX= +@@ -151,8 +151,10 @@ LINKER_SYMBOL_PREFIX= # The file /etc/asterisk.makeopts will also be included but can be overridden # by the file in your home directory. @@ -21,7 +21,7 @@ $OpenBSD: patch-Makefile,v 1.31 2011/09/09 15:29:21 sthen Exp $ MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include" OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include" -@@ -196,7 +198,9 @@ endif +@@ -162,7 +164,9 @@ OPTIONS= ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),) ifeq ($(findstring -pipe,$(_ASTCFLAGS) $(ASTCFLAGS)),) @@ -31,13 +31,3 @@ $OpenBSD: patch-Makefile,v 1.31 2011/09/09 15:29:21 sthen Exp $ endif endif -@@ -222,7 +226,9 @@ endif - - ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),) - ifneq ($(PROC),ultrasparc) -+ ifneq ($(OSARCH),OpenBSD) - _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) -+ endif - endif - endif - diff --git a/telephony/asterisk/patches/patch-configure_ac b/telephony/asterisk/patches/patch-configure_ac index edffc836f87..a0617140a91 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.24 2012/05/03 11:25:27 sthen Exp $ ---- configure.ac.orig Mon Mar 26 20:35:31 2012 -+++ configure.ac Thu May 3 08:42:50 2012 +$OpenBSD: patch-configure_ac,v 1.25 2012/06/07 10:39:25 sthen Exp $ +--- configure.ac.orig Thu Apr 12 15:26:06 2012 ++++ configure.ac Wed Jun 6 21:57:10 2012 @@ -55,7 +55,7 @@ AC_SUBST([astvarrundir], ['${localstatedir}/run/a case "${host_os}" in @@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.24 2012/05/03 11:25:27 sthen Exp $ astvarlibdir='${prefix}/share/asterisk' astdbdir='${localstatedir}/db/asterisk' fi -@@ -1590,7 +1590,7 @@ if test "${USE_IMAP_TK}" != "no"; then +@@ -1605,7 +1605,7 @@ if test "${USE_IMAP_TK}" != "no"; then ) else #looking in imap directory didn't work, try c-client imap_ldflags="" @@ -19,7 +19,7 @@ $OpenBSD: patch-configure_ac,v 1.24 2012/05/03 11:25:27 sthen Exp $ imap_include="-DUSE_SYSTEM_CCLIENT" CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" -@@ -1776,7 +1776,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [-- +@@ -1791,7 +1791,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [-- AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h]) diff --git a/telephony/asterisk/patches/patch-main_features_c b/telephony/asterisk/patches/patch-main_features_c index fc48a7d07c1..30051f71f88 100644 --- a/telephony/asterisk/patches/patch-main_features_c +++ b/telephony/asterisk/patches/patch-main_features_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-main_features_c,v 1.2 2012/05/30 22:45:26 sthen Exp $ ---- main/features.c.orig Thu May 17 23:30:18 2012 -+++ main/features.c Thu May 17 23:31:57 2012 -@@ -960,7 +960,9 @@ static void bridge_call_thread_launch(void *data) +$OpenBSD: patch-main_features_c,v 1.3 2012/06/07 10:39:25 sthen Exp $ +--- main/features.c.orig Thu Apr 26 21:23:09 2012 ++++ main/features.c Wed Jun 6 21:57:10 2012 +@@ -1012,7 +1012,9 @@ static void bridge_call_thread_launch(void *data) ast_pthread_create(&thread, &attr, bridge_call_thread, data); pthread_attr_destroy(&attr); memset(&sched, 0, sizeof(sched)); diff --git a/telephony/asterisk/pkg/PLIST-main b/telephony/asterisk/pkg/PLIST-main index 3c9c05de7e1..15579214f6c 100644 --- a/telephony/asterisk/pkg/PLIST-main +++ b/telephony/asterisk/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.42 2012/03/13 23:17:46 sthen Exp $ +@comment $OpenBSD: PLIST-main,v 1.43 2012/06/07 10:39:25 sthen Exp $ @conflict asterisk-sounds-<=1.2.1p2 @conflict asterisk-curl-* @conflict asterisk-fax-* @@ -1020,7 +1020,6 @@ share/examples/asterisk/default/smdi.conf share/examples/asterisk/default/telcordia-1.adsi share/examples/asterisk/default/udptl.conf share/examples/asterisk/default/unistim.conf -share/examples/asterisk/default/usbradio.conf share/examples/asterisk/default/users.conf share/examples/asterisk/default/voicemail.conf @comment share/examples/asterisk/default/vpb.conf