Revision bump (bristuff update) and fixed bristuff part of SRC_URI (after site redesign)

Package-Manager: portage-2.0.51.22-r2

8 files changed, 503 insertions, 40 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index e431f961aa7f..3552f4d4d048 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,14 @@
 # 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.73 2005/08/02 18:55:44 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.74 2005/08/18 18:01:48 stkn Exp $
+
+*asterisk-1.0.9-r1 (18 Aug 2005)
+
+  18 Aug 2005; <stkn@gentoo.org> asterisk-1.0.6-r1.ebuild,
+  asterisk-1.0.7-r1.ebuild, asterisk-1.0.8.ebuild, asterisk-1.0.9.ebuild,
+  +asterisk-1.0.9-r1.ebuild:
+  Revision bump (bristuff update) and fixed bristuff part of SRC_URI (after
+  site redesign).
 
   02 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> asterisk-1.0.8.ebuild:
   Stable on sparc
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index d6c565559bb2..9e5f6bd3693e 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,40 +1,32 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3a02d714a0cea48cce4aa6a1f237df63 asterisk-1.0.9.ebuild 13371
-MD5 2b60745345f4072343ab5de54d717488 asterisk-1.0.8.ebuild 13484
-MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 13dc6ccd1a6df943f810c51e949c4728 asterisk-1.0.7-r1.ebuild 13360
+MD5 52656872fa2b24fdf5d2c67a5ab11fe3 asterisk-1.0.6-r1.ebuild 13740
 MD5 8a58b364b0ad9e0a2f2a88365da7afd5 asterisk-1.0.5-r2.ebuild 11975
-MD5 dd6c6b7f4015bd3469119952d5126a7a asterisk-1.0.6-r1.ebuild 13746
-MD5 3975b5a2779f62d1fcd496a8ec9dd325 ChangeLog 14101
-MD5 48a3518349e2abfe20fa918a9db5eea2 files/digest-asterisk-1.0.7-r1 210
-MD5 f399592939cd5b43b7851e20744a108e files/digest-asterisk-1.0.6-r1 210
+MD5 b3c9d42daec8c35fc86a2aae967675ca asterisk-1.0.8.ebuild 13474
+MD5 b2049851325410f0027c86bd8dd48ed3 asterisk-1.0.9.ebuild 13365
+MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
+MD5 75819e8bdf92f57ca2fd179e130a3daf ChangeLog 14388
+MD5 e5f4219548aa3adbf265827f48667a1a asterisk-1.0.7-r1.ebuild 13354
+MD5 f0786dc0b399be32e5e46c426e3bab9a asterisk-1.0.9-r1.ebuild 13368
 MD5 97ed00bdccf7c70d5fcbf37580da91c4 files/digest-asterisk-1.0.5-r2 139
 MD5 b3bbedde09faea609a0357b21eafa596 files/digest-asterisk-1.0.8 210
+MD5 58b3329253168e6dfb4c8ecbb98aeecd files/digest-asterisk-1.0.9-r1 210
+MD5 48a3518349e2abfe20fa918a9db5eea2 files/digest-asterisk-1.0.7-r1 210
+MD5 f399592939cd5b43b7851e20744a108e files/digest-asterisk-1.0.6-r1 210
 MD5 19916e691993701d9707674f9f046bd6 files/digest-asterisk-1.0.9 210
-MD5 1d5c7f8847a95005af3ffb0699bba20f files/1.0.0/asterisk.confd.sec 528
-MD5 ab552fbbe803766b5291d61942dbcd9f files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff 860
-MD5 d8501003cf3148ae662a03866e734481 files/1.0.0/asterisk-1.0.7-manager-cli-segv.patch 4008
-MD5 38064faca1838d7c57bb26293741f31b files/1.0.0/asterisk-1.0.8-hppa.patch 1274
-MD5 5e1e00b71a830e487787ce48be04ccdc files/1.0.0/asterisk-1.0.8-initgroups.diff 1558
+MD5 f20e5b869d5e221194187dd7f504d38b files/1.0.0/asterisk-1.0.5-astcfg-0.0.2.diff 5829
 MD5 0c31aac944f4fdff2b26b446d0d0eef4 files/1.0.0/asterisk-1.0.7-initgroups.diff 1826
-MD5 08d718c04e911f465f867577d649d204 files/1.0.0/asterisk-1.0.5-uclibc-dns.diff 304
-MD5 920f8ae54f895cfa46a8a037c865e59a files/1.0.0/asterisk.rc6 517
-MD5 b2446878d3b46ea595a7994ae8de0499 files/1.0.0/asterisk-1.0.7-scripts.diff 1629
+MD5 93d2e0533a32a38e21f99f278f635266 files/1.0.0/asterisk-1.0.5-speex.diff 1214
+MD5 a839d8b6b55e3b6ad17b9a7f4be2e6ba files/1.0.0/asterisk-1.0.5-hppa.patch 909
 MD5 54c23dc3014fee285ac62bf121125a34 files/1.0.0/asterisk.rc6.sec 1208
+MD5 b2446878d3b46ea595a7994ae8de0499 files/1.0.0/asterisk-1.0.7-scripts.diff 1629
+MD5 920f8ae54f895cfa46a8a037c865e59a files/1.0.0/asterisk.rc6 517
+MD5 d8501003cf3148ae662a03866e734481 files/1.0.0/asterisk-1.0.7-manager-cli-segv.patch 4008
+MD5 ab552fbbe803766b5291d61942dbcd9f files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff 860
+MD5 85e291d6eb70a24fdc82469ed53bfe54 files/1.0.0/asterisk.confd 283
+MD5 5e1e00b71a830e487787ce48be04ccdc files/1.0.0/asterisk-1.0.8-initgroups.diff 1558
+MD5 1d5c7f8847a95005af3ffb0699bba20f files/1.0.0/asterisk.confd.sec 528
 MD5 f0fe0308b464c71f83cf2483388c8058 files/1.0.0/asterisk-1.0.1-linux26.diff 474
-MD5 6a50db2ee46d4139128d0c4225ac071f files/1.0.0/asterisk-uclibc-dns.diff 433
+MD5 08d718c04e911f465f867577d649d204 files/1.0.0/asterisk-1.0.5-uclibc-dns.diff 304
 MD5 8929203070b56a9d9204423cc5b3349a files/1.0.0/asterisk-1.0.9-weak-references.diff 8406
-MD5 93d2e0533a32a38e21f99f278f635266 files/1.0.0/asterisk-1.0.5-speex.diff 1214
 MD5 18fb1b2e1fbf2f19e8a9a600eab4c5c8 files/1.0.0/asterisk-1.0.8-callerid.patch 631
-MD5 f20e5b869d5e221194187dd7f504d38b files/1.0.0/asterisk-1.0.5-astcfg-0.0.2.diff 5829
-MD5 85e291d6eb70a24fdc82469ed53bfe54 files/1.0.0/asterisk.confd 283
-MD5 a839d8b6b55e3b6ad17b9a7f4be2e6ba files/1.0.0/asterisk-1.0.5-hppa.patch 909
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFC78HPKRy60XGEcJIRAiNVAJ99jgS4kWg8tUFvKIVgCsoTJYTGIgCcCDtb
-JqactgrFA5Ydc4FOMeF6kvM=
-=q5UW
------END PGP SIGNATURE-----
+MD5 6a50db2ee46d4139128d0c4225ac071f files/1.0.0/asterisk-uclibc-dns.diff 433
+MD5 38064faca1838d7c57bb26293741f31b files/1.0.0/asterisk-1.0.8-hppa.patch 1274
diff --git a/net-misc/asterisk/asterisk-1.0.6-r1.ebuild b/net-misc/asterisk/asterisk-1.0.6-r1.ebuild
index 6d5770de870f..4a88a31f7110 100644
--- a/net-misc/asterisk/asterisk-1.0.6-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.6-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.6-r1.ebuild,v 1.7 2005/07/25 22:22:48 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.6-r1.ebuild,v 1.8 2005/08/18 18:01:48 stkn Exp $
 
 inherit eutils perl-module
 
@@ -11,7 +11,7 @@ DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="ftp://ftp.asterisk.org/pub/telephony/${PN}/old-releases/${P}.tar.gz
 	 ftp://ftp.asterisk.org/pub/telephony/${PN}/old-releases/${PN}-addons-${ADDONS_VERSION}.tar.gz
-	 bri? ( http://www.junghanns.net/${PN}/downloads/bristuff-${BRI_VERSION}.tar.gz )"
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
 
 S_ADDONS=${WORKDIR}/${PN}-addons-${ADDONS_VERSION}
 
diff --git a/net-misc/asterisk/asterisk-1.0.7-r1.ebuild b/net-misc/asterisk/asterisk-1.0.7-r1.ebuild
index 23bff01677ac..cebfcab1c91a 100644
--- a/net-misc/asterisk/asterisk-1.0.7-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.7-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.7-r1.ebuild,v 1.15 2005/07/25 22:22:48 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.7-r1.ebuild,v 1.16 2005/08/18 18:01:48 stkn Exp $
 
 inherit eutils perl-module
 
@@ -11,7 +11,7 @@ DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="ftp://ftp.asterisk.org/pub/telephony/${PN}/old-releases/${P}.tar.gz
 	 ftp://ftp.asterisk.org/pub/telephony/${PN}/old-releases/${PN}-addons-${ADDONS_VERSION}.tar.gz
-	 bri? ( http://www.junghanns.net/${PN}/downloads/bristuff-${BRI_VERSION}.tar.gz )"
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
 
 S_ADDONS=${WORKDIR}/${PN}-addons-${ADDONS_VERSION}
 
diff --git a/net-misc/asterisk/asterisk-1.0.8.ebuild b/net-misc/asterisk/asterisk-1.0.8.ebuild
index 7cc9340aa96c..13fb28226ad7 100644
--- a/net-misc/asterisk/asterisk-1.0.8.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.8.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.11 2005/08/02 18:55:44 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.8.ebuild,v 1.12 2005/08/18 18:01:48 stkn Exp $
 
 inherit eutils perl-module
 
@@ -11,7 +11,7 @@ DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="ftp://ftp.asterisk.org/pub/telephony/${PN}/old-releases/${P}.tar.gz
 	 ftp://ftp.asterisk.org/pub/telephony/${PN}/${PN}-addons-${ADDONS_VERSION}.tar.gz
-	 bri? ( http://www.junghanns.net/${PN}/downloads/bristuff-${BRI_VERSION}.tar.gz )"
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
 
 S_ADDONS=${WORKDIR}/${PN}-addons-${ADDONS_VERSION}
 
diff --git a/net-misc/asterisk/asterisk-1.0.9-r1.ebuild b/net-misc/asterisk/asterisk-1.0.9-r1.ebuild
new file mode 100644
index 000000000000..7c5a038f2cfd
--- /dev/null
+++ b/net-misc/asterisk/asterisk-1.0.9-r1.ebuild
@@ -0,0 +1,460 @@
+# 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.1 2005/08/18 18:01:48 stkn Exp $
+
+inherit eutils perl-module
+
+ADDONS_VERSION="1.0.9"
+BRI_VERSION="0.2.0-RC8n"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="ftp://ftp.asterisk.org/pub/telephony/${PN}/${P}.tar.gz
+	 ftp://ftp.asterisk.org/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
+	#
+
+	# 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
+}
+
+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 /bin/false /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.0.9.ebuild b/net-misc/asterisk/asterisk-1.0.9.ebuild
index ef7314fe1d4d..0cd968d7a5f7 100644
--- a/net-misc/asterisk/asterisk-1.0.9.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.9.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.ebuild,v 1.2 2005/07/29 19:51:57 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9.ebuild,v 1.3 2005/08/18 18:01:48 stkn Exp $
 
 inherit eutils perl-module
 
@@ -11,7 +11,7 @@ DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="ftp://ftp.asterisk.org/pub/telephony/${PN}/${P}.tar.gz
 	 ftp://ftp.asterisk.org/pub/telephony/${PN}/${PN}-addons-${ADDONS_VERSION}.tar.gz
-	 bri? ( http://www.junghanns.net/${PN}/downloads/bristuff-${BRI_VERSION}.tar.gz )"
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
 
 S_ADDONS=${WORKDIR}/${PN}-addons-${ADDONS_VERSION}
 
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.9-r1 b/net-misc/asterisk/files/digest-asterisk-1.0.9-r1
new file mode 100644
index 000000000000..33f5aed3f4de
--- /dev/null
+++ b/net-misc/asterisk/files/digest-asterisk-1.0.9-r1
@@ -0,0 +1,3 @@
+MD5 0d7f1c680ae53a739f26a069ef8b580a asterisk-1.0.9.tar.gz 9604582
+MD5 2b6e1da3ff097f9792d3123e7e5a0059 asterisk-addons-1.0.9.tar.gz 73716
+MD5 a6b5c61c16b35f02c616c8abadb9999d bristuff-0.2.0-RC8n.tar.gz 143979