Version bump and security fix for bug #93054.

Package-Manager: portage-2.0.51.19

5 files changed, 73 insertions, 3 deletions

diff --git a/app-cdr/xdvdfs-tools/ChangeLog b/app-cdr/xdvdfs-tools/ChangeLog
index 898d307b1f70..aaa37ce4029b 100644
--- a/app-cdr/xdvdfs-tools/ChangeLog
+++ b/app-cdr/xdvdfs-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/xdvdfs-tools
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xdvdfs-tools/ChangeLog,v 1.7 2005/04/24 10:45:45 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xdvdfs-tools/ChangeLog,v 1.8 2005/05/21 11:21:36 chrb Exp $
+
+*xdvdfs-tools-2.1 (21 May 2005)
+
+  21 May 2005; Chris Bainbridge <chrb@gentoo.org>
+  +files/xdvdfs-tools-2.1-fnamefix.patch, +xdvdfs-tools-2.1.ebuild:
+  Version bump and security fix for bug #93054.
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   xdvdfs-tools-1.0.ebuild:
diff --git a/app-cdr/xdvdfs-tools/Manifest b/app-cdr/xdvdfs-tools/Manifest
index 2def62b97ef6..0321bdfa1915 100644
--- a/app-cdr/xdvdfs-tools/Manifest
+++ b/app-cdr/xdvdfs-tools/Manifest
@@ -1,4 +1,7 @@
-MD5 b55bf22a4c01cf1ce709019e821aa5cf xdvdfs-tools-1.0.ebuild 1160
+MD5 cd25bc45fa27bb837887c6d970058cfa ChangeLog 1075
 MD5 cd41f64bed64c155db558d351b91f000 metadata.xml 327
-MD5 320e297b9064216e7e547c84d1939b63 ChangeLog 877
+MD5 b55bf22a4c01cf1ce709019e821aa5cf xdvdfs-tools-1.0.ebuild 1160
+MD5 7b8c725f4a3eafa0ad8129f3a45a2147 xdvdfs-tools-2.1.ebuild 1238
+MD5 a9c96e22a327bc4170a56d0c12f1df5a files/xdvdfs-tools-2.1-fnamefix.patch 677
 MD5 5c0fd1eb2e799fa5e82fbc86a68c839d files/digest-xdvdfs-tools-1.0 65
+MD5 3bd5675ceb426613795078cbb3fa5dd3 files/digest-xdvdfs-tools-2.1 64
diff --git a/app-cdr/xdvdfs-tools/files/digest-xdvdfs-tools-2.1 b/app-cdr/xdvdfs-tools/files/digest-xdvdfs-tools-2.1
new file mode 100644
index 000000000000..1e74f009e657
--- /dev/null
+++ b/app-cdr/xdvdfs-tools/files/digest-xdvdfs-tools-2.1
@@ -0,0 +1 @@
+MD5 0bf99b83e917a80ccac48031e759d2db XDVDFSToolsv2.1.rar 211193
diff --git a/app-cdr/xdvdfs-tools/files/xdvdfs-tools-2.1-fnamefix.patch b/app-cdr/xdvdfs-tools/files/xdvdfs-tools-2.1-fnamefix.patch
new file mode 100644
index 000000000000..4d06822eb06c
--- /dev/null
+++ b/app-cdr/xdvdfs-tools/files/xdvdfs-tools-2.1-fnamefix.patch
@@ -0,0 +1,17 @@
+--- XDVDFS_Tools.orig/src/xdvdfs/xdvdfs.c	2003-08-15 23:26:58.000000000 +0000
++++ XDVDFS_Tools/src/xdvdfs/xdvdfs.c	2005-05-21 12:13:55.655839216 +0000
+@@ -157,6 +157,14 @@
+ 	memcpy(SearchRecord->Filename, Entry->Filename, Entry->FilenameLength);
+ 	SearchRecord->Filename[Entry->FilenameLength] = 0;
+ 
++	if (strstr(SearchRecord->Filename,"..") || 
++	    strchr(SearchRecord->Filename, '/') || 
++	    strchr(SearchRecord->Filename, '\\'))
++	  {
++	    printf("Filename contains invalid characters\n");
++	    exit(1);
++	  }
++
+ 	// Copy file parameters in the search_rec
+ 	SearchRecord->Attributes = Entry->FileAttributes;
+ 	SearchRecord->FileSize = ENDIAN_SAFE32(Entry->FileSize);
diff --git a/app-cdr/xdvdfs-tools/xdvdfs-tools-2.1.ebuild b/app-cdr/xdvdfs-tools/xdvdfs-tools-2.1.ebuild
new file mode 100644
index 000000000000..c2d61a6f91ab
--- /dev/null
+++ b/app-cdr/xdvdfs-tools/xdvdfs-tools-2.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xdvdfs-tools/xdvdfs-tools-2.1.ebuild,v 1.1 2005/05/21 11:21:36 chrb Exp $
+
+inherit eutils
+
+DESCRIPTION="Tools for manipulating Xbox ISO images"
+HOMEPAGE="http://www.layouts.xbox-scene.com/"
+SRC_URI="http://www.layouts.xbox-scene.com/main/files/XDVDFSToolsv2.1.rar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="app-arch/unrar"
+
+S=${WORKDIR}/"XDVDFS_Tools/src"
+
+src_unpack() {
+	unrar x ${DISTDIR}/XDVDFSToolsv${PV}.rar
+	mv "XDVDFS Tools" XDVDFS_Tools
+	sed -i -e "s:CCFLAGS = .*:CCFLAGS = ${CFLAGS}:g" "${S}"/makefile.prefab
+	epatch ${FILESDIR}/${P}-fnamefix.patch
+	mkdir ${S}/xdvdfs_extract/output ${S}/xdvdfs_maker/output
+}
+
+src_compile() {
+	cd ${S}/xdvdfs_dumper
+	emake || die "xdvdfs_dumper"
+	cd ../xdvdfs_extract
+	emake || die "xdvdfs_extract"
+	cd ../xdvdfs_maker
+	emake || die "xdvdfs_maker"
+}
+
+src_install() {
+	dobin xdvdfs_dumper/output/xdvdfs_dumper || die "xdvdfs_dumper"
+	dobin xdvdfs_extract/output/xdvdfs_extract || die "xdvdfs_extract"
+	dobin xdvdfs_maker/output/xdvdfs_maker || die "xdvdfs_maker"
+	dohtml ../documentation/*.htm
+	dodoc ../Readme.txt
+}