Version bump to libvorbis-1.2.1_rc1 which includes all the recent security fixes, see bug 222085.

Package-Manager: portage-2.1.5.5

3 files changed, 69 insertions, 12 deletions

diff --git a/media-libs/libvorbis/ChangeLog b/media-libs/libvorbis/ChangeLog
index f4dcbf7a75f2..e096a8032763 100644
--- a/media-libs/libvorbis/ChangeLog
+++ b/media-libs/libvorbis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libvorbis
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.94 2008/05/18 09:18:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.95 2008/06/12 12:04:44 yngwin Exp $
+
+*libvorbis-1.2.1_rc1 (12 Jun 2008)
+
+  12 Jun 2008; Ben de Groot <yngwin@gentoo.org> +libvorbis-1.2.1_rc1.ebuild:
+  Version bump to 1.2.1_rc1 which includes all the recent security fixes.
 
   18 May 2008; Alexis Ballier <aballier@gentoo.org>
   files/libvorbis-1.2.0-CVE-2008-1419.patch,
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index bd5d1974bbcb..100c99faeb9d 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libvorbis-1.1.2-CVE-3106-4029.patch 3973 RMD160 7006d0c3fe933a35a91e89ddbe57fc2ff09d81e1 SHA1 b26624f2c174777d95854140586e4b69f5be964b SHA256 4b71e4f85f3e558668ce36eaa3becb055ebd3554721f912fe9c31953538ae0d4
 AUX libvorbis-1.2.0-CVE-2008-1419.patch 526 RMD160 5849a5946378b25da9744c1d2648a4f77eac7b83 SHA1 38e9be20669e35eb74d185f24f254d2cc6dc58bd SHA256 fe59da027603ff8757b46dca00ae3bf7abb8d7d1906c10dbd8767e7e39b716eb
 AUX libvorbis-1.2.0-CVE-2008-1420.patch 1080 RMD160 bc1d40716d76a90c3a1f74d1c292b5593041fff5 SHA1 b8a4964f7b63d809b59d75d340f955d0ff645acb SHA256 87b6d445cdb43da9faef6189bdb6ad15754fb69f3bcdc9b289f336f7b77ea5cc
@@ -8,15 +5,10 @@ AUX libvorbis-1.2.0-CVE-2008-1423.patch 554 RMD160 15043bb87839bd9c7e9822fc2ef5f
 DIST aotuvb4.51-libvorbis-1.1.2.diff.bz2 23371 RMD160 df4f90ddd7e38069aff77674734d8d39c780c74a SHA1 5720046bdc603d35218beabb668a44a59cfb0ac5 SHA256 feaae2ed481635bf36e5eb18e966559f743e95e410c21560f961d42455b91560
 DIST libvorbis-1.1.2.tar.gz 1316434 RMD160 2f1c59ab8237fe3af28f9979cd96008cfa3567cb SHA1 26289fc41aa5436b1a277d726bb5cb106d675c35 SHA256 3f7135ccbda589c251017912f5f5ec9da626c976d2376bcfda19ad6b9c4a6050
 DIST libvorbis-1.2.0.tar.bz2 1214374 RMD160 4b2ceccb6bed6f367a49f3057ed4e4c0e3f0f302 SHA1 fd10558c7dc297887caf20f3ac2601e084715a6a SHA256 9ef4c57ab72081d31aa2cd256276c1c1b0081927cbf0e87b7f1066e1d112065b
+DIST libvorbis-1.2.1rc1.tar.bz2 1175156 RMD160 f99900fdac5dcd91e7b3011eadda1cd499d8450e SHA1 25c8713fec0de238d56603812abd433115a8c091 SHA256 565d8b3565dfab1ca08c374c0ef1ba66d3cb47292537cdc40f86f227c51cf316
 EBUILD libvorbis-1.1.2-r1.ebuild 2078 RMD160 43a1e7fc754bf86ca371278a164d6ac56eddc68d SHA1 1970f5eb8a9da59af93cdb3cd421340f1a0cec08 SHA256 da97ec54a5bb6f95a7859f5735836cabb339faa03633417f1a7ea27785566c5b
 EBUILD libvorbis-1.2.0-r1.ebuild 1495 RMD160 e729945fc8528a869dbb63fab03c079e0d950278 SHA1 e3822704236a43a4400f5465611dc86bdca2b702 SHA256 5341d1627da4e74085c4bf46ad6c81b71a2bdc0a3db9471e3008927073a47b1a
 EBUILD libvorbis-1.2.0.ebuild 1341 RMD160 37df16631310910804e5a11b34fbba4ff321e0c2 SHA1 653317d5a7cfd3b89d448aee4f6e8e0f0e29b797 SHA256 b1740945f2341c1d000052e02c7f82a36a49e4fdf5a7c812020c34b41728c384
-MISC ChangeLog 13194 RMD160 0ff3313383445e785e58b0b1465eddb1739f5dcb SHA1 f7d4c048939106fd5dade2f604fa6f7b608f8cda SHA256 67f224eac3461ae18e4338ee0bd8ec76e924fdc86d8a48db2bb38548d3b4a06e
+EBUILD libvorbis-1.2.1_rc1.ebuild 1386 RMD160 16a300276fa3293d231680d598c38fb0259f953a SHA1 8cc0773b96765e7069a8633af0a6a7cb62755035 SHA256 265f8afd264f390bb701e48f6ca48db1a8b2c25f7e79a32f526ea7c98912c617
+MISC ChangeLog 13380 RMD160 55102acab2878f89cd3af4b117f8558ad76e3656 SHA1 59457c5c931725e30584e76ebfa99cc6688e7d23 SHA256 d17c8f8d70e7f38173a8198a2e67eef8eb5ed2defe8ac73ddd6ecd441dbca3f1
 MISC metadata.xml 252 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a SHA1 6e5cc1551616801a2f257d688e6fc286044c3499 SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgv9HIACgkQvFcC4BYPU0qzgQCfXbsTLtrz2Aq478pJxGzUk7A4
-RPwAoL6WiE+H8LmKOpaOemsIu5k1+9yB
-=6fgg
------END PGP SIGNATURE-----
diff --git a/media-libs/libvorbis/libvorbis-1.2.1_rc1.ebuild b/media-libs/libvorbis/libvorbis-1.2.1_rc1.ebuild
new file mode 100644
index 000000000000..bad6bac081cc
--- /dev/null
+++ b/media-libs/libvorbis/libvorbis-1.2.1_rc1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.2.1_rc1.ebuild,v 1.1 2008/06/12 12:04:44 yngwin Exp $
+
+inherit libtool flag-o-matic eutils toolchain-funcs
+
+MY_P=${P/_/}
+DESCRIPTION="the Ogg Vorbis sound file format library"
+HOMEPAGE="http://xiph.org/vorbis"
+SRC_URI="http://people.xiph.org/~giles/2008/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND=">=media-libs/libogg-1"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	elibtoolize
+
+	epunt_cxx #74493
+
+	# Insane.
+	sed -i -e "s:-O20::g" -e "s:-mfused-madd::g" configure
+	sed -i -e "s:-mcpu=750::g" configure
+}
+
+src_compile() {
+	# gcc-3.4 and k6 with -ftracer causes code generation problems #49472
+	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "34" ]]; then
+		is-flag -march=k6* && filter-flags -ftracer
+		is-flag -mtune=k6* && filter-flags -ftracer
+		replace-flags -Os -O2
+	fi
+
+	econf
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	rm -rf "${D}"/usr/share/doc/${P}
+
+	dodoc AUTHORS CHANGES README todo.txt
+
+	if use doc; then
+		docinto txt
+		dodoc doc/*.txt
+		dohtml -r doc
+	fi
+}
+