Trim down 1.8 branch by culling vulnerable ebuilds for security bug #352059. Adding 1.8.2.1 which fixes a stack buffer overflow in SIP URI encoding. Patchset unchanged.

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

5 files changed, 17 insertions, 882 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 8bd89146ce35..64a44bb4a325 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.282 2011/01/18 13:09:13 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.283 2011/01/19 12:52:32 chainsaw Exp $
+
+*asterisk-1.8.2.1 (19 Jan 2011)
+
+  19 Jan 2011; Tony Vroon <chainsaw@gentoo.org> -asterisk-1.8.1.1-r1.ebuild,
+  -asterisk-1.8.1.1-r2.ebuild, -asterisk-1.8.2.ebuild,
+  +asterisk-1.8.2.1.ebuild:
+  Trim down 1.8 branch by culling vulnerable ebuilds for security bug #352059.
+  Adding 1.8.2.1 which fixes a stack buffer overflow in SIP URI encoding.
+  Patchset unchanged.
 
 *asterisk-1.8.2 (18 Jan 2011)
 
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 0c301cb19cac..466a5893525c 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -41,24 +41,20 @@ DIST asterisk-1.2.37.tar.gz 29899629 RMD160 1de7ff96d3b1fd8d89f3ef7b3bb9e35bedcc
 DIST asterisk-1.2.40.tar.gz 29903514 RMD160 dc3da60756c82c98a055e49b068eb6760a01948e SHA1 4b4b794e858a3436bc35bdd2f4edf824c2885b68 SHA256 61dc745b12f6dc2998404e77747a964db56df8efae84a666c4ccddf016c9c06d
 DIST asterisk-1.4.37.tar.gz 21666828 RMD160 0918c251f4f1045a65a3276afbbe78525cc09e74 SHA1 c56758e0e39970eacf2d1d081e960f44d4efdb0e SHA256 0168cc552eb5c3758a447d22c6d08a8cba0509b0be4036e253f895066facf3f6
 DIST asterisk-1.6.2.14.tar.gz 23715262 RMD160 96024982e8e298c5ec61c5e3d6322a788060df51 SHA1 452b5b9200b9ac82679102516cb7cbf006c1bd9a SHA256 344fc0c4d0bb5488084aee7c2068b9efe21ec0fa183f41a4c3608e64fa38f332
-DIST asterisk-1.8.1.1.tar.gz 26198619 RMD160 a761369083f9b5789dd055ab7df678b1cce83287 SHA1 8499778d83a8f35ce5abbfe4680de1701dc10f7c SHA256 71016372d81dd6c0b2977b8994aa626afa8aa71a2379005fc8fe30625ceedafa
-DIST asterisk-1.8.2.tar.gz 26237515 RMD160 2d7c5c98dde2fb98317f05ea94e94a3c0a264008 SHA1 aa47c1602581fb1a9ea59af4d911c33713c50d85 SHA256 864a66bd2c6bed2799d5e42f3b71ad4ce13715aa615bf1a50fb7fb6233f4d42e
+DIST asterisk-1.8.2.1.tar.gz 26309719 RMD160 d6bcbbbc61b0727174ae99ffb67a220fb2dc39a3 SHA1 e2cd54c464d35698bba94f4a326f8eba64123143 SHA256 be28025efbc6d56de2167952c0383c0b67461d8eabeb28bad2a2b76ae24665de
 DIST gentoo-asterisk-patchset-0.1.tar.bz2 5394 RMD160 bfd546101c77f6e6989c406bfb202e592f9d16fd SHA1 e49b7784f987e027d833fbe8e0773acb1ef78521 SHA256 07c1bc6a29bda4fa98e7d1eb436d2e6eafc13263b774a0ff41698e523fa59a97
 DIST gentoo-asterisk-patchset-0.2.tar.bz2 7398 RMD160 65b282fa621b3e65d293cd7e1d2f0af1e7837643 SHA1 71958e5108f225dda4e22a97a26a793e51f39283 SHA256 cff992cef307d73d336bf64ed56c32382a264e1b0eb468921a51d09c7f9d5861
-DIST gentoo-asterisk-patchset-0.3.tar.bz2 10729 RMD160 5e54673853210b2defe45da3b974f1d7b767c9b2 SHA1 c90d1d5f4ea1cb2e887e50a4513a62fb16902bcf SHA256 01c9bd50b85dba2f8ec72d62233f5002a42e2c3647591bbea76c67e665beea21
 EBUILD asterisk-1.2.37.ebuild 10738 RMD160 0f409319cb82c2c92cde0ab6436e44dd214c0cf3 SHA1 6cce3c94e5ace2f1f9fa7e6a621b358e3921cbec SHA256 fc6ed3447de3400e74fcffeee457adc59a4433047655f4190b55a9dfbec8c18b
 EBUILD asterisk-1.2.40.ebuild 10743 RMD160 f3db358e4776aef3dfb196f5e182f6f588030f60 SHA1 ae80355f7aa6e84c413f83c20028209e2908e3f9 SHA256 f67e2a7c507315feffdeb5950f9225c9edb038bb915f5402102dbd4da693c35d
 EBUILD asterisk-1.4.37.ebuild 8182 RMD160 cba2a7b76e5e85af081628c93ce8bca08578b585 SHA1 865eb1c2338b82863c4a37c24afc74997251c9c5 SHA256 bb18a3f8e15aa66c1f8ec6171d7228a10d9a0e9a89fa5908fe008e2a5bb81ffd
 EBUILD asterisk-1.6.2.14.ebuild 6450 RMD160 f53c065e0d5f5f89c14bcbf54f32e2016a4c3142 SHA1 e3bbafe31336381edfaef2278283ce8e9c6c8f34 SHA256 a62ebf9759f9083dbf23dd758bbcec14dc14a16ff6f1041fdc10ed84bfb74267
-EBUILD asterisk-1.8.1.1-r1.ebuild 14456 RMD160 770470bbdc6fecf58ccd8b11e018ec46daba55c4 SHA1 a94c40fcd31513a21626d9d037567a90db0de7f4 SHA256 8b6c5042b4de5fb425a8aac6af14b8fbc20f7f12deccbe28a3bd7afae9735235
-EBUILD asterisk-1.8.1.1-r2.ebuild 14423 RMD160 b00f830bb0101005a95c492460550d387be124b5 SHA1 283e83b6e5ec147fcebd32c2b7e9f6ad9c783ff7 SHA256 f92caf5b62cba31bdae1a9a1349801c180bc8f73caebd50a6785c07c181097b5
-EBUILD asterisk-1.8.2.ebuild 14418 RMD160 b53be03dd1f50d1009868b3623a2591ec2df2026 SHA1 42a05cac558279a8a18c262da03e617d8c5c08ad SHA256 78ac5637bd5df181c1b5f7a66ff8fb010e0ac935dc4c25cc60ebe435b8fad3e6
-MISC ChangeLog 69014 RMD160 ed0677e2537ce8421b6d6a07aeda057358395083 SHA1 2ab9b75cf58b9c1ef705aee9429cab99080414fc SHA256 ef1e83f6f59e8a42e3befd259b0c25785b1e77281ec480288ba157f15f202491
+EBUILD asterisk-1.8.2.1.ebuild 14420 RMD160 d632601c093912f75155efd273de7e0dfdaab7ba SHA1 bc862c03fd1096f23d7ee47683c60bc7a7c07310 SHA256 1f808f424bc70caf9087c7d5cd4cf0362ef5465d494aa4bbc2cf1b915892a4f6
+MISC ChangeLog 69383 RMD160 c2e2f986af6168b34153292b09f66cb7c5cb2806 SHA1 77f834581ed4595a994660c81341a8f533bcf597 SHA256 7f58f0b1b86f80af72d14903d4179b84637801ebcee5641a4bf86d6537cee3f0
 MISC metadata.xml 1681 RMD160 fa822016d351dcf52f4b52226adcfa03a4b4e726 SHA1 3436530fb26d46b1d4ff9adba8d684b1e054de20 SHA256 d4199859f1f0eea8a81a895d98270344a0967a76592004b6fdf5ff77a053e824
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk01kQAACgkQp5vW4rUFj5pGNQCfSGHMK3geAzcfbm/x1P6nl3Gj
-iR0An1wQeQaeLIKHqPKLKOTCH+gdU9jd
-=yFGc
+iEYEARECAAYFAk023pcACgkQp5vW4rUFj5rA7wCfX7GAoSzk6hSGA3YTE8oklQDY
+YDIAoJGGZrDHsrZMIDiSGnHo1J09VXPl
+=dmg6
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-1.8.1.1-r1.ebuild b/net-misc/asterisk/asterisk-1.8.1.1-r1.ebuild
deleted file mode 100644
index 446b9b46fe85..000000000000
--- a/net-misc/asterisk/asterisk-1.8.1.1-r1.ebuild
+++ /dev/null
@@ -1,437 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.1.1-r1.ebuild,v 1.1 2011/01/04 17:31:53 chainsaw Exp $
-
-EAPI=3
-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-0.2.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk h323 http iconv jabber jingle ldap lua misdn mysql newt +samples odbc osplookup oss portaudio postgres radius snmp span speex ssl sqlite sqlite3 srtp static syslog usb vorbis"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset" )
-
-RDEPEND="sys-libs/ncurses
-	dev-libs/popt
-	sys-libs/zlib
-	dev-libs/libxml2
-	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 )
-	h323? ( net-libs/openh323 )
-	http? ( dev-libs/gmime:0 )
-	iconv? ( virtual/libiconv )
-	jabber? ( dev-libs/iksemel )
-	jingle? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua )
-	misdn? ( net-dialup/misdnuser )
-	mysql? ( dev-db/mysql )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit
-		dev-libs/openssl )
-	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 )
-	sqlite? ( dev-db/sqlite:0 )
-	sqlite3? ( dev-db/sqlite:3 )
-	srtp? ( net-libs/libsrtp )
-	ssl? ( dev-libs/openssl )
-	syslog? ( app-admin/syslog-ng )
-	usb? ( dev-libs/libusb
-		media-libs/alsa-lib )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${RDEPEND}
-	!net-misc/asterisk-addons
-	!net-misc/asterisk-chan_unistim
-	!net-misc/zaptel"
-
-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
-}
-
-src_prepare() {
-	base_src_prepare
-	AT_M4DIR=autoconf eautoreconf
-}
-
-src_configure() {
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with portaudio) \
-		$(use_with ssl crypto) \
-		$(use_with ssl)
-
-	#
-	# 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
-	if use ais; then
-		menuselect/menuselect --enable res_ais menuselect.makeopts
-	else
-		menuselect/menuselect --disable res_ais menuselect.makeopts
-	fi
-	if use alsa; then
-		menuselect/menuselect --enable chan_alsa menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_alsa menuselect.makeopts
-	fi
-	if use bluetooth; then
-		menuselect/menuselect --enable chan_mobile menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_mobile menuselect.makeopts
-	fi
-	if use calendar; then
-		menuselect/menuselect --enable res_calendar menuselect.makeopts
-		menuselect/menuselect --enable res_calendar_caldav menuselect.makeopts
-		menuselect/menuselect --enable res_calendar_ews menuselect.makeopts
-		menuselect/menuselect --enable res_calendar_exchange menuselect.makeopts
-		menuselect/menuselect --enable res_calendar_icalendar menuselect.makeopts
-	else
-		menuselect/menuselect --disable res_calendar menuselect.makeopts
-		menuselect/menuselect --disable res_calendar_caldav menuselect.makeopts
-		menuselect/menuselect --disable res_calendar_ews menuselect.makeopts
-		menuselect/menuselect --disable res_calendar_exchange menuselect.makeopts
-		menuselect/menuselect --disable res_calendar_icalendar menuselect.makeopts
-	fi
-	if use curl; then
-		menuselect/menuselect --enable func_curl menuselect.makeopts
-		menuselect/menuselect --enable res_config_curl menuselect.makeopts
-		menuselect/menuselect --enable res_curl menuselect.makeopts
-	else
-		menuselect/menuselect --disable func_curl menuselect.makeopts
-		menuselect/menuselect --disable res_config_curl menuselect.makeopts
-		menuselect/menuselect --disable res_curl menuselect.makeopts
-	fi
-	if use dahdi; then
-		menuselect/menuselect --enable app_dahdibarge menuselect.makeopts
-		menuselect/menuselect --enable app_dahdiras menuselect.makeopts
-		menuselect/menuselect --enable chan_dahdi menuselect.makeopts
-		menuselect/menuselect --enable codec_dahdi menuselect.makeopts
-		menuselect/menuselect --enable res_timing_dahdi menuselect.makeopts
-	else
-		menuselect/menuselect --disable app_dahdibarge menuselect.makeopts
-		menuselect/menuselect --disable app_dahdiras menuselect.makeopts
-		menuselect/menuselect --disable chan_dahdi menuselect.makeopts
-		menuselect/menuselect --disable codec_dahdi menuselect.makeopts
-		menuselect/menuselect --disable res_timing_dahdi menuselect.makeopts
-	fi
-	if use freetds; then
-		menuselect/menuselect --enable cdr_tds menuselect.makeopts
-		menuselect/menuselect --enable cel_tds menuselect.makeopts
-	else
-		menuselect/menuselect --disable cdr_tds menuselect.makeopts
-		menuselect/menuselect --disable cel_tds menuselect.makeopts
-	fi
-	if use gtalk; then
-		menuselect/menuselect --enable chan_gtalk menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_gtalk menuselect.makeopts
-	fi
-	if use h323; then
-		menuselect/menuselect --enable chan_ooh323 menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-	fi
-	if use http; then
-		menuselect/menuselect --enable res_http_post menuselect.makeopts
-	else
-		menuselect/menuselect --disable res_http_post menuselect.makeopts
-	fi
-	if use iconv; then
-		menuselect/menuselect --enable func_iconv menuselect.makeopts
-	else
-		menuselect/menuselect --disable func_iconv menuselect.makeopts
-	fi
-	if use jabber; then
-		menuselect/menuselect --enable res_jabber menuselect.makeopts
-	else
-		menuselect/menuselect --disable res_jabber menuselect.makeopts
-	fi
-	if use jingle; then
-		menuselect/menuselect --enable chan_jingle menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_jingle menuselect.makeopts
-	fi
-	if use ldap; then
-		menuselect/menuselect --enable res_config_ldap menuselect.makeopts
-	else
-		menuselect/menuselect --disable res_config_ldap menuselect.makeopts
-	fi
-	if use lua; then
-		menuselect/menuselect --enable pbx_lua menuselect.makeopts
-	else
-		menuselect/menuselect --disable pbx_lua menuselect.makeopts
-	fi
-	if use misdn; then
-		menuselect/menuselect --enable chan_misdn menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_misdn menuselect.makeopts
-	fi
-	if use mysql; then
-		menuselect/menuselect --enable app_mysql menuselect.makeopts
-		menuselect/menuselect --enable cdr_mysql menuselect.makeopts
-		menuselect/menuselect --enable res_config_mysql menuselect.makeopts
-	else
-		menuselect/menuselect --disable app_mysql menuselect.makeopts
-		menuselect/menuselect --disable cdr_mysql menuselect.makeopts
-		menuselect/menuselect --disable res_config_mysql menuselect.makeopts
-	fi
-	if use odbc; then
-		menuselect/menuselect --enable cdr_adaptive_odbc menuselect.makeopts
-		menuselect/menuselect --enable cdr_odbc menuselect.makeopts
-		menuselect/menuselect --enable cel_odbc menuselect.makeopts
-		menuselect/menuselect --enable func_odbc menuselect.makeopts
-		menuselect/menuselect --enable res_config_odbc menuselect.makeopts
-		menuselect/menuselect --enable res_odbc menuselect.makeopts
-	else
-		menuselect/menuselect --disable cdr_adaptive_odbc menuselect.makeopts
-		menuselect/menuselect --disable cdr_odbc menuselect.makeopts
-		menuselect/menuselect --disable cel_odbc menuselect.makeopts
-		menuselect/menuselect --disable func_odbc menuselect.makeopts
-		menuselect/menuselect --disable res_config_odbc menuselect.makeopts
-		menuselect/menuselect --disable res_odbc menuselect.makeopts
-	fi
-	if use osplookup; then
-		menuselect/menuselect --enable app_osplookup menuselect.makeopts
-	else
-		menuselect/menuselect --disable app_osplookup menuselect.makeopts
-	fi
-	if use oss; then
-		menuselect/menuselect --enable chan_oss menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_oss menuselect.makeopts
-	fi
-	if use postgres; then
-		menuselect/menuselect --enable cdr_pgsql menuselect.makeopts
-		menuselect/menuselect --enable cel_pgsql menuselect.makeopts
-		menuselect/menuselect --enable res_config_pgsql menuselect.makeopts
-	else
-		menuselect/menuselect --disable cdr_pgsql menuselect.makeopts
-		menuselect/menuselect --disable cel_pgsql menuselect.makeopts
-		menuselect/menuselect --disable res_config_pgsql menuselect.makeopts
-	fi
-	if use radius; then
-		menuselect/menuselect --enable cdr_radius menuselect.makeopts
-		menuselect/menuselect --enable cel_radius menuselect.makeopts
-	else
-		menuselect/menuselect --disable cdr_radius menuselect.makeopts
-		menuselect/menuselect --disable cel_radius menuselect.makeopts
-	fi
-	if use snmp; then
-		menuselect/menuselect --enable res_snmp menuselect.makeopts
-	else
-		menuselect/menuselect --disable res_snmp menuselect.makeopts
-	fi
-	if use span; then
-		menuselect/menuselect --enable res_fax_spandsp menuselect.makeopts
-	else
-		menuselect/menuselect --disable res_fax_spandsp menuselect.makeopts
-	fi
-	if use speex; then
-		menuselect/menuselect --enable codec_speex menuselect.makeopts
-		menuselect/menuselect --enable func_speex menuselect.makeopts
-	else
-		menuselect/menuselect --disable codec_speex menuselect.makeopts
-		menuselect/menuselect --disable func_speex menuselect.makeopts
-	fi
-	if use sqlite; then
-		menuselect/menuselect --enable cdr_sqlite menuselect.makeopts
-	else
-		menuselect/menuselect --disable cdr_sqlite menuselect.makeopts
-	fi
-	if use sqlite3; then
-		menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-		menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
-	else
-		menuselect/menuselect --disable cdr_sqlite3_custom menuselect.makeopts
-		menuselect/menuselect --disable cel_sqlite3_custom menuselect.makeopts
-	fi
-	if use srtp; then
-		menuselect/menuselect --enable res_srtp menuselect.makeopts
-	else
-		menuselect/menuselect --disable res_srtp menuselect.makeopts
-	fi
-	if use syslog; then
-		menuselect/menuselect --enable cdr_syslog menuselect.makeopts
-	else
-		menuselect/menuselect --disable cdr_syslog menuselect.makeopts
-	fi
-	if use usb; then
-		menuselect/menuselect --enable chan_usbradio menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_usbradio menuselect.makeopts
-	fi
-	if use vorbis; then
-		menuselect/menuselect --enable format_ogg_vorbis menuselect.makeopts
-	else
-		menuselect/menuselect --disable format_ogg_vorbis menuselect.makeopts
-	fi
-}
-
-src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake || die "emake failed"
-}
-
-src_install() {
-	# setup directory structure
-	#
-	mkdir -p "${D}"usr/sbin
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig
-	mkdir -p "${D}"usr/$(get_libdir)/asterisk/modules
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use samples; then
-		emake DESTDIR="${D}" samples || die "emake samples failed"
-		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/*
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-*
-		rm -f  "${D}"var/lib/asterisk/agi-bin/*
-		rm -f  "${D}"etc/asterisk/*
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default
-
-	# 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.6.2/asterisk.initd2 asterisk
-	newconfd "${FILESDIR}"/1.6.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
-		dodoc doc/PEERING
-		dodoc doc/CODING-GUIDELINES
-		dodoc doc/tex/*.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_preinst() {
-	enewgroup asterisk
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-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
-}
diff --git a/net-misc/asterisk/asterisk-1.8.1.1-r2.ebuild b/net-misc/asterisk/asterisk-1.8.1.1-r2.ebuild
deleted file mode 100644
index 4a5af4ba7ab8..000000000000
--- a/net-misc/asterisk/asterisk-1.8.1.1-r2.ebuild
+++ /dev/null
@@ -1,433 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.1.1-r2.ebuild,v 1.1 2011/01/13 21:37:22 chainsaw Exp $
-
-EAPI=3
-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-0.3.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk h323 http iconv jabber jingle ldap lua misdn mysql newt +samples odbc osplookup oss portaudio postgres radius snmp span speex ssl sqlite sqlite3 srtp static syslog usb vorbis"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset" )
-
-RDEPEND="sys-libs/ncurses
-	dev-libs/popt
-	sys-libs/zlib
-	dev-libs/libxml2
-	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 )
-	h323? ( net-libs/openh323 )
-	http? ( dev-libs/gmime:0 )
-	iconv? ( virtual/libiconv )
-	jabber? ( dev-libs/iksemel )
-	jingle? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua )
-	misdn? ( net-dialup/misdnuser )
-	mysql? ( dev-db/mysql )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit
-		dev-libs/openssl )
-	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 )
-	sqlite? ( dev-db/sqlite:0 )
-	sqlite3? ( dev-db/sqlite:3 )
-	srtp? ( net-libs/libsrtp )
-	ssl? ( dev-libs/openssl )
-	syslog? ( app-admin/syslog-ng )
-	usb? ( dev-libs/libusb
-		media-libs/alsa-lib )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${RDEPEND}
-	!net-misc/asterisk-addons
-	!net-misc/asterisk-chan_unistim
-	!net-misc/zaptel"
-
-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
-}
-
-src_prepare() {
-	base_src_prepare
-	AT_M4DIR=autoconf eautoreconf
-}
-
-src_configure() {
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with portaudio) \
-		$(use_with ssl crypto) \
-		$(use_with ssl)
-
-	#
-	# 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
-	if use ais; then
-		menuselect/menuselect --enable res_ais menuselect.makeopts
-	else
-		menuselect/menuselect --disable res_ais menuselect.makeopts
-	fi
-	if use alsa; then
-		menuselect/menuselect --enable chan_alsa menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_alsa menuselect.makeopts
-	fi
-	if use bluetooth; then
-		menuselect/menuselect --enable chan_mobile menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_mobile menuselect.makeopts
-	fi
-	if use calendar; then
-		menuselect/menuselect --enable res_calendar menuselect.makeopts
-		menuselect/menuselect --enable res_calendar_caldav menuselect.makeopts
-		menuselect/menuselect --enable res_calendar_ews menuselect.makeopts
-		menuselect/menuselect --enable res_calendar_exchange menuselect.makeopts
-		menuselect/menuselect --enable res_calendar_icalendar menuselect.makeopts
-	else
-		menuselect/menuselect --disable res_calendar menuselect.makeopts
-		menuselect/menuselect --disable res_calendar_caldav menuselect.makeopts
-		menuselect/menuselect --disable res_calendar_ews menuselect.makeopts
-		menuselect/menuselect --disable res_calendar_exchange menuselect.makeopts
-		menuselect/menuselect --disable res_calendar_icalendar menuselect.makeopts
-	fi
-	if use curl; then
-		menuselect/menuselect --enable func_curl menuselect.makeopts
-		menuselect/menuselect --enable res_config_curl menuselect.makeopts
-		menuselect/menuselect --enable res_curl menuselect.makeopts
-	else
-		menuselect/menuselect --disable func_curl menuselect.makeopts
-		menuselect/menuselect --disable res_config_curl menuselect.makeopts
-		menuselect/menuselect --disable res_curl menuselect.makeopts
-	fi
-	if use dahdi; then
-		menuselect/menuselect --enable app_dahdibarge menuselect.makeopts
-		menuselect/menuselect --enable app_dahdiras menuselect.makeopts
-		menuselect/menuselect --enable chan_dahdi menuselect.makeopts
-		menuselect/menuselect --enable codec_dahdi menuselect.makeopts
-		menuselect/menuselect --enable res_timing_dahdi menuselect.makeopts
-	else
-		menuselect/menuselect --disable app_dahdibarge menuselect.makeopts
-		menuselect/menuselect --disable app_dahdiras menuselect.makeopts
-		menuselect/menuselect --disable chan_dahdi menuselect.makeopts
-		menuselect/menuselect --disable codec_dahdi menuselect.makeopts
-		menuselect/menuselect --disable res_timing_dahdi menuselect.makeopts
-	fi
-	if use freetds; then
-		menuselect/menuselect --enable cdr_tds menuselect.makeopts
-		menuselect/menuselect --enable cel_tds menuselect.makeopts
-	else
-		menuselect/menuselect --disable cdr_tds menuselect.makeopts
-		menuselect/menuselect --disable cel_tds menuselect.makeopts
-	fi
-	if use gtalk; then
-		menuselect/menuselect --enable chan_gtalk menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_gtalk menuselect.makeopts
-	fi
-	if use h323; then
-		menuselect/menuselect --enable chan_ooh323 menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-	fi
-	if use http; then
-		menuselect/menuselect --enable res_http_post menuselect.makeopts
-	else
-		menuselect/menuselect --disable res_http_post menuselect.makeopts
-	fi
-	if use iconv; then
-		menuselect/menuselect --enable func_iconv menuselect.makeopts
-	else
-		menuselect/menuselect --disable func_iconv menuselect.makeopts
-	fi
-	if use jabber; then
-		menuselect/menuselect --enable res_jabber menuselect.makeopts
-	else
-		menuselect/menuselect --disable res_jabber menuselect.makeopts
-	fi
-	if use jingle; then
-		menuselect/menuselect --enable chan_jingle menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_jingle menuselect.makeopts
-	fi
-	if use ldap; then
-		menuselect/menuselect --enable res_config_ldap menuselect.makeopts
-	else
-		menuselect/menuselect --disable res_config_ldap menuselect.makeopts
-	fi
-	if use lua; then
-		menuselect/menuselect --enable pbx_lua menuselect.makeopts
-	else
-		menuselect/menuselect --disable pbx_lua menuselect.makeopts
-	fi
-	if use misdn; then
-		menuselect/menuselect --enable chan_misdn menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_misdn menuselect.makeopts
-	fi
-	if use mysql; then
-		menuselect/menuselect --enable app_mysql menuselect.makeopts
-		menuselect/menuselect --enable cdr_mysql menuselect.makeopts
-		menuselect/menuselect --enable res_config_mysql menuselect.makeopts
-	else
-		menuselect/menuselect --disable app_mysql menuselect.makeopts
-		menuselect/menuselect --disable cdr_mysql menuselect.makeopts
-		menuselect/menuselect --disable res_config_mysql menuselect.makeopts
-	fi
-	if use odbc; then
-		menuselect/menuselect --enable cdr_adaptive_odbc menuselect.makeopts
-		menuselect/menuselect --enable cdr_odbc menuselect.makeopts
-		menuselect/menuselect --enable cel_odbc menuselect.makeopts
-		menuselect/menuselect --enable func_odbc menuselect.makeopts
-		menuselect/menuselect --enable res_config_odbc menuselect.makeopts
-		menuselect/menuselect --enable res_odbc menuselect.makeopts
-	else
-		menuselect/menuselect --disable cdr_adaptive_odbc menuselect.makeopts
-		menuselect/menuselect --disable cdr_odbc menuselect.makeopts
-		menuselect/menuselect --disable cel_odbc menuselect.makeopts
-		menuselect/menuselect --disable func_odbc menuselect.makeopts
-		menuselect/menuselect --disable res_config_odbc menuselect.makeopts
-		menuselect/menuselect --disable res_odbc menuselect.makeopts
-	fi
-	if use osplookup; then
-		menuselect/menuselect --enable app_osplookup menuselect.makeopts
-	else
-		menuselect/menuselect --disable app_osplookup menuselect.makeopts
-	fi
-	if use oss; then
-		menuselect/menuselect --enable chan_oss menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_oss menuselect.makeopts
-	fi
-	if use postgres; then
-		menuselect/menuselect --enable cdr_pgsql menuselect.makeopts
-		menuselect/menuselect --enable cel_pgsql menuselect.makeopts
-		menuselect/menuselect --enable res_config_pgsql menuselect.makeopts
-	else
-		menuselect/menuselect --disable cdr_pgsql menuselect.makeopts
-		menuselect/menuselect --disable cel_pgsql menuselect.makeopts
-		menuselect/menuselect --disable res_config_pgsql menuselect.makeopts
-	fi
-	if use radius; then
-		menuselect/menuselect --enable cdr_radius menuselect.makeopts
-		menuselect/menuselect --enable cel_radius menuselect.makeopts
-	else
-		menuselect/menuselect --disable cdr_radius menuselect.makeopts
-		menuselect/menuselect --disable cel_radius menuselect.makeopts
-	fi
-	if use snmp; then
-		menuselect/menuselect --enable res_snmp menuselect.makeopts
-	else
-		menuselect/menuselect --disable res_snmp menuselect.makeopts
-	fi
-	if use span; then
-		menuselect/menuselect --enable res_fax_spandsp menuselect.makeopts
-	else
-		menuselect/menuselect --disable res_fax_spandsp menuselect.makeopts
-	fi
-	if use speex; then
-		menuselect/menuselect --enable codec_speex menuselect.makeopts
-		menuselect/menuselect --enable func_speex menuselect.makeopts
-	else
-		menuselect/menuselect --disable codec_speex menuselect.makeopts
-		menuselect/menuselect --disable func_speex menuselect.makeopts
-	fi
-	if use sqlite; then
-		menuselect/menuselect --enable cdr_sqlite menuselect.makeopts
-	else
-		menuselect/menuselect --disable cdr_sqlite menuselect.makeopts
-	fi
-	if use sqlite3; then
-		menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-		menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
-	else
-		menuselect/menuselect --disable cdr_sqlite3_custom menuselect.makeopts
-		menuselect/menuselect --disable cel_sqlite3_custom menuselect.makeopts
-	fi
-	if use srtp; then
-		menuselect/menuselect --enable res_srtp menuselect.makeopts
-	else
-		menuselect/menuselect --disable res_srtp menuselect.makeopts
-	fi
-	if use syslog; then
-		menuselect/menuselect --enable cdr_syslog menuselect.makeopts
-	else
-		menuselect/menuselect --disable cdr_syslog menuselect.makeopts
-	fi
-	if use usb; then
-		menuselect/menuselect --enable chan_usbradio menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_usbradio menuselect.makeopts
-	fi
-	if use vorbis; then
-		menuselect/menuselect --enable format_ogg_vorbis menuselect.makeopts
-	else
-		menuselect/menuselect --disable format_ogg_vorbis menuselect.makeopts
-	fi
-}
-
-src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake || die "emake failed"
-}
-
-src_install() {
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig
-	emake DESTDIR="${D}" -j1 installdirs || die "emake installdirs failed"
-	emake DESTDIR="${D}" install || die "emake installdirs failed"
-
-	if use samples; then
-		emake DESTDIR="${D}" samples || die "emake samples failed"
-		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/*
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-*
-		rm -f  "${D}"var/lib/asterisk/agi-bin/*
-		rm -f  "${D}"etc/asterisk/*
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default
-
-	# 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.6.2/asterisk.initd2 asterisk
-	newconfd "${FILESDIR}"/1.6.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
-		dodoc doc/PEERING
-		dodoc doc/CODING-GUIDELINES
-		dodoc doc/tex/*.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_preinst() {
-	enewgroup asterisk
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-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
-}
diff --git a/net-misc/asterisk/asterisk-1.8.2.ebuild b/net-misc/asterisk/asterisk-1.8.2.1.ebuild
index 14b86af47587..727ced6d4437 100644
--- a/net-misc/asterisk/asterisk-1.8.2.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.2.ebuild,v 1.1 2011/01/18 13:09:13 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.2.1.ebuild,v 1.1 2011/01/19 12:52:32 chainsaw Exp $
 
 EAPI=3
 inherit autotools base eutils linux-info multilib