Version bump, addresses a REGAUTH loop (security issue AST-2009-001). Remove old ebuilds.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 26 insertions, 64 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 98a8fcc33f17..a0481f01fc80 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.201 2009/05/11 13:56:42 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.202 2009/06/10 17:25:18 chainsaw Exp $
+
+*asterisk-1.6.1.1 (10 Jun 2009)
+*asterisk-1.2.33 (10 Jun 2009)
+
+  10 Jun 2009; <chainsaw@gentoo.org> -asterisk-1.2.31.1.ebuild,
+  +asterisk-1.2.33.ebuild, -asterisk-1.6.0.9.ebuild,
+  +asterisk-1.6.1.1.ebuild:
+  Version bump, addresses a REGAUTH loop (security issue AST-2009-001).
+  Remove old ebuilds.
 
 *asterisk-1.6.1.0 (11 May 2009)
 
diff --git a/net-misc/asterisk/asterisk-1.2.32.ebuild b/net-misc/asterisk/asterisk-1.2.32.ebuild
index 7babb7711fb1..59ca3e58d7f8 100644
--- a/net-misc/asterisk/asterisk-1.2.32.ebuild
+++ b/net-misc/asterisk/asterisk-1.2.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.32.ebuild,v 1.4 2009/04/21 18:38:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.32.ebuild,v 1.5 2009/06/10 17:25:18 chainsaw Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs
@@ -140,10 +140,7 @@ pkg_setup() {
 
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	#
 	# gentoo patchset
 	#
diff --git a/net-misc/asterisk/asterisk-1.2.31.1.ebuild b/net-misc/asterisk/asterisk-1.2.33.ebuild
index ac45451c52a9..8d95ecf0a738 100644
--- a/net-misc/asterisk/asterisk-1.2.31.1.ebuild
+++ b/net-misc/asterisk/asterisk-1.2.33.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.31.1.ebuild,v 1.6 2009/03/19 13:08:38 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.33.ebuild,v 1.1 2009/06/10 17:25:18 chainsaw Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs
 
-IUSE="alsa bri curl debug doc gtk h323 hardened lowmem mmx \
-	nosamples odbc osp postgres pri sqlite ssl speex zaptel \
-	elibc_uclibc"
+IUSE="alsa curl debug doc gtk h323 hardened lowmem mmx nosamples \
+	odbc osp postgres pri sqlite ssl speex zaptel elibc_uclibc"
 
-BRI_VERSION="0.3.0-PRE-1y-w"
 AST_PATCHES="1.2.27-patches-1.0"
 
 MY_P="${P/_p/.}"
@@ -17,15 +15,13 @@ MY_P="${P/_p/.}"
 DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="http://downloads.digium.com/pub/asterisk/releases/${MY_P}.tar.gz
-	 mirror://gentoo/${PN}-${AST_PATCHES}.tar.bz2
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
+	 mirror://gentoo/${PN}-${AST_PATCHES}.tar.bz2"
 
 S="${WORKDIR}/${MY_P}"
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~hppa ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 
 RDEPEND="dev-libs/newt
 	media-sound/sox
@@ -41,9 +37,7 @@ RDEPEND="dev-libs/newt
 	sqlite? ( <dev-db/sqlite-3.0.0 )
 	zaptel? ( >=net-misc/zaptel-1.2.16 )
 	postgres? ( virtual/postgresql-base )
-	osp? ( >=net-libs/osptoolkit-3.3.4 )
-	bri? (  >=net-libs/libpri-1.2.5[bri]
-		>=net-misc/zaptel-1.2.18 )"
+	osp? ( >=net-libs/osptoolkit-3.3.4 )"
 
 DEPEND="${RDEPEND}
 	sys-devel/flex
@@ -146,10 +140,7 @@ pkg_setup() {
 
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_preparek() {
 	#
 	# gentoo patchset
 	#
@@ -180,8 +171,6 @@ src_unpack() {
 	fi
 
 	epatch "${FILESDIR}/1.2.0/asterisk-1.2.21.1-h323-dumb-makefile.diff"
-	epatch "${FILESDIR}/1.2.0/${P}-svn89254.diff"
-	epatch "${FILESDIR}/1.2.0/${P}-comma-is-not-pipe.diff"
 
 	#
 	# uclibc patch
@@ -193,19 +182,6 @@ src_unpack() {
 	fi
 
 	#
-	# BRI patches
-	#
-	if use bri; then
-		cd "${S_BRI}"
-		einfo "Patching asterisk w/ BRI stuff"
-		epatch "${FILESDIR}"/1.2.0/${P}-bri-fixups.diff
-		cd "${S}"
-		for x in $(grep -v "^#\| \+" "${S_BRI}"/patches/asterisk/series); do
-			epatch "${S_BRI}"/patches/asterisk/${x}
-		done
-	fi
-
-	#
 	# Disable AEL, security bug #171884
 	# Re-enable at your own risk (no USE since it can be critical)
 	#
@@ -245,10 +221,6 @@ src_compile() {
 	# create api docs
 	use doc && \
 		make progdocs
-
-	# build bristuff's ISDNguard
-	use bri && \
-		make -C "${S_BRI}"/ISDNguard
 }
 
 src_install() {
@@ -257,10 +229,6 @@ src_install() {
 	make DESTDIR="${D}" ASTLIBDIR="\$(INSTALL_PREFIX)/usr/$(get_libdir)/asterisk" install || die "Make install failed"
 	make DESTDIR="${D}" ASTLIBDIR="\$(INSTALL_PREFIX)/usr/$(get_libdir)/asterisk" samples || die "Failed to create sample files"
 
-	# remove bristuff capi
-	use bri && \
-		rm -f "${D}"usr/$(get_libdir)/asterisk/modules/{app,chan}_capi*.so 2>/dev/null
-
 	# remove installed sample files if nosamples flag is set
 	if use nosamples; then
 		einfo "Skipping installation of sample files..."
@@ -322,17 +290,6 @@ src_install() {
 		doins doc/api/html/*
 	fi
 
-	# install ISDNguard
-	if use bri; then
-		cd "${S_BRI}"/ISDNguard
-		dosbin ISDNguard
-
-		docinto ISDNguard
-		dodoc INSTALL.ISDNguard
-
-		cd "${S}"
-	fi
-
 	insinto /usr/share/doc/${PF}/cgi
 	doins contrib/scripts/vmail.cgi
 	doins images/*.gif
diff --git a/net-misc/asterisk/asterisk-1.6.0.9.ebuild b/net-misc/asterisk/asterisk-1.6.1.1.ebuild
index affbf39cefd9..2ffde83772cc 100644
--- a/net-misc/asterisk/asterisk-1.6.0.9.ebuild
+++ b/net-misc/asterisk/asterisk-1.6.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.0.9.ebuild,v 1.1 2009/04/09 19:58:56 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.1.1.ebuild,v 1.1 2009/06/10 17:25:18 chainsaw Exp $
 
 EAPI=1
 inherit eutils autotools
@@ -155,36 +155,36 @@ src_unpack() {
 	#
 	# put pid file(s) into /var/run/asterisk
 	#
-	epatch "${FILESDIR}"/1.6.0/${PN}-1.6.0-var_rundir.patch || die "patch failed"
+	epatch "${FILESDIR}"/1.6.1/${PN}-1.6.1-var_rundir.patch || die "patch failed"
 
 	#
 	# fix gsm codec cflags (e.g. i586 core epias) and disable
 	# assembler optimizations
 	#
-	epatch "${FILESDIR}"/1.6.0/${PN}-1.6.0-gsm-pic.patch || die "patch failed"
+	epatch "${FILESDIR}"/1.6.1/${PN}-1.6.1-gsm-pic.patch || die "patch failed"
 
 	#
 	# add missing LIBS for uclibc
 	#
-	epatch "${FILESDIR}"/1.6.0/${PN}-1.6.0-uclibc.patch  || die "patch failed"
+	epatch "${FILESDIR}"/1.6.1/${PN}-1.6.1-uclibc.patch  || die "patch failed"
 
 	#
 	# try to tame the custom build system a little so make likes it better
 	# patch credit: Diego E. 'Flameeyes' Pettenò <flameeyes@entoo.org>
 	#
-	epatch "${FILESDIR}"/1.6.0/asterisk-1.6.0.6-parallelmake.patch || die "patch failed"
+	epatch "${FILESDIR}"/1.6.1/asterisk-1.6.1-parallelmake.patch || die "patch failed"
 
 	#
 	# do not try to pass libraries in ldflags but use libs properly
 	# keeps NET-SNMP configure test from failing horribly on --as-needed
 	# http://bugs.digium.com/view.php?id=14671
 	#
-	epatch "${FILESDIR}"/1.6.0/asterisk-1.6.0.6-toolcheck-libs-not-ldflags.patch || die "patch failed"
+	epatch "${FILESDIR}"/1.6.1/asterisk-1.6.1-toolcheck-libs-not-ldflags.patch || die "patch failed"
 
 	#
 	# link UW-IMAP with Kerberos5 if necessary
 	#
-	epatch "${FILESDIR}"/1.6.0/asterisk-1.6.0.6-imap-kerberos.patch || die "patch failed"
+	epatch "${FILESDIR}"/1.6.1/asterisk-1.6.1-imap-kerberos.patch || die "patch failed"
 
 	AT_M4DIR=autoconf eautoreconf
 
diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml
index 0ee428399413..1503c26ae7e3 100644
--- a/net-misc/asterisk/metadata.xml
+++ b/net-misc/asterisk/metadata.xml
@@ -9,7 +9,6 @@
   <use>
     <flag name="pri">Enables pri support</flag>
     <flag name="zaptel">Enables deprecated zaptel support (use dahdi if available)</flag>
-    <flag name="bri">Enable ISDN BRI support (bristuff)</flag>
     <flag name="h323">Build the H.323 channel driver bundled with Asterisk</flag>
     <flag name="lowmem">Build Asterisk for environments with low amounts of memory (embedded devices)</flag>
     <flag name="nosamples">Don't install sample sound and configuration files</flag>