Add an upstream patch to fix a security issue with information leakage #85387.

Package-Manager: portage-2.0.51.19

5 files changed, 15 insertions, 7 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 2a4d5669831e..8d6269c33107 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/wine
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.89 2005/03/13 11:00:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.90 2005/03/18 00:53:24 vapier Exp $
+
+*wine-20050111-r1 (18 Mar 2005)
+
+  18 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/wine-20050111-upstream-registry-fix.patch.bz2,
+  -wine-20050111.ebuild, +wine-20050111-r1.ebuild:
+  Add an upstream patch to fix a security issue with information leakage #85387.
 
 *wine-20050310 (13 Mar 2005)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index e21459e55915..b2efe18b1df3 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,15 +1,16 @@
-MD5 4aec1efb2da76e4815808698c38a880c ChangeLog 15879
+MD5 449230b44a85c482406dc3bec7b22618 ChangeLog 16151
 MD5 6525c48ba09d08599432ea6c299e52f4 metadata.xml 354
 MD5 c1827c6cc58e99351d55e19916234acf wine-20050310.ebuild 3429
 MD5 1fcec66c3a3db069065a704291b8b4c4 wine-20041019.ebuild 3772
 MD5 fb6682213117b666a78dd3b8960b190d wine-20041019-r3.ebuild 2927
-MD5 db33247fa3d4ed19668319fa3497fa61 wine-20050111.ebuild 3059
 MD5 29184f4b38f581e093dd147a4df25c78 wine-20050211.ebuild 3471
+MD5 ecc175b14b17bb75418a8b58e62a91cd wine-20050111-r1.ebuild 3096
 MD5 67846279ad436d5d70d0857d29c5fabf files/20050211-docs.patch 719
 MD5 64c9b939319110b4f44ef6f431262181 files/digest-wine-20041019 212
 MD5 1668a758aa2007cb99a773b3c5c844c9 files/winearts-kdecvs-fix.patch 325
 MD5 03f968d969bdc86d7afd384b026aa7cf files/digest-wine-20050310 67
 MD5 23ff2a3980929ae4a6f02161bd875b55 files/digest-wine-20041019-r3 67
+MD5 32c5bd022b8547d02b07517dd7a9bc02 files/wine-20050111-upstream-registry-fix.patch.bz2 13584
 MD5 d9e9a2cb6521b07ace7e7c142679b85b files/20041019-no-stack.patch 257
-MD5 8028af5342611d0521183f95342f787a files/digest-wine-20050111 67
 MD5 fe364ce26a93f838a04f30b274df034c files/digest-wine-20050211 67
+MD5 8028af5342611d0521183f95342f787a files/digest-wine-20050111-r1 67
diff --git a/app-emulation/wine/files/digest-wine-20050111 b/app-emulation/wine/files/digest-wine-20050111-r1
index c061286bb658..c061286bb658 100644
--- a/app-emulation/wine/files/digest-wine-20050111
+++ b/app-emulation/wine/files/digest-wine-20050111-r1
diff --git a/app-emulation/wine/files/wine-20050111-upstream-registry-fix.patch.bz2 b/app-emulation/wine/files/wine-20050111-upstream-registry-fix.patch.bz2
new file mode 100644
index 000000000000..05dac02a5a52
--- /dev/null
+++ b/app-emulation/wine/files/wine-20050111-upstream-registry-fix.patch.bz2
diff --git a/app-emulation/wine/wine-20050111.ebuild b/app-emulation/wine/wine-20050111-r1.ebuild
index 8b12bf7fc259..f151027c30b3 100644
--- a/app-emulation/wine/wine-20050111.ebuild
+++ b/app-emulation/wine/wine-20050111-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050111.ebuild,v 1.3 2005/02/20 02:30:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050111-r1.ebuild,v 1.1 2005/03/18 00:53:24 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -28,9 +28,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
 	sys-devel/bison
-	sys-devel/gcc
 	doc? ( app-text/docbook-sgml-utils app-text/jadetex )
 	sys-devel/flex"
 
@@ -38,6 +36,8 @@ src_unpack() {
 	unpack Wine-${PV}.tar.gz
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-upstream-registry-fix.patch.bz2 #85387
+
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in