New version, ebuild cleanups, uk callerid support for x100p clones, chan_sip MySQL friends support and new bristuff version (RC8q).

(Portage version: 2.0.51.22-r2)

4 files changed, 740 insertions, 1 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 4643e2fcaeda..fc5ab5695ed4 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.94 2005/12/01 00:50:55 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.95 2005/12/02 03:42:17 stkn Exp $
+
+*asterisk-1.0.10 (02 Dec 2005)
+
+  02 Dec 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.10-weak-references.diff,
+  +asterisk-1.0.10.ebuild:
+  New version, ebuild cleanups, uk callerid support for x100p clones, chan_sip
+  MySQL friends support and new bristuff version (RC8q).
 
   01 Dec 2005; Stefan Knoblich <stkn@gentoo.org> Manifest:
   Fixed Manifest.
diff --git a/net-misc/asterisk/asterisk-1.0.10.ebuild b/net-misc/asterisk/asterisk-1.0.10.ebuild
new file mode 100644
index 000000000000..1e556bc1fb34
--- /dev/null
+++ b/net-misc/asterisk/asterisk-1.0.10.ebuild
@@ -0,0 +1,499 @@
+# 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.10.ebuild,v 1.1 2005/12/02 03:42:17 stkn Exp $
+
+inherit eutils perl-app
+
+ADDONS_VERSION="1.0.9"
+BRI_VERSION="0.2.0-RC8q"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://ftp1.digium.com/pub/telephony/${PN}/${P}.tar.gz
+	 http://ftp1.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}
+S_BRI=${WORKDIR}/bristuff-${BRI_VERSION}
+
+IUSE="alsa bri debug doc gtk hardened mmx mysql mysqlfriends postgres pri resperl speex ukcid vmdbmysql vmdbpostgres zaptel"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+
+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.10 )
+	alsa? ( media-libs/alsa-lib )
+	mysql? ( dev-db/mysql )
+	speex? ( media-libs/speex )
+	zaptel? ( >=net-misc/zaptel-1.0.10 )
+	postgres? ( dev-db/postgresql )
+	vmdbmysql? ( dev-db/mysql )
+	mysqlfriends? ( dev-db/mysql )
+	vmdbpostgres? ( dev-db/postgresql )
+	resperl? ( dev-lang/perl
+		   >=net-misc/zaptel-1.0.10 )"
+
+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
+
+	# check if zaptel has been built with ukcid
+	if use ukcid && ! built_with_use net-misc/zaptel ukcid; then
+		eerror "Re-emerge zaptel with ukcid useflag enabled!"
+		die "Zaptel missing ukcid support"
+	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.10-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
+
+	#
+	# MySQL friends support
+	#
+	if use mysqlfriends; then
+		einfo "Enabling MySQL friends support for SIP and IAX"
+		sed -i  -e "s:^\(USE_MYSQL_FRIENDS\)=.*:\1=1:" \
+			-e "s:^\(USE_SIP_MYSQL_FRIENDS\)=.*:\1=1:" \
+			channels/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"
+
+		# remove after new patch has been released
+		sed -i -e "s:^\([+-]\)1\.0\.9:\11.0.10:" \
+			${S_BRI}/patches/asterisk.patch
+
+		epatch ${S_BRI}/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
+
+	# UK callerid patch, adds support for british-telecoms callerid to x100p cards
+	# see http://www.lusyn.com/asterisk/patches.html for more information
+	use ukcid && \
+		epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-ukcid.patch
+
+	# needed for >=freetds-0.63
+	if has_version ">=dev-db/freetds-0.63"; then
+		epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-freetds.diff
+	fi
+
+	# security fix, bug #11836
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
+}
+
+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/files/1.0.0/asterisk-1.0.10-weak-references.diff b/net-misc/asterisk/files/1.0.0/asterisk-1.0.10-weak-references.diff
new file mode 100644
index 000000000000..90bc007b16de
--- /dev/null
+++ b/net-misc/asterisk/files/1.0.0/asterisk-1.0.10-weak-references.diff
@@ -0,0 +1,229 @@
+--- asterisk-1.0.10/include/asterisk/adsi.h.orig	2005-06-25 00:27:10.000000000 +0200
++++ asterisk-1.0.10/include/asterisk/adsi.h	2005-11-22 22:45:31.000000000 +0100
+@@ -118,11 +118,14 @@
+  * Returns 0 on success (or adsi unavailable) and -1 on hangup
+  * 
+  */
+-extern int adsi_channel_init(struct ast_channel *chan);
++extern int adsi_channel_init(struct ast_channel *chan)
++	__attribute__ ((weak));
+ 
+-extern int adsi_begin_download(struct ast_channel *chan, char *service, char *fdn, char *sec, int version);
++extern int adsi_begin_download(struct ast_channel *chan, char *service, char *fdn, char *sec, int version)
++	__attribute__ ((weak));
+ 
+-extern int adsi_end_download(struct ast_channel *chan);
++extern int adsi_end_download(struct ast_channel *chan)
++	__attribute__ ((weak));
+ 
+ //! Restore ADSI initialization (for applications that play with ADSI
+ //  and want to restore it to normal.  If you touch "INFO" then you
+@@ -133,7 +136,8 @@
+  * Returns 0 on success (or adsi unavailable) and -1 on hangup
+  *
+  */
+-extern int adsi_channel_restore(struct ast_channel *chan);
++extern int adsi_channel_restore(struct ast_channel *chan)
++	__attribute__ ((weak));
+ 
+ //! Display some stuff on the screen
+ /*!
+@@ -145,7 +149,8 @@
+  * Return 0 on success (or adsi unavailable) and -1 on hangup
+  *
+  */
+-extern int adsi_print(struct ast_channel *chan, char **lines, int *align, int voice);
++extern int adsi_print(struct ast_channel *chan, char **lines, int *align, int voice)
++	__attribute__ ((weak));
+ 
+ //! Check if scripts for a given app are already loaded.  Version may be -1
+ //  if any version is okay, or 0-255 for a specific version.
+@@ -158,18 +163,24 @@
+  * Returns 0 if scripts is not loaded or not an ADSI CPE.  Returns -1
+  * on hangup.  Returns 1 if script already loaded.
+  */
+-extern int adsi_load_session(struct ast_channel *chan, unsigned char *app, int ver, int data);
+-extern int adsi_unload_session(struct ast_channel *chan);
++extern int adsi_load_session(struct ast_channel *chan, unsigned char *app, int ver, int data)
++	__attribute__ ((weak));
++extern int adsi_unload_session(struct ast_channel *chan)
++	__attribute__ ((weak));
+ 
+ /* ADSI Layer 2 transmission functions */
+-extern int adsi_transmit_messages(struct ast_channel *chan, unsigned char **msg, int *msglen, int *msgtype);
+-extern int adsi_transmit_message(struct ast_channel *chan, unsigned char *msg, int msglen, int msgtype);
+-extern int adsi_transmit_message_full(struct ast_channel *chan, unsigned char *msg, int msglen, int msgtype, int dowait);
++extern int adsi_transmit_messages(struct ast_channel *chan, unsigned char **msg, int *msglen, int *msgtype)
++	__attribute__ ((weak));
++extern int adsi_transmit_message(struct ast_channel *chan, unsigned char *msg, int msglen, int msgtype)
++	__attribute__ ((weak));
++extern int adsi_transmit_message_full(struct ast_channel *chan, unsigned char *msg, int msglen, int msgtype, int dowait)
++	__attribute__ ((weak));
+ //! Read some encoded DTMF data.  
+ /*!
+  * Returns number of bytes received
+  */
+-extern int adsi_read_encoded_dtmf(struct ast_channel *chan, unsigned char *buf, int maxlen);
++extern int adsi_read_encoded_dtmf(struct ast_channel *chan, unsigned char *buf, int maxlen)
++	__attribute__ ((weak));
+ 
+ /* ADSI Layer 3 creation functions */
+ 
+@@ -183,14 +194,17 @@
+  *
+  */
+ 
+-extern int adsi_connect_session(unsigned char *buf, unsigned char *fdn, int ver);
++extern int adsi_connect_session(unsigned char *buf, unsigned char *fdn, int ver)
++	__attribute__ ((weak));
+ 
+ //! Build Query CPE ID of equipment */
+ /*!
+  *  Returns number of bytes added to message
+  */
+-extern int adsi_query_cpeid(unsigned char *buf);
+-extern int adsi_query_cpeinfo(unsigned char *buf);
++extern int adsi_query_cpeid(unsigned char *buf)
++	__attribute__ ((weak));
++extern int adsi_query_cpeinfo(unsigned char *buf)
++	__attribute__ ((weak));
+ 
+ //! Get CPE ID from an attached ADSI compatible CPE.
+ /*!
+@@ -198,9 +212,11 @@
+  * or -1 on hangup, or 0 if there was no hangup but it failed to find the
+  * device ID.  Returns to voice mode if "voice" is non-zero.
+  */
+-extern int adsi_get_cpeid(struct ast_channel *chan, unsigned char *cpeid, int voice);
++extern int adsi_get_cpeid(struct ast_channel *chan, unsigned char *cpeid, int voice)
++	__attribute__ ((weak));
+ 
+-extern int adsi_get_cpeinfo(struct ast_channel *chan, int *width, int *height, int *buttons, int voice);
++extern int adsi_get_cpeinfo(struct ast_channel *chan, int *width, int *height, int *buttons, int voice)
++	__attribute__ ((weak));
+ 
+ //! Begin an ADSI script download */
+ /*!
+@@ -214,7 +230,8 @@
+  *
+  */
+ 
+-extern int adsi_download_connect(unsigned char *buf, unsigned char *service, unsigned char *fdn, unsigned char *sec, int ver);
++extern int adsi_download_connect(unsigned char *buf, unsigned char *service, unsigned char *fdn, unsigned char *sec, int ver)
++	__attribute__ ((weak));
+ 
+ //! Disconnects a running session
+ /*!
+@@ -223,7 +240,8 @@
+  * Returns number of bytes added to buffer or -1 on error.
+  *
+  */
+-extern int adsi_disconnect_session(unsigned char *buf);
++extern int adsi_disconnect_session(unsigned char *buf)
++	__attribute__ ((weak));
+ 
+ //! Disconnects (and hopefully saves) a downloaded script
+ /*!
+@@ -232,7 +250,8 @@
+  * Returns number of bytes added to buffer or -1 on error.
+  *
+  */
+-extern int adsi_download_disconnect(unsigned char *buf);
++extern int adsi_download_disconnect(unsigned char *buf)
++	__attribute__ ((weak));
+ 
+ //! Puts CPE in data mode...
+ /*!
+@@ -241,9 +260,12 @@
+  * Returns number of bytes added to buffer or -1 on error.
+  *
+  */
+-extern int adsi_data_mode(unsigned char *buf);
+-extern int adsi_clear_soft_keys(unsigned char *buf);
+-extern int adsi_clear_screen(unsigned char *buf);
++extern int adsi_data_mode(unsigned char *buf)
++	__attribute__ ((weak));
++extern int adsi_clear_soft_keys(unsigned char *buf)
++	__attribute__ ((weak));
++extern int adsi_clear_screen(unsigned char *buf)
++	__attribute__ ((weak));
+ 
+ //! Puts CPE in voice mode...
+ /*!
+@@ -253,14 +275,16 @@
+  * Returns number of bytes added to buffer or -1 on error.
+  *
+  */
+-extern int adsi_voice_mode(unsigned char *buf, int when);
++extern int adsi_voice_mode(unsigned char *buf, int when)
++	__attribute__ ((weak));
+ 
+ //! Returns non-zero if Channel does or might support ADSI
+ /*!
+  * \param chan Channel to check
+  *
+  */
+-extern int adsi_available(struct ast_channel *chan);
++extern int adsi_available(struct ast_channel *chan)
++	__attribute__ ((weak));
+ 
+ //! Loads a line of info into the display */
+ /*!
+@@ -276,7 +300,8 @@
+  *
+  */
+ 
+-extern int adsi_display(unsigned char *buf, int page, int line, int just, int wrap, unsigned char *col1, unsigned char *col2);
++extern int adsi_display(unsigned char *buf, int page, int line, int just, int wrap, unsigned char *col1, unsigned char *col2)
++	__attribute__ ((weak));
+ 
+ //! Sets the current line and page */
+ /*!
+@@ -288,7 +313,8 @@
+  *
+  */
+ 
+-extern int adsi_set_line(unsigned char *buf, int page, int line);
++extern int adsi_set_line(unsigned char *buf, int page, int line)
++	__attribute__ ((weak));
+ 
+ //! Creates "load soft key" parameters
+ /*! 
+@@ -302,7 +328,8 @@
+  * Returns number of bytes added to buffer or -1 on error.
+  *
+  */
+-extern int adsi_load_soft_key(unsigned char *buf, int key, unsigned char *llabel, unsigned char *slabel, unsigned char *ret, int data);
++extern int adsi_load_soft_key(unsigned char *buf, int key, unsigned char *llabel, unsigned char *slabel, unsigned char *ret, int data)
++	__attribute__ ((weak));
+ 
+ //! Set which soft keys should be displayed
+ /*!
+@@ -313,7 +340,8 @@
+  * Returns number of bytes added to buffer or -1 on error.
+  *
+  */
+-extern int adsi_set_keys(unsigned char *buf, unsigned char *keys);
++extern int adsi_set_keys(unsigned char *buf, unsigned char *keys)
++	__attribute__ ((weak));
+ 
+ //! Set input information
+ /*!
+@@ -327,7 +355,8 @@
+  * Returns number of bytes added to buffer or -1 on error.
+  *
+  */
+-extern int adsi_input_control(unsigned char *buf, int page, int line, int display, int format, int just);
++extern int adsi_input_control(unsigned char *buf, int page, int line, int display, int format, int just)
++	__attribute__ ((weak));
+ 
+ //! Set input format
+ /*!
+@@ -341,5 +370,6 @@
+  * Returns number of bytes added to buffer or -1 on error.
+  *
+  */
+-extern int adsi_input_format(unsigned char *buf, int num, int dir, int wrap, unsigned char *format1, unsigned char *format2);
++extern int adsi_input_format(unsigned char *buf, int num, int dir, int wrap, unsigned char *format1, unsigned char *format2)
++	__attribute__ ((weak));
+ #endif
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.10 b/net-misc/asterisk/files/digest-asterisk-1.0.10
new file mode 100644
index 000000000000..56aaf160ad19
--- /dev/null
+++ b/net-misc/asterisk/files/digest-asterisk-1.0.10
@@ -0,0 +1,3 @@
+MD5 f60f4c4edc36fa61dc55a5385fd82e71 asterisk-1.0.10.tar.gz 9609302
+MD5 2b6e1da3ff097f9792d3123e7e5a0059 asterisk-addons-1.0.9.tar.gz 73716
+MD5 215dd795ce8ea72370b2e9d1bb7d8f6a bristuff-0.2.0-RC8q.tar.gz 152037