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

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 36 insertions, 85 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/Manifest b/net-misc/asterisk/Manifest
index b9773a73736b..fc9f1afe4cf8 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,9 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-- -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.0.0/asterisk-1.0.5-uclibc-dns.diff 304 RMD160 6d58a0fdad04f5105c1b8f8bb3e2058b4f97f12f SHA1 5f7819a1e5f5b8f035146d5506bab83f4ecb6ae0 SHA256 e4de36e528b7d1a7941689d530d93f1ffd41a2f863a856e612e3637f78ea4890
 AUX 1.2.0/asterisk-1.2.1-uclibc-getloadavg.diff 317 RMD160 f598d94a52cec83fefdafdce0694049c657e09e0 SHA1 fc0f4d990e386d39d43bac073f353421063186c9 SHA256 61daa70727418dbaf232fc5d1eaddd20a8505b943b8fb724a1b63170edfe88cc
 AUX 1.2.0/asterisk-1.2.21.1-h323-dumb-makefile.diff 1098 RMD160 c39cee5a6f420e6e63e30ac5e83aa9b78c1b12c8 SHA1 93087ecdcde11bd983d25acaac3723450abbc111 SHA256 86d0c8cd754754916c45d77d9c745d1688b3b7b54181ecb1d42a1934bdea7deb
@@ -31,28 +28,20 @@ AUX 1.6.1/asterisk-1.6.1-toolcheck-libs-not-ldflags.patch 726 RMD160 c1886f3462e
 AUX 1.6.1/asterisk-1.6.1-uclibc.patch 373 RMD160 08f18dd2af3736497995ebcbea84939ae4c4cc98 SHA1 b10884d4b9123800f62b4aabac5a93b1a110e3da SHA256 b6fe54def0ab3f90058c2ed7bd288dd21c96aaf88b9028f12d223fb31d7e41c5
 AUX 1.6.1/asterisk-1.6.1-var_rundir.patch 441 RMD160 55869a82a01be38e80da9a31faac6d2d03f0fc58 SHA1 5bf2a8ed9778623f611330fcc4ea75c50f642680 SHA256 f75156feb6a6e421fc83e2d518b4b9204e4ae11e802440576a54de226ffd8064
 DIST asterisk-1.2.27-patches-1.0.tar.bz2 6653 RMD160 18f1d7fc4497466050ed4f517ff5732eb448ff2e SHA1 2aecd3e91cde38dbb0fd591e8a49db221f44b94e SHA256 a4da0570fca2df3c508f072be62722879956fe8c454027fbb8dafb7a6095384c
-DIST asterisk-1.2.31.1.tar.gz 10632376 RMD160 b38d7204bd24fcc70e02659f16c6506f9ec5a3df SHA1 aea8f0a8a3ffb2c150b4c719a3671c4049cb03ab SHA256 7962e10aeed737db040a5dbfaf6cab6db2cd7f0cb0a4e985fdb7321431f2cee4
 DIST asterisk-1.2.32.tar.gz 10636564 RMD160 2d83e006e5f4e8f03862d188525df665396d1074 SHA1 6e35e57939f0e895dd320a9637dd8c9050889b5d SHA256 0019c23bb888a7c8d5a034174f1700a1608883770ec48d6cb69dfae9aee12652
-DIST asterisk-1.6.0.9.tar.gz 13198345 RMD160 37de351cd87874ffeb790e432126f0ee3803d8ad SHA1 876b598c3ffec104c388c9bff9c11f264c49030d SHA256 ee7c1da586041a53884cd82b4411fe48ec585c1cd181fc42afce3f93d293e6fe
+DIST asterisk-1.2.33.tar.gz 10638312 RMD160 529fc724fc9e3f4ba6951a39b9e1164ba03a5475 SHA1 e660940ddc330d484fe3c450eded637624b31cec SHA256 0d8b6b9eecbdf78edcce433085be274844128f895a2db73727ed32151f956e16
 DIST asterisk-1.6.1.0.tar.gz 13627016 RMD160 2fd9fc82a3f9cf23bbe2ed974b008a7a5bfdd570 SHA1 cd976cf05ba4c4b53b50e7af69fd6d684f070f86 SHA256 37b97603d19a9b403f59e3a8a5246cea10871b74d5f3ba8614345610e4d2cab8
-DIST bristuff-0.3.0-PRE-1y-w.tar.gz 300178 RMD160 9edbfa43547f29da345deea9b7787d46b2d6dc20 SHA1 1b875154712adae915289531e6ee54a4159243d7 SHA256 ad13304dd3fc30e06e2d6b4643d58434aaa37eda926d8c1bf20b86e10c96cf59
-EBUILD asterisk-1.2.31.1.ebuild 11809 RMD160 e07642f266dd340afd216be517ab53c05d21d18e SHA1 079aecf9aa5ed0488810684f6ecb6fac14f25a9d SHA256 b0fdfc45867fe79763cd98913d246eb18f85f5ba772d2a9240fe06f415913acc
-EBUILD asterisk-1.2.32.ebuild 10956 RMD160 745a36f62ff8b0f084ae3c64dcd586a99a7f30ec SHA1 77231b0b6549d74231ab132640bb72cc44aa2016 SHA256 7d71ea825c7d7845b67be9db109ce882301b1d886287313929f82621a4605404
-EBUILD asterisk-1.6.0.9.ebuild 12064 RMD160 c1292e25a56347465a0bb89715d244bdb1ecc888 SHA1 746732bda70075be6679ab51ba100a87ea22ef06 SHA256 7c92e237ec5aaca1114de62fcc30564bcc178d54369f4773415b0c0bd8332c16
+DIST asterisk-1.6.1.1.tar.gz 13630484 RMD160 2eddf1f8b234480a84ce840323c66b204fea09e1 SHA1 db9462d1a829625da0149c4952abfa7eee99d0c2 SHA256 551775588a8d25544b7bcc4017185cb15fd33988f832c30c87e014df78401b9a
+EBUILD asterisk-1.2.32.ebuild 10933 RMD160 2dc28a35ccab7bfacdf0368ebab86879d9504cb9 SHA1 4219ca45a51e662595c2af6e6dc21597ec0c71af SHA256 7fec0c823111ff1486a163193d3e945596d7a831d6722e75231221eb0664581d
+EBUILD asterisk-1.2.33.ebuild 10836 RMD160 7d75d0e7dde5dd9d000460f34bf6ae15e7e40526 SHA1 81fceed8c13539161fda9a6d68901bbf90dbc093 SHA256 e2c6b157f257d8a4da7ec14a55d68ba68a3f603aa38989c269d7a6d18c9be0d3
 EBUILD asterisk-1.6.1.0.ebuild 12058 RMD160 3b4a9ac79f571983519d760f55beeed93ebe6cba SHA1 f1aa0e09f5c290059e194f3647d4bdf484cb8e40 SHA256 16a33feb73b0fbdb79c07273031c97f6d148bde797bbbd977f4cede311c10985
-MISC ChangeLog 42222 RMD160 d3f62d970351210bd6ecae85e35f7ad8a117be4e SHA1 4d4427ae5efd021535c78dccf68550b0413d7eee SHA256 6c01550ce567609fc1bd046bda976be29a3462220a68cd247e230f8e80a5ddd0
-MISC metadata.xml 1248 RMD160 3dc4417124d1cbc49566798212a75464aa0eaa78 SHA1 bef2f778e9f63e295eeec8127d5e0bd5353efd61 SHA256 25bab15816cd5b3e69899b26a059c8f5abb098692dc16fd78280bf225cc245a3
-- -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoILoMACgkQp5vW4rUFj5q8egCfQH9Rsw1sF2G525iYDa0LTkYM
-EJ0AoKHSaBL2waPU9r2PntAedIcjM7WH
-=Y4qv
-- -----END PGP SIGNATURE-----
+EBUILD asterisk-1.6.1.1.ebuild 12058 RMD160 06dcb9e125aa728a7218d0ed8741db2e1fbb000d SHA1 a94c19c5d345dfc5dad7b22bea33636d87f9ac05 SHA256 4ab193b98b6e66e8c48eb0ddb952b5c60201ffe173d95104139aeef8b6d1528b
+MISC ChangeLog 42526 RMD160 41ff535df683fbd54f9807914a783284f8b3bc2e SHA1 fed67c6e6f1d6c52711a8f6d50bc6c074733f084 SHA256 4e778afc4e3cc27ea70ade53be6ae789129a1fe7879fa1269bbfd4bc1fa45684
+MISC metadata.xml 1185 RMD160 eb12d6782abb8afd1c4eced97537a3528f960839 SHA1 80f58a977e41229cf37ee2cb5820e1cc29e517bc SHA256 4f1f9a977fac87bc22bc782cb30e4e7952e9772685d3424c69a514de3be5d0d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEUEARECAAYFAkoIZLYACgkQp5vW4rUFj5oh9QCfaQlGNldGJVW+Llx9wx1lpkCO
-wvsAmIo5L1PqKllbA1N1P1V5acZjtzQ=
-=qely
+iEYEARECAAYFAkov7IIACgkQp5vW4rUFj5qhbwCfVpmVB+1aDvRvT2+I7IRUNo0m
+blQAmwbcL0yPs0zp+PXRbEFqV/QuKRKJ
+=haxs
 -----END PGP SIGNATURE-----
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>