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

Major version update to 1.6.0.19. For more information about the

Browse Source 
upgrade, see /usr/local/share/doc/asterisk/UPGRADE-1.6.txt

Particular thanks to fgsch@, ian@ and Michiel van Baak for help and testing.
This commit is contained in:
sthen 2009-12-13 12:11:29 +00:00
parent 15e6b39691
commit 16b6df18f8
27 changed files with 1429 additions and 713 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
telephony/asterisk/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.64 2009/11/30 22:51:39 sthen Exp $
# $OpenBSD: Makefile,v 1.65 2009/12/13 12:11:29 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit
VER= 1.4.27.1
VER= 1.6.0.19
# you can set PATCHVER=p0, p1 etc to bump everything,
# this takes care of the subpackage/flavor maze
PATCHVER=
@ -25,59 +25,75 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MULTI_PACKAGES= -main
MULTI_PACKAGES+= -main
SUBST_VARS+= CORESOUNDS
WANTLIB-main= c crypto m pthread ssl stdc++ termcap z
LIB_DEPENDS-main= gsm::audio/gsm \
ogg.>=5::audio/libogg \
vorbis.>=5,vorbisenc.>=2::audio/libvorbis \
sqlite3.>=3::databases/sqlite3 \
execinfo::devel/libexecinfo \
popt::devel/popt
LIB_DEPENDS-main= popt::devel/popt \
gsm::audio/gsm
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/releases/
MASTER_SITES= http://downloads.digium.com/pub/telephony/asterisk/releases/ \
http://downloads.digium.com/pub/telephony/asterisk/old-releases/
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
AUTOCONF_VERSION= 2.61
CONFIGURE_STYLE= autoconf
# Should be 2.63(?)
AUTOCONF_VERSION= 2.62
AUTOMAKE_VERSION= 1.9
BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include
LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib
LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}"
MAKE_ENV= ASTCFLAGS="${CFLAGS}" \
MAKE_ENV+= ASTCFLAGS="${CFLAGS}" \
ASTLDFLAGS="${LDFLAGS}" \
DEBUG=""
NOISY_BUILD="Yes"
CONFIGURE_ARGS+= --with-asterisk-user=_asterisk \
--with-asterisk-group=_asterisk \
--localstatedir=/var \
--sharedstatedir=${PREFIX}/share/asterisk \
--with-asound=no \
# basic stuff
CONFIGURE_ARGS+= --localstatedir=/var \
--sharedstatedir=${PREFIX}/share/asterisk
# unlikely
CONFIGURE_ARGS+= --with-asound=no \
--with-avcodec=no \
--with-cap=no \
--with-dahdi=no \
--with-gtk=no \
--with-gtk2=no \
--with-gmime=no \
--with-isdnnet=no \
--with-kde=no \
--with-misdn=no \
--with-nbs=no \
--with-newt=no \
--with-popt=${LOCALBASE} \
--with-osptk=no \
--with-oss=no \
--with-pri=no \
--with-qt=no \
--with-sqlite=no \
--with-ss7=no \
--with-suppserv=no \
--with-tinfo=no \
--with-tonezone=no \
--with-vpb=no \
--with-zaptel=no
--with-usb=no \
--with-vpb=no
CONFIGURE_ARGS+= --with-osptk=no \
--with-oss=no \
# sometime?
CONFIGURE_ARGS+= --with-imap=no \
--with-jack=no \
--with-lua=no \
--with-portaudio=no \
--with-radius=no \
--with-sqlite=no \
--with-tds=no \
--with-imap=no
--with-resample=no \
--with-sdl=no \
--with-SDL_image=no \
--with-tds=no
# Some build options (including a useful malloc debug) are available
# via menuselect. They may be enabled by running 'make configure', cd
@ -90,13 +106,13 @@ FLAVORS= h323
# odbc
PSEUDO_FLAVORS+= no_odbc
.if ${FLAVOR:L:Mno_odbc}
CONFIGURE_ARGS+= --with-odbc=no \
CONFIGURE_ARGS+= --with-iodbc=no \
--with-ltdl=no
.else
MULTI_PACKAGES+= -odbc
COMMENT-odbc= ODBC support for Asterisk
LIB_DEPENDS-odbc= iodbc.>=3::databases/iodbc
CONFIGURE_ARGS+= --with-odbc=${LOCALBASE} \
CONFIGURE_ARGS+= --with-iodbc=${LOCALBASE} \
--with-ltdl=${LOCALBASE}
.endif
@ -130,22 +146,6 @@ CONFIGURE_ARGS+= --with-speex=no
# --with-speexdsp=${LOCALBASE}
#.endif
# ogg
PSEUDO_FLAVORS+= no_ogg
.if ${FLAVOR:L:Mno_ogg}
CONFIGURE_ARGS+= --with-ogg=no \
--with-vorbis=no
.else
MULTI_PACKAGES+= -ogg
COMMENT-ogg= Ogg Vorbis format translator for Asterisk
WANTLIB-ogg= m
LIB_DEPENDS-ogg= ogg.>=5::audio/libogg \
vorbis.>=5::audio/libvorbis \
vorbisenc.>=2::audio/libvorbis
CONFIGURE_ARGS+= --with-ogg=${LOCALBASE} \
--with-vorbis=${LOCALBASE}
.endif
# curl
PSEUDO_FLAVORS+= no_curl
.if ${FLAVOR:L:Mno_curl}
@ -173,46 +173,55 @@ CONFIGURE_ARGS+= --with-postgres=${LOCALBASE}
# jabber
PSEUDO_FLAVORS+= no_jabber
.if ${FLAVOR:L:Mno_jabber}
CONFIGURE_ARGS+= --with-gnutls=no \
--with-iksemel=no
CONFIGURE_ARGS+= --with-iksemel=no
.else
MULTI_PACKAGES+= -jabber
COMMENT-jabber= Jabber support for Asterisk
WANTLIB-jabber= gcrypt gnutls gpg-error z
LIB_DEPENDS-jabber= iksemel::textproc/iksemel
CONFIGURE_ARGS+= --with-gnutls=${LOCALBASE} \
--with-iksemel=${LOCALBASE}
.endif
# h323
.if ${FLAVOR:L:Mh323}
LIB_DEPENDS-main+= h323::net/openh323 \
pt::devel/pwlib
CPPFLAGS+= -I${LOCALBASE}/include/openh323
CONFIGURE_ARGS+= --with-pwlib=${LOCALBASE}/lib \
--with-h323=${LOCALBASE}/lib
WANTLIB-main+= SDL avutil expat lber ldap ldap_r sasl2
FULLPKGNAME-main= asterisk-${VER}${PATCHVER}-h323
pre-build:
cd ${WRKSRC} && ${MAKE_PROGRAM} include/asterisk/buildopts.h
cd ${WRKSRC}/channels/h323 && ${MAKE_PROGRAM} opt
.else
CONFIGURE_ARGS+= --with-pwlib=no \
--with-h323=no
.endif
# ldap
PSEUDO_FLAVORS+= no_ldap
.if ${FLAVOR:L:Mno_ldap}
CONFIGURE_ARGS+= --with-ldap=no
.else
MULTI_PACKAGES+= -ldap
COMMENT-ldap= LDAP support for Asterisk
LIB_DEPENDS-ldap= ldap::databases/openldap,-main
.endif
# fax
PSEUDO_FLAVORS+= no_fax
.if ${FLAVOR:L:Mno_fax}
CONFIGURE_ARGS+= --with-spandsp=no
.else
MULTI_PACKAGES+= -fax
COMMENT-fax= FAX support for Asterisk
LIB_DEPENDS-fax= spandsp::telephony/spandsp \
tiff::graphics/tiff
.endif
.for i in ${MULTI_PACKAGES:S/-main//}
FULLPKGNAME$i ?= asterisk$i-${VER}${PATCHVER}
RUN_DEPENDS$i += :asterisk-${VER}${PATCHVER}:telephony/asterisk
RUN_DEPENDS$i += :asterisk-${VER}:${PKGPATH}
.endfor
NO_REGRESS= Yes
INSTALL_TARGET= install samples
EXAMPLEDIR= ${PREFIX}/share/examples/asterisk
EXAMPLEFILES= extensions.ael extensions.conf logger.conf \
modules.conf musiconhold.conf sip.conf voicemail.conf
post-patch:
cd ${WRKSRC}; \
@ -223,17 +232,18 @@ post-patch:
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/asterisk
${INSTALL_DATA} ${WRKSRC}/{BUGS,CHANGES,COPYING,CREDITS} \
${WRKSRC}/{ChangeLog,LICENSE,README,UPGRADE.txt} \
${WRKSRC}/{ChangeLog,LICENSE,README,UPGRADE*.txt} \
${PREFIX}/share/doc/asterisk
${INSTALL_DATA} `find ${WRKSRC}/doc -type f` \
${PREFIX}/share/doc/asterisk
${INSTALL_DATA_DIR} ${EXAMPLEDIR}
${INSTALL_DATA_DIR} ${EXAMPLEDIR}/openbsd
${INSTALL_DATA} ${FILESDIR}/*.sample ${EXAMPLEDIR}/openbsd
@perl -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g;" \
${EXAMPLEDIR}/openbsd/*
.for i in ${EXAMPLEFILES}
@${SUBST_CMD} -c ${FILESDIR}/$i.sample \
${EXAMPLEDIR}/openbsd/$i.sample
.endfor
@mv ${WRKINST}/${SYSCONFDIR}/asterisk ${EXAMPLEDIR}/default
@mv ${WRKINST}/var/spool/asterisk/voicemail ${EXAMPLEDIR}/voicemail
@chown -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLEDIR}
@rm -rf ${WRKINST}/{etc,var/{log,run,spool}}/asterisk
.include <bsd.port.mk>

10
telephony/asterisk/distinfo
View File

@ -1,5 +1,5 @@
MD5 (asterisk-1.4.27.1.tar.gz) = 4JyhY6bpABjJLGWlC57DmA==
RMD160 (asterisk-1.4.27.1.tar.gz) = 2/xSa5l6jAGgNxN0fnvPvzaAsSc=
SHA1 (asterisk-1.4.27.1.tar.gz) = TrwLvURvAYfJctd6UynPPDwExpg=
SHA256 (asterisk-1.4.27.1.tar.gz) = nyyNZnsq6/9mXLcEHvilxb0q3Gdhqs9ny/2J5sfI5xc=
SIZE (asterisk-1.4.27.1.tar.gz) = 21463687
MD5 (asterisk-1.6.0.19.tar.gz) = DMgLBdKvN0+145dROVmiBg==
RMD160 (asterisk-1.6.0.19.tar.gz) = r0s4CYSD8a/tyDIbQY/Z79qvSLk=
SHA1 (asterisk-1.6.0.19.tar.gz) = NGJZLfDA/4st2CeQMT/tJj62lPw=
SHA256 (asterisk-1.6.0.19.tar.gz) = 3/l/I4HevgMAjKwSQhHKiqnZ1VzbytUed1RGGtE45Cs=
SIZE (asterisk-1.6.0.19.tar.gz) = 23045642

17
telephony/asterisk/files/extensions.ael.sample Normal file
View File

@ -0,0 +1,17 @@
// $Id: extensions.ael.sample,v 1.1 2009/12/13 12:11:29 sthen Exp $
// Longer example available in ${TRUEPREFIX}/share/examples/asterisk/default
// This context is named "ael-default" to avoid a conflict with an
// existing old-style extensions.conf file; you may want to rename it
// to "default".
context ael-default {
*99 => {
VoiceMailMain(${CALLERIDNUM});
};
_XXX => {
Dial(SIP/${EXTEN},12,tr);
Voicemail(${EXTEN});
Hangup();
};
};

4
telephony/asterisk/files/extensions.conf.sample
View File

@ -1,5 +1,7 @@
; $OpenBSD: extensions.conf.sample,v 1.2 2007/09/05 22:42:52 sthen Exp $
; $OpenBSD: extensions.conf.sample,v 1.3 2009/12/13 12:11:29 sthen Exp $
; Longer example available in %%LOCALBASE%%/share/examples/asterisk/default
; For new installations, you may prefer to use extensions.ael rather than
; this file.
[default]
exten => *99,1,VoiceMailMain(${CALLERIDNUM})

4
telephony/asterisk/files/musiconhold.conf.sample
View File

@ -1,4 +1,4 @@
; $OpenBSD: musiconhold.conf.sample,v 1.2 2007/09/05 22:42:52 sthen Exp $
; $OpenBSD: musiconhold.conf.sample,v 1.3 2009/12/13 12:11:29 sthen Exp $
; Music on Hold -- Sample Configuration
; There are various ways to handle musiconhold. The lightweight method
@ -12,7 +12,7 @@
[default]
mode=files
directory=/usr/local/share/asterisk/moh
directory=${LOCALBASE}/share/asterisk/moh
random=yes
; The method used in earlier versions is to have one external process

4
telephony/asterisk/files/sip.conf.sample
View File

@ -1,5 +1,5 @@
; $OpenBSD: sip.conf.sample,v 1.3 2007/09/05 22:42:52 sthen Exp $
; Longer example available in %%LOCALBASE%%/share/examples/asterisk/default
; $OpenBSD: sip.conf.sample,v 1.4 2009/12/13 12:11:29 sthen Exp $
; Longer example available in ${TRUEPREFIX}/share/examples/asterisk/default
[general]
disallow=all

4
telephony/asterisk/files/voicemail.conf.sample
View File

@ -1,5 +1,5 @@
; $OpenBSD: voicemail.conf.sample,v 1.2 2007/09/05 22:42:52 sthen Exp $
; Longer example available in %%LOCALBASE%%/share/examples/asterisk/default
; $OpenBSD: voicemail.conf.sample,v 1.3 2009/12/13 12:11:29 sthen Exp $
; Longer example available in ${TRUEPREFIX}/share/examples/asterisk/default
[default]
100 => 1234,Phone #1

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

@ -1,41 +1,16 @@
$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
+export ASTDBDIR
export ASTDATADIR
export ASTLOGDIR
export ASTLIBDIR
@@ -88,7 +89,7 @@ ASTCFLAGS+=$(COPTS)
ASTLDFLAGS+=$(LDOPTS)
#Uncomment this to see all build commands instead of 'quiet' output
-#NOISY_BUILD=yes
+NOISY_BUILD=yes
# Create OPTIONS variable
OPTIONS=
@@ -101,7 +102,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
$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
@@ -118,7 +118,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
OVERWRITE=y
# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
-DEBUG=-g3
+DEBUG?=-g3
+#DEBUG=-g3
# Staging directory
# Files are copied here temporarily during the install process
@@ -136,6 +137,7 @@ else
ifneq ($(findstring BSD,$(OSARCH)),)
ASTVARLIBDIR=$(prefix)/share/asterisk
ASTVARRUNDIR=$(localstatedir)/run/asterisk
+ ASTDBDIR=$(localstatedir)/db/asterisk
else
ASTVARLIBDIR=$(localstatedir)/lib/asterisk
endif
@@ -164,8 +166,10 @@ HTTP_CGIDIR=/var/www/cgi-bin
# Define standard directories for various platforms
@@ -180,8 +180,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,37 +21,36 @@ $OpenBSD: patch-Makefile,v 1.21 2009/11/19 16:17:05 sthen Exp $
MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
@@ -204,8 +208,10 @@ ifeq ($(OSARCH),linux-gnu)
endif
@@ -224,7 +226,9 @@ endif
ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),)
+ifneq ($(OSARCH),OpenBSD)
_ASTCFLAGS+=-pipe
ifeq ($(findstring -pipe,$(_ASTCFLAGS) $(ASTCFLAGS)),)
+ ifneq ($(OSARCH),OpenBSD)
_ASTCFLAGS+=-pipe
+ endif
endif
endif
+endif
_ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
@@ -226,8 +232,10 @@ ifneq ($(findstring BSD,$(OSARCH)),)
@@ -249,7 +253,9 @@ ifneq ($(findstring BSD,$(OSARCH)),)
endif
ifneq ($(PROC),ultrasparc)
+ifneq ($(OSARCH),OpenBSD)
+ 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
ifeq ($(PROC),ppc)
_ASTCFLAGS+=-fsigned-char
@@ -589,6 +597,7 @@ samples: adsi
echo "astetcdir => $(ASTETCDIR)" ; \
echo "astmoddir => $(MODULES_DIR)" ; \
echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
+ echo "astdbdir => $(ASTDBDIR)" ; \
echo "astdatadir => $(ASTDATADIR)" ; \
echo "astagidir => $(AGI_DIR)" ; \
echo "astspooldir => $(ASTSPOOLDIR)" ; \
@@ -619,16 +628,16 @@ samples: adsi
@@ -657,7 +663,7 @@ samples: adsi
echo "astrundir => $(ASTVARRUNDIR)" ; \
echo "astlogdir => $(ASTLOGDIR)" ; \
echo "" ; \
- echo ";[options]" ; \
+ echo "[options]" ; \
echo ";verbose = 3" ; \
echo ";debug = 3" ; \
echo ";alwaysfork = yes ; same as -F at startup" ; \
@@ -684,15 +690,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" ; \
@ -84,7 +58,6 @@ $OpenBSD: patch-Makefile,v 1.21 2009/11/19 16:17:05 sthen Exp $
- 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 ";dahdichanname = yes ; Channels created by chan_dahdi will be called 'DAHDI', otherwise 'Zap'" ; \
echo "" ; \
echo "; Changing the following lines may compromise your security." ; \
- echo ";[files]" ; \
@ -97,6 +70,6 @@ $OpenBSD: patch-Makefile,v 1.21 2009/11/19 16:17:05 sthen Exp $
+ echo "astctlowner = _asterisk" ; \
+ echo "astctlgroup = wheel" ; \
+ echo "astctl = asterisk.ctl" ; \
) > $(DESTDIR)$(ASTCONFPATH) ; \
else \
echo "Skipping asterisk.conf creation"; \
echo "" ; \
echo "[compat]" ; \
echo "pbx_realtime=1.6" ; \

70
telephony/asterisk/patches/patch-bootstrap_sh
View File

@ -1,14 +1,60 @@
$OpenBSD: patch-bootstrap_sh,v 1.1 2009/11/04 21:51:49 sthen Exp $
--- bootstrap.sh.orig Thu Oct 30 20:58:24 2008
+++ bootstrap.sh Wed Nov 4 21:25:03 2009
@@ -19,8 +19,8 @@ if [ $? = 0 ] ; then # FreeBSD case
else # linux case
MY_AC_VER=
MY_AM_VER=
$OpenBSD: patch-bootstrap_sh,v 1.2 2009/12/13 12:11:29 sthen Exp $
--- bootstrap.sh.orig Sun Oct 11 17:11:30 2009
+++ bootstrap.sh Sun Oct 11 17:10:37 2009
@@ -9,29 +9,34 @@ check_for_app() {
fi
}
-# On FreeBSD and OpenBSD, multiple autoconf/automake versions have different names.
-# On linux, envitonment variables tell which one to use.
+MY_AC_VER=
+MY_AM_VER=
-uname -s | grep -q BSD
-if [ $? = 0 ] ; then # BSD case
- case `uname -sr` in
- 'FreeBSD 4'*) # FreeBSD 4.x has a different naming
- MY_AC_VER=259
- MY_AM_VER=19
- ;;
- *)
- MY_AC_VER=-2.61
- MY_AM_VER=-1.9
- ;;
- esac
-else # linux case
- MY_AC_VER=
- MY_AM_VER=
- AUTOCONF_VERSION=2.60
- AUTOMAKE_VERSION=1.9
+ [ -z "$AUTOCONF_VERSION" ] && AUTOCONF_VERSION=2.60
+ [ -z "$AUTOMAKE_VERSION" ] && AUTOMAKE_VERSION=1.9
export AUTOCONF_VERSION
export AUTOMAKE_VERSION
fi
- export AUTOCONF_VERSION
- export AUTOMAKE_VERSION
-fi
+# On FreeBSD, multiple autoconf/automake versions have different names.
+# On Linux and OpenBSD, environment variables tell which one to use.
+
+case `uname -sr` in
+ 'FreeBSD 4'*) # FreeBSD 4.x has a different naming
+ MY_AC_VER=259
+ MY_AM_VER=19
+ ;;
+ OpenBSD*)
+ [ -z "$AUTOCONF_VERSION" ] && AUTOCONF_VERSION=2.61
+ [ -z "$AUTOMAKE_VERSION" ] && AUTOMAKE_VERSION=1.9
+ export AUTOCONF_VERSION
+ export AUTOMAKE_VERSION
+ ;;
+ *BSD*)
+ MY_AC_VER=-2.61
+ MY_AM_VER=-1.9
+ ;;
+ *)
+ AUTOCONF_VERSION=2.60
+ AUTOMAKE_VERSION=1.9
+ export AUTOCONF_VERSION
+ export AUTOMAKE_VERSION
+ ;;
+esac
check_for_app autoconf${MY_AC_VER}
check_for_app autoheader${MY_AC_VER}

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

@ -1,10 +1,10 @@
$OpenBSD: patch-build_tools_cflags_xml,v 1.2 2008/04/02 23:18:11 sthen Exp $
--- build_tools/cflags.xml.orig Wed Mar 19 17:12:52 2008
+++ build_tools/cflags.xml Fri Mar 28 23:42:25 2008
$OpenBSD: patch-build_tools_cflags_xml,v 1.3 2009/12/13 12:11:29 sthen Exp $
--- build_tools/cflags.xml.orig Mon Dec 1 13:39:14 2008
+++ build_tools/cflags.xml Mon Dec 1 13:39:38 2008
@@ -1,5 +1,6 @@
<category name="MENUSELECT_CFLAGS" displayname="Compiler Flags" positive_output="yes" remove_on_change=".lastclean">
<member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler">
+ <defaultenabled>yes</defaultenabled>
</member>
<member name="DEBUG_CHANNEL_LOCKS" displayname="Debug Channel Locking">
</member>
<member name="ENABLE_UPLOADS" displayname="Enable HTTP uploads">
<defaultenabled>yes</defaultenabled>

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

@ -1,12 +0,0 @@
$OpenBSD: patch-build_tools_make_defaults_h,v 1.4 2007/10/04 11:25:44 sthen Exp $
--- build_tools/make_defaults_h.orig Mon Sep 24 18:22:08 2007
+++ build_tools/make_defaults_h Wed Oct 3 12:54:37 2007
@@ -15,7 +15,7 @@ cat << END
#define AST_LOG_DIR "${INSTALL_PATH}${ASTLOGDIR}"
#define AST_AGI_DIR "${INSTALL_PATH}${AGI_DIR}"
#define AST_KEY_DIR "${INSTALL_PATH}${ASTDATADIR}/keys"
-#define AST_DB "${INSTALL_PATH}${ASTVARLIBDIR}/astdb"
+#define AST_DB "${INSTALL_PATH}${ASTDBDIR}/astdb"
#define AST_TMP_DIR "${INSTALL_PATH}${ASTSPOOLDIR}/tmp"
#define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"

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

@ -1,8 +1,8 @@
$OpenBSD: patch-channels_Makefile,v 1.7 2007/12/19 21:07:27 sthen Exp $
--- channels/Makefile.orig Mon Dec 17 07:21:08 2007
+++ channels/Makefile Tue Dec 18 22:20:15 2007
@@ -21,8 +21,8 @@ C_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(ALL_C_MO
CC_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(ALL_CC_MODS))
$OpenBSD: patch-channels_Makefile,v 1.8 2009/12/13 12:11:29 sthen Exp $
--- channels/Makefile.orig Mon Dec 1 13:40:51 2008
+++ channels/Makefile Mon Dec 1 13:41:05 2008
@@ -16,8 +16,8 @@ MENUSELECT_CATEGORY=CHANNELS
MENUSELECT_DESCRIPTION=Channel Drivers
ifeq ($(OSARCH),OpenBSD)
- PTLIB=-lpt_OpenBSD_x86_r

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

@ -1,7 +1,7 @@
$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
$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
@@ -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])
AST_EXT_LIB_SETUP([NEWT], [newt], [newt])
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/11/19 16:17:05 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])
@@ -1227,7 +1227,7 @@ fi
@@ -1258,7 +1258,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.3 2009/11/19 16:17:05 sthen Exp $
AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], [])
@@ -1346,7 +1346,8 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "
@@ -1373,7 +1373,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.3 2009/11/19 16:17:05 sthen Exp $
AST_CHECK_PWLIB_BUILD([OpenH323], [OPENH323],
[Define if your system has the OpenH323 libraries.],
[#include "ptlib.h"
@@ -1441,7 +1442,7 @@ AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_f
@@ -1470,7 +1471,7 @@ AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_f
AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [])

28
telephony/asterisk/patches/patch-contrib_scripts_safe_asterisk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.8 2008/06/14 16:00:10 sthen Exp $
--- contrib/scripts/safe_asterisk.orig Fri May 30 17:44:39 2008
+++ contrib/scripts/safe_asterisk Thu Jun 12 19:49:36 2008
@@ -2,19 +2,20 @@
$OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.9 2009/12/13 12:11:29 sthen Exp $
--- contrib/scripts/safe_asterisk.orig Tue Dec 16 19:55:38 2008
+++ contrib/scripts/safe_asterisk Fri Apr 24 15:01:35 2009
@@ -2,9 +2,9 @@
# vim:textwidth=80:tabstop=4:shiftwidth=4:smartindent:autoindent
CLIARGS="$*" # Grab any args passed to safe_asterisk
@ -12,8 +12,9 @@ $OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.8 2008/06/14 16:00:10 sthen Ex
+CONSOLE=no # Whether or not you want a console
+NOTIFY=root # Who to notify about crashes
#EXEC=/path/to/somescript # Run this command if Asterisk crashes
MACHINE=`hostname` # To specify which machine has crashed when getting the mail
DUMPDROP=/tmp
#LOGFILE=/path/to/logfile # Where to place the normal logfile (disabled if blank)
#SYSLOG=local0 # Which syslog facility to use (disabled if blank)
@@ -13,10 +13,11 @@ DUMPDROP=/tmp
SLEEPSECS=4
ASTSBINDIR=__ASTERISK_SBIN_DIR__
ASTPIDFILE=__ASTERISK_VARRUN_DIR__/asterisk.pid
@ -27,7 +28,16 @@ $OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.8 2008/06/14 16:00:10 sthen Ex
# run asterisk with this priority
PRIORITY=0
@@ -74,6 +75,12 @@ else
@@ -32,7 +33,7 @@ PRIORITY=0
# set to the system's maximum files open devided by two, if not set here.
# MAXFILES=32768
-function message() {
+message() {
echo "$1" >&2
if [ "$SYSLOG" != "" ]; then
logger -p "${SYSLOG}.warn" -t safe_asterisk[$$] "$1"
@@ -91,6 +92,12 @@ else
# set the process's filemax to whatever set above
ulimit -n $MAXFILES
@ -39,8 +49,8 @@ $OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.8 2008/06/14 16:00:10 sthen Ex
+ fi
fi
#
@@ -170,7 +177,7 @@ run_asterisk()
if test "x$UMASK" != "x"; then
@@ -192,7 +199,7 @@ run_asterisk()
sleep $SLEEPSECS
if [ $KILLALLMPG123 ]
then

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

@ -1,11 +0,0 @@
$OpenBSD: patch-main_asterisk_c,v 1.10 2009/05/22 09:05:10 sthen Exp $
--- main/asterisk.c.orig Thu Apr 9 05:31:38 2009
+++ main/asterisk.c Thu May 21 21:22:19 2009
@@ -2552,6 +2552,7 @@ static void ast_readconfig(void)
snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", v->value);
} else if (!strcasecmp(v->name, "astvarlibdir")) {
ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR));
+ } else if (!strcasecmp(v->name, "astdbdir")) {
snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value);
} else if (!strcasecmp(v->name, "astdatadir")) {
ast_copy_string(ast_config_AST_DATA_DIR, v->value, sizeof(ast_config_AST_DATA_DIR));

1
telephony/asterisk/pkg/DESCR-fax Normal file
View File

@ -0,0 +1 @@
Fax support for Asterisk.

1
telephony/asterisk/pkg/DESCR-ldap Normal file
View File

@ -0,0 +1 @@
LDAP support for Asterisk.

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

@ -7,3 +7,6 @@ Interactive Voice Response, and Call Queuing.
Asterisk supports Voice over IP in many protocols, and can
interoperate with almost all standards-based telephony equipment
using relatively inexpensive hardware.
Flavors:
h323 - compile in H.323 support.

1
telephony/asterisk/pkg/DESCR-ogg
View File

@ -1 +0,0 @@
An Asterisk file format driver to use Ogg Vorbis files.

4
telephony/asterisk/pkg/PFRAG.h323-main
View File

@ -1,5 +1,3 @@
@comment $OpenBSD: PFRAG.h323-main,v 1.1 2007/11/27 10:41:04 sthen Exp $
lib/asterisk/modules/chan_h323.so
share/doc/asterisk/h323.txt
@comment $OpenBSD: PFRAG.h323-main,v 1.2 2009/12/13 12:11:29 sthen Exp $
share/examples/asterisk/default/h323.conf
@sample ${SYSCONFDIR}/asterisk/h323.conf

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

@ -1,2 +1,3 @@
@comment $OpenBSD: PLIST-curl,v 1.1 2007/09/05 22:42:52 sthen Exp $
@comment $OpenBSD: PLIST-curl,v 1.2 2009/12/13 12:11:29 sthen Exp $
lib/asterisk/modules/func_curl.so
lib/asterisk/modules/res_config_curl.so

2
telephony/asterisk/pkg/PLIST-fax Normal file
View File

@ -0,0 +1,2 @@
@comment $OpenBSD: PLIST-fax,v 1.1 2009/12/13 12:11:29 sthen Exp $
lib/asterisk/modules/app_fax.so

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

@ -1,11 +1,18 @@
@comment $OpenBSD: PLIST-jabber,v 1.1 2007/09/05 22:42:52 sthen Exp $
@comment $OpenBSD: PLIST-jabber,v 1.2 2009/12/13 12:11:29 sthen Exp $
include/asterisk/jabber.h
include/asterisk/jingle.h
lib/asterisk/modules/chan_gtalk.so
lib/asterisk/modules/chan_jingle.so
lib/asterisk/modules/res_jabber.so
share/doc/asterisk/jabber.txt
share/doc/asterisk/jingle.txt
share/examples/asterisk/default/gtalk.conf
@sample ${SYSCONFDIR}/asterisk/gtalk.conf
share/examples/asterisk/default/jabber.conf
@mode 640
@group _asterisk
@sample ${SYSCONFDIR}/asterisk/jabber.conf
@mode
@group
share/examples/asterisk/default/jingle.conf
@sample ${SYSCONFDIR}/asterisk/jingle.conf

5
telephony/asterisk/pkg/PLIST-ldap Normal file
View File

@ -0,0 +1,5 @@
@comment $OpenBSD: PLIST-ldap,v 1.1 2009/12/13 12:11:29 sthen Exp $
lib/asterisk/modules/res_config_ldap.so
share/doc/asterisk/ldap.txt
share/examples/asterisk/default/res_ldap.conf
@sample ${SYSCONFDIR}/asterisk/res_ldap.conf

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

File diff suppressed because it is too large Load Diff

13
telephony/asterisk/pkg/PLIST-odbc
View File

@ -1,11 +1,20 @@
@comment $OpenBSD: PLIST-odbc,v 1.1 2007/09/05 22:42:52 sthen Exp $
@comment $OpenBSD: PLIST-odbc,v 1.2 2009/12/13 12:11:29 sthen Exp $
include/asterisk/res_odbc.h
lib/asterisk/modules/cdr_adaptive_odbc.so
lib/asterisk/modules/cdr_odbc.so
lib/asterisk/modules/func_odbc.so
lib/asterisk/modules/res_config_odbc.so
lib/asterisk/modules/res_odbc.so
share/doc/asterisk/odbcstorage.txt
share/doc/asterisk/odbcstorage.tex
share/doc/asterisk/voicemail_odbc_postgresql.txt
share/examples/asterisk/default/cdr_adaptive_odbc.conf
@mode 640
@owner root
@group _asterisk
@sample ${SYSCONFDIR}/asterisk/cdr_adaptive_odbc.conf
@mode
@owner
@group
share/examples/asterisk/default/cdr_odbc.conf
@mode 640
@owner root

2
telephony/asterisk/pkg/PLIST-ogg
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PLIST-ogg,v 1.1 2007/09/05 22:42:52 sthen Exp $
lib/asterisk/modules/format_ogg_vorbis.so