Pullup ticket 531 - requested by Lubomir Sedlacik

security fix for wine

Apply patch from Lubomir Sedlacik.  "it fixes insecure tempfile creation
in /tmp, patches are from Wine bugzilla:
http://bugs.winehq.org/show_bug.cgi?id=2715"

5 files changed, 33 insertions, 4 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index f6907b4a055..af3e95c3df1 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2005/03/14 13:56:57 abs Exp $
+# $NetBSD: Makefile,v 1.80.2.1 2005/06/02 23:00:30 snj Exp $
 
 DISTNAME=	Wine-20050211
 PKGNAME=	${DISTNAME:S/W/w/}
+PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wine/} \
 		http://www.ibiblio.org/pub/Linux/ALPHA/wine/development/ \
diff --git a/emulators/wine/buildlink3.mk b/emulators/wine/buildlink3.mk
index cfd63100b55..1f750acd733 100644
--- a/emulators/wine/buildlink3.mk
+++ b/emulators/wine/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:14:41 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.2.4.1 2005/06/02 23:00:30 snj Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WINE_BUILDLINK3_MK:=	${WINE_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	wine
 
 .if !empty(WINE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.wine+=	wine>=20040309
-BUILDLINK_RECOMMENDED.wine+=	wine>=20040505nb1
+BUILDLINK_RECOMMENDED.wine+=	wine>=20050211nb1
 BUILDLINK_PKGSRCDIR.wine?=	../../emulators/wine
 .endif	# WINE_BUILDLINK3_MK
 
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index bc8ad687697..66531c00a25 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2005/03/11 21:18:15 rillig Exp $
+$NetBSD: distinfo,v 1.30.2.1 2005/06/02 23:00:30 snj Exp $
 
 SHA1 (Wine-20050211.tar.gz) = 6c1b7397d653e5a053e03923db55dfd8209a2566
 RMD160 (Wine-20050211.tar.gz) = 06ce19f57d8235cd280f956d53c77bea0ace4c50
@@ -9,3 +9,5 @@ SHA1 (patch-ac) = 8c909b1683185e0ac12f2be6024e26da40addf1c
 SHA1 (patch-ad) = 92abc177dc37ed983ec6079cd08ad7a1472e178a
 SHA1 (patch-ae) = a18b1c01d61d26fbe1a82dca82ea0d76df0c8bcd
 SHA1 (patch-af) = 72a5d77dc4dc2d67e87e90603f4f00e6b6ed5851
+SHA1 (patch-ag) = 0b0b9fb8597391060b81280a349b6113d4f73205
+SHA1 (patch-ah) = d74c4d4987beb6c18e4ea8e27d268e3c1066b7b1
diff --git a/emulators/wine/patches/patch-ag b/emulators/wine/patches/patch-ag
new file mode 100644
index 00000000000..e4eb780bee6
--- /dev/null
+++ b/emulators/wine/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3.12.1 2005/06/02 23:00:30 snj Exp $
+
+--- misc/registry.c.orig	2004-08-25 02:48:47.000000000 +0200
++++ misc/registry.c	2005-06-01 15:23:10.000000000 +0200
+@@ -1227,7 +1227,7 @@
+     ret = _xmalloc(50);
+     for (count = 0;;) {
+         sprintf(ret,"/tmp/reg%lx%04x.tmp",(long)getpid(),count++);
+-        if ((tmp_fd = open(ret,O_CREAT | O_EXCL | O_WRONLY,0666)) != -1) break;
++        if ((tmp_fd = open(ret,O_CREAT | O_EXCL | O_WRONLY,0600)) != -1) break;
+         if (errno != EEXIST) {
+             ERR("Unexpected error while open() call: %s\n",strerror(errno));
+             free(ret);
diff --git a/emulators/wine/patches/patch-ah b/emulators/wine/patches/patch-ah
new file mode 100644
index 00000000000..2b2ddd29204
--- /dev/null
+++ b/emulators/wine/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.4.12.1 2005/06/02 23:00:30 snj Exp $
+
+--- server/registry.c.orig	2004-11-30 22:38:57.000000000 +0100
++++ server/registry.c	2005-06-01 15:24:40.000000000 +0200
+@@ -1615,7 +1615,7 @@
+     for (;;)
+     {
+         sprintf( p, "reg%lx%04x.tmp", (long) getpid(), count++ );
+-        if ((fd = open( tmp, O_CREAT | O_EXCL | O_WRONLY, 0666 )) != -1) break;
++        if ((fd = open( tmp, O_CREAT | O_EXCL | O_WRONLY, 0600 )) != -1) break;
+         if (errno != EEXIST) goto done;
+         close( fd );
+     }