#83686

(Portage version: 2.0.51.17)

5 files changed, 118 insertions, 8 deletions

diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog
index 493dd44fe025..62e8c88824f1 100644
--- a/media-gfx/xv/ChangeLog
+++ b/media-gfx/xv/ChangeLog
@@ -1,6 +1,12 @@
 # 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.43 2005/02/26 21:47:21 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.44 2005/03/01 15:28:51 taviso Exp $
+
+*xv-3.10a-r10 (01 Mar 2005)
+
+  01 Mar 2005; Tavis Ormandy <taviso@gentoo.org>
+  +files/xv-filename-format-string.diff, +xv-3.10a-r10.ebuild:
+  patch for #83686
 
   26 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> xv-3.10a-r8.ebuild:
   Stable ppc-macos
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 8fd65fc51230..c230d50a11b0 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -1,15 +1,18 @@
+MD5 d3caaf1691b52006d2295f1443fe691b xv-3.10a-r9.ebuild 2529
+MD5 dc0b061aaeed137e8b962c121294763b xv-3.10a-r10.ebuild 2634
+MD5 fbe8dc0be0ab018633f1e153b56c1662 xv-3.10a-r8.ebuild 2347
 MD5 3535d7bfce51905e27b4b4a975795d1d ChangeLog 7368
 MD5 8fc22f08ecb2e292e60ce7553c58d0c2 metadata.xml 222
-MD5 fbe8dc0be0ab018633f1e153b56c1662 xv-3.10a-r8.ebuild 2347
-MD5 d3caaf1691b52006d2295f1443fe691b xv-3.10a-r9.ebuild 2529
 MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r8 127
+MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r9 127
+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 cda66dd1f3a032802881a6ae4430e0d6 files/xv-use-getcwd.patch 222
-MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r9 127
-MD5 a5b5fd8ad9fbef9a63f360d83f55e546 files/xv-optimize-jpeg.diff 553
-MD5 f555e07727c8b51042dae772ae474f42 files/xv-postscript-double-free.diff 864
-MD5 8edd408b62a85896b2b76411f7839c60 files/xv-smoothing-algorithm.diff 6418
-MD5 24acb62ee86813a3fde2819683b2ffc9 files/xv-3.10a-makefile-osx.patch 538
 MD5 32841798fbb3c9923d5d8a26994e1b0a files/xv-3.10a-vdcomp-osx.patch 341
 MD5 b6755903a15ab242469da379020a0a66 files/xv-3.10a-xv-osx.patch 615
+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
diff --git a/media-gfx/xv/files/digest-xv-3.10a-r10 b/media-gfx/xv/files/digest-xv-3.10a-r10
new file mode 100644
index 000000000000..2bb5f3fa79b8
--- /dev/null
+++ b/media-gfx/xv/files/digest-xv-3.10a-r10
@@ -0,0 +1,2 @@
+MD5 2d4fbeec1561304362781cc8e2f7f72d xv-3.10a.tar.gz 2259124
+MD5 f8b8a8f7d76e5108b4abe3e7a5901f3e xv-3.10a-gentoo.tar.gz 52394
diff --git a/media-gfx/xv/files/xv-filename-format-string.diff b/media-gfx/xv/files/xv-filename-format-string.diff
new file mode 100644
index 000000000000..9cc4870c0ec1
--- /dev/null
+++ b/media-gfx/xv/files/xv-filename-format-string.diff
@@ -0,0 +1,11 @@
+--- xv.c	2005-03-01 15:20:50.153871368 +0000
++++ xv.c	2005-03-01 15:20:39.241530296 +0000
+@@ -2249,7 +2249,7 @@
+   SetISTR(ISTR_INFO,formatStr);
+ 	
+   SetInfoMode(INF_PART);
+-  SetISTR(ISTR_FILENAME, 
++  SetISTR(ISTR_FILENAME, "%s",
+ 	  (filenum==DFLTPIC || filenum==GRABBED || frompipe)
+ 	  ? "<none>" : basefname);
+ 
diff --git a/media-gfx/xv/xv-3.10a-r10.ebuild b/media-gfx/xv/xv-3.10a-r10.ebuild
new file mode 100644
index 000000000000..f83c3b5a8f65
--- /dev/null
+++ b/media-gfx/xv/xv-3.10a-r10.ebuild
@@ -0,0 +1,88 @@
+# 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-r10.ebuild,v 1.1 2005/03/01 15:28:51 taviso Exp $
+
+inherit ccc flag-o-matic eutils
+
+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="ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo.tar.gz"
+
+LICENSE="xv"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~amd64 ~ppc64 ~ppc-macos"
+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}
+
+	use ppc && epatch ${FILESDIR}/${P}-ppc.patch
+
+	epatch ../${P}-enhanced-Nu.patch || die
+	epatch ../${P}-gentoo-Nu.patch || die
+	epatch ${FILESDIR}/xv-use-getcwd.patch || die
+	# fix security issues #61619
+	epatch ${FILESDIR}/${P}-security.diff || die
+
+	# These patches from Dave Coffin
+	# http://www.cybercom.net/~dcoffin/dcraw/
+	epatch ${FILESDIR}/xv-smoothing-algorithm.diff || die
+	epatch ${FILESDIR}/xv-optimize-jpeg.diff || die
+	epatch ${FILESDIR}/xv-postscript-double-free.diff || die
+
+	if use ppc-macos; then
+		epatch ${FILESDIR}/${P}-xv-osx.patch
+		epatch ${FILESDIR}/${P}-vdcomp-osx.patch
+		epatch ${FILESDIR}/${P}-makefile-osx.patch
+	fi
+
+	# security issue with malformed filenames #83686
+	epatch ${FILESDIR}/${PN}-filename-format-string.diff || die
+}
+
+src_compile() {
+	if use jpeg; then
+		append-flags -DDOJPEG
+	else
+		sed -i -e "s:JPEGLIB = -ljpeg:JPEGLIB =:" Makefile || die "sed jpeg failed"
+	fi
+	if use png; then
+		append-flags -DDOPNG
+	else
+		sed -i -e "s:PNGLIB = -lpng:PNGLIB =:" Makefile || die "sed png failed"
+		sed -i -e "s:ZLIBLIB = -lz:ZLIBLIB =:" Makefile || die "sed zlib failed"
+	fi
+	if use tiff; then
+		append-flags -DDOTIFF
+	else
+		sed -i -e "s:TIFFLIB = -ltiff:TIFFLIB =:" Makefile || die "sed tiff failed"
+	fi
+	sed -i 's:CCOPTS = -O:CCOPTS = $(E_CFLAGS):' Makefile || die "sed Makefile failed"
+	sed -i 's:COPTS=\t-O:COPTS= $(E_CFLAGS):' tiff/Makefile || die "sed tiff/Makefile failed"
+	is-ccc && replace-cc-hardcode
+	echo make E_CFLAGS="${CFLAGS}" > go.sh
+	make E_CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+
+	# LIBDIR is where xv installs xvdocs.ps and we dodoc it below
+	make \
+		DESTDIR=${D} \
+		BINDIR=${D}/usr/bin \
+		MANDIR=${D}/usr/share/man/man1 \
+		LIBDIR=/dev/null \
+		install || die
+
+	dodoc README INSTALL CHANGELOG BUGS IDEAS docs/*.ps docs/*.doc
+}