Version bump for security bug #224949, with apologies for the delay. Took maintainership. Corrected Asterisk dependency, this will not work against 1.6 or 1.4 at all. Removed vulnerable version.

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

4 files changed, 49 insertions, 40 deletions

diff --git a/net-misc/asterisk-addons/ChangeLog b/net-misc/asterisk-addons/ChangeLog
index c24adfb86071..747cd77d0cf8 100644
--- a/net-misc/asterisk-addons/ChangeLog
+++ b/net-misc/asterisk-addons/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/asterisk-addons
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/ChangeLog,v 1.14 2008/08/16 16:09:46 tove Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/ChangeLog,v 1.15 2009/05/01 15:43:59 chainsaw Exp $
+
+*asterisk-addons-1.2.9 (01 May 2009)
+
+  01 May 2009; <chainsaw@gentoo.org> -asterisk-addons-1.2.8.ebuild,
+  +asterisk-addons-1.2.9.ebuild, metadata.xml:
+  Version bump for security bug #224949, with apologies for the delay. Took
+  maintainership. Corrected Asterisk dependency, this will not work against
+  1.6 or 1.4 at all. Removed vulnerable version.
 
   16 Aug 2008; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove stkn from metadata.xml (#27693)
diff --git a/net-misc/asterisk-addons/Manifest b/net-misc/asterisk-addons/Manifest
index 05584074f23e..182256ebb98a 100644
--- a/net-misc/asterisk-addons/Manifest
+++ b/net-misc/asterisk-addons/Manifest
@@ -8,15 +8,15 @@ AUX asterisk-addons-1.2.2-uclibc.diff 569 RMD160 015f80c0efc2fda1b7b7c324f5c94cc
 AUX asterisk-addons-1.2.3-gentoo-ooh323c.diff 1465 RMD160 b584cb11b208e6a384bdefa47219d0425ded3357 SHA1 3c531e0ffa330e15298249eab7d0319ef0acdcd0 SHA256 2d661f6d051326d9cdb48bb02c08f27de6c0c001cfffae0afeaf5ca5672e2a47
 AUX asterisk-addons-1.2.4-uclibc.diff 886 RMD160 2018dbe61d12279359dc98cea428feaa8f69b58b SHA1 fb7f54a8a8e51064bf1b50bfe4f0efbc46d5f557 SHA256 b8c0be41e6058e863cb89152319be9defd38b8b8975f64e43303f0efc968524e
 AUX sqlite-3.2.1-data-corruption.patch 6529 RMD160 06f79a07f5dfb12967ebc233544b0807ac8114af SHA1 73203e5145119b9ad070596271793ea36e0bd651 SHA256 7b42e48387045ab466a0d7f936099de0d1597b0cf593fb28705a46c1b6e76b81
-DIST asterisk-addons-1.2.8.tar.gz 761218 RMD160 379f7b0ae6ad27a8c30000f88d0ab0dd0f04bf09 SHA1 a93ba0825b9fd0cc2f991111792f267d2a64f620 SHA256 939e082e4e778933be1939f0b44321399dbc9af0965f7759ce01dd5a54044c73
+DIST asterisk-addons-1.2.9.tar.gz 762705 RMD160 329125af2567fe96255c5f70092a2d2196b7db81 SHA1 719b45b99e5cc622d5ddc2035bea9e31fd4a491e SHA256 13df280ca14e9573b3a72de4c1ac75424939add981337cfd1c73a99444f75dc4
 DIST sqlite-3.2.1.tar.gz 1351842 RMD160 3b4cfc1fca27d4df369220d15eb5e28777bd99da SHA1 df9b8a28bb64a29df8b2411b6b8b746b04d742eb SHA256 daba70d5d7666ff8091a7a9322a1a2d88889043d50e136ed7d3e726d751001a7
-EBUILD asterisk-addons-1.2.8.ebuild 4313 RMD160 fa7b573826a34aa8bb5823010650d64e4606d3d2 SHA1 aa4e4b79f70d42169af2af7c1936a57049bfa4d1 SHA256 8ca4b80546b97ade2da30bcd29619969e0e1da4ab2a630d285dec80b9736aa90
-MISC ChangeLog 3276 RMD160 2ca53a6b5c749b9fce65d2d1be8d451807b9c3f3 SHA1 b44033a197135ea74d7cb59fa3fd8c89dc783439 SHA256 b00cd81f9b3f122081991aa94c9f22455c3179232a6230627c0d823c764f8db1
-MISC metadata.xml 249 RMD160 3e63aeda35c9b61f150ed68d98adeadfd352f8c8 SHA1 979db9acbc7677cb6b51225821a41dc3657c897d SHA256 d2ec98b79b133c9b83f435df4a07812fda78bf04e15e5e81193bbe553cf799aa
+EBUILD asterisk-addons-1.2.9.ebuild 4316 RMD160 0dae2f36a0bd8d81a77eea21bd1d25ec9f73bfcd SHA1 ff3e907908295f43cf628141fe6ab2b18af6b9ac SHA256 ee3c5491c637f09f090b785f6520178944c88ced0f2aa32393d3e83ea8ac61d3
+MISC ChangeLog 3635 RMD160 92a140ce62791b00d018919ba3d80c818e9df5e0 SHA1 a53086abcce28262e027857e6c1378ab0ad852ef SHA256 6d2178380bc6d2e2e69300d7218e4cb89a142fde0d8f500c5a59095b5d817691
+MISC metadata.xml 347 RMD160 500132e360b39cc8f2a4c2763e242d700df81467 SHA1 dbbf70e51895671da71c708ed95f4d049adea12b SHA256 ecf7b68234022ca3ad594155e153417bf2d9aae54c18ff067ccc8f4db0e4e19a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkim+74ACgkQV3J2n04Eauw2EACg2VlHubSve2JeYLLAzu/QCPqN
-DBcAnjUDuOHFolPAwiCVYC43fuKoZdmp
-=Ikfq
+iEYEARECAAYFAkn7GLYACgkQp5vW4rUFj5qKxwCdEd94yM904itU/a2B4tgZWoZB
+D5MAoLA5LfIa+POtvl2eqrNFkir39/cb
+=nC/Q
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk-addons/asterisk-addons-1.2.8.ebuild b/net-misc/asterisk-addons/asterisk-addons-1.2.9.ebuild
index 2733a3a24062..b0d6bb0f6f57 100644
--- a/net-misc/asterisk-addons/asterisk-addons-1.2.8.ebuild
+++ b/net-misc/asterisk-addons/asterisk-addons-1.2.9.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/asterisk-addons-1.2.8.ebuild,v 1.1 2008/02/21 04:07:47 rajiv Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/asterisk-addons-1.2.9.ebuild,v 1.1 2009/05/01 15:43:59 chainsaw Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -23,7 +20,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~sparc ~x86"
 
-DEPEND=">=net-misc/asterisk-1.2.0
+RDEPEND="=net-misc/asterisk-1.2*
 	mysql? ( virtual/mysql )"
 
 pkg_setup() {
@@ -58,32 +55,32 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	#
 	# gentoo patchset
 	#
-	epatch ${FILESDIR}/${PN}-1.2.0-gentoo-base.diff
-	epatch ${FILESDIR}/${PN}-1.2.0-gentoo-res_sqlite3.diff
-	epatch ${FILESDIR}/${PN}-1.2.2-gentoo-format_mp3.diff
-	epatch ${FILESDIR}/${PN}-1.2.3-gentoo-ooh323c.diff
+	epatch "${FILESDIR}/${PN}-1.2.0-gentoo-base.diff"
+	epatch "${FILESDIR}/${PN}-1.2.0-gentoo-res_sqlite3.diff"
+	epatch "${FILESDIR}/${PN}-1.2.2-gentoo-format_mp3.diff"
+	epatch "${FILESDIR}/${PN}-1.2.3-gentoo-ooh323c.diff"
 
 	# patch from jaervosz for uclibc
 	if use elibc_uclibc; then
-		epatch ${FILESDIR}/${PN}-1.2.2-uclibc.diff
-		epatch ${FILESDIR}/${PN}-1.2.4-uclibc.diff
+		epatch "${FILESDIR}/${PN}-1.2.2-uclibc.diff"
+		epatch "${FILESDIR}/${PN}-1.2.4-uclibc.diff"
 	fi
 	# patch sqlite
 	if use sqlite; then
-		cd ${WORKDIR}/sqlite-${SQLITE_PV}
+		cd "${WORKDIR}/sqlite-${SQLITE_PV}"
 
-		epatch ${FILESDIR}/sqlite-${SQLITE_PV}-data-corruption.patch
+		epatch "${FILESDIR}/sqlite-${SQLITE_PV}-data-corruption.patch"
 		epunt_cxx
 	fi
 
 	# rebuild ooh323c configure
 	if use h323; then
-		cd ${S}/asterisk-ooh323c
+		cd "${S}/asterisk-ooh323c"
 		eautoreconf
 	fi
 }
@@ -94,53 +91,53 @@ src_compile() {
 	emake -j1 OPTIMIZE="${CFLAGS}" || die "Make failed"
 
 	if use sqlite; then
-		cd ${WORKDIR}/sqlite-${SQLITE_PV}
+		cd "${WORKDIR}/sqlite-${SQLITE_PV}"
 		econf --enable-threadsafe || die ""
 		emake || die ""
 
-		cd ${S}
+		cd "${S}"
 		emake -j1 -C res_sqlite3 \
-			SQLITEDIR=${WORKDIR}/sqlite-${SQLITE_PV} || die "Make res_sqlite failed"
+			SQLITEDIR="${WORKDIR}/sqlite-${SQLITE_PV}" || die "Make res_sqlite failed"
 	fi
 
 	if use h323; then
-		cd ${S}/asterisk-ooh323c
+		cd "${S}/asterisk-ooh323c"
 		econf || die "econf failed"
 		emake || die "emake failed"
 	fi
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "Make install failed"
+	make DESTDIR="${D}" install || die "Make install failed"
 
 	if use sqlite; then
 		make -C res_sqlite3 \
-			DESTDIR=${D} install || die "Make install res_sqlite3 failed"
+			DESTDIR="${D}" install || die "Make install res_sqlite3 failed"
 	fi
 
 	if use h323; then
 		make -C asterisk-ooh323c \
-			DESTDIR=${D} install || die "Make instal ooh323c failed"
+			DESTDIR="${D}" install || die "Make instal ooh323c failed"
 	fi
 
 	# install standard docs...
 	dodoc README
 	dodoc doc/cdr_mysql.txt
 
-	insinto /usr/share/doc/${PF}
+	insinto "/usr/share/doc/${PF}"
 	doins configs/*.sample
 
 	if use sqlite; then
-		cd ${S}/res_sqlite3
+		cd "${S}/res_sqlite3"
 		docinto res_sqlite3
 		dodoc README
-		insinto /usr/share/doc/${PF}/res_sqlite3
+		insinto "/usr/share/doc/${PF}/res_sqlite3"
 		doins res_sqlite.conf dialplan.sql
 		keepdir /var/lib/asterisk/sqlite
 	fi
 
 	if use h323; then
-		cd ${S}/asterisk-ooh323c
+		cd "${S}/asterisk-ooh323c"
 		docinto chan_ooh323c
 		dodoc AUTHORS INSTALL NEWS README ChangeLog
 		dodoc h323.conf.sample extensions.conf.sample
@@ -149,7 +146,7 @@ src_install() {
 		newins h323.conf.sample h323.conf
 	fi
 
-	cd ${S}
+	cd "${S}"
 
 	if use mysql; then
 		insinto /etc/asterisk
@@ -159,8 +156,8 @@ src_install() {
 
 	if use h323 || use mysql; then
 		einfo "Fixing permissions"
-		chown -R root:asterisk ${D}etc/asterisk
-		chmod -R u=rwX,g=rX,o= ${D}etc/asterisk
+		chown -R root:asterisk "${D}etc/asterisk"
+		chmod -R u=rwX,g=rX,o= "${D}etc/asterisk"
 	fi
 }
 
diff --git a/net-misc/asterisk-addons/metadata.xml b/net-misc/asterisk-addons/metadata.xml
index 036daf6ace24..c15061751ba4 100644
--- a/net-misc/asterisk-addons/metadata.xml
+++ b/net-misc/asterisk-addons/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>voip</herd>
+  <maintainer>
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
   <use>
     <flag name="h323">Build the chan_ooh323c H.323 channel driver</flag>
   </use>