From 49557aa667b8c7ac4d72fd17c5be2fbf3a8b9330 Mon Sep 17 00:00:00 2001
From: Tony Vroon <chainsaw@gentoo.org>
Date: Mon, 12 Dec 2011 11:25:47 +0000
Subject: Security update addresses AST-2011-013 (disparate general/peer NAT
 settings exposing valid usernames) and AST-2011-014 (null pointer dereference
 in INFO command reply if automon feature is enabled). Cull the 1.8 branch by
 removing vulnerable ebuilds except current stable. For security bug #394095.

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64
---
 net-misc/asterisk/ChangeLog                  |  11 +-
 net-misc/asterisk/Manifest                   |   6 +-
 net-misc/asterisk/asterisk-1.8.7.1-r1.ebuild | 431 ---------------------------
 net-misc/asterisk/asterisk-1.8.7.1-r2.ebuild | 286 ------------------
 net-misc/asterisk/asterisk-1.8.7.2.ebuild    | 286 ++++++++++++++++++
 5 files changed, 299 insertions(+), 721 deletions(-)
 delete mode 100644 net-misc/asterisk/asterisk-1.8.7.1-r1.ebuild
 delete mode 100644 net-misc/asterisk/asterisk-1.8.7.1-r2.ebuild
 create mode 100644 net-misc/asterisk/asterisk-1.8.7.2.ebuild

(limited to 'net-misc/asterisk')

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 7599c9298ea6..ecbcd37a509c 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.360 2011/12/12 11:18:00 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.361 2011/12/12 11:25:47 chainsaw Exp $
+
+*asterisk-1.8.7.2 (12 Dec 2011)
+
+  12 Dec 2011; Tony Vroon <chainsaw@gentoo.org> -asterisk-1.8.7.1-r1.ebuild,
+  -asterisk-1.8.7.1-r2.ebuild, +asterisk-1.8.7.2.ebuild:
+  Security update addresses AST-2011-013 (disparate general/peer NAT settings
+  exposing valid usernames) and AST-2011-014 (null pointer dereference in INFO
+  command reply if automon feature is enabled). Cull the 1.8 branch by removing
+  vulnerable ebuilds except current stable. For security bug #394095.
 
 *asterisk-10.0.0_rc3 (12 Dec 2011)
 
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index bfe8ce88748e..ef4b2852ecd4 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -9,13 +9,13 @@ AUX 1.6.2/sip_calc_auth 493 RMD160 1813bd5aecbb60b38c20752050e6be44cca10f47 SHA1
 AUX 1.8.0/asterisk.confd 2203 RMD160 00d92671d00ff495d1651ec064fec8c790f94f6c SHA1 3da25f263e8bdeda7130ed03f9aced379591875f SHA256 32f60bc5ff42edb1ecda236f6e87d67fd723533658bd1efb6085e87736536969
 AUX 1.8.0/asterisk.initd 6511 RMD160 183128f493953a1dc9241e2966398c6e5f3e1365 SHA1 13ff4c28dc86d5bd534b43b2b08763f8ec19baa1 SHA256 88028e2c8cf78414725697c2121bbb861a18869f7675d4b814fcb8fecfe71586
 DIST asterisk-1.8.7.1.tar.gz 28557326 RMD160 e69d6f6c555f52b8c6bd16428c9e64a22988e736 SHA1 c29671daaca5725b4f4257a972c2fe88effbc16e SHA256 46a713113705f9c747f19b5c5bfd31ee2ebd7db221eb9aa4ca8c817d531f95f3
+DIST asterisk-1.8.7.2.tar.gz 28870981 RMD160 14bde4270f62852ce4d7dec5028af9824341e98b SHA1 55eb86a453ba8f0ae81ac36c26b145c5b67499b3 SHA256 5d7d3e35051d39c6a5551196a40955542fda331eea82c95cba528b7e2366a448
 DIST asterisk-10.0.0-rc3.tar.gz 24711837 RMD160 c3023205fc772b3ff0d023eb1349771605fb5fcc SHA1 253a143398e5dbcecbff5fbf5b90419222d58f74 SHA256 515d8c6008d089c6fad76bc973083ee9c8980fdecdf0511325477a900b647ea9
 DIST gentoo-asterisk-patchset-1.4.tar.bz2 31078 RMD160 3e24de735eb1754951708cd23e73ad125b9f626b SHA1 ed725bceb74ca1cf961a2e97fe12e89eb66b1719 SHA256 315a3878d3c591030b73d9796e0264f924ef5bde51ee682dc011974bf91b6630
 DIST gentoo-asterisk-patchset-1.5.tar.bz2 32182 RMD160 38081074d9814b8d3bc7130c37debf34f19a53c5 SHA1 8d3a5bda76ed1d32feda1e109e8affc75ffd7917 SHA256 458f03fef712166fc5e983f24fa6a53befbb1910d1e63cc7e79a3c83872f39ab
 DIST gentoo-asterisk-patchset-2.0.tar.bz2 6125 RMD160 75fa8bf76e11ee12025ed3f38ab06998a752ad59 SHA1 f38a963c8d479a248b151f089fe172a701d6b505 SHA256 b02fb7e7e1d281a653fd98d7389a0a1777376398572c06ecb912fe7ed0b6c9e2
-EBUILD asterisk-1.8.7.1-r1.ebuild 14426 RMD160 c20d9e317692e83f0a5985ec631dacccf977cf03 SHA1 22f6ec06d74858039dacd74dbd99714d2e5e7ea0 SHA256 f7a50dddd72af95d9153be25e2a6b31a9af0688a62c75d0596148def5193732c
-EBUILD asterisk-1.8.7.1-r2.ebuild 8441 RMD160 654f1647f7d697fd627750a11f1c1a9c91f997a4 SHA1 f9672bccb99f752c31e5911fcdd210e9134fc63b SHA256 7a577c3798d1201758755cb77938863940ac9b3cf518445a54821b8ba251ee25
 EBUILD asterisk-1.8.7.1.ebuild 14423 RMD160 ac4edbba788830ab10237d3f4a3ab743aee7bd70 SHA1 127e0deff4a40acd49b5adf6e247977efc7f507b SHA256 220eba22c0217d08b69efe0c715b417996b20eda7c509142544b7f69ba3d47aa
+EBUILD asterisk-1.8.7.2.ebuild 8438 RMD160 c3988bff93dcc57f31691a9e14c01834b9795a07 SHA1 1a29e2e1640f6eebd78bbe9bf1fc5e79eb5e619f SHA256 8096a576b90f82cb4a91edd4789d25efa7d646749a49f23b8537983ac9be825b
 EBUILD asterisk-10.0.0_rc3.ebuild 8519 RMD160 d0b13fd2903e9a060ac98e6cd70f59c3253b9e50 SHA1 e7983695195ee509f326ebfa1ec6da7fc1e171b4 SHA256 8733d16d1d3a983634c47bfa79a2863dcabd3f0c45418a8aa1fbf8a6549fd4e4
-MISC ChangeLog 91175 RMD160 dc89524de517e2366377762ed7055b79eb755763 SHA1 660bfac09233326290a595c9e26428b781601ccd SHA256 2018bc482328c462b57ce76a6019d19aea25285039427655af8902807d560987
+MISC ChangeLog 91650 RMD160 ddf78401601f549025a9159095bdba95c63bae7d SHA1 c976522cd7bb31f485e8c115e908c3e186a25ae5 SHA256 14571c81efc048c0f4090bc1015ba9d88ec55934255f9e2adf0f63f89e6a5e2a
 MISC metadata.xml 1028 RMD160 5b59e20d3efbe652abf786d05a7b9744105a088b SHA1 e718c3ce0210047b34a05c92ff8a7b4707316e17 SHA256 63267079fefbcc798d902e6b9822609df79c756a9934c3ad3abdabfbad357de5
diff --git a/net-misc/asterisk/asterisk-1.8.7.1-r1.ebuild b/net-misc/asterisk/asterisk-1.8.7.1-r1.ebuild
deleted file mode 100644
index 3d4dcf7f213f..000000000000
--- a/net-misc/asterisk/asterisk-1.8.7.1-r1.ebuild
+++ /dev/null
@@ -1,431 +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.7.1-r1.ebuild,v 1.1 2011/10/26 09:04:56 chainsaw Exp $
-
-EAPI=4
-inherit autotools base eutils linux-info multilib
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-1.5.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk http iconv jabber jingle ldap lua mysql newt +samples odbc osplookup oss portaudio postgres radius snmp span speex ssl sqlite sqlite3 srtp static syslog usb vorbis"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset" )
-
-RDEPEND="dev-libs/popt
-	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 )
-	http? ( dev-libs/gmime:2.4 )
-	iconv? ( virtual/libiconv )
-	jabber? ( dev-libs/iksemel )
-	jingle? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua )
-	mysql? ( dev-db/mysql )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit
-		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 )
-	usb? ( dev-libs/libusb
-		media-libs/alsa-lib )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${RDEPEND}
-	!net-libs/openh323"
-
-RDEPEND="${RDEPEND}
-	syslog? ( virtual/logger )"
-
-PDEPEND="net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	enewgroup asterisk
-	enewgroup dialout 20
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-src_prepare() {
-	base_src_prepare
-	AT_M4DIR=autoconf eautoreconf
-}
-
-src_configure() {
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-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
-
-	# 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
-
-	# The others are based on USE-flag settings
-	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 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 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
-}
-
-src_install() {
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-	if use radius; then
-		insinto /etc/radiusclient-ng/
-		doins contrib/dictionary.digium
-	fi
-	if use samples; then
-		emake DESTDIR="${D}" samples
-		for conffile in "${D}"etc/asterisk/*.*
-		do
-			chown asterisk:asterisk $conffile
-			chmod 0660 $conffile
-		done
-		einfo "Sample files have been installed"
-	else
-		einfo "Skipping installation of sample files..."
-		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
-		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
-		rm -f  "${D}"etc/asterisk/* || die
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
-
-	# keep directories
-	diropts -m 0770 -o asterisk -g asterisk
-	keepdir	/etc/asterisk
-	keepdir /var/lib/asterisk
-	keepdir /var/run/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd asterisk
-	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-	# install the upgrade documentation
-	#
-	dodoc README UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	#
-	if use doc
-	then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install SIP scripts; bug #300832
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.6.2/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.6.2/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
-}
-
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	echo
-	elog "If you want to know more about asterisk, visit these sites:"
-	elog "http://www.asteriskdocs.org/"
-	elog "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	elog "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	elog "Gentoo VoIP IRC Channel:"
-	elog "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-	elog "1.6 -> 1.8 changes that you may care about:"
-	elog "http://svn.asterisk.org/svn/${PN}/tags/${PV}/UPGRADE.txt"
-	elog "or: bzless ${ROOT}usr/share/doc/${PF}/UPGRADE.txt.bz2"
-}
-
-pkg_config() {
-	einfo "Do you want to reset file permissions and ownerships (y/N)?"
-
-	read tmp
-	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
-
-	if [[ "$tmp" = "y" ]] ||\
-		[[ "$tmp" = "yes" ]]
-	then
-		einfo "Resetting permissions to defaults..."
-
-		for x in spool run lib log; do
-			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
-			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
-		done
-
-		chown -R root:asterisk  "${ROOT}"etc/asterisk
-		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
-
-		einfo "done"
-	else
-		einfo "skipping"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-1.8.7.1-r2.ebuild b/net-misc/asterisk/asterisk-1.8.7.1-r2.ebuild
deleted file mode 100644
index fe96642f1a29..000000000000
--- a/net-misc/asterisk/asterisk-1.8.7.1-r2.ebuild
+++ /dev/null
@@ -1,286 +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.7.1-r2.ebuild,v 1.1 2011/11/04 10:19:05 chainsaw Exp $
-
-EAPI=4
-inherit autotools base eutils linux-info multilib
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-1.5.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk http iconv jabber jingle ldap lua mysql newt +samples odbc osplookup oss portaudio postgres radius snmp span speex sqlite sqlite3 srtp static syslog usb vorbis"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset" )
-
-RDEPEND="dev-libs/popt
-	dev-libs/libxml2
-	dev-libs/openssl
-	ais? ( sys-cluster/openais )
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	calendar? ( net-libs/neon
-		 dev-libs/libical
-		 dev-libs/iksemel )
-	caps? ( sys-libs/libcap )
-	curl? ( net-misc/curl )
-	dahdi? ( >=net-libs/libpri-1.4.12_beta2
-		net-misc/dahdi-tools )
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.4 )
-	iconv? ( virtual/libiconv )
-	jabber? ( dev-libs/iksemel )
-	jingle? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua )
-	mysql? ( dev-db/mysql )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql-base )
-	radius? ( net-dialup/radiusclient-ng )
-	snmp? ( net-analyzer/net-snmp )
-	span? ( media-libs/spandsp )
-	speex? ( media-libs/speex )
-	sqlite? ( dev-db/sqlite:0 )
-	sqlite3? ( dev-db/sqlite:3 )
-	srtp? ( net-libs/libsrtp )
-	usb? ( dev-libs/libusb
-		media-libs/alsa-lib )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${RDEPEND}
-	!net-libs/openh323"
-
-RDEPEND="${RDEPEND}
-	syslog? ( virtual/logger )"
-
-PDEPEND="net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	enewgroup asterisk
-	enewgroup dialout 20
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-src_prepare() {
-	base_src_prepare
-	AT_M4DIR=autoconf eautoreconf
-}
-
-src_configure() {
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-ssl \
-		--with-z \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with portaudio)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# Compile menuselect binary for optional components
-	emake menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect/menuselect --disable chan_misdn menuselect.makeopts
-	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect/menuselect --enable smsq menuselect.makeopts
-	menuselect/menuselect --enable streamplayer menuselect.makeopts
-	menuselect/menuselect --enable aelparse menuselect.makeopts
-	menuselect/menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect/menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect/menuselect --enable func_aes menuselect.makeopts
-	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect/menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select ais			res_ais
-	use_select alsa			chan_alsa
-	use_select bluetooth	chan_mobile
-	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select curl			func_curl res_config_curl res_curl
-	use_select dahdi		app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
-	use_select freetds		{cdr,cel}_tds
-	use_select gtalk		chan_gtalk
-	use_select http			res_http_post
-	use_select iconv		func_iconv
-	use_select jabber		res_jabber
-	use_select jingle		chan_jingle
-	use_select ldap			res_config_ldap
-	use_select lua			pbx_lua
-	use_select mysql		app_mysql cdr_mysql res_config_mysql
-	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup	app_osplookup
-	use_select oss			chan_oss
-	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
-	use_select radius		{cdr,cel}_radius
-	use_select snmp			res_snmp
-	use_select span			res_fax_spandsp
-	use_select speex		{codec,func}_speex
-	use_select sqlite		cdr_sqlite
-	use_select sqlite3		{cdr,cel}_sqlite3_custom
-	use_select srtp			res_srtp
-	use_select syslog		cdr_syslog
-	use_select usb			chan_usbradio
-	use_select vorbis		format_ogg_vorbis
-}
-
-src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake
-}
-
-src_install() {
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-	if use radius; then
-		insinto /etc/radiusclient-ng/
-		doins contrib/dictionary.digium
-	fi
-	if use samples; then
-		emake DESTDIR="${D}" samples
-		for conffile in "${D}"etc/asterisk/*.*
-		do
-			chown asterisk:asterisk $conffile
-			chmod 0660 $conffile
-		done
-		einfo "Sample files have been installed"
-	else
-		einfo "Skipping installation of sample files..."
-		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
-		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
-		rm -f  "${D}"etc/asterisk/* || die
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
-
-	# keep directories
-	diropts -m 0770 -o asterisk -g asterisk
-	keepdir	/etc/asterisk
-	keepdir /var/lib/asterisk
-	keepdir /var/run/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd asterisk
-	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-	# install the upgrade documentation
-	#
-	dodoc README UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	#
-	if use doc
-	then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install SIP scripts; bug #300832
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.6.2/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.6.2/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
-}
-
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	echo
-	elog "If you want to know more about asterisk, visit these sites:"
-	elog "http://www.asteriskdocs.org/"
-	elog "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	elog "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	elog "Gentoo VoIP IRC Channel:"
-	elog "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-	elog "1.6 -> 1.8 changes that you may care about:"
-	elog "http://svn.asterisk.org/svn/${PN}/tags/${PV}/UPGRADE.txt"
-	elog "or: bzless ${ROOT}usr/share/doc/${PF}/UPGRADE.txt.bz2"
-}
-
-pkg_config() {
-	einfo "Do you want to reset file permissions and ownerships (y/N)?"
-
-	read tmp
-	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
-
-	if [[ "$tmp" = "y" ]] ||\
-		[[ "$tmp" = "yes" ]]
-	then
-		einfo "Resetting permissions to defaults..."
-
-		for x in spool run lib log; do
-			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
-			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
-		done
-
-		chown -R root:asterisk  "${ROOT}"etc/asterisk
-		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
-
-		einfo "done"
-	else
-		einfo "skipping"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-1.8.7.2.ebuild b/net-misc/asterisk/asterisk-1.8.7.2.ebuild
new file mode 100644
index 000000000000..eb8f68bf4212
--- /dev/null
+++ b/net-misc/asterisk/asterisk-1.8.7.2.ebuild
@@ -0,0 +1,286 @@
+# 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.7.2.ebuild,v 1.1 2011/12/12 11:25:47 chainsaw Exp $
+
+EAPI=4
+inherit autotools base eutils linux-info multilib
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-1.5.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk http iconv jabber jingle ldap lua mysql newt +samples odbc osplookup oss portaudio postgres radius snmp span speex sqlite sqlite3 srtp static syslog usb vorbis"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+RDEPEND="dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl
+	ais? ( sys-cluster/openais )
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.4 )
+	iconv? ( virtual/libiconv )
+	jabber? ( dev-libs/iksemel )
+	jingle? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua )
+	mysql? ( dev-db/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql-base )
+	radius? ( net-dialup/radiusclient-ng )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	sqlite? ( dev-db/sqlite:0 )
+	sqlite3? ( dev-db/sqlite:3 )
+	srtp? ( net-libs/libsrtp )
+	usb? ( dev-libs/libusb
+		media-libs/alsa-lib )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${RDEPEND}
+	!net-libs/openh323"
+
+RDEPEND="${RDEPEND}
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select ais			res_ais
+	use_select alsa			chan_alsa
+	use_select bluetooth	chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_gtalk
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select jabber		res_jabber
+	use_select jingle		chan_jingle
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup	app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select sqlite		cdr_sqlite
+	use_select sqlite3		{cdr,cel}_sqlite3_custom
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select usb			chan_usbradio
+	use_select vorbis		format_ogg_vorbis
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown asterisk:asterisk $conffile
+			chmod 0660 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk -g asterisk
+	keepdir	/etc/asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/run/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.6.2/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.6.2/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "1.6 -> 1.8 changes that you may care about:"
+	elog "http://svn.asterisk.org/svn/${PN}/tags/${PV}/UPGRADE.txt"
+	elog "or: bzless ${ROOT}usr/share/doc/${PF}/UPGRADE.txt.bz2"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}
-- 
cgit v1.2.3-65-gdbad