diff --git a/telephony/asterisk/Makefile b/telephony/asterisk/Makefile index 9cd7fa29ca5..82f5247536a 100644 --- a/telephony/asterisk/Makefile +++ b/telephony/asterisk/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.62 2009/11/04 21:51:49 sthen Exp $ +# $OpenBSD: Makefile,v 1.63 2009/11/19 16:17:04 sthen Exp $ SHARED_ONLY= Yes COMMENT-main= open source multi-protocol PBX and telephony toolkit -VER= 1.4.26.3 +VER= 1.4.27 # you can set PATCHVER=p0, p1 etc to bump everything, # this takes care of the subpackage/flavor maze PATCHVER= -CORESOUNDS= 1.4.15 +CORESOUNDS= 1.4.16 DISTNAME= asterisk-${VER:S/rc/-rc/} FULLPKGNAME-main= asterisk-${VER}${PATCHVER} @@ -19,8 +19,7 @@ MAINTAINER= Stuart Henderson # Mostly GPL v2 (only). "Specific permission is also granted to link # Asterisk with OpenSSL and OpenH323 and distribute the resulting binary -# files." iaxy.bin (firmware) is freely redistributable, see LICENSE. -# core-sounds-en-gsm: GPLv2/CC-BY-SA, http://bugs.digium.com/view.php?id=10144 +# files." core-sounds-*: GPLv2/CC-BY-SA. PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes @@ -45,8 +44,14 @@ AUTOMAKE_VERSION= 1.9 BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \ ${MODGNU_AUTOMAKE_DEPENDS} -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include +LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" +MAKE_ENV= ASTCFLAGS="${CFLAGS}" \ + ASTLDFLAGS="${LDFLAGS}" \ + DEBUG="" CONFIGURE_ARGS+= --with-asterisk-user=_asterisk \ --with-asterisk-group=_asterisk \ @@ -203,10 +208,6 @@ FULLPKGNAME$i ?= asterisk$i-${VER}${PATCHVER} RUN_DEPENDS$i += :asterisk-${VER}${PATCHVER}:telephony/asterisk .endfor -MAKE_ENV= ASTCFLAGS="${CFLAGS}" \ - ASTLDFLAGS="${LDFLAGS}" \ - DEBUG="" - NO_REGRESS= Yes INSTALL_TARGET= install samples diff --git a/telephony/asterisk/distinfo b/telephony/asterisk/distinfo index f82d59b5e62..b29c4929e4e 100644 --- a/telephony/asterisk/distinfo +++ b/telephony/asterisk/distinfo @@ -1,5 +1,5 @@ -MD5 (asterisk-1.4.26.3.tar.gz) = BAF9/cjK649GY7XcSp4QGQ== -RMD160 (asterisk-1.4.26.3.tar.gz) = aTU2nI5umCFu4y1Wp1QvdcCmWkQ= -SHA1 (asterisk-1.4.26.3.tar.gz) = QjWernerN0d5U+HaKmNAAUdWlVw= -SHA256 (asterisk-1.4.26.3.tar.gz) = Maish2tV/AbiKMU+waRN44zB/8PGc8sbeXaPjwoJ2Lc= -SIZE (asterisk-1.4.26.3.tar.gz) = 21441536 +MD5 (asterisk-1.4.27.tar.gz) = 7/ZfRmYbTS/VATq7/tc63g== +RMD160 (asterisk-1.4.27.tar.gz) = M9xkLsmD6w8SQ4P3aXbTuGtp6yU= +SHA1 (asterisk-1.4.27.tar.gz) = Loi5w+UjnwUiPE/ouIwp5EnVaCE= +SHA256 (asterisk-1.4.27.tar.gz) = ik6qIxNtxr3TY3GUTo/uWKSHpt4+FJAQtDLmDDNKoxw= +SIZE (asterisk-1.4.27.tar.gz) = 21460899 diff --git a/telephony/asterisk/patches/patch-Makefile b/telephony/asterisk/patches/patch-Makefile index 7b7271fe050..bd6932002b5 100644 --- a/telephony/asterisk/patches/patch-Makefile +++ b/telephony/asterisk/patches/patch-Makefile @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile,v 1.20 2009/07/21 22:05:24 sthen Exp $ ---- Makefile.orig Thu Jun 11 23:20:31 2009 -+++ Makefile Thu Jun 18 20:50:45 2009 -@@ -35,6 +35,7 @@ export ASTVARRUNDIR +$OpenBSD: patch-Makefile,v 1.21 2009/11/19 16:17:05 sthen Exp $ +--- Makefile.orig Fri Oct 23 15:00:01 2009 ++++ Makefile Thu Nov 19 15:09:24 2009 +@@ -41,6 +41,7 @@ export ASTVARRUNDIR export MODULES_DIR export ASTSPOOLDIR export ASTVARLIBDIR @@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile,v 1.20 2009/07/21 22:05:24 sthen Exp $ export ASTDATADIR export ASTLOGDIR export ASTLIBDIR -@@ -82,7 +83,7 @@ ASTCFLAGS+=$(COPTS) +@@ -88,7 +89,7 @@ ASTCFLAGS+=$(COPTS) ASTLDFLAGS+=$(LDOPTS) #Uncomment this to see all build commands instead of 'quiet' output @@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.20 2009/07/21 22:05:24 sthen Exp $ # Create OPTIONS variable OPTIONS= -@@ -95,7 +96,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR)) +@@ -101,7 +102,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR)) OVERWRITE=y # Include debug and macro symbols in the executables (-g) and profiling info (-pg) @@ -27,7 +27,7 @@ $OpenBSD: patch-Makefile,v 1.20 2009/07/21 22:05:24 sthen Exp $ # Staging directory # Files are copied here temporarily during the install process -@@ -130,6 +131,7 @@ else +@@ -136,6 +137,7 @@ else ifneq ($(findstring BSD,$(OSARCH)),) ASTVARLIBDIR=$(prefix)/share/asterisk ASTVARRUNDIR=$(localstatedir)/run/asterisk @@ -35,7 +35,7 @@ $OpenBSD: patch-Makefile,v 1.20 2009/07/21 22:05:24 sthen Exp $ else ASTVARLIBDIR=$(localstatedir)/lib/asterisk endif -@@ -158,8 +160,10 @@ HTTP_CGIDIR=/var/www/cgi-bin +@@ -164,8 +166,10 @@ HTTP_CGIDIR=/var/www/cgi-bin # The file /etc/asterisk.makeopts will also be included but can be overridden # by the file in your home directory. @@ -46,39 +46,29 @@ $OpenBSD: patch-Makefile,v 1.20 2009/07/21 22:05:24 sthen Exp $ MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include -@@ -198,8 +202,10 @@ ifeq ($(OSARCH),linux-gnu) +@@ -204,8 +208,10 @@ ifeq ($(OSARCH),linux-gnu) endif - ifeq ($(findstring -save-temps,$(ASTCFLAGS)),) + ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),) +ifneq ($(OSARCH),OpenBSD) - ASTCFLAGS+=-pipe + _ASTCFLAGS+=-pipe endif +endif - ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) + _ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) -@@ -219,9 +225,11 @@ ifneq ($(findstring BSD,$(OSARCH)),) - ASTLDFLAGS+=-L/usr/local/lib +@@ -226,8 +232,10 @@ ifneq ($(findstring BSD,$(OSARCH)),) endif -+ifneq ($(OSARCH),OpenBSD) ifneq ($(PROC),ultrasparc) - ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) ++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 ifeq ($(PROC),ppc) - ASTCFLAGS+=-fsigned-char -@@ -404,7 +412,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean - rm -f build_tools/menuselect-deps - - datafiles: _all -- if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" bash build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi -+ if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" ksh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi - # Should static HTTP be installed during make samples or even with its own target ala - # webvoicemail? There are portions here that *could* be customized but might also be - # improved a lot. I'll put it here for now. -@@ -581,6 +589,7 @@ samples: adsi + _ASTCFLAGS+=-fsigned-char +@@ -589,6 +597,7 @@ samples: adsi echo "astetcdir => $(ASTETCDIR)" ; \ echo "astmoddir => $(MODULES_DIR)" ; \ echo "astvarlibdir => $(ASTVARLIBDIR)" ; \ @@ -86,7 +76,7 @@ $OpenBSD: patch-Makefile,v 1.20 2009/07/21 22:05:24 sthen Exp $ echo "astdatadir => $(ASTDATADIR)" ; \ echo "astagidir => $(AGI_DIR)" ; \ echo "astspooldir => $(ASTSPOOLDIR)" ; \ -@@ -611,16 +620,16 @@ samples: adsi +@@ -619,16 +628,16 @@ 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-build_tools_mkpkgconfig b/telephony/asterisk/patches/patch-build_tools_mkpkgconfig deleted file mode 100644 index 708718f4d59..00000000000 --- a/telephony/asterisk/patches/patch-build_tools_mkpkgconfig +++ /dev/null @@ -1,9 +0,0 @@ -$OpenBSD: patch-build_tools_mkpkgconfig,v 1.1 2009/07/21 22:05:24 sthen Exp $ ---- build_tools/mkpkgconfig.orig Thu Jun 18 20:50:21 2009 -+++ build_tools/mkpkgconfig Thu Jun 18 20:50:25 2009 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/ksh - PPATH=$1 - ## Make sure we were called from Makefile - diff --git a/telephony/asterisk/patches/patch-configure_ac b/telephony/asterisk/patches/patch-configure_ac index b9af3b5163f..8a6c9b9b06d 100644 --- a/telephony/asterisk/patches/patch-configure_ac +++ b/telephony/asterisk/patches/patch-configure_ac @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_ac,v 1.2 2009/05/22 09:05:10 sthen Exp $ ---- configure.ac.orig Wed Apr 22 22:35:03 2009 -+++ configure.ac Thu May 21 21:22:19 2009 -@@ -195,7 +195,7 @@ AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [n +$OpenBSD: patch-configure_ac,v 1.3 2009/11/19 16:17:05 sthen Exp $ +--- configure.ac.orig Mon Oct 26 22:13:25 2009 ++++ configure.ac Thu Nov 19 15:06:35 2009 +@@ -198,7 +198,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]) AST_EXT_LIB_SETUP([NEWT], [newt], [newt]) @@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/05/22 09:05:10 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]) -@@ -1221,7 +1221,7 @@ fi +@@ -1227,7 +1227,7 @@ fi AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h]) @@ -19,7 +19,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/05/22 09:05:10 sthen Exp $ AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], []) -@@ -1340,7 +1340,8 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != " +@@ -1346,7 +1346,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.2 2009/05/22 09:05:10 sthen Exp $ AST_CHECK_PWLIB_BUILD([OpenH323], [OPENH323], [Define if your system has the OpenH323 libraries.], [#include "ptlib.h" -@@ -1435,7 +1436,7 @@ AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_f +@@ -1441,7 +1442,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 a3d55aba539..eff1faf50e3 100644 --- a/telephony/asterisk/pkg/PLIST-main +++ b/telephony/asterisk/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.17 2009/11/04 21:49:42 sthen Exp $ +@comment $OpenBSD: PLIST-main,v 1.18 2009/11/19 16:17:05 sthen Exp $ @conflict asterisk-sounds-<=1.2.1p2 @conflict app_conference-<=20070710 @newgroup _asterisk:545 @@ -248,14 +248,13 @@ share/asterisk/agi-bin/agi-test.agi share/asterisk/agi-bin/jukebox.agi share/asterisk/firmware/ share/asterisk/firmware/iax/ -share/asterisk/firmware/iax/iaxy.bin share/asterisk/images/ share/asterisk/images/asterisk-intro.jpg share/asterisk/keys/ share/asterisk/keys/freeworlddialup.pub share/asterisk/keys/iaxtel.pub share/asterisk/moh/ -share/asterisk/moh/.asterisk-moh-freeplay-wav +share/asterisk/moh/.asterisk-moh-opsound-wav share/asterisk/moh/CHANGES-asterisk-moh-opsound-wav share/asterisk/moh/CREDITS-asterisk-moh-opsound-wav share/asterisk/moh/LICENSE-asterisk-moh-opsound-wav @@ -664,6 +663,7 @@ share/asterisk/sounds/vm-opts-full.gsm share/asterisk/sounds/vm-opts.gsm share/asterisk/sounds/vm-passchanged.gsm share/asterisk/sounds/vm-password.gsm +share/asterisk/sounds/vm-pls-try-again.gsm share/asterisk/sounds/vm-press.gsm share/asterisk/sounds/vm-prev.gsm share/asterisk/sounds/vm-reachoper.gsm @@ -723,6 +723,7 @@ share/doc/asterisk/COPYING share/doc/asterisk/CREDITS share/doc/asterisk/ChangeLog share/doc/asterisk/IAX2-security.pdf +share/doc/asterisk/IAX2-security.txt share/doc/asterisk/LICENSE share/doc/asterisk/PEERING share/doc/asterisk/README @@ -771,7 +772,7 @@ share/doc/asterisk/misdn.txt share/doc/asterisk/model.txt share/doc/asterisk/modules.txt share/doc/asterisk/mp3.txt -share/doc/asterisk/musiconhold-fpm.txt +share/doc/asterisk/musiconhold-opsound.txt share/doc/asterisk/mysql.txt share/doc/asterisk/osp.txt share/doc/asterisk/privacy.txt