Add correct divisor to trunk frequency for IAX2 channels, from an upstream commit by seanbright. Chained certificate support & correct handling of non-blocking I/O for TLS/SSL, as reported by Matthias Nagl in bugs #407781 & #407919. Upstream has fixed the port number in outbound SIP NOTIFY packets, included iLBC, fixed the caller ID in originated calls and stopped UDPTL from being created unneccesarily. Also the SIP timer should no longer be stopped prematurely.

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

3 files changed, 306 insertions, 5 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index f38d48027b20..1f8dbfd83356 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,17 @@
 # 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.373 2012/03/02 17:48:28 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.374 2012/03/13 11:51:32 chainsaw Exp $
+
+*asterisk-10.2.0 (13 Mar 2012)
+
+  13 Mar 2012; Tony Vroon <chainsaw@gentoo.org> +asterisk-10.2.0.ebuild:
+  Add correct divisor to trunk frequency for IAX2 channels, from an upstream
+  commit by seanbright. Chained certificate support & correct handling of
+  non-blocking I/O for TLS/SSL, as reported by Matthias Nagl in bugs #407781 &
+  #407919. Upstream has fixed the port number in outbound SIP NOTIFY packets,
+  included iLBC, fixed the caller ID in originated calls and stopped UDPTL from
+  being created unneccesarily. Also the SIP timer should no longer be stopped
+  prematurely.
 
   02 Mar 2012; Tony Vroon <chainsaw@gentoo.org> asterisk-1.8.8.2.ebuild,
   asterisk-1.8.9.2.ebuild, asterisk-1.8.9.3.ebuild, asterisk-10.0.1.ebuild,
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 8e64bcfb1ad2..3434282672b2 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -17,9 +17,11 @@ DIST asterisk-10.0.1.tar.gz 24866828 RMD160 289731127e45351047f565acd0f6372cb48c
 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 asterisk-10.1.3.tar.gz 24738519 RMD160 813aacebe3b2dde1f7f49b52987f505c4d542bfd SHA1 a61574d06e6dc1a6115f9624e0d0438a85aa05e4 SHA256 c30e9a61da0af9896dc9eeab812632c7e75509022513ba970a044d3ffdcbb95c
+DIST asterisk-10.2.0.tar.gz 25131266 RMD160 1cf481102232a8e733983edff079e8b7bbff0648 SHA1 bdba827120469dcb457d16887c5d2c7595942a33 SHA256 4bf64c484e7b727d3b40dc249afbbfba422119a0124d1cabe8c345b14aae192d
 DIST gentoo-asterisk-patchset-1.7.tar.bz2 30115 RMD160 78a9a74f0346339d63badec8e6cb001135eedde9 SHA1 81b5cfea40616d047baf866c741738f0a8037f36 SHA256 0eff0193130f5a08a0e04cc1c4ab52c535dfeea21d9894a3461b143f40c8add2
 DIST gentoo-asterisk-patchset-1.8.tar.bz2 29452 RMD160 3a140e687ab8d5f32579c4eca960ca9e2949ad41 SHA1 c7aedc911d161bc6e5153f3f92df47db37314825 SHA256 2ce7225a69c43898a24a3b6ed6c2bdebfbd020eae14467a2f14cba276d7a9fd9
 DIST gentoo-asterisk-patchset-2.0.tar.bz2 6125 RMD160 75fa8bf76e11ee12025ed3f38ab06998a752ad59 SHA1 f38a963c8d479a248b151f089fe172a701d6b505 SHA256 b02fb7e7e1d281a653fd98d7389a0a1777376398572c06ecb912fe7ed0b6c9e2
+DIST gentoo-asterisk-patchset-2.1.tar.bz2 7315 RMD160 6ef55959a8e3772a5878c1a84fc2e01ea5ee76b4 SHA1 e2ba7c014212bca9ee604b971f3c67010a9fd3d8 SHA256 d7244d75d93416171ac5926953bcec49f96fbf65dfafebb445d5b49c38d2cd6e
 EBUILD asterisk-1.8.8.2.ebuild 8438 RMD160 e208cef00fdced6f3b218172d0c1265c2bc1e537 SHA1 3f074f91868aabcc1665646f46522a8ed2854953 SHA256 2875a67d13b6af27526e27b65027c4adb4033ba652cc6cc06a3d72449a2c17a0
 EBUILD asterisk-1.8.9.2.ebuild 8469 RMD160 fdbdc0b609397dca75a6e9a84f0e2c3d491e0690 SHA1 9878fd84d74f9395b4adae1529d0414c6e44feb0 SHA256 4cfd9eab559250c392ba893c4649349e306e77e57a6a3a47fd34cc35fcb6185a
 EBUILD asterisk-1.8.9.3.ebuild 8469 RMD160 82a49be3bccbc23521b3cac1fa43b6eaaf98b794 SHA1 e86cbb49f8589e2c4153df45999c4151240891ef SHA256 86f09d70b7f59a4c9a554e32a549433d8e4471825fa0910cd1ec9b4a9ae1f14f
@@ -27,12 +29,13 @@ EBUILD asterisk-10.0.1.ebuild 8517 RMD160 94ed893d72f84ddf8b1bdd3f847b7651734a9c
 EBUILD asterisk-10.1.0.ebuild 8517 RMD160 843816b54be2b1cc8b7f179b449b2c84d3c2c324 SHA1 46360a155384bd5c21668e8fa1dedc8a46028ea4 SHA256 182a4273f31eb5bbe5311ae8c90f18dbcb026e06172c178f04cb357af2b914d4
 EBUILD asterisk-10.1.2.ebuild 8517 RMD160 43876b520fac6cb290b7b5e997f8fe649c217432 SHA1 da9708371ae269606396b681d49c66ac07fc049e SHA256 7f386f7fc35b93901288c522ce51ff2c20cf3a9e40f3d9dda7f07c20410bce23
 EBUILD asterisk-10.1.3.ebuild 8517 RMD160 a55f37bb6b1f3f806fff77039663f87aea47caca SHA1 f335c64dc0a0e613ec6a0cc43b64d288084579b6 SHA256 f96116e53b35072752b1e877192a28d08af0a7248433fc6f09d84b82011c294b
-MISC ChangeLog 95124 RMD160 1045556591dc9395f1b8ed10ad3cd66979338dbd SHA1 87d64cce4f44100e96830c305adafb5b349e2a8e SHA256 5da0743c6e897f8b9d8afed499014d8dd548712b568c2b6020089abee070e2c9
+EBUILD asterisk-10.2.0.ebuild 8517 RMD160 ec0c241a87a05a9ce5448cab45edc55bc087def2 SHA1 60f8c8d254c2e06ff9f00d5ebdc9c0ade381e7a1 SHA256 0f213283f600a65b6d165dccb3a9620fd8e662cece730bda27d855032902a691
+MISC ChangeLog 95711 RMD160 d24a29f6853b94a12c1b6d259272b84fa6c27bae SHA1 2703a6b136e8faa807ac8ae937fe83f38d2c4119 SHA256 0b596da5d64468ad4d19b8240d5e9bf5540aed4fa8496f3c7633062298c2e68e
 MISC metadata.xml 1028 RMD160 5b59e20d3efbe652abf786d05a7b9744105a088b SHA1 e718c3ce0210047b34a05c92ff8a7b4707316e17 SHA256 63267079fefbcc798d902e6b9822609df79c756a9934c3ad3abdabfbad357de5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9RB/UACgkQp5vW4rUFj5pdKACfc65/HpJTiiT+8dGCEGBpKjeh
-hBUAnAy9FyEUjOEHyE1HTTbaAkbnEGQU
-=AJWF
+iEYEARECAAYFAk9fNM4ACgkQp5vW4rUFj5qWmQCbBaDdwgp7ldsQpKAfB/rQmzDr
+aHwAoKNIB1Rt4PYyQQEnmfV+TO+P3Xil
+=TIkI
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-10.2.0.ebuild b/net-misc/asterisk/asterisk-10.2.0.ebuild
new file mode 100644
index 000000000000..a6a8bc509cd7
--- /dev/null
+++ b/net-misc/asterisk/asterisk-10.2.0.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.2.0.ebuild,v 1.1 2012/03/13 11:51:32 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.1.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? ( virtual/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
+}