net-misc/asterisk: CVE-2017-14099 / AST-2017-008.

Package-Manager: portage-2.3.8

3 files changed, 11 insertions, 15 deletions

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 6ea298501a93..406a3204ecae 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,6 +1,5 @@
 DIST asterisk-11.25.1.tar.gz 35125897 SHA256 dc9c282ca1142b286e5a5c391647d6be73f35524c8def37718de866e8384a57c SHA512 37144b7296f929bdb707853690a12d4c1403741221c943becc88c18fe20587ba2381425574e97647c10efa9f98200336ddae7e3433740e5a509a837ed28ca02c WHIRLPOOL afc4cea1e4b7fcad7b1cfdff738cc3f6b28b9aaea0fd5a1a53b632c6fd5977f80e45984c68d51f96424eceda16cd92e45281a53abed48f6577677c51fed14a44
-DIST asterisk-13.15.1.tar.gz 32828857 SHA256 03d29bcb0e1791809fb21fa80c3a7e8ab2f521e1f4397f625d1fe982f64186e2 SHA512 2ee19853431b890c988b69e03604b0d39b9764a93074c22a9975bde7d6f432582a00c2e841be6c6fd5f86fab338b9e717d4a7912e4fbac5034cb7a0dcf3b2337 WHIRLPOOL 61c8aca091a0e7805096136a38bf805b8e0c6247112ed40d30c981b2b607551cc749fd4be0bfd166ecea54f4d31c2b56e09740154231c43265ecae95fca5c57e
-DIST asterisk-13.17.0.tar.gz 32908945 SHA256 c4a89386d7db58520391fcbd3202902584b4434289094ca2e4a6b8dada1e90a4 SHA512 be2188843d1c4b860204dfe2311179b9bf39727c5d3130d70127147062a8253e9251055dfe201431e1a978d80307e08eda93d2f03c9e69d4906858aa338bfd47 WHIRLPOOL 3022edbccb5e8db2b81f1927577898e8f487712b73ea4ae3a83c711713c5980d4df3400b52b6a5d9bbe3ac495918f34766077737a3d497c690d46be09ee0a22f
+DIST asterisk-11.25.3.tar.gz 35134682 SHA256 beb63953cb61b9822fc8f1d79842d821c5147f2a2944941d54a02f2e5fd4db20 SHA512 9c0521d55e5b69663ea40066d52e397ba6c165a4b20cd0a1e5e375b9c0e5a6e4f37908e50b0b580e288dec9be252af9a8bce7bceb03ba029f902fb757e6311ed WHIRLPOOL 6b1ad68b719354d3e90f3e8b87d8affb1477467c7a30aa9457d8bcf4ef874d8653f36c40376507070846a558454a5522267e690aa4c2b1250af5d4bcfc74323a
+DIST asterisk-13.17.2.tar.gz 32899368 SHA256 19ae0565687b85bde382b2cc274dd5a27ac33dc57a4eb3b663cb5ad9b238f1ac SHA512 008354cb0cba679444bfbfd4be34d919ea0a0a0cbd60541b7528d254ab0fa92efee118d5b006e8dc7b709f9c44fd391026df9b8705d17515494a23ad36dedd4b WHIRLPOOL 2abd792e436a76158fd4470be81601fc11581e71b36cbe302e6987f4b0ef1f834c5b5a3731154601accc14b9d263761166780d99a0391940a57937fb46cf395c
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 SHA256 2af864f0b40b42c55f3c3ac737856942c9393adddd47ebf6d982d9214b85a2ad SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d WHIRLPOOL 79017eeb3737953515286db6386bfd848f7501b6f2abbc1ba6b6865a75495ce999d555e3112336abae23371a21a2d64a10f1d173e285314bb5bab22bfe2d4c1a
-DIST gentoo-asterisk-patchset-4.04.tar.bz2 5024 SHA256 785c5fd1b173f34a8bf230d899d8e491442bba42ad32c57710e19be9cfba90fd SHA512 667d4d7af6fa9a6611e27d30537c4ce3d1c6318714d3c1619190bbce19dd11d5d3c3b5b3adf9a87b7510d738ff5279fefb7593cef5b7798cd98f6dcffcb2b4ad WHIRLPOOL 025c885834ae6c77ce148a6cbbfe8f044480c94216956079c995743821561dc62f4d62ec899cf4d94bc6d14b1b96fc6d21afa6c106477a53fe2fe6def6fb6d41
 DIST gentoo-asterisk-patchset-4.05.tar.bz2 2889 SHA256 2d5d90777c896065d1f1ab7e44c7040ec2b143ee816080791a1c357efe6a0a60 SHA512 6fdb245e37074f124f4725c25a1547c872f6216eb1d37faeda8ed7c5e4dc87424e9c1ba20bb34722165027692916bde4c8bfc816ac5c89710972bb3f51bd1b75 WHIRLPOOL 5d89902c3863027780d67f9aa6428a2788f191582d03e905642fc817bbb7aa7991c04423a09e06d95e92c5ba15b6ca193c47a146379ef5c120f07b9fa6419126
diff --git a/net-misc/asterisk/asterisk-13.15.1.ebuild b/net-misc/asterisk/asterisk-11.25.3.ebuild
index 3b1db1be92a0..0da2300554a5 100644
--- a/net-misc/asterisk/asterisk-13.15.1.ebuild
+++ b/net-misc/asterisk/asterisk-11.25.3.ebuild
@@ -9,17 +9,17 @@ 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/releases/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-4.04.tar.bz2"
+	 mirror://gentoo/gentoo-asterisk-patchset-3.17.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 IUSE_VOICEMAIL_STORAGE="
 	+voicemail_storage_file
 	voicemail_storage_odbc
 	voicemail_storage_imap
 "
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
 IUSE_EXPAND="VOICEMAIL_STORAGE"
 REQUIRED_USE="gtalk? ( xmpp )
 	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
@@ -31,7 +31,6 @@ PATCHES=( "${WORKDIR}/asterisk-patchset" )
 
 CDEPEND="dev-db/sqlite:3
 	dev-libs/popt
-	dev-libs/jansson
 	dev-libs/libxml2
 	!libressl? ( dev-libs/openssl:0 )
 	libressl? ( dev-libs/libressl )
@@ -66,7 +65,7 @@ CDEPEND="dev-db/sqlite:3
 	snmp? ( net-analyzer/net-snmp )
 	span? ( media-libs/spandsp )
 	speex? ( media-libs/speex )
-	srtp? ( net-libs/libsrtp:= )
+	srtp? ( net-libs/libsrtp:0 )
 	vorbis? ( media-libs/libvorbis )"
 
 DEPEND="${CDEPEND}
@@ -74,7 +73,6 @@ DEPEND="${CDEPEND}
 	!net-libs/pjsip
 	voicemail_storage_imap? ( virtual/imap-c-client )
 	virtual/pkgconfig
-	pjproject? ( net-libs/pjproject )
 "
 
 RDEPEND="${CDEPEND}
@@ -101,7 +99,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	AT_M4DIR="autoconf third-party third-party/pjproject" eautoreconf
+	AT_M4DIR=autoconf eautoreconf
 }
 
 src_configure() {
@@ -119,8 +117,7 @@ src_configure() {
 		$(use_with caps cap) \
 		$(use_with http gmime) \
 		$(use_with newt) \
-		$(use_with portaudio) \
-		$(use_with pjproject)
+		$(use_with portaudio)
 
 	# Blank out sounds/sounds.xml file to prevent
 	# asterisk from installing sounds files (we pull them in via
@@ -173,7 +170,7 @@ src_configure() {
 	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
 	use_select cluster		res_corosync
 	use_select curl			func_curl res_config_curl res_curl
-	use_select dahdi		app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select dahdi		app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
 	use_select freetds		{cdr,cel}_tds
 	use_select gtalk		chan_motif
 	use_select http			res_http_post
@@ -297,8 +294,8 @@ pkg_postinst() {
 	elog "#gentoo-voip @ irc.freenode.net"
 	echo
 	echo
-	elog "Please read the Asterisk 13 upgrade document:"
-	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
 }
 
 pkg_config() {
diff --git a/net-misc/asterisk/asterisk-13.17.0.ebuild b/net-misc/asterisk/asterisk-13.17.2.ebuild
index 7235f13116f7..7235f13116f7 100644
--- a/net-misc/asterisk/asterisk-13.17.0.ebuild
+++ b/net-misc/asterisk/asterisk-13.17.2.ebuild