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

Update to Asterisk 1.8.12.0, including lots of fixes for bad sizeof()

Browse Source 
use and possible uninitialized var use, some memory leaks, a couple of
possible deadlocks and other issues.

While there, enable the http post module (done as a subpackage to
avoid pulling gmime/glib2 into the main package) and WANTLIB cleanup.

AEL dialplan users should see UPGRADE.txt for information about
changes to inheritance of the 'h' extension.
This commit is contained in:
sthen 2012-05-03 11:25:27 +00:00
parent 863d932489
commit 67d6b15dc9
6 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
telephony/asterisk/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.145 2012/04/28 10:52:08 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.146 2012/05/03 11:25:27 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit
VER= 1.8.11.1
VER= 1.8.12.0
DISTNAME= asterisk-${VER:S/beta/-beta/:S/rc/-rc/}
PKGNAME-main= asterisk-${VER}
@ -28,13 +28,16 @@ PERMIT_DISTFILES_CDROM= patent licensing clauses
PERMIT_DISTFILES_FTP= Yes
WANTLIB-main += c crypto curl execinfo gsm idn iksemel
WANTLIB-main += m ogg pthread spandsp sqlite3 srtp ssl stdc++ termcap
WANTLIB-main += tiff vorbis vorbisenc xml2 z ${MODLIBICONV_WANTLIB}
WANTLIB-main += m ogg pthread spandsp sqlite3 ssl stdc++ termcap
WANTLIB-main += tiff vorbis vorbisenc vorbisfile xml2 z
WANTLIB-main += ${MODGETTEXT_WANTLIB}
MODULES= devel/gettext converters/libiconv
MODULES= devel/gettext
MULTI_PACKAGES= -main -calendar -ldap -odbc -pgsql -snmp -speex
PSEUDO_FLAVORS= no_calendar no_ldap no_odbc no_pgsql no_snmp no_speex
MULTI_PACKAGES= -main -calendar -http_post -ldap -odbc \
-pgsql -snmp -speex
PSEUDO_FLAVORS= no_calendar no_http_post no_ldap no_odbc \
no_pgsql no_snmp no_speex
SUBST_VARS+= ${SOUNDS:S/^/SOUNDS_/}
@ -44,10 +47,12 @@ LIB_DEPENDS-main= audio/gsm \
devel/libexecinfo \
graphics/tiff \
net/curl \
security/libsrtp>=1.4.4 \
telephony/spandsp \
textproc/iksemel \
textproc/libxml
textproc/libxml \
${MODGETTEXT_LIB_DEPENDS}
RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS}
BUILD_DEPENDS-main= security/libsrtp>=1.4.4 # statically linked
MASTER_SITES= http://downloads.digium.com/pub/telephony/asterisk/releases/ \
http://downloads.digium.com/pub/telephony/asterisk/old-releases/
@ -90,7 +95,6 @@ CONFIGURE_ARGS+= --with-asound=no \
--with-cap=no \
--with-dahdi=no \
--with-gtk2=no \
--with-gmime=no \
--with-isdnnet=no \
--with-misdn=no \
--with-nbs=no \
@ -105,7 +109,6 @@ CONFIGURE_ARGS+= --with-asound=no \
--with-suppserv=no \
--with-tinfo=no \
--with-tonezone=no \
--with-usb=no \
--with-vpb=no
CONFIGURE_ARGS+= --with-jack=no \
@ -146,16 +149,23 @@ WANTLIB-calendar= ${MODGETTEXT_WANTLIB} asn1 crypto expat gssapi \
LIB_DEPENDS-calendar= net/neon \
textproc/libical \
${MODGETTEXT_LIB_DEPENDS}
.if !${BUILD_PACKAGES:M-calendar}
CONFIGURE_ARGS+= --with-ical=no
.endif
# http_post
COMMENT-http_post= HTTP POST support for Asterisk
LIB_DEPENDS-http_post= mail/gmime ${MODGETTEXT_LIB_DEPENDS}
WANTLIB-http_post= gio-2.0 glib-2.0 gmime-2.6 gobject-2.0 \
${MODGETTEXT_WANTLIB}
.if !${BUILD_PACKAGES:M-http_post}
CONFIGURE_ARGS+= --with-gmime=no
.endif
# ldap
COMMENT-ldap= LDAP support for Asterisk
LIB_DEPENDS-ldap= databases/openldap,-main
WANTLIB-ldap= ldap
.if !${BUILD_PACKAGES:M-ldap}
CONFIGURE_ARGS+= --with-ldap=no
.endif
@ -168,7 +178,6 @@ CONFIGURE_ARGS+= --with-ldap=no
#COMMENT-mysql= MySQL support for Asterisk
#WANTLIB-mysql= mysqlclient
#LIB_DEPENDS-mysql= databases/mysql
#
#.if !${BUILD_PACKAGES:M-mysql}
#CONFIGURE_ARGS+= --with-mysqlclient=no
#.endif
@ -177,7 +186,6 @@ CONFIGURE_ARGS+= --with-ldap=no
COMMENT-odbc= ODBC support for Asterisk
LIB_DEPENDS-odbc= databases/iodbc
WANTLIB-odbc= iodbc
.if !${BUILD_PACKAGES:M-odbc}
CONFIGURE_ARGS+= --with-iodbc=no \
--with-ltdl=no
@ -187,7 +195,6 @@ CONFIGURE_ARGS+= --with-iodbc=no \
COMMENT-pgsql= PostgreSQL support for Asterisk
WANTLIB-pgsql= pq z
LIB_DEPENDS-pgsql= databases/postgresql
.if !${BUILD_PACKAGES:M-pgsql}
CONFIGURE_ARGS+= --with-postgres=no
.endif
@ -196,7 +203,6 @@ CONFIGURE_ARGS+= --with-postgres=no
COMMENT-snmp= Net-SNMP support for Asterisk
WANTLIB-snmp= m netsnmp netsnmpagent netsnmpmibs crypto kvm wrap
LIB_DEPENDS-snmp= net/net-snmp
.if !${BUILD_PACKAGES:M-snmp}
CONFIGURE_ARGS+= --with-snmp=no
.endif
@ -205,7 +211,6 @@ CONFIGURE_ARGS+= --with-snmp=no
COMMENT-speex= Speex codec for Asterisk
WANTLIB-speex= m speex speexdsp
LIB_DEPENDS-speex= audio/speex>=1.2rc1
.if !${BUILD_PACKAGES:M-speex}
CONFIGURE_ARGS+= --with-speex=no
.endif

10
telephony/asterisk/distinfo
View File

@ -1,32 +1,32 @@
MD5 (asterisk-1.8.11.1.tar.gz) = /g6HhPyfAXyzYHC2Mc7l2g==
MD5 (asterisk-1.8.12.0.tar.gz) = c9HaBtph9lKmyD8mBDUN9Q==
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.11.1.tar.gz) = XxzJRJwkPla+TXeLwmLlzZMaop4=
RMD160 (asterisk-1.8.12.0.tar.gz) = 5RKj12kL8PH47uUj+ybtagQGz5M=
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.11.1.tar.gz) = QBvn+ZZlvEI8uv2K5MDX12dps9s=
SHA1 (asterisk-1.8.12.0.tar.gz) = LbtPhkJdsdprw6GZRpkgpBos+70=
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.11.1.tar.gz) = LJ7Z8Tle92RryYdp3GlnWFJXJ23GG1hYD7HgKAw6mO4=
SHA256 (asterisk-1.8.12.0.tar.gz) = wg2ek7emEYDCLVooUESUhfcxU33TqU/s2qmBUSo0k0s=
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.11.1.tar.gz) = 25243311
SIZE (asterisk-1.8.12.0.tar.gz) = 25100215
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

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

@ -1,7 +1,7 @@
$OpenBSD: patch-addons_chan_ooh323_c,v 1.2 2012/04/08 22:34:51 sthen Exp $
--- addons/chan_ooh323.c.orig Thu Feb 23 03:36:46 2012
+++ addons/chan_ooh323.c Fri Mar 30 01:18:06 2012
@@ -2724,8 +2724,10 @@ int reload_config(int reload)
$OpenBSD: patch-addons_chan_ooh323_c,v 1.3 2012/05/03 11:25:27 sthen Exp $
--- addons/chan_ooh323.c.orig Wed Apr 4 17:29:18 2012
+++ addons/chan_ooh323.c Thu May 3 08:42:49 2012
@@ -2727,8 +2727,10 @@ int reload_config(int reload)
gTOS = IPTOS_THROUGHPUT;
else if (!strcasecmp(v->value, "reliability"))
gTOS = IPTOS_RELIABILITY;

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

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.23 2012/04/08 22:34:51 sthen Exp $
--- configure.ac.orig Thu Feb 16 19:26:16 2012
+++ configure.ac Fri Mar 30 01:18:07 2012
$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
@@ -55,7 +55,7 @@ AC_SUBST([astvarrundir], ['${localstatedir}/run/a
case "${host_os}" in
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.23 2012/04/08 22:34:51 sthen Exp $
astvarlibdir='${prefix}/share/asterisk'
astdbdir='${localstatedir}/db/asterisk'
fi
@@ -1586,7 +1586,7 @@ if test "${USE_IMAP_TK}" != "no"; then
@@ -1590,7 +1590,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.23 2012/04/08 22:34:51 sthen Exp $
imap_include="-DUSE_SYSTEM_CCLIENT"
CPPFLAGS="${saved_cppflags}"
LIBS="${saved_libs}"
@@ -1772,7 +1772,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
@@ -1776,7 +1776,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])

2
telephony/asterisk/pkg/DESCR-http_post Normal file
View File

@ -0,0 +1,2 @@
This is the HTTP POST module for Asterisk, packaged separately to avoid
additional dependencies for the main package.

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

@ -0,0 +1,2 @@
@comment $OpenBSD: PLIST-http_post,v 1.1 2012/05/03 11:25:27 sthen Exp $
lib/asterisk/modules/res_http_post.so