commit:     0a1a10b157219db7acd065049d38b5c684f4eed9
Author:     Tony Vroon <chainsaw <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  9 14:37:31 2016 +0000
Commit:     Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Fri Dec  9 14:38:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a1a10b1

net-misc/asterisk: AST-2016-{008,009} remote crash on crafted Opus parameters 
in SDP offer.

Package-Manager: portage-2.3.2

 net-misc/asterisk/Manifest                         |   9 +-
 net-misc/asterisk/asterisk-11.24.1.ebuild          | 325 --------------------
 net-misc/asterisk/asterisk-11.25.0.ebuild          | 325 --------------------
 ...risk-11.23.1.ebuild => asterisk-11.25.1.ebuild} |   0
 net-misc/asterisk/asterisk-13.11.2-r1.ebuild       | 328 ---------------------
 net-misc/asterisk/asterisk-13.13.0.ebuild          | 328 ---------------------
 ...risk-13.12.1.ebuild => asterisk-13.13.1.ebuild} |   0
 7 files changed, 2 insertions(+), 1313 deletions(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 0e044b3..2ae1ffa 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,11 +1,6 @@
 DIST asterisk-11.21.1.tar.gz 34867941 SHA256 
d02afbdda172a6bb98883350d64f83ce865fcea01642a05067ca2c916c3a1ee5 SHA512 
d52a14ebae872d62cbfa676bfd86b28790d8e9cfad97585e9255cf9e8ca1957dae509d41ac46cd5280478d38707bc9628bafb31551ab8345e7064aabdbd5dea3
 WHIRLPOOL 
396eda8b1bc8b8a1465c90456c76f83c4946fd696ec647596bfdd2e74b32a1c6a15e9f4423d54da7ecda949f5ab472df3f08c30a99ebb099204d82cd8440d515
-DIST asterisk-11.23.1.tar.gz 35098451 SHA256 
5696a7f999dc01afdce91ed3afbd62f54b49ed37b4cbddb02bab124a88656d5c SHA512 
6d067ea86a7c050b19e29d6ea25aefd23c3f32bb7d334f4e3c74bcaedaf21e4faeeab71b4fd260fc39f3e12f645c3bf89737f4c2d16f988cc66f93d4e47f80a7
 WHIRLPOOL 
3b2d0b67b5c58cd326176eb05ed056622cbfdb492f4acf861e6ad8bde183a4f7c0f3ef38003e120b0dcd754cafa359bec83502f0f9011edec6cda8a256058874
-DIST asterisk-11.24.1.tar.gz 35123437 SHA256 
006fe06c6a03e0c0af0ea392e500dbba7bc87b14542a7355b4d8648a0bedefc8 SHA512 
d24c60070dfa82f7b35315fdff5c548ac4e2c109d77acbb995e31344df1555366291502a620ec59ac29ca28347d6d169cb2f6001d7955c3053056802bf6285df
 WHIRLPOOL 
a8111cff061f1001335a77fb8cbc85e9b7fb9092cb8f24e569dc3ce69a5e7d2db4d5a88eb249c2c9b8253b534f8c21a0452bcd4024729785e5f12575228d5244
-DIST asterisk-11.25.0.tar.gz 35125167 SHA256 
12bc6d6b254e232417c656e86bec99e08828335e135d923f87498c133641f1c1 SHA512 
a545352180612b9008ab92c7c24e416835cbf12ba3fd93c8a6ceee9b7a930b197b5ee3eb0de949605a800f0f57257393bee7deab2a1d933beed3d81ce28ec0c2
 WHIRLPOOL 
047654c4defe3446f3930192e3228e5df2d882ba2e7c307c15d575e1a226f401c59ca2e6d2e6a63d7fd8a2b8273961d5f900482c5a6b02fc6e45662665c9a79c
-DIST asterisk-13.11.2.tar.gz 32630702 SHA256 
6ea7001bb11ba11fcdbb5febb028b2fd62c44c7bda3cc966b8aaafcb429c5a3a SHA512 
c0275d353ab19de37ddd7b026ca5c920cf2a9fa578396e6af9a170e8dd8abf51875beacb103aaa1f9829d12efadd7ab7fd608e311f7f8b855a451073fe7197e9
 WHIRLPOOL 
78547c3734d8c688221b88771ee75069cf00cdae25122cc309d4a33b11798723967f3933117bcea9637219134213c4f8e5c0b725908294e56931bdd805e33731
-DIST asterisk-13.12.1.tar.gz 32701506 SHA256 
fe8523a1182cdd4e638c530038956d84db1e8a63a1eece1e31e9dbbc6d3e6f30 SHA512 
cbd5b15d2070302c6a7b979ccb9f43b6ecdde34e062f5f13b51c4c07b65f1cf54408cb15b64af0eab15711ff1cfb8ef25ddca1713c4c77af80cd2ee2a87a30d2
 WHIRLPOOL 
92a8be0382d48d12999907ef0b512fe4e95abeeb46352067db108a3fa7069861d265d75624776d489276ea4deb0a89359f0cead1cf8ed77e4b86dc19ff08c440
-DIST asterisk-13.13.0.tar.gz 32761401 SHA256 
e35064b5d4c5c766661b34794f4e5fdf15ad683c3121b35e03c9e9f2a3fa9738 SHA512 
e404a0a4239165784f6393c4e0b15aa0fb30ab2b4a32fb1bbe4c21a7c2b04e5bd4e9155030d4784dd03d409814e181aafa97494dd408aecf5c8445730191c9bb
 WHIRLPOOL 
e2115b6e27fa55595aa0db9cbf1c7b17e6c31506f436d894324abc4ebf671910afc718c57cc170d70b93f39c0c331ae937030f3100e9143eccdfc313e8544ca1
+DIST asterisk-11.25.1.tar.gz 35125897 SHA256 
dc9c282ca1142b286e5a5c391647d6be73f35524c8def37718de866e8384a57c SHA512 
37144b7296f929bdb707853690a12d4c1403741221c943becc88c18fe20587ba2381425574e97647c10efa9f98200336ddae7e3433740e5a509a837ed28ca02c
 WHIRLPOOL 
afc4cea1e4b7fcad7b1cfdff738cc3f6b28b9aaea0fd5a1a53b632c6fd5977f80e45984c68d51f96424eceda16cd92e45281a53abed48f6577677c51fed14a44
+DIST asterisk-13.13.1.tar.gz 32743348 SHA256 
6da3c46a22e919b92edf2ccb5b3a2f51bc17e8819e6fca704026869bf349007a SHA512 
34ffc3835f70e006baba2127038dfafdc8e6e4fc78c0fcd7437d287327b06f708fde405577a30a805372d4373efe038a2239a49c8b203ac4a356cc0778d567c9
 WHIRLPOOL 
42999acdb34f703ae227a699f55500b419060f2ec6370fb0493fba1431a5f6a18c8296660465cdf30f458bf5281c4acab1eb070aedf93c0b8dfacc2f32c90289
 DIST gentoo-asterisk-patchset-3.16.tar.bz2 5018 SHA256 
9c393aba3272b19ae7c7d79302c288ddb6d6b0368c72fbbeda11569ab751be6d SHA512 
83d0be42f935068afd130ecf6768355d6f9702238c829e1482135d320f99e6a2ad9dd39814ea139e8a8e9009ecb99a6b3d5ed5f2cc778353d03a09183d7a06a0
 WHIRLPOOL 
cc6a032aaa781a4eb29f913578bd10245775d9915f5a934f7c2982f44cf063cf3030b764e628b6e17f4f023558fb50e73116a19c77738ae5e8de85c0c672dfd9
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 SHA256 
2af864f0b40b42c55f3c3ac737856942c9393adddd47ebf6d982d9214b85a2ad SHA512 
37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d
 WHIRLPOOL 
79017eeb3737953515286db6386bfd848f7501b6f2abbc1ba6b6865a75495ce999d555e3112336abae23371a21a2d64a10f1d173e285314bb5bab22bfe2d4c1a
-DIST gentoo-asterisk-patchset-4.03.tar.bz2 5989 SHA256 
3a68854bb8a9c2c5e44615412c586606d0ba5fb3abb88e61b22c4d7dbfda7bed SHA512 
acde7d6e017c260b236b0f2dafd3e02c545fc31cbd50abaff3dbc734a6423bdcfdf9c136d5c8d76fc39735d8f07f2df4086aada034d16e9b6936207e39c4abb0
 WHIRLPOOL 
b2c1f5d8d5bd07ae57925c6746ab7193388fdbc5357f908dd60179cebacfb07b8846ac6e0b37a345916e05d57aaad9351b410c92f93b33f9498c1ccb2a374d48
 DIST gentoo-asterisk-patchset-4.04.tar.bz2 5024 SHA256 
785c5fd1b173f34a8bf230d899d8e491442bba42ad32c57710e19be9cfba90fd SHA512 
667d4d7af6fa9a6611e27d30537c4ce3d1c6318714d3c1619190bbce19dd11d5d3c3b5b3adf9a87b7510d738ff5279fefb7593cef5b7798cd98f6dcffcb2b4ad
 WHIRLPOOL 
025c885834ae6c77ce148a6cbbfe8f044480c94216956079c995743821561dc62f4d62ec899cf4d94bc6d14b1b96fc6d21afa6c106477a53fe2fe6def6fb6d41

diff --git a/net-misc/asterisk/asterisk-11.24.1.ebuild 
b/net-misc/asterisk/asterisk-11.24.1.ebuild
deleted file mode 100644
index 97b607c..00000000
--- a/net-misc/asterisk/asterisk-11.24.1.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit autotools eutils linux-info multilib user systemd
-
-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-3.17.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~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 portaudio postgres radius selinux snmp 
span speex srtp static syslog vorbis"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-       ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-       voicemail_storage_odbc? ( odbc )
-"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset" )
-
-CDEPEND="dev-db/sqlite:3
-       dev-libs/popt
-       dev-libs/libxml2
-       !libressl? ( dev-libs/openssl:0 )
-       libressl? ( dev-libs/libressl )
-       sys-libs/ncurses:*
-       sys-libs/zlib
-       alsa? ( media-libs/alsa-lib )
-       bluetooth? ( net-wireless/bluez )
-       calendar? ( net-libs/neon
-                dev-libs/libical
-                dev-libs/iksemel )
-       caps? ( sys-libs/libcap )
-       cluster? ( sys-cluster/corosync )
-       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.6 )
-       iconv? ( virtual/libiconv )
-       ilbc? ( dev-libs/ilbc-rfc3951 )
-       xmpp? ( dev-libs/iksemel )
-       ldap? ( net-nds/openldap )
-       libedit? ( dev-libs/libedit )
-       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:* )
-       radius? ( net-dialup/freeradius-client )
-       snmp? ( net-analyzer/net-snmp )
-       span? ( media-libs/spandsp )
-       speex? ( media-libs/speex )
-       srtp? ( net-libs/libsrtp )
-       vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${CDEPEND}
-       !net-libs/openh323
-       !net-libs/pjsip
-       voicemail_storage_imap? ( virtual/imap-c-client )
-       virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-asterisk )
-       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() {
-       default
-       AT_M4DIR=autoconf eautoreconf
-}
-
-src_configure() {
-       local vmst
-
-       econf \
-               --libdir="/usr/$(get_libdir)" \
-               --localstatedir="/var" \
-               --with-crypto \
-               --with-gsm=internal \
-               --with-popt \
-               --with-ssl \
-               --with-z \
-               --without-pwlib \
-               $(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
-
-       # That NATIVE_ARCH chatter really is quite bothersome
-       sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || 
die "Unable to squelch noisy build system"
-
-       # 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 alsa                 chan_alsa
-       use_select bluetooth            chan_mobile
-       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_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
-       use_select iconv                func_iconv
-       use_select xmpp                 res_xmpp
-       use_select ilbc                 codec_ilbc format_ilbc
-       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 vorbis               format_ogg_vorbis
-
-       # Voicemail storage ...
-       for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-               if use ${vmst}; then
-                       menuselect/menuselect --enable $(echo ${vmst##*_} | tr 
'[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-               fi
-       done
-
-       if use debug; then
-               for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-                       menuselect/menuselect --enable $o menuselect.makeopts
-               done
-       fi
-}
-
-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/
-               doins contrib/dictionary.digium
-       fi
-       diropts -m 0750 -o root -g asterisk
-       keepdir /etc/asterisk
-       if use samples; then
-               emake DESTDIR="${D}" samples
-               for conffile in "${D}"etc/asterisk/*.*
-               do
-                       chown root:root $conffile
-                       chmod 0644 $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 asterisk
-       keepdir /var/lib/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.initd8 asterisk
-       newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-       systemd_dounit "${FILESDIR}"/asterisk.service
-       systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-       systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-       # 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.8.0/find_call_sip_trace.sh"
-       dodoc "${FILESDIR}/1.8.0/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.logrotate4" 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 "Please read the Asterisk 11 upgrade document:"
-       elog 
"https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11";
-}
-
-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
-}

diff --git a/net-misc/asterisk/asterisk-11.25.0.ebuild 
b/net-misc/asterisk/asterisk-11.25.0.ebuild
deleted file mode 100644
index 97b607c..00000000
--- a/net-misc/asterisk/asterisk-11.25.0.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit autotools eutils linux-info multilib user systemd
-
-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-3.17.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~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 portaudio postgres radius selinux snmp 
span speex srtp static syslog vorbis"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-       ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-       voicemail_storage_odbc? ( odbc )
-"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset" )
-
-CDEPEND="dev-db/sqlite:3
-       dev-libs/popt
-       dev-libs/libxml2
-       !libressl? ( dev-libs/openssl:0 )
-       libressl? ( dev-libs/libressl )
-       sys-libs/ncurses:*
-       sys-libs/zlib
-       alsa? ( media-libs/alsa-lib )
-       bluetooth? ( net-wireless/bluez )
-       calendar? ( net-libs/neon
-                dev-libs/libical
-                dev-libs/iksemel )
-       caps? ( sys-libs/libcap )
-       cluster? ( sys-cluster/corosync )
-       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.6 )
-       iconv? ( virtual/libiconv )
-       ilbc? ( dev-libs/ilbc-rfc3951 )
-       xmpp? ( dev-libs/iksemel )
-       ldap? ( net-nds/openldap )
-       libedit? ( dev-libs/libedit )
-       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:* )
-       radius? ( net-dialup/freeradius-client )
-       snmp? ( net-analyzer/net-snmp )
-       span? ( media-libs/spandsp )
-       speex? ( media-libs/speex )
-       srtp? ( net-libs/libsrtp )
-       vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${CDEPEND}
-       !net-libs/openh323
-       !net-libs/pjsip
-       voicemail_storage_imap? ( virtual/imap-c-client )
-       virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-asterisk )
-       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() {
-       default
-       AT_M4DIR=autoconf eautoreconf
-}
-
-src_configure() {
-       local vmst
-
-       econf \
-               --libdir="/usr/$(get_libdir)" \
-               --localstatedir="/var" \
-               --with-crypto \
-               --with-gsm=internal \
-               --with-popt \
-               --with-ssl \
-               --with-z \
-               --without-pwlib \
-               $(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
-
-       # That NATIVE_ARCH chatter really is quite bothersome
-       sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || 
die "Unable to squelch noisy build system"
-
-       # 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 alsa                 chan_alsa
-       use_select bluetooth            chan_mobile
-       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_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
-       use_select iconv                func_iconv
-       use_select xmpp                 res_xmpp
-       use_select ilbc                 codec_ilbc format_ilbc
-       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 vorbis               format_ogg_vorbis
-
-       # Voicemail storage ...
-       for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-               if use ${vmst}; then
-                       menuselect/menuselect --enable $(echo ${vmst##*_} | tr 
'[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-               fi
-       done
-
-       if use debug; then
-               for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-                       menuselect/menuselect --enable $o menuselect.makeopts
-               done
-       fi
-}
-
-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/
-               doins contrib/dictionary.digium
-       fi
-       diropts -m 0750 -o root -g asterisk
-       keepdir /etc/asterisk
-       if use samples; then
-               emake DESTDIR="${D}" samples
-               for conffile in "${D}"etc/asterisk/*.*
-               do
-                       chown root:root $conffile
-                       chmod 0644 $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 asterisk
-       keepdir /var/lib/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.initd8 asterisk
-       newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-       systemd_dounit "${FILESDIR}"/asterisk.service
-       systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-       systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-       # 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.8.0/find_call_sip_trace.sh"
-       dodoc "${FILESDIR}/1.8.0/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.logrotate4" 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 "Please read the Asterisk 11 upgrade document:"
-       elog 
"https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11";
-}
-
-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
-}

diff --git a/net-misc/asterisk/asterisk-11.23.1.ebuild 
b/net-misc/asterisk/asterisk-11.25.1.ebuild
similarity index 100%
rename from net-misc/asterisk/asterisk-11.23.1.ebuild
rename to net-misc/asterisk/asterisk-11.25.1.ebuild

diff --git a/net-misc/asterisk/asterisk-13.11.2-r1.ebuild 
b/net-misc/asterisk/asterisk-13.11.2-r1.ebuild
deleted file mode 100644
index bd5e6c3..00000000
--- a/net-misc/asterisk/asterisk-13.11.2-r1.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit autotools eutils linux-info multilib user systemd
-
-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.03.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~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_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-       ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-       voicemail_storage_odbc? ( odbc )
-"
-
-EPATCH_SUFFIX="patch"
-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 )
-       sys-libs/ncurses:*
-       sys-libs/zlib
-       alsa? ( media-libs/alsa-lib )
-       bluetooth? ( net-wireless/bluez )
-       calendar? ( net-libs/neon
-                dev-libs/libical
-                dev-libs/iksemel )
-       caps? ( sys-libs/libcap )
-       cluster? ( sys-cluster/corosync )
-       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.6 )
-       iconv? ( virtual/libiconv )
-       ilbc? ( dev-libs/ilbc-rfc3951 )
-       xmpp? ( dev-libs/iksemel )
-       ldap? ( net-nds/openldap )
-       libedit? ( dev-libs/libedit )
-       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:* )
-       radius? ( net-dialup/freeradius-client )
-       snmp? ( net-analyzer/net-snmp )
-       span? ( media-libs/spandsp )
-       speex? ( media-libs/speex )
-       srtp? ( net-libs/libsrtp )
-       vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${CDEPEND}
-       !net-libs/openh323
-       !net-libs/pjsip
-       voicemail_storage_imap? ( virtual/imap-c-client )
-       virtual/pkgconfig
-       pjproject? ( net-libs/pjproject )
-"
-
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-asterisk )
-       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() {
-       default
-       AT_M4DIR="autoconf third-party third-party/pjproject" eautoreconf
-}
-
-src_configure() {
-       local vmst
-
-       econf \
-               --libdir="/usr/$(get_libdir)" \
-               --localstatedir="/var" \
-               --with-crypto \
-               --with-gsm=internal \
-               --with-popt \
-               --with-ssl \
-               --with-z \
-               --without-pwlib \
-               $(use_with caps cap) \
-               $(use_with http gmime) \
-               $(use_with newt) \
-               $(use_with portaudio) \
-               $(use_with pjproject)
-
-       # 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
-
-       # That NATIVE_ARCH chatter really is quite bothersome
-       sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || 
die "Unable to squelch noisy build system"
-
-       # 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 alsa                 chan_alsa
-       use_select bluetooth            chan_mobile
-       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 freetds              {cdr,cel}_tds
-       use_select gtalk                chan_motif
-       use_select http                 res_http_post
-       use_select iconv                func_iconv
-       use_select xmpp                 res_xmpp
-       use_select ilbc                 codec_ilbc format_ilbc
-       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 vorbis               format_ogg_vorbis
-
-       # Voicemail storage ...
-       for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-               if use ${vmst}; then
-                       menuselect/menuselect --enable $(echo ${vmst##*_} | tr 
'[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-               fi
-       done
-
-       if use debug; then
-               for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-                       menuselect/menuselect --enable $o menuselect.makeopts
-               done
-       fi
-}
-
-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/
-               doins contrib/dictionary.digium
-       fi
-       diropts -m 0750 -o root -g asterisk
-       keepdir /etc/asterisk
-       if use samples; then
-               emake DESTDIR="${D}" samples
-               for conffile in "${D}"etc/asterisk/*.*
-               do
-                       chown root:root $conffile
-                       chmod 0644 $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 asterisk
-       keepdir /var/lib/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.initd8 asterisk
-       newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-       systemd_dounit "${FILESDIR}"/asterisk.service
-       systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-       systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-       # 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.8.0/find_call_sip_trace.sh"
-       dodoc "${FILESDIR}/1.8.0/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.logrotate4" 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 "Please read the Asterisk 13 upgrade document:"
-       elog 
"https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13";
-}
-
-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
-}

diff --git a/net-misc/asterisk/asterisk-13.13.0.ebuild 
b/net-misc/asterisk/asterisk-13.13.0.ebuild
deleted file mode 100644
index b1debde..00000000
--- a/net-misc/asterisk/asterisk-13.13.0.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit autotools eutils linux-info multilib user systemd
-
-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"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~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_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-       ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-       voicemail_storage_odbc? ( odbc )
-"
-
-EPATCH_SUFFIX="patch"
-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 )
-       sys-libs/ncurses:*
-       sys-libs/zlib
-       alsa? ( media-libs/alsa-lib )
-       bluetooth? ( net-wireless/bluez )
-       calendar? ( net-libs/neon
-                dev-libs/libical
-                dev-libs/iksemel )
-       caps? ( sys-libs/libcap )
-       cluster? ( sys-cluster/corosync )
-       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.6 )
-       iconv? ( virtual/libiconv )
-       ilbc? ( dev-libs/ilbc-rfc3951 )
-       xmpp? ( dev-libs/iksemel )
-       ldap? ( net-nds/openldap )
-       libedit? ( dev-libs/libedit )
-       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:* )
-       radius? ( net-dialup/freeradius-client )
-       snmp? ( net-analyzer/net-snmp )
-       span? ( media-libs/spandsp )
-       speex? ( media-libs/speex )
-       srtp? ( net-libs/libsrtp )
-       vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${CDEPEND}
-       !net-libs/openh323
-       !net-libs/pjsip
-       voicemail_storage_imap? ( virtual/imap-c-client )
-       virtual/pkgconfig
-       pjproject? ( net-libs/pjproject )
-"
-
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-asterisk )
-       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() {
-       default
-       AT_M4DIR="autoconf third-party third-party/pjproject" eautoreconf
-}
-
-src_configure() {
-       local vmst
-
-       econf \
-               --libdir="/usr/$(get_libdir)" \
-               --localstatedir="/var" \
-               --with-crypto \
-               --with-gsm=internal \
-               --with-popt \
-               --with-ssl \
-               --with-z \
-               --without-pwlib \
-               $(use_with caps cap) \
-               $(use_with http gmime) \
-               $(use_with newt) \
-               $(use_with portaudio) \
-               $(use_with pjproject)
-
-       # 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
-
-       # That NATIVE_ARCH chatter really is quite bothersome
-       sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || 
die "Unable to squelch noisy build system"
-
-       # 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 alsa                 chan_alsa
-       use_select bluetooth            chan_mobile
-       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 freetds              {cdr,cel}_tds
-       use_select gtalk                chan_motif
-       use_select http                 res_http_post
-       use_select iconv                func_iconv
-       use_select xmpp                 res_xmpp
-       use_select ilbc                 codec_ilbc format_ilbc
-       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 vorbis               format_ogg_vorbis
-
-       # Voicemail storage ...
-       for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-               if use ${vmst}; then
-                       menuselect/menuselect --enable $(echo ${vmst##*_} | tr 
'[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-               fi
-       done
-
-       if use debug; then
-               for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-                       menuselect/menuselect --enable $o menuselect.makeopts
-               done
-       fi
-}
-
-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/
-               doins contrib/dictionary.digium
-       fi
-       diropts -m 0750 -o root -g asterisk
-       keepdir /etc/asterisk
-       if use samples; then
-               emake DESTDIR="${D}" samples
-               for conffile in "${D}"etc/asterisk/*.*
-               do
-                       chown root:root $conffile
-                       chmod 0644 $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 asterisk
-       keepdir /var/lib/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.initd8 asterisk
-       newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-       systemd_dounit "${FILESDIR}"/asterisk.service
-       systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-       systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-       # 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.8.0/find_call_sip_trace.sh"
-       dodoc "${FILESDIR}/1.8.0/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.logrotate4" 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 "Please read the Asterisk 13 upgrade document:"
-       elog 
"https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13";
-}
-
-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
-}

diff --git a/net-misc/asterisk/asterisk-13.12.1.ebuild 
b/net-misc/asterisk/asterisk-13.13.1.ebuild
similarity index 100%
rename from net-misc/asterisk/asterisk-13.12.1.ebuild
rename to net-misc/asterisk/asterisk-13.13.1.ebuild

Reply via email to