From 215e885c74725aa163abc406204400b693934683 Mon Sep 17 00:00:00 2001
From: salo <salo>
Date: Fri, 12 Aug 2005 13:57:44 +0000
Subject: Security fix for SA16352.

"A vulnerability in wine can be exploited by malicious, local users to
perform certain actions on a vulnerable system with escalated privileges.

The vulnerability is caused due to a temporary file being created
insecurely in "/tmp" by winelauncher.in under certain error conditions.
This can be exploited via symlink attacks to create or overwrite
arbitrary files with the privileges of the user running the affected
application."

http://secunia.com/advisories/16352/

Patch from Wine CVS.
---
 emulators/wine/Makefile         |  5 +++--
 emulators/wine/distinfo         |  3 ++-
 emulators/wine/patches/patch-ai | 25 +++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 emulators/wine/patches/patch-ai

(limited to 'emulators')

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 70f1fde7bad..185ccf44ca1 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.88 2005/07/26 13:24:36 adam Exp $
+# $NetBSD: Makefile,v 1.89 2005/08/12 13:57:44 salo Exp $
 
 DISTNAME=	Wine-20050725
 PKGNAME=	${DISTNAME:S/W/w/}
+PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wine/} \
 		http://www.ibiblio.org/pub/Linux/ALPHA/wine/development/ \
@@ -20,7 +21,7 @@ ONLY_FOR_PLATFORM+=	FreeBSD*-i386 Linux*-i386 SunOS*-i386 Darwin*-i386
 
 WRKSRC=		 	${WRKDIR}/${DISTNAME:S/W/w/}
 USE_LIBTOOL=		yes
-USE_TOOLS+=		bison gmake
+USE_TOOLS+=		bison gmake mktemp
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-curses --disable-trace --disable-debug
 CONFIGURE_ENV+=		ac_cv_path_ARTSCCONFIG=${TRUE}
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index fa34c96d9bf..da45e86e68f 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2005/07/26 13:24:36 adam Exp $
+$NetBSD: distinfo,v 1.35 2005/08/12 13:57:44 salo Exp $
 
 SHA1 (Wine-20050725.tar.gz) = dfda93cc903b9ad9eeab076e9fbdbbb09ca59c49
 RMD160 (Wine-20050725.tar.gz) = a86fda53cf9c3a36ab3bf42ecb66740bdcbe3174
@@ -11,3 +11,4 @@ SHA1 (patch-ae) = dbd40183fb8e1f1d7af9ab4e51910a2227524e3c
 SHA1 (patch-af) = a8eb0a12b990ce5431498bff51bd2ad6a0b9d7b8
 SHA1 (patch-ag) = 656f9667da542489595d1db65c84579b3dfce279
 SHA1 (patch-ah) = 9be209efc28693b98354624af96e81b64d2fbc6c
+SHA1 (patch-ai) = 3d154e96464192cc3c8c0f428d0fe518ec7e1d8c
diff --git a/emulators/wine/patches/patch-ai b/emulators/wine/patches/patch-ai
new file mode 100644
index 00000000000..10080b21c6d
--- /dev/null
+++ b/emulators/wine/patches/patch-ai
@@ -0,0 +1,25 @@
+$NetBSD: patch-ai,v 1.5 2005/08/12 13:57:44 salo Exp $
+
+Fix for SA16352, from Wine CVS.
+
+--- programs/winelauncher.in.orig	2004-06-22 01:56:15.000000000 +0200
++++ programs/winelauncher.in	2005-08-12 15:11:18.000000000 +0200
+@@ -59,8 +59,8 @@
+ if [ $? -ne 0 ] ; then
+     # xmessage not found; make sure the user notices this error
+     # (GUI users wouldn't even notice if we printed the text on console !)
+-    MSGFILE=/tmp/WINE_CANNOT_FIND_XMESSAGE
+-    cat > $MSGFILE << EOF
++    MSGFILE=`mktemp "/tmp/wine.xmessage.XXXXXX"`
++    cat > $MSGFILE <<EOF
+ Warning:
+     The Wine launcher is unable to find the xmessage program,
+     which it needs to properly notify you of Wine execution status
+@@ -87,6 +87,7 @@
+ 
+     # ok, we really give up now, this system is hosed ;-)
+     cat $MSGFILE
++    rm $MSGFILE
+ else
+     XMESSAGE="xmessage $COLOR"
+ fi
-- 
cgit v1.2.3