Version bump for security #271786, thanks to Robert Buchholz.

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

4 files changed, 63 insertions, 7 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index 57a4dca2ebf5..7ee136b1b7a1 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xvid
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.104 2009/02/11 19:35:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.105 2009/05/29 16:36:40 ssuominen Exp $
+
+*xvid-1.2.2 (29 May 2009)
+
+  29 May 2009; Samuli Suominen <ssuominen@gentoo.org> +xvid-1.2.2.ebuild:
+  Version bump for security #271786, thanks to Robert Buchholz.
 
   11 Feb 2009; Alexis Ballier <aballier@gentoo.org> xvid-1.2.1.ebuild:
   depend on nasm-2 as that is what is required; use it on bsd too; dont
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index db425231e8a7..70bf67c236cb 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -4,7 +4,9 @@ AUX xvid-1.1.3-ia64-build.patch 393 RMD160 2d4b9e76e7c8bcea8466e19c76458db378c12
 DIST xvid-1.1.2-noexec-stack.patch.bz2 2426 RMD160 083da9ab8e4fdcd067cd2970eeb7ad634894219f SHA1 0f5e9e15e96c6c2a1a6d7bea67e8abd5b41442fa SHA256 6de38a05303e02a2524e3f0093a3e0b021bba93d0889c2b97a05a29ba21efffa
 DIST xvidcore-1.1.3.tar.bz2 625974 RMD160 f890a2ef58be5362aa1d2894e748ef11a0c7bba8 SHA1 7a945c245851e115bc107aa621f72d775a5d1adb SHA256 f5d7f658840ef6fda5b2cd8b105d3738e1a3e735ee12ddc0136527f0185c14ed
 DIST xvidcore-1.2.1.tar.bz2 641101 RMD160 fcb6a5a0410d1921d99361fe5d580f00128b9ba3 SHA1 0e4fdbbf12914999095a5ea51d94adb4e9a0eca3 SHA256 ef0175aa86b2d8b48138ca993526645403371b87683c69853b09f1163797ddcc
+DIST xvidcore-1.2.2.tar.bz2 643344 RMD160 5fbbc99a02d9eab7f2394220cec2c872957ff26f SHA1 d03270c803592f7655e7aa4181de587be25ba97f SHA256 e42a602de489438b96f7f4742b68e9bed7efa7aee3570379bb2582b4290b6d11
 EBUILD xvid-1.1.3.ebuild 1875 RMD160 61aa265000c6b92e62afe2172db47dbf62dfb5fc SHA1 0965e58a77047ba8f5e809e6eae1bbd7f7230411 SHA256 238316234351f6a64aa34ceb3291208b928f50d6bf8e29a7d24995c76b61cc59
 EBUILD xvid-1.2.1.ebuild 1428 RMD160 3d02091ba181f259b3ebbd1d3fc45cb002d4a29a SHA1 6ced7700f08bd8f8c8cb99eb57a60722197d148a SHA256 c0577ca3e007d7cda3b6fefff8760ea7f10c48a061dd3903cc8fa36825d27c89
-MISC ChangeLog 13700 RMD160 fecb2e6bd5424f282beda3a03b6ed3663a360128 SHA1 0453139bc8b1a160abd1e9437cb535bf213139f4 SHA256 8ea139d451ea30768211c091c9e9b2d74db313822e70394b416d57e7e14f2359
-MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
+EBUILD xvid-1.2.2.ebuild 1192 RMD160 dcd5cd4848074957aa9ed06ff33d90ba9a9923e4 SHA1 e5c5fcc3d2b301d406ba843fc36b863ee57d4d84 SHA256 e7090366ecc2140ff1bd4153458f85ccdd2a91035bc684b78cb8631ed0c07608
+MISC ChangeLog 13867 RMD160 4b020137014c437d3fb77dbcf9a4bb641d231ef5 SHA1 6dc7524f1db7a78a50986b1b73a6a690277bd9b7 SHA256 f159a0a2ec4282d614a7aceff4a42f64a6552a9b76670e5f17694928eb4619d3
+MISC metadata.xml 326 RMD160 91617f57d22a91f7320a8a4cf31acdb62be99786 SHA1 8a03f8977295939de344ac23e4fdd8185d953d65 SHA256 44f920b8335d7708c3208af6281abb98d71274f3400ed3538ca469c3846705c9
diff --git a/media-libs/xvid/metadata.xml b/media-libs/xvid/metadata.xml
index 1cadc2e4ec21..cc1a0288e38f 100644
--- a/media-libs/xvid/metadata.xml
+++ b/media-libs/xvid/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
-<maintainer>
-  <email>media-video@gentoo.org</email>
-</maintainer>
+	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/xvid/xvid-1.2.2.ebuild b/media-libs/xvid/xvid-1.2.2.ebuild
new file mode 100644
index 000000000000..58b7369a83f8
--- /dev/null
+++ b/media-libs/xvid/xvid-1.2.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.2.ebuild,v 1.1 2009/05/29 16:36:40 ssuominen Exp $
+
+EAPI=2
+inherit multilib
+
+MY_PN=${PN}core
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution"
+HOMEPAGE="http://www.xvid.org"
+SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="examples pic"
+
+NASM=">=dev-lang/nasm-2.04"
+DEPEND="x86? ( ${NASM} )
+	amd64? ( ${NASM} )
+	x86-fbsd? ( ${NASM} )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_PN}/build/generic
+
+src_configure() {
+	econf \
+		$(use_enable pic assembly)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc "${S}"/../../{AUTHORS,ChangeLog*,CodingStyle,README,TODO}
+
+	local mylib=$(basename $(ls "${D}"/usr/$(get_libdir)/libxvidcore.so*))
+	dosym ${mylib} /usr/$(get_libdir)/libxvidcore.so
+	dosym ${mylib} /usr/$(get_libdir)/${mylib%.?}
+
+	if use examples; then
+		insinto /usr/share/${PN}
+		doins -r "${S}"/../../examples
+	fi
+}