New upstream bugfix release; addresses among other things deadlocks in chan_agent, an infinite loop in T.38 passthrough, SIP INFO DTMF handling for non-numeric codes and a crash in ParkAndAnnounce. Distro patchset unchanged.

Package-Manager: portage-2.1.10.46/cvs/Linux x86_64

3 files changed, 301 insertions, 5 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index c60516c9c3c4..eb938c9d54e8 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.369 2012/02/03 10:49:47 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.370 2012/02/20 15:51:46 chainsaw Exp $
+
+*asterisk-10.1.2 (20 Feb 2012)
+
+  20 Feb 2012; Tony Vroon <chainsaw@gentoo.org> +asterisk-10.1.2.ebuild:
+  New upstream bugfix release; addresses among other things deadlocks in
+  chan_agent, an infinite loop in T.38 passthrough, SIP INFO DTMF handling for
+  non-numeric codes and a crash in ParkAndAnnounce. Distro patchset unchanged.
 
 *asterisk-10.1.0 (03 Feb 2012)
 
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index cdd45a940196..37512505c44a 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -13,17 +13,19 @@ AUX 1.8.0/asterisk.initd2 6522 RMD160 7c472eff7ee817dd3d8b3d228f66b27f2341fb91 S
 DIST asterisk-1.8.8.2.tar.gz 24776534 RMD160 140d2bafdeeb259469b1514c3c6a4d09eb17aa17 SHA1 4046350bc9143882db6569d1fa8df90a63c53f26 SHA256 8dae66785d2b3c991a04ae096ee6d85053e2ca0b7d5874075de7433b8ccf9171
 DIST asterisk-10.0.1.tar.gz 24866828 RMD160 289731127e45351047f565acd0f6372cb48cb7d1 SHA1 7a700c3c5b9af28f433f20d4267d5fc71ca32341 SHA256 f60ed688e2c8959d82e521e30dd1c2225d78bf079b5886d9cde7a86f5f55a802
 DIST asterisk-10.1.0.tar.gz 24745392 RMD160 8c08392d67c407cbb17eae84d8509daf7176808e SHA1 a2123563d37a1f1bc4222798065ec88f2943712b SHA256 6642e558fa2dc64749a209c2878536e7ec3e9672981ac41ceee794f58b7f7af0
+DIST asterisk-10.1.2.tar.gz 24735448 RMD160 972ef8066be66179e2e7d2bd1798605ad9b38320 SHA1 a07f934dee0dd77efe3a4566a515998f8b1e8627 SHA256 b62aa1083400d80ab6da179beb8c7094d97bcbdc6dae95d38f4cf011cbc4b049
 DIST gentoo-asterisk-patchset-1.7.tar.bz2 30115 RMD160 78a9a74f0346339d63badec8e6cb001135eedde9 SHA1 81b5cfea40616d047baf866c741738f0a8037f36 SHA256 0eff0193130f5a08a0e04cc1c4ab52c535dfeea21d9894a3461b143f40c8add2
 DIST gentoo-asterisk-patchset-2.0.tar.bz2 6125 RMD160 75fa8bf76e11ee12025ed3f38ab06998a752ad59 SHA1 f38a963c8d479a248b151f089fe172a701d6b505 SHA256 b02fb7e7e1d281a653fd98d7389a0a1777376398572c06ecb912fe7ed0b6c9e2
 EBUILD asterisk-1.8.8.2.ebuild 8434 RMD160 799807f7e04f37363178ea38ef9a840e2675fe81 SHA1 9ee6ef108fe04dc811794451f5b89d43d2f79cb2 SHA256 e7aaa7d16303f8aab427fb454d49b67cdb6095e82b099de85542eab65df6b44b
 EBUILD asterisk-10.0.1.ebuild 8516 RMD160 567c13c2930ec60c3c6fffdd974befa3c63829fc SHA1 6ffcbeb48b5bf1aae66300ece4a92c896fb49ef9 SHA256 b6fe7d8cdd4a603a49fb70ec57856fe61e42b6d5e365357c23677c5109bdf802
 EBUILD asterisk-10.1.0.ebuild 8516 RMD160 082fa1b0bd8564667b4cbeba20e1dcc60dc4f588 SHA1 c6b27dabf0ed052f71dc2b9eba7011354bb7063f SHA256 de983d1b559a6db89998f272c934e1a124217876c61d58d530ac8b233737c0ad
-MISC ChangeLog 93711 RMD160 20f99e2a3610aed0cb9c1cafb60ed965ec8981d3 SHA1 ecab5f065fad84606fb2210cf76d2b8f4c453bad SHA256 385033b18593db396c57897cc5306651aba519a395f9b99a3b1d1bce56aa38d6
+EBUILD asterisk-10.1.2.ebuild 8516 RMD160 1e084d8f90e8a73e691d411742281aeaca68cf47 SHA1 08cbb3bf186f952e8ce26f22fb467106bb11c4df SHA256 5d71f39f3086548ddb68d332ae27350bdcd33068fa744b29fbc2220b609a5565
+MISC ChangeLog 94048 RMD160 95c04c0e6e846a2ce332f6c684412015fc12e413 SHA1 289607764cd6efb332f41f90ab98087df47914bb SHA256 3159f066417ff2d89b1214693fec29cd6f171937843ea485406ad6815bda451a
 MISC metadata.xml 1028 RMD160 5b59e20d3efbe652abf786d05a7b9744105a088b SHA1 e718c3ce0210047b34a05c92ff8a7b4707316e17 SHA256 63267079fefbcc798d902e6b9822609df79c756a9934c3ad3abdabfbad357de5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8ru9AACgkQp5vW4rUFj5qpdwCgi3HjS9udQV3jmd/rnN8TLF7q
-4rIAoJz1hX0vaOMOO8kCwEF8EeHkjbvX
-=5RD0
+iEYEARECAAYFAk9CbBkACgkQp5vW4rUFj5qcGwCguM/hGJa6tt4fwXwgH8d5DLC3
+SRoAoKmnqQocb3zO+TsxiR0xuERaZs/+
+=ELEm
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-10.1.2.ebuild b/net-misc/asterisk/asterisk-10.1.2.ebuild
new file mode 100644
index 000000000000..459d3dafab45
--- /dev/null
+++ b/net-misc/asterisk/asterisk-10.1.2.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-10.1.2.ebuild,v 1.1 2012/02/20 15:51:46 chainsaw Exp $
+
+EAPI=4
+inherit autotools base eutils linux-info multilib
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-2.0.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk http iconv jabber jingle ldap lua mysql newt +samples odbc osplookup oss portaudio postgres radius snmp span speex srtp static syslog usb vorbis"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl
+	ais? ( sys-cluster/openais )
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.4 )
+	iconv? ( virtual/libiconv )
+	jabber? ( dev-libs/iksemel )
+	jingle? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua )
+	mysql? ( dev-db/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql-base )
+	radius? ( net-dialup/radiusclient-ng )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	usb? ( dev-libs/libusb
+		media-libs/alsa-lib )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${RDEPEND}
+	!net-libs/openh323"
+
+RDEPEND="${RDEPEND}
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select ais			res_ais
+	use_select alsa			chan_alsa
+	use_select bluetooth	chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_gtalk
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select jabber		res_jabber
+	use_select jingle		chan_jingle
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup	app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select usb			chan_usbradio
+	use_select vorbis		format_ogg_vorbis
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown asterisk:asterisk $conffile
+			chmod 0660 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk -g asterisk
+	keepdir	/etc/asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/run/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd2 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.6.2/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.6.2/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "1.6 -> 1.8 changes that you may care about:"
+	elog "http://svn.asterisk.org/svn/${PN}/tags/${PV}/UPGRADE.txt"
+	elog "or: bzless ${ROOT}usr/share/doc/${PF}/UPGRADE.txt.bz2"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}