Security revbump for #111836 (fixes security hole in vmail.cgi)

(Portage version: 2.0.51.22-r2)

16 files changed, 66 insertions, 477 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 623b33393272..25ec9d1f9cbe 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.87 2005/10/29 02:53:16 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.88 2005/11/08 15:35:21 stkn Exp $
+
+*asterisk-1.2.0_beta1-r1 (08 Nov 2005)
+*asterisk-1.0.9-r2 (08 Nov 2005)
+*asterisk-1.0.8-r1 (08 Nov 2005)
+*asterisk-1.0.7-r2 (08 Nov 2005)
+*asterisk-1.0.6-r2 (08 Nov 2005)
+*asterisk-1.0.5-r3 (08 Nov 2005)
+
+  08 Nov 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.9-vmail.cgi.patch, -asterisk-1.0.5-r2.ebuild,
+  +asterisk-1.0.5-r3.ebuild, -asterisk-1.0.6-r1.ebuild,
+  +asterisk-1.0.6-r2.ebuild, -asterisk-1.0.7-r1.ebuild,
+  +asterisk-1.0.7-r2.ebuild, -asterisk-1.0.8.ebuild,
+  +asterisk-1.0.8-r1.ebuild, -asterisk-1.0.9.ebuild,
+  -asterisk-1.0.9-r1.ebuild, +asterisk-1.0.9-r2.ebuild,
+  -asterisk-1.2.0_beta1.ebuild, +asterisk-1.2.0_beta1-r1.ebuild:
+  Security revbump, fixes #11836. Removed old insecure versions. Thanks to
+  Rajiv Manglani <rajiv@gentoo.org> for reporting this one.
 
   29 Oct 2005; Stefan Knoblich <stkn@gentoo.org>
   files/1.0.0/asterisk-1.0.9-freetds.diff:
diff --git a/net-misc/asterisk/asterisk-1.0.5-r2.ebuild b/net-misc/asterisk/asterisk-1.0.5-r3.ebuild
index d2ab7a2c36a6..ee13e673a879 100644
--- a/net-misc/asterisk/asterisk-1.0.5-r2.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.5-r2.ebuild,v 1.10 2005/09/15 02:40:34 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.5-r3.ebuild,v 1.1 2005/11/08 15:35:21 stkn Exp $
 
 inherit eutils perl-module
 
@@ -221,6 +221,9 @@ src_unpack() {
 
 	# fix segfault on amd64 and possibly other 64bit systems (#105762)
 	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
+
+	# security fix, bug #11836
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
 }
 
 src_compile() {
diff --git a/net-misc/asterisk/asterisk-1.0.6-r1.ebuild b/net-misc/asterisk/asterisk-1.0.6-r2.ebuild
index 1d4d1589e88b..83a61ea61b95 100644
--- a/net-misc/asterisk/asterisk-1.0.6-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.6-r1.ebuild,v 1.12 2005/09/15 02:40:34 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.6-r2.ebuild,v 1.1 2005/11/08 15:35:21 stkn Exp $
 
 inherit eutils perl-module
 
@@ -278,6 +278,9 @@ src_unpack() {
 
 	# fix segfault on amd64 and possibly other 64bit systems (#105762)
 	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
+
+	# security fix, bug #11836
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
 }
 
 src_compile() {
diff --git a/net-misc/asterisk/asterisk-1.0.7-r1.ebuild b/net-misc/asterisk/asterisk-1.0.7-r2.ebuild
index 2789cbae4dc7..480572676f13 100644
--- a/net-misc/asterisk/asterisk-1.0.7-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.7-r1.ebuild,v 1.20 2005/09/15 02:40:34 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.7-r2.ebuild,v 1.1 2005/11/08 15:35:21 stkn Exp $
 
 inherit eutils perl-module
 
@@ -275,6 +275,9 @@ src_unpack() {
 
 	# fix segfault on amd64 and possibly other 64bit systems (#105762)
 	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
+
+	# security fix, bug #11836
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
 }
 
 src_compile() {
diff --git a/net-misc/asterisk/asterisk-1.0.8.ebuild b/net-misc/asterisk/asterisk-1.0.8-r1.ebuild
index 59cd15512869..416657a8d497 100644
--- a/net-misc/asterisk/asterisk-1.0.8.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.8.ebuild,v 1.16 2005/09/15 02:40:34 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.8-r1.ebuild,v 1.1 2005/11/08 15:35:21 stkn Exp $
 
 inherit eutils perl-module
 
@@ -279,6 +279,9 @@ src_unpack() {
 
 	# fix segfault on amd64 and possibly other 64bit systems (#105762)
 	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
+
+	# security fix, bug #11836
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
 }
 
 src_compile() {
diff --git a/net-misc/asterisk/asterisk-1.0.9-r1.ebuild b/net-misc/asterisk/asterisk-1.0.9-r2.ebuild
index e93fbb9ee420..ae3b717fdce6 100644
--- a/net-misc/asterisk/asterisk-1.0.9-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9-r1.ebuild,v 1.6 2005/10/28 23:06:23 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9-r2.ebuild,v 1.1 2005/11/08 15:35:21 stkn Exp $
 
 inherit eutils perl-module
 
@@ -281,6 +281,9 @@ src_unpack() {
 	if has_version ">=dev-db/freetds-0.6.3"; then
 		epatch ${FILESDIR}/1.0.0/${P}-freetds.diff
 	fi
+
+	# security fix, bug #11836
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
 }
 
 src_compile() {
diff --git a/net-misc/asterisk/asterisk-1.0.9.ebuild b/net-misc/asterisk/asterisk-1.0.9.ebuild
deleted file mode 100644
index 7462cb413dd9..000000000000
--- a/net-misc/asterisk/asterisk-1.0.9.ebuild
+++ /dev/null
@@ -1,467 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9.ebuild,v 1.7 2005/09/15 02:40:34 stkn Exp $
-
-inherit eutils perl-module
-
-ADDONS_VERSION="1.0.9"
-BRI_VERSION="0.2.0-RC8l"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="ftp://ftp.digium.com/pub/telephony/${PN}/${P}.tar.gz
-	 ftp://ftp.digium.com/pub/telephony/${PN}/${PN}-addons-${ADDONS_VERSION}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
-
-S_ADDONS=${WORKDIR}/${PN}-addons-${ADDONS_VERSION}
-
-IUSE="alsa doc gtk mmx mysql pri zaptel debug postgres vmdbmysql vmdbpostgres bri hardened speex resperl"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~amd64 ~ppc"
-
-DEPEND="dev-libs/newt
-	dev-libs/openssl
-	media-sound/mpg123
-	media-sound/sox
-	doc? ( app-doc/doxygen )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	pri? ( >=net-libs/libpri-1.0.9 )
-	bri? ( >=net-libs/libpri-1.0.9
-		>=net-misc/zaptel-1.0.9 )
-	alsa? ( media-libs/alsa-lib )
-	mysql? ( dev-db/mysql )
-	speex? ( media-libs/speex )
-	zaptel? ( >=net-misc/zaptel-1.0.9 )
-	postgres? ( dev-db/postgresql )
-	vmdbmysql? ( dev-db/mysql )
-	vmdbpostgres? ( dev-db/postgresql )
-	resperl? ( dev-lang/perl
-		   >=net-misc/zaptel-1.0.9 )"
-
-pkg_setup() {
-	local n
-
-	#
-	# Warning about security changes...
-	#
-	ewarn "****************** Important changes warning! *********************"
-	ewarn
-	ewarn "- Asterisk runs as user asterisk, group asterisk by default"
-	ewarn
-	ewarn "- Permissions of /etc/asterisk have been changed to root:asterisk"
-	ewarn "  750 (directories) / 640 (files)"
-	ewarn
-	ewarn "- Permissions of /var/{log,lib,run,spool}/asterisk have been changed"
-	ewarn "  to asterisk:asterisk 750 (directories) / 640 (files)"
-	ewarn
-	ewarn "- Asterisk's unix socket and pidfile are now in /var/run/asterisk"
-	ewarn
-	ewarn "- More information at the end of this emerge"
-	ewarn
-	ewarn "     http://bugs.gentoo.org/show_bug.cgi?id=88732"
-	ewarn "     http://www.voip-info.org/wiki-Asterisk+non-root"
-	ewarn
-	einfo "Press Ctrl+C to abort"
-	echo
-	ebeep
-
-	n=15
-	while [[ $n -gt 0 ]]; do
-		echo -en "  Waiting $n seconds...\r"
-		sleep 1
-		(( n-- ))
-	done
-
-	#
-	# Regular checks
-	#
-	einfo "Running some pre-flight checks..."
-	if use resperl; then
-		# res_perl pre-flight check...
-		if ! $(perl -V | grep -q "usemultiplicity=define") ||\
-		   ! built_with_use dev-lang/perl ithreads || ! built_with_use sys-devel/libperl ithreads
-		then
-			eerror "Embedded perl add-on needs Perl and libperl with built-in threads support"
-			eerror "(rebuild perl and libperl with ithreads use-flag enabled)"
-			die "Perl w/o threads support..."
-		fi
-		einfo "Perl with ithreads support found"
-	fi
-
-
-	# mysql and postgres voicemail support are mutually exclusive..
-	if use vmdbmysql && use vmdbpostgres; then
-		eerror "MySQL and PostgreSQL Voicemail support are mutually exclusive... choose one!"
-		die "Conflicting use-flags"
-	fi
-
-	# check if zaptel and libpri have been built with bri enabled
-	if use bri; then
-		if ! built_with_use net-misc/zaptel bri; then
-			eerror "Re-emerge zaptel with bri use-flag enabled!"
-			die "Zaptel without bri support detected"
-		fi
-
-		if ! built_with_use net-libs/libpri bri; then
-			eerror "Re-emerge libpri with bri use-flag enabled!"
-			die "Libpri without bri support detected"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# set cflags & mmx optimization
-	sed -i  -e "s:^\(OPTIMIZE+=\).*:\1 ${CFLAGS}:" \
-		-e "s:^\(CFLAGS+=\$(shell if \$(CC)\):#\1:" \
-		Makefile
-
-	# hppa patch for gsm codec
-	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-hppa.patch
-
-	# mark adsi functions as weak references, things will blow
-	# on hardened otherwise (bug #100697 and #85655)
-	epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-weak-references.diff
-
-	# gsm codec still uses -fomit-frame-pointer, and other codecs have their
-	# own flags. We only change the arch.
-	sed -i  -e "s:^OPTIMIZE+=.*:OPTIMIZE=${CFLAGS}:" \
-		-e "s:^CFLAGS[\t ]\++=:CFLAGS =:" \
-		codecs/gsm/Makefile
-
-	if use mmx; then
-		if ! use hardened; then
-			einfo "Enabling mmx optimization"
-			sed -i  -e "s:^#\(K6OPT[\t ]\+= -DK6OPT\):\1:" \
-				codecs/gsm/Makefile
-		else
-			ewarn "Hardened use-flag is set, not enabling mmx optimization for codec_gsm!"
-
-		fi
-	fi
-	if ! use mmx || use hardened; then
-		# don't build + link asm mmx object file
-		# without this codec_gsm.so will include text relocations
-		sed -i  -e "/k6opt\.\(s\|o\)/ d" \
-			codecs/gsm/Makefile
-	fi
-
-	if ! use debug; then
-		einfo "Disabling debugging"
-		sed -i -e "s:^\(DEBUG=\):#\1:" Makefile
-	fi
-
-	# change image path in voicemail cgi
-	sed -i -e "s:^\(\$astpath = \).*:\1 \"/asterisk\";:" contrib/scripts/vmail.cgi
-
-	#
-	# embedded perl
-	#
-	if use resperl; then
-		einfo "Patching asterisk for embedded perl support..."
-		epatch ${S_ADDONS}/res_perl/astmake.diff
-
-		# create necessary .c file
-		/usr/bin/perl -MExtUtils::Embed -e xsinit || die "Could not create perlxsi.c"
-
-		cd ${S_ADDONS}
-
-		# fix perl path, source location and remove res_musiconhold
-		sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:" \
-			res_perl/Makefile \
-			${S}/Makefile \
-			res_perl/INC/*.pm
-		sed -i -e "s:^ASTSRC.*:ASTSRC = ${S}:" \
-			-e "s:\$(ASTLIBDIR)/modules/res_musiconhold.so::" \
-			res_perl/Makefile
-
-		if use bri; then
-			epatch ${FILESDIR}/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff
-		fi
-
-		cd ${S}
-	fi
-
-	#
-	# uclibc patch
-	#
-	if use elibc_uclibc; then
-		einfo "Patching asterisk for uclibc..."
-		epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-uclibc-dns.diff
-	fi
-
-	#
-	# other patches
-	#
-
-	# fix lpc10 Makefile, remove the
-	# CFLAGS+=-march=$(shell uname -m) part
-	epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-lpc10flags.diff
-
-	# asterisk-config
-	epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-astcfg-0.0.2.diff
-
-	#
-	# database voicemail support
-	#
-	if use postgres; then
-		sed -i  -e "s:^#\(APPS+=app_sql_postgres.so\):\1:" \
-			-e "s:/usr/local/pgsql/include:/usr/include/postgresql/pgsql:" \
-			-e "s:/usr/local/pgsql/lib:/usr/lib/postgresql:" \
-			apps/Makefile
-	fi
-
-	if use vmdbpostgres; then
-		einfo "Enabling PostgreSQL voicemail support"
-		sed -i  -e "s:^\(USE_POSTGRES_VM_INTERFACE\).*:\1=1:" \
-			-e "s:/usr/local/pgsql/include:/usr/include/postgresql/pgsql:" \
-			-e "s:/usr/local/pgsql/lib:/usr/lib/postgresql:" \
-			apps/Makefile
-
-		# patch app_voicemail.c
-		sed -i -e "s:^#include <postgresql/libpq-fe\.h>:#include \"libpq-fe\.h\":" \
-			apps/app_voicemail.c
-
-	elif use vmdbmysql; then
-		einfo "Enabling MySQL voicemail support"
-		sed -i  -e "s:^\(USE_MYSQL_VM_INTERFACE\).*:\1=1:" \
-			-e "s:^\(CFLAGS+=-DUSEMYSQLVM\):\1 -I${S_ADDONS}:" \
-			apps/Makefile
-	fi
-
-	#
-	# asterisk add-ons
-	#
-	cd ${S_ADDONS}
-	sed -i -e "s:-I../asterisk:-I${S} -I${S}/include:" Makefile
-	sed -i  -e "s:^OPTIMIZE+=.*:OPTIMIZE+=${CFLAGS}:" \
-		-e "s:^\(CFLAGS=\)\(.*\):\1-I${S}/include -fPIC \2:" \
-		format_mp3/Makefile
-
-
-	#
-	# BRI patches
-	#
-	if use bri; then
-		cd ${S}
-		einfo "Patching asterisk w/ BRI stuff"
-
-		epatch ${WORKDIR}/bristuff-${BRI_VERSION}/patches/asterisk.patch
-	fi
-
-	#
-	# Revived snmp plugin support
-	#
-#	if use snmp; then
-#		cd ${S}
-#		einfo "Patching snmp plugin helper functions"
-#		epatch ${FILESDIR}/1.0.0/ast-ax-snmp-1.0.6.diff
-#	fi
-
-	# fix path for non-root
-	cd ${S}
-	sed -i -e "s:^\(ASTVARRUNDIR=\).*:\1\$(INSTALL_PREFIX)/var/run/asterisk:" \
-		Makefile
-
-	# fix contrib scripts for non-root
-	epatch ${FILESDIR}/1.0.0/${PN}-1.0.7-scripts.diff
-
-	# add initgroups support to asterisk, this is needed
-	# to support supplementary groups for the asterisk
-	# user (start-stop-daemons --chguid breaks realtime priority support)
-	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-initgroups.diff
-
-	# fix segfault on amd64 and possibly other 64bit systems (#105762)
-	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
-}
-
-src_compile() {
-	# build asterisk first...
-	einfo "Building Asterisk..."
-	cd ${S}
-	emake -j1 || die "Make failed"
-
-	# create api docs
-	use doc && \
-		emake -j1 progdocs
-
-	#
-	# add-ons
-	#
-	einfo "Building additional stuff..."
-	cd ${S_ADDONS}
-	emake -j1 || die "Make failed"
-
-	if use resperl; then
-		cd ${S_ADDONS}/res_perl
-		emake -j1 || die "Building embedded perl failed"
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "Make install failed"
-	make DESTDIR=${D} samples || die "Make install samples failed"
-
-	# install astconf.h, a lot of external modules need this
-	insinto /usr/include/asterisk
-	doins	astconf.h
-
-	# install addmailbox and astgenkey
-	dosbin contrib/scripts/addmailbox
-	dosbin contrib/scripts/astgenkey
-
-	newinitd ${FILESDIR}/1.0.0/asterisk.rc6.sec asterisk
-	newconfd ${FILESDIR}/1.0.0/asterisk.confd.sec asterisk
-
-	# don't delete these, even if they are empty
-	keepdir /var/spool/asterisk/voicemail/default/1234/INBOX
-	keepdir /var/spool/asterisk/tmp
-	keepdir /var/log/asterisk/cdr-csv
-	keepdir /var/run/asterisk
-
-	# install standard docs...
-	dodoc BUGS CREDITS LICENSE ChangeLog HARDWARE README README.fpm
-	dodoc SECURITY doc/CODING-GUIDELINES doc/linkedlists.README
-	dodoc doc/README.*
-	dodoc doc/*.txt
-
-	docinto scripts
-	dodoc contrib/scripts/*
-	docinto firmware/iax
-	dodoc contrib/firmware/iax/*
-
-	# install api docs
-	if use doc; then
-		insinto /usr/share/doc/${PF}/api/html
-		doins doc/api/html/*
-	fi
-
-	insinto /usr/share/doc/${PF}/cgi
-	doins contrib/scripts/vmail.cgi
-	doins images/*.gif
-
-	#
-	# add-ons
-	#
-
-	# install additional modules...
-	einfo "Installing additional modules..."
-	cd ${S_ADDONS}
-	make INSTALL_PREFIX=${D} install || die "Make install failed"
-
-	if use resperl; then
-		perlinfo
-
-		cd ${S_ADDONS}/res_perl
-		make INSTALL_PREFIX=${D} install || die "Installation of perl AST_API failed"
-
-		# move AstApiBase.so to a proper place
-		dodir ${VENDOR_LIB}/auto/AstAPIBase
-		mv ${D}/etc/asterisk/perl/AstAPIBase.so ${D}${VENDOR_LIB}/auto/AstAPIBase
-
-		# move *.pm files to other location
-		dodir ${VENDOR_LIB}/AstAPI
-		dodir ${VENDOR_LIB}/AstAPIBase
-		for x in AstAPI.pm AstConfig.pm LoadFile.pm PerlSwitch.pm WebServer.pm; do
-			mv ${D}/etc/asterisk/perl/${x} ${D}${VENDOR_LIB}/AstAPI
-			dosed "s/^use[\t ]\+${x/.pm/};/use AstAPI::${x/.pm/};/" /etc/asterisk/perl/asterisk_init.pm
-		done
-		mv ${D}/etc/asterisk/perl/AstAPIBase.pm ${D}${VENDOR_LIB}/AstAPIBase
-		dosed "s/^use[\t ]\+AstAPI;/use AstAPI::AstAPI;/" /etc/asterisk/perl/asterisk_init.pm
-		dosed "s/^use[\t ]\+AstAPIBase;/use AstAPIBase::AstAPIBase;/" ${VENDOR_LIB}/AstAPI/AstAPI.pm
-
-		# move apps + htdocs to a proper place
-		dodir /var/lib/asterisk/perl
-		mv ${D}/etc/asterisk/perl/{apps,htdocs} ${D}/var/lib/asterisk/perl
-
-		# fix locations
-		sed -i -e "s:/etc/asterisk/perl:/var/lib/asterisk/perl:" \
-			${D}${VENDOR_LIB}/AstAPI/LoadFile.pm ${D}${VENDOR_LIB}/AstAPI/WebServer.pm
-	fi
-}
-
-pkg_preinst() {
-	einfo "Adding asterisk user and group"
-	enewgroup asterisk
-	enewuser asterisk -1 -1 /var/lib/asterisk asterisk
-}
-
-pkg_postinst() {
-	#
-	# Change permissions and ownerships of asterisk
-	# directories and files
-	#
-	einfo "Fixing permissions and ownerships"
-	# fix permissions in /var/...
-	for x in spool run lib log; do
-		chown -R asterisk:asterisk ${ROOT}var/${x}/asterisk
-		chmod -R u=rwX,g=rX,o=     ${ROOT}var/${x}/asterisk
-	done
-
-	chown -R root:asterisk ${ROOT}etc/asterisk
-	chmod -R u=rwX,g=rX,o= ${ROOT}etc/asterisk
-
-	#
-	# Fix locations for old installations (pre-non-root versions)
-	#
-	if [[ -z "$(grep "/var/run/asterisk" ${ROOT}etc/asterisk/asterisk.conf)" ]]
-	then
-		einfo "Fixing astrundir in ${ROOT}etc/asterisk/asterisk.conf"
-		mv -f ${ROOT}etc/asterisk/asterisk.conf \
-			${ROOT}etc/asterisk/asterisk.conf.bak
-		sed -e "s:^\(astrundir[\t ]=>\).*:\1 /var/run/asterisk:" \
-			${ROOT}etc/asterisk/asterisk.conf.bak >\
-			${ROOT}etc/asterisk/asterisk.conf
-		einfo "Backup has been saved as ${ROOT}etc/asterisk/asterisk.conf.bak"
-	fi
-
-	#
-	# Some messages
-	#
-	einfo "Asterisk has been installed"
-	einfo ""
-	einfo "to add new Mailboxes use: /usr/sbin/addmailbox"
-	einfo ""
-	einfo "If you want to know more about asterisk, visit these sites:"
-	einfo "http://www.asteriskdocs.org/"
-	einfo "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	einfo "http://asterisk.xvoip.com/"
-	einfo "http://junghanns.net/asterisk/"
-	einfo "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	einfo "Gentoo VoIP IRC Channel:"
-	einfo "#gentoo-voip @ irc.freenode.net"
-
-	#
-	# Warning about security changes...
-	#
-	ewarn "*********************** Important changes **************************"
-	ewarn
-	ewarn "- Asterisk runs as user asterisk, group asterisk by default"
-	ewarn
-	ewarn "- Make sure the asterisk user is a member of the proper groups if you want it"
-	ewarn "  to have access to hardware devices, e.g. \"audio\" for Alsa and OSS sound or"
-	ewarn "  \"dialout\" for zaptel!"
-	ewarn
-	ewarn "- Permissions of /etc/asterisk have been changed to root:asterisk"
-	ewarn "  750 (rwxr-x--- directories) / 640 (rw-r----- files)"
-	ewarn
-	ewarn "- Permissions of /var/{log,lib,run,spool}/asterisk have been changed"
-	ewarn "  to asterisk:asterisk 750 / 640"
-	ewarn
-	ewarn "- Asterisk's unix socket and pidfile are now in /var/run/astrisk"
-	ewarn
-	ewarn "- Asterisk cannot set the IP ToS bits when run as user,"
-	ewarn "  use something like this to make iptables set them for you:"
-	ewarn "  \"iptables -A OUTPUT -t mangle -p udp -m udp --dport 5060 -j DSCP --set-dscp 0x28\""
-	ewarn "  \"iptables -A OUTPUT -t mangle -p udp -m udp --sport 10000:20000 -j DSCP --set-dscp 0x28\""
-	ewarn "  (taken from voip-info.org comments (see below), thanks andrewid)"
-	ewarn
-	ewarn "For more details:"
-	ewarn "     http://bugs.gentoo.org/show_bug.cgi?id=88732"
-	ewarn "     http://www.voip-info.org/wiki-Asterisk+non-root"
-}
diff --git a/net-misc/asterisk/asterisk-1.2.0_beta1.ebuild b/net-misc/asterisk/asterisk-1.2.0_beta1-r1.ebuild
index 65ca865904d4..7227800d9e66 100644
--- a/net-misc/asterisk/asterisk-1.2.0_beta1.ebuild
+++ b/net-misc/asterisk/asterisk-1.2.0_beta1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.0_beta1.ebuild,v 1.7 2005/09/11 15:58:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.0_beta1-r1.ebuild,v 1.1 2005/11/08 15:35:21 stkn Exp $
 
 inherit eutils
 
@@ -122,6 +122,9 @@ src_unpack() {
 #		einfo "Patching asterisk w/ BRI stuff"
 #		epatch ${WORKDIR}/bristuff-${BRI_VERSION}/patches/asterisk.patch
 #	fi
+
+	# security fix, bug #11836
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
 }
 
 src_compile() {
diff --git a/net-misc/asterisk/files/1.0.0/asterisk-1.0.9-vmail.cgi.patch b/net-misc/asterisk/files/1.0.0/asterisk-1.0.9-vmail.cgi.patch
new file mode 100644
index 000000000000..7c6cb09a9d46
--- /dev/null
+++ b/net-misc/asterisk/files/1.0.0/asterisk-1.0.9-vmail.cgi.patch
@@ -0,0 +1,23 @@
+--- asterisk/contrib/scripts/vmail.cgi	2005/07/07 23:34:59	1.15
++++ asterisk/contrib/scripts/vmail.cgi	2005/10/30 16:30:35	1.16
+@@ -545,14 +545,16 @@ _EOH
+ sub message_audio()
+ {
+ 	my ($forcedownload) = @_;
+-	my $folder = param('folder');
+-	my $msgid = param('msgid');
+-	my $mailbox = param('mailbox');
+-	my $context = param('context');
++	my $folder = &untaint(param('folder'));
++	my $msgid = &untaint(param('msgid'));
++	my $mailbox = &untaint(param('mailbox'));
++	my $context = &untaint(param('context'));
+ 	my $format = param('format');
+ 	if (!$format) {
+ 		$format = &getcookie('format');
+ 	}
++	&untaint($format);
++
+ 	my $path = "/var/spool/asterisk/voicemail/$context/$mailbox/$folder/msg${msgid}.$format";
+ 
+ 	$msgid =~ /^\d\d\d\d$/ || die("Msgid Liar ($msgid)!");
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.5-r2 b/net-misc/asterisk/files/digest-asterisk-1.0.5-r3
index 2d91497409dc..2d91497409dc 100644
--- a/net-misc/asterisk/files/digest-asterisk-1.0.5-r2
+++ b/net-misc/asterisk/files/digest-asterisk-1.0.5-r3
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.6-r1 b/net-misc/asterisk/files/digest-asterisk-1.0.6-r2
index 3632af547735..3632af547735 100644
--- a/net-misc/asterisk/files/digest-asterisk-1.0.6-r1
+++ b/net-misc/asterisk/files/digest-asterisk-1.0.6-r2
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.7-r1 b/net-misc/asterisk/files/digest-asterisk-1.0.7-r2
index f612dfa6ee77..f612dfa6ee77 100644
--- a/net-misc/asterisk/files/digest-asterisk-1.0.7-r1
+++ b/net-misc/asterisk/files/digest-asterisk-1.0.7-r2
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.8 b/net-misc/asterisk/files/digest-asterisk-1.0.8-r1
index 7002e10bae97..7002e10bae97 100644
--- a/net-misc/asterisk/files/digest-asterisk-1.0.8
+++ b/net-misc/asterisk/files/digest-asterisk-1.0.8-r1
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.9 b/net-misc/asterisk/files/digest-asterisk-1.0.9
deleted file mode 100644
index d3b9cefb7d76..000000000000
--- a/net-misc/asterisk/files/digest-asterisk-1.0.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0d7f1c680ae53a739f26a069ef8b580a asterisk-1.0.9.tar.gz 9604582
-MD5 2b6e1da3ff097f9792d3123e7e5a0059 asterisk-addons-1.0.9.tar.gz 73716
-MD5 1ec812a912de461b6847c64a88b70d1e bristuff-0.2.0-RC8l.tar.gz 141245
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.9-r1 b/net-misc/asterisk/files/digest-asterisk-1.0.9-r2
index 33f5aed3f4de..33f5aed3f4de 100644
--- a/net-misc/asterisk/files/digest-asterisk-1.0.9-r1
+++ b/net-misc/asterisk/files/digest-asterisk-1.0.9-r2
diff --git a/net-misc/asterisk/files/digest-asterisk-1.2.0_beta1 b/net-misc/asterisk/files/digest-asterisk-1.2.0_beta1-r1
index 27af8bbc1b44..27af8bbc1b44 100644
--- a/net-misc/asterisk/files/digest-asterisk-1.2.0_beta1
+++ b/net-misc/asterisk/files/digest-asterisk-1.2.0_beta1-r1