bump, security fix

(Portage version: 2.0.51.19)

6 files changed, 93 insertions, 11 deletions

diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog
index f75a84d12040..3480afe21b9f 100644
--- a/media-gfx/xv/ChangeLog
+++ b/media-gfx/xv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/xv
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.51 2005/03/14 01:45:03 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.52 2005/04/15 09:26:21 taviso Exp $
+
+*xv-3.10a-r11 (15 Apr 2005)
+
+  15 Apr 2005; Tavis Ormandy <taviso@gentoo.org>
+  +files/xv-3.10a-bmpfix.patch.bz2, +files/xv-3.10a-yaos.dif.bz2,
+  +xv-3.10a-r11.ebuild:
+  switching to the jumbo patch format, includes security fixes.
 
   13 Mar 2005; Hardave Riar <hardave@gentoo.org> xv-3.10a-r10.ebuild:
   Stable on mips, bug #83686.
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 386e0e4f1a33..9a92ae9541a4 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 6f1f70e71dce64524b68b787db5e7614 xv-3.10a-r11.ebuild 1945
 MD5 d3caaf1691b52006d2295f1443fe691b xv-3.10a-r9.ebuild 2529
 MD5 46d0c5a9c8dc6b5df90784815999b70d xv-3.10a-r10.ebuild 2635
 MD5 fbe8dc0be0ab018633f1e153b56c1662 xv-3.10a-r8.ebuild 2347
@@ -12,6 +10,7 @@ MD5 24acb62ee86813a3fde2819683b2ffc9 files/xv-3.10a-makefile-osx.patch 538
 MD5 4b034e22d5bb0502e383afcfeb8ea4b0 files/xv-3.10a-ppc.patch 359
 MD5 123bdb40134767bb438eeaccb50f1646 files/xv-3.10a-security.diff 4079
 MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r10 127
+MD5 3ed815662a9d31a5214c50bdb1c73d92 files/digest-xv-3.10a-r11 145
 MD5 cda66dd1f3a032802881a6ae4430e0d6 files/xv-use-getcwd.patch 222
 MD5 32841798fbb3c9923d5d8a26994e1b0a files/xv-3.10a-vdcomp-osx.patch 341
 MD5 b6755903a15ab242469da379020a0a66 files/xv-3.10a-xv-osx.patch 615
@@ -19,10 +18,3 @@ MD5 8edd408b62a85896b2b76411f7839c60 files/xv-smoothing-algorithm.diff 6418
 MD5 63deb1e35f05b4f406f141d1e48ff17b files/xv-filename-format-string.diff 319
 MD5 a5b5fd8ad9fbef9a63f360d83f55e546 files/xv-optimize-jpeg.diff 553
 MD5 f555e07727c8b51042dae772ae474f42 files/xv-postscript-double-free.diff 864
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCNOwaM+I1L6GK/u4RAtU1AJsEe2HG/JoGmROgUTOL1WQAxrdkrwCggcbh
-e+dkz9nSnpUP56Bf+3n13oI=
-=B441
------END PGP SIGNATURE-----
diff --git a/media-gfx/xv/files/digest-xv-3.10a-r11 b/media-gfx/xv/files/digest-xv-3.10a-r11
new file mode 100644
index 000000000000..753f8e86594f
--- /dev/null
+++ b/media-gfx/xv/files/digest-xv-3.10a-r11
@@ -0,0 +1,2 @@
+MD5 2d4fbeec1561304362781cc8e2f7f72d xv-3.10a.tar.gz 2259124
+MD5 3e0ba6c317df2e64015e03f7c97acb60 xv-3.10a-jumbo-patches-20050410.tar.bz2 262943
diff --git a/media-gfx/xv/files/xv-3.10a-bmpfix.patch.bz2 b/media-gfx/xv/files/xv-3.10a-bmpfix.patch.bz2
new file mode 100644
index 000000000000..c51897e3f945
--- /dev/null
+++ b/media-gfx/xv/files/xv-3.10a-bmpfix.patch.bz2
diff --git a/media-gfx/xv/files/xv-3.10a-yaos.dif.bz2 b/media-gfx/xv/files/xv-3.10a-yaos.dif.bz2
new file mode 100644
index 000000000000..07eedade3a4c
--- /dev/null
+++ b/media-gfx/xv/files/xv-3.10a-yaos.dif.bz2
diff --git a/media-gfx/xv/xv-3.10a-r11.ebuild b/media-gfx/xv/xv-3.10a-r11.ebuild
new file mode 100644
index 000000000000..c96e7839494b
--- /dev/null
+++ b/media-gfx/xv/xv-3.10a-r11.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r11.ebuild,v 1.1 2005/04/15 09:26:21 taviso Exp $
+
+inherit flag-o-matic eutils toolchain-funcs
+
+JUMBOV=20050410
+DESCRIPTION="An interactive image manipulation program for X which can deal with a wide variety of image formats"
+HOMEPAGE="http://www.trilon.com/xv/index.html"
+SRC_URI="http://www.sonic.net/~roelofs/code/${P}-jumbo-patches-${JUMBOV}.tar.bz2	ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz"
+
+LICENSE="xv"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="jpeg tiff png"
+
+DEPEND="virtual/x11
+	jpeg? ( >=media-libs/jpeg-6b )
+	tiff? ( >=media-libs/tiff-3.6.1-r2 )
+	png? ( >=media-libs/libpng-1.2 >=sys-libs/zlib-1.1.4 )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	epatch ${WORKDIR}/${P}-jumbo-fix-patch-${JUMBOV}.txt || die
+	epatch ${WORKDIR}/${P}-jumbo-enh-patch-${JUMBOV}.txt || die
+
+	# various security issues.
+	epatch ${FILESDIR}/${P}-bmpfix.patch.bz2 || die
+	epatch ${FILESDIR}/${P}-yaos.dif.bz2 || die
+
+	sed -i	-e 's/\(^JPEG.*\)/#\1/g' \
+			-e 's/\(^PNG.*\)/#\1/g' \
+			-e 's/\(^TIFF.*\)/#\1/g' \
+			-e 's/\(^LIBS = .*\)/\1 $(LDFLAGS) /g' Makefile
+
+	# /usr/bin/gzip => /bin/gzip
+	sed -i	-e 's#/usr\(/bin/gzip\)#\1#g' config.h
+
+}
+
+src_compile() {
+	append-flags -DUSE_GETCWD -DLINUX -DUSLEEP
+
+	einfo "Enabling Optional Features..."
+	if use jpeg; then
+		ebegin "	jpeg"
+			append-flags -DDOJPEG
+			append-ldflags -ljpeg
+		eend
+	fi
+	if use png; then
+		ebegin "	png"
+			append-flags -DDOPNG
+			append-ldflags -lz -lpng
+		eend
+	fi
+	if use tiff; then
+		ebegin "	tiff"
+			append-flags -DDOTIFF -DUSE_TILED_TIFF_BOTLEFT_FIX
+			append-ldflags -ltiff
+		eend
+	fi
+	einfo "done."
+
+	emake CC="$(tc-getCC)" CCOPTS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+
+	emake	DESTDIR=${D} \
+			BINDIR=${D}/usr/bin \
+			MANDIR=${D}/usr/share/man/man1 \
+			LIBDIR=${T} install || die
+
+	dodoc README{,.jumbo,.pcd} INSTALL CHANGELOG BUGS IDEAS docs/*.ps docs/*.doc
+}