Fix fortify issues in shell32 code #336887 by Evan Teran.

54 files changed, 207 insertions, 53 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 30e8f2c99acb..a895cad5a462 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.327 2010/09/21 21:32:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.328 2010/09/21 21:54:17 vapier Exp $
+
+  21 Sep 2010; Mike Frysinger <vapier@gentoo.org> wine-1.0.ebuild,
+  wine-1.0.1.ebuild, wine-1.1.0.ebuild, wine-1.1.1.ebuild, wine-1.1.2.ebuild,
+  wine-1.1.3.ebuild, wine-1.1.4.ebuild, wine-1.1.5.ebuild, wine-1.1.6.ebuild,
+  wine-1.1.7.ebuild, wine-1.1.8.ebuild, wine-1.1.9.ebuild, wine-1.1.10.ebuild,
+  wine-1.1.11.ebuild, wine-1.1.12.ebuild, wine-1.1.13.ebuild,
+  wine-1.1.14.ebuild, wine-1.1.15.ebuild, wine-1.1.16.ebuild,
+  wine-1.1.17.ebuild, wine-1.1.18.ebuild, wine-1.1.19.ebuild,
+  wine-1.1.20.ebuild, wine-1.1.21.ebuild, wine-1.1.22.ebuild,
+  wine-1.1.23.ebuild, wine-1.1.24.ebuild, wine-1.1.25.ebuild,
+  wine-1.1.26.ebuild, wine-1.1.27.ebuild, wine-1.1.28.ebuild,
+  wine-1.1.29.ebuild, wine-1.1.30.ebuild, wine-1.1.31.ebuild,
+  wine-1.1.32.ebuild, wine-1.1.33.ebuild, wine-1.1.34.ebuild,
+  wine-1.1.35.ebuild, wine-1.1.36.ebuild, wine-1.1.37.ebuild,
+  wine-1.1.38.ebuild, wine-1.1.39.ebuild, wine-1.1.40.ebuild,
+  wine-1.1.41.ebuild, wine-1.1.42.ebuild, wine-1.1.43.ebuild,
+  wine-1.1.44.ebuild, wine-1.2.ebuild, +files/wine-1.3-shell32-fortify.patch,
+  wine-1.3.0.ebuild, wine-1.3.1.ebuild, wine-1.3.2.ebuild, wine-9999.ebuild:
+  Fix fortify issues in shell32 code #336887 by Evan Teran.
 
   21 Sep 2010; Mike Frysinger <vapier@gentoo.org> wine-1.3.2.ebuild,
   wine-9999.ebuild:
diff --git a/app-emulation/wine/files/wine-1.3-shell32-fortify.patch b/app-emulation/wine/files/wine-1.3-shell32-fortify.patch
new file mode 100644
index 000000000000..97693178cefe
--- /dev/null
+++ b/app-emulation/wine/files/wine-1.3-shell32-fortify.patch
@@ -0,0 +1,83 @@
+http://bugs.gentoo.org/336887
+
+From fa3feddb19c9333e677ec6ab89e697d1005428a4 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 14 Sep 2010 09:32:46 -0400
+Subject: [PATCH] shell32: use flexible arrays to avoid fortify failures
+
+Newer versions of gcc/glibc with fortify checks enabled will complain
+about the handling of the network's szNames field.  Currently it is
+always defined with a length of one which means writing more then a
+single byte will trigger:
+	In function 'strcpy', inlined from '_ILCreateEntireNetwork' at
+	dlls/shell32/pidl.c:1762:15:
+	warning: call to __builtin___strcpy_chk will always overflow destination buffer
+and then at runtime, we hit an abort().
+
+Since this field is really serving as the header to an arbitrary buffer,
+using a flexible array instead should solve the issue.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ dlls/shell32/pidl.h |    8 ++++----
+ include/windef.h    |    7 +++++++
+ 2 files changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h
+index 3dbfaa6..4d5a191 100644
+--- a/dlls/shell32/pidl.h
++++ b/dlls/shell32/pidl.h
+@@ -117,7 +117,7 @@ typedef struct tagPIDLCPanelStruct
+     DWORD iconIdx;		/*02 negative icon ID */
+     WORD offsDispName;		/*06*/
+     WORD offsComment;		/*08*/
+-    CHAR szName[1];		/*10*/ /* terminated by 0x00, followed by display name and comment string */
++    CHAR FLEXIBLE_ARRAY(szName);		/*10*/ /* terminated by 0x00, followed by display name and comment string */
+ } PIDLCPanelStruct;
+ 
+ typedef struct tagGUIDStruct
+@@ -139,7 +139,7 @@ typedef struct tagFileStruct
+     WORD uFileDate;		/*06*/
+     WORD uFileTime;		/*08*/
+     WORD uFileAttribs;		/*10*/
+-    CHAR szNames[1];		/*12*/
++    CHAR FLEXIBLE_ARRAY(szNames);		/*12*/
+     /* Here are coming two strings. The first is the long name.
+     The second the dos name when needed or just 0x00 */
+ } FileStruct;
+@@ -172,12 +172,12 @@ typedef struct tagPIDLDATA
+ 	  struct tagFileStruct file;
+ 	  struct
+ 	  { WORD dummy;		/*01*/
+-	    CHAR szNames[1];	/*03*/
++	    CHAR FLEXIBLE_ARRAY(szNames);	/*03*/
+ 	  } network;
+ 	  struct
+ 	  { WORD dummy;		/*01*/
+ 	    DWORD dummy1;	/*02*/
+-	    CHAR szName[1];	/*06*/ /* terminated by 0x00 0x00 */
++	    CHAR FLEXIBLE_ARRAY(szName);	/*06*/ /* terminated by 0x00 0x00 */
+ 	  } htmlhelp;
+ 	  struct tagPIDLCPanelStruct cpanel;
+           struct tagValueW valueW;
+diff --git a/include/windef.h b/include/windef.h
+index 8f5ea30..b16919f 100644
+--- a/include/windef.h
++++ b/include/windef.h
+@@ -251,6 +251,13 @@ typedef unsigned int    ULONG,      *PULONG;
+ 
+ #include <winnt.h>
+ 
++#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
++    (defined(__GNUC__) && __GNUC__ >= 3)
++# define FLEXIBLE_ARRAY(arr) arr[]
++#else
++# define FLEXIBLE_ARRAY(arr) arr[1]
++#endif
++
+ /* Polymorphic types */
+ 
+ typedef UINT_PTR        WPARAM;
+-- 
+1.7.2
+
diff --git a/app-emulation/wine/wine-1.0.1.ebuild b/app-emulation/wine/wine-1.0.1.ebuild
index d706972bf7a5..2bd23a1b6ffb 100644
--- a/app-emulation/wine/wine-1.0.1.ebuild
+++ b/app-emulation/wine/wine-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.0.1.ebuild,v 1.8 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.0.1.ebuild,v 1.9 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="1"
 
@@ -87,6 +87,7 @@ src_unpack() {
 	fi
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.0.ebuild b/app-emulation/wine/wine-1.0.ebuild
index b7891186949d..b3069120f0f9 100644
--- a/app-emulation/wine/wine-1.0.ebuild
+++ b/app-emulation/wine/wine-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.0.ebuild,v 1.8 2010/07/24 04:42:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.0.ebuild,v 1.9 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="1"
 
@@ -87,6 +87,7 @@ src_unpack() {
 	fi
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.0.ebuild b/app-emulation/wine/wine-1.1.0.ebuild
index 9d6b3e5c048f..96e72647e061 100644
--- a/app-emulation/wine/wine-1.1.0.ebuild
+++ b/app-emulation/wine/wine-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.0.ebuild,v 1.10 2010/07/24 04:42:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.0.ebuild,v 1.11 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="1"
 
@@ -87,6 +87,7 @@ src_unpack() {
 	fi
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.1.ebuild b/app-emulation/wine/wine-1.1.1.ebuild
index 81c205d2645e..523c4f38aa45 100644
--- a/app-emulation/wine/wine-1.1.1.ebuild
+++ b/app-emulation/wine/wine-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.1.ebuild,v 1.9 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.1.ebuild,v 1.10 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="1"
 
@@ -87,6 +87,7 @@ src_unpack() {
 	fi
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.10.ebuild b/app-emulation/wine/wine-1.1.10.ebuild
index fbfd1314f9ea..77b119b77bcf 100644
--- a/app-emulation/wine/wine-1.1.10.ebuild
+++ b/app-emulation/wine/wine-1.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.10.ebuild,v 1.8 2010/07/24 04:42:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.10.ebuild,v 1.9 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="1"
 
@@ -88,6 +88,7 @@ src_unpack() {
 	fi
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.11.ebuild b/app-emulation/wine/wine-1.1.11.ebuild
index 10d041367815..cda4f2c2acb5 100644
--- a/app-emulation/wine/wine-1.1.11.ebuild
+++ b/app-emulation/wine/wine-1.1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.11.ebuild,v 1.8 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.11.ebuild,v 1.9 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="1"
 
@@ -88,6 +88,7 @@ src_unpack() {
 	fi
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.12.ebuild b/app-emulation/wine/wine-1.1.12.ebuild
index 20c2fec83a36..6f9088363b67 100644
--- a/app-emulation/wine/wine-1.1.12.ebuild
+++ b/app-emulation/wine/wine-1.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.12.ebuild,v 1.8 2010/07/24 04:42:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.12.ebuild,v 1.9 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="1"
 
@@ -89,6 +89,7 @@ src_unpack() {
 	fi
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.13.ebuild b/app-emulation/wine/wine-1.1.13.ebuild
index 02bbc5d52ca7..4fde1c0c4d85 100644
--- a/app-emulation/wine/wine-1.1.13.ebuild
+++ b/app-emulation/wine/wine-1.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.13.ebuild,v 1.22 2010/07/24 04:42:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.13.ebuild,v 1.23 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -92,6 +92,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
diff --git a/app-emulation/wine/wine-1.1.14.ebuild b/app-emulation/wine/wine-1.1.14.ebuild
index dd20524cc4d7..12ceae51aa61 100644
--- a/app-emulation/wine/wine-1.1.14.ebuild
+++ b/app-emulation/wine/wine-1.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.14.ebuild,v 1.17 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.14.ebuild,v 1.18 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -92,6 +92,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
diff --git a/app-emulation/wine/wine-1.1.15.ebuild b/app-emulation/wine/wine-1.1.15.ebuild
index 6513d8169789..4a0d256cd806 100644
--- a/app-emulation/wine/wine-1.1.15.ebuild
+++ b/app-emulation/wine/wine-1.1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.15.ebuild,v 1.19 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.15.ebuild,v 1.20 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -93,6 +93,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-configure-host.patch #260726
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.16.ebuild b/app-emulation/wine/wine-1.1.16.ebuild
index 5107461d72c3..0ea33d4cfae8 100644
--- a/app-emulation/wine/wine-1.1.16.ebuild
+++ b/app-emulation/wine/wine-1.1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.16.ebuild,v 1.18 2010/07/24 04:42:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.16.ebuild,v 1.19 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -92,6 +92,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.17.ebuild b/app-emulation/wine/wine-1.1.17.ebuild
index eb8577e11093..6cbb9583c07d 100644
--- a/app-emulation/wine/wine-1.1.17.ebuild
+++ b/app-emulation/wine/wine-1.1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.17.ebuild,v 1.15 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.17.ebuild,v 1.16 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -92,6 +92,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.18.ebuild b/app-emulation/wine/wine-1.1.18.ebuild
index 0c069c6b9eef..9ef74d9ac918 100644
--- a/app-emulation/wine/wine-1.1.18.ebuild
+++ b/app-emulation/wine/wine-1.1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.18.ebuild,v 1.15 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.18.ebuild,v 1.16 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -92,6 +92,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.19.ebuild b/app-emulation/wine/wine-1.1.19.ebuild
index a3bc35679145..2bc534063519 100644
--- a/app-emulation/wine/wine-1.1.19.ebuild
+++ b/app-emulation/wine/wine-1.1.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.19.ebuild,v 1.15 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.19.ebuild,v 1.16 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -92,6 +92,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.2.ebuild b/app-emulation/wine/wine-1.1.2.ebuild
index df9e5ba64b95..bec635a0e0de 100644
--- a/app-emulation/wine/wine-1.1.2.ebuild
+++ b/app-emulation/wine/wine-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.2.ebuild,v 1.9 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.2.ebuild,v 1.10 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="1"
 
@@ -87,6 +87,7 @@ src_unpack() {
 	fi
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.20.ebuild b/app-emulation/wine/wine-1.1.20.ebuild
index e2df01bab920..18bfcd042bcb 100644
--- a/app-emulation/wine/wine-1.1.20.ebuild
+++ b/app-emulation/wine/wine-1.1.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.20.ebuild,v 1.15 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.20.ebuild,v 1.16 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -92,6 +92,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.21.ebuild b/app-emulation/wine/wine-1.1.21.ebuild
index a3884bc556d0..4d7a116b8e89 100644
--- a/app-emulation/wine/wine-1.1.21.ebuild
+++ b/app-emulation/wine/wine-1.1.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.21.ebuild,v 1.14 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.21.ebuild,v 1.15 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -92,6 +92,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.22.ebuild b/app-emulation/wine/wine-1.1.22.ebuild
index 6ee5367fe0d1..5f758eb7512f 100644
--- a/app-emulation/wine/wine-1.1.22.ebuild
+++ b/app-emulation/wine/wine-1.1.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.22.ebuild,v 1.11 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.22.ebuild,v 1.12 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -92,6 +92,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.23.ebuild b/app-emulation/wine/wine-1.1.23.ebuild
index be6c364f0aca..8d49d27cf760 100644
--- a/app-emulation/wine/wine-1.1.23.ebuild
+++ b/app-emulation/wine/wine-1.1.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.23.ebuild,v 1.11 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.23.ebuild,v 1.12 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -92,6 +92,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.24.ebuild b/app-emulation/wine/wine-1.1.24.ebuild
index a20608a2f0a9..235b7e83a0bc 100644
--- a/app-emulation/wine/wine-1.1.24.ebuild
+++ b/app-emulation/wine/wine-1.1.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.24.ebuild,v 1.11 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.24.ebuild,v 1.12 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -92,6 +92,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.25.ebuild b/app-emulation/wine/wine-1.1.25.ebuild
index a8081a805693..7491ab65671c 100644
--- a/app-emulation/wine/wine-1.1.25.ebuild
+++ b/app-emulation/wine/wine-1.1.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.25.ebuild,v 1.11 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.25.ebuild,v 1.12 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -92,6 +92,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.26.ebuild b/app-emulation/wine/wine-1.1.26.ebuild
index 86b94a116624..12e61ca73b9b 100644
--- a/app-emulation/wine/wine-1.1.26.ebuild
+++ b/app-emulation/wine/wine-1.1.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.26.ebuild,v 1.11 2010/07/24 04:42:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.26.ebuild,v 1.12 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -92,6 +92,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.27.ebuild b/app-emulation/wine/wine-1.1.27.ebuild
index 76bbaae77642..48595471a5bf 100644
--- a/app-emulation/wine/wine-1.1.27.ebuild
+++ b/app-emulation/wine/wine-1.1.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.27.ebuild,v 1.12 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.27.ebuild,v 1.13 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -93,6 +93,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.28.ebuild b/app-emulation/wine/wine-1.1.28.ebuild
index 7df9c1b1ea0b..e915c6eb1b97 100644
--- a/app-emulation/wine/wine-1.1.28.ebuild
+++ b/app-emulation/wine/wine-1.1.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.28.ebuild,v 1.12 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.28.ebuild,v 1.13 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -93,6 +93,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.29.ebuild b/app-emulation/wine/wine-1.1.29.ebuild
index a1957147f80d..1ced05450229 100644
--- a/app-emulation/wine/wine-1.1.29.ebuild
+++ b/app-emulation/wine/wine-1.1.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.29.ebuild,v 1.13 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.29.ebuild,v 1.14 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -94,6 +94,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.3.ebuild b/app-emulation/wine/wine-1.1.3.ebuild
index b6a2f17f5890..1419f148e05d 100644
--- a/app-emulation/wine/wine-1.1.3.ebuild
+++ b/app-emulation/wine/wine-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.3.ebuild,v 1.9 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.3.ebuild,v 1.10 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="1"
 
@@ -87,6 +87,7 @@ src_unpack() {
 	fi
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.30.ebuild b/app-emulation/wine/wine-1.1.30.ebuild
index 5aeff0b539d2..d644b97a938e 100644
--- a/app-emulation/wine/wine-1.1.30.ebuild
+++ b/app-emulation/wine/wine-1.1.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.30.ebuild,v 1.12 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.30.ebuild,v 1.13 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -99,6 +99,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.31.ebuild b/app-emulation/wine/wine-1.1.31.ebuild
index 29d6d5904775..7c22b1063f98 100644
--- a/app-emulation/wine/wine-1.1.31.ebuild
+++ b/app-emulation/wine/wine-1.1.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.31.ebuild,v 1.11 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.31.ebuild,v 1.12 2010/09/21 21:54:17 vapier Exp $
 
 EAPI="2"
 
@@ -98,6 +98,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.32.ebuild b/app-emulation/wine/wine-1.1.32.ebuild
index 163afaff75f2..c90b94a0aa4a 100644
--- a/app-emulation/wine/wine-1.1.32.ebuild
+++ b/app-emulation/wine/wine-1.1.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.32.ebuild,v 1.11 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.32.ebuild,v 1.12 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -98,6 +98,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.33.ebuild b/app-emulation/wine/wine-1.1.33.ebuild
index 6d491bb21c00..6f377967b57c 100644
--- a/app-emulation/wine/wine-1.1.33.ebuild
+++ b/app-emulation/wine/wine-1.1.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.33.ebuild,v 1.11 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.33.ebuild,v 1.12 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -99,6 +99,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.34.ebuild b/app-emulation/wine/wine-1.1.34.ebuild
index 056f359c4acb..6a6f41fdc4d9 100644
--- a/app-emulation/wine/wine-1.1.34.ebuild
+++ b/app-emulation/wine/wine-1.1.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.34.ebuild,v 1.10 2010/07/24 04:42:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.34.ebuild,v 1.11 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -99,6 +99,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.35.ebuild b/app-emulation/wine/wine-1.1.35.ebuild
index 76515e3d5b93..d690383cd506 100644
--- a/app-emulation/wine/wine-1.1.35.ebuild
+++ b/app-emulation/wine/wine-1.1.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.35.ebuild,v 1.8 2010/07/24 04:42:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.35.ebuild,v 1.9 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -99,6 +99,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.36.ebuild b/app-emulation/wine/wine-1.1.36.ebuild
index cd48ed67b8d5..d8e04eecc80e 100644
--- a/app-emulation/wine/wine-1.1.36.ebuild
+++ b/app-emulation/wine/wine-1.1.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.36.ebuild,v 1.6 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.36.ebuild,v 1.7 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -99,6 +99,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.37.ebuild b/app-emulation/wine/wine-1.1.37.ebuild
index 4072bab1a1be..efd5b9ac18f7 100644
--- a/app-emulation/wine/wine-1.1.37.ebuild
+++ b/app-emulation/wine/wine-1.1.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.37.ebuild,v 1.6 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.37.ebuild,v 1.7 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -99,6 +99,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.38.ebuild b/app-emulation/wine/wine-1.1.38.ebuild
index f309bf4514d5..0b74846d6339 100644
--- a/app-emulation/wine/wine-1.1.38.ebuild
+++ b/app-emulation/wine/wine-1.1.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.38.ebuild,v 1.6 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.38.ebuild,v 1.7 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -99,6 +99,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.39.ebuild b/app-emulation/wine/wine-1.1.39.ebuild
index 78e58df65ec1..080217c9f871 100644
--- a/app-emulation/wine/wine-1.1.39.ebuild
+++ b/app-emulation/wine/wine-1.1.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.39.ebuild,v 1.8 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.39.ebuild,v 1.9 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -107,6 +107,7 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.4.ebuild b/app-emulation/wine/wine-1.1.4.ebuild
index 423fea05548f..81ed05b8dcd9 100644
--- a/app-emulation/wine/wine-1.1.4.ebuild
+++ b/app-emulation/wine/wine-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.4.ebuild,v 1.10 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.4.ebuild,v 1.11 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="1"
 
@@ -87,6 +87,7 @@ src_unpack() {
 	fi
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch "${FILESDIR}"/${P}-install-fix.patch #237011
 	epatch_user #282735
diff --git a/app-emulation/wine/wine-1.1.40.ebuild b/app-emulation/wine/wine-1.1.40.ebuild
index db90276a30a4..1e20b30b5630 100644
--- a/app-emulation/wine/wine-1.1.40.ebuild
+++ b/app-emulation/wine/wine-1.1.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.40.ebuild,v 1.8 2010/07/24 04:42:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.40.ebuild,v 1.9 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -107,6 +107,7 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.41.ebuild b/app-emulation/wine/wine-1.1.41.ebuild
index cf8d91e8390d..38cc919bd70b 100644
--- a/app-emulation/wine/wine-1.1.41.ebuild
+++ b/app-emulation/wine/wine-1.1.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.41.ebuild,v 1.8 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.41.ebuild,v 1.9 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -107,6 +107,7 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.42.ebuild b/app-emulation/wine/wine-1.1.42.ebuild
index 60547d65df5e..cc3b73cc48a8 100644
--- a/app-emulation/wine/wine-1.1.42.ebuild
+++ b/app-emulation/wine/wine-1.1.42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.42.ebuild,v 1.7 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.42.ebuild,v 1.8 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -107,6 +107,7 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.43.ebuild b/app-emulation/wine/wine-1.1.43.ebuild
index ac16f4e2ab31..31714b6c7fb3 100644
--- a/app-emulation/wine/wine-1.1.43.ebuild
+++ b/app-emulation/wine/wine-1.1.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.43.ebuild,v 1.7 2010/07/24 04:42:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.43.ebuild,v 1.8 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -107,6 +107,7 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.44.ebuild b/app-emulation/wine/wine-1.1.44.ebuild
index fda50dd0725b..0d2832b3abdb 100644
--- a/app-emulation/wine/wine-1.1.44.ebuild
+++ b/app-emulation/wine/wine-1.1.44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.44.ebuild,v 1.8 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.44.ebuild,v 1.9 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -107,6 +107,7 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.5.ebuild b/app-emulation/wine/wine-1.1.5.ebuild
index 68f53c9a9dbf..ffdecfa55645 100644
--- a/app-emulation/wine/wine-1.1.5.ebuild
+++ b/app-emulation/wine/wine-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.5.ebuild,v 1.8 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.5.ebuild,v 1.9 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="1"
 
@@ -87,6 +87,7 @@ src_unpack() {
 	fi
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.6.ebuild b/app-emulation/wine/wine-1.1.6.ebuild
index cd687037a1b7..02e7d022c732 100644
--- a/app-emulation/wine/wine-1.1.6.ebuild
+++ b/app-emulation/wine/wine-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.6.ebuild,v 1.9 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.6.ebuild,v 1.10 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="1"
 
@@ -88,6 +88,7 @@ src_unpack() {
 	fi
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.7.ebuild b/app-emulation/wine/wine-1.1.7.ebuild
index 78fb8cc1ec16..35da6dbd6643 100644
--- a/app-emulation/wine/wine-1.1.7.ebuild
+++ b/app-emulation/wine/wine-1.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.7.ebuild,v 1.9 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.7.ebuild,v 1.10 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="1"
 
@@ -88,6 +88,7 @@ src_unpack() {
 	fi
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.8.ebuild b/app-emulation/wine/wine-1.1.8.ebuild
index ff16f107ae9b..4eed7347c92f 100644
--- a/app-emulation/wine/wine-1.1.8.ebuild
+++ b/app-emulation/wine/wine-1.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.8.ebuild,v 1.8 2010/07/24 04:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.8.ebuild,v 1.9 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="1"
 
@@ -88,6 +88,7 @@ src_unpack() {
 	fi
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.9.ebuild b/app-emulation/wine/wine-1.1.9.ebuild
index b0a9191271c4..ff9791d036d1 100644
--- a/app-emulation/wine/wine-1.1.9.ebuild
+++ b/app-emulation/wine/wine-1.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.9.ebuild,v 1.8 2010/07/24 04:42:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.9.ebuild,v 1.9 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="1"
 
@@ -88,6 +88,7 @@ src_unpack() {
 	fi
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.2.ebuild b/app-emulation/wine/wine-1.2.ebuild
index 803ce2160c8f..ed99c8e04aea 100644
--- a/app-emulation/wine/wine-1.2.ebuild
+++ b/app-emulation/wine/wine-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.ebuild,v 1.3 2010/08/30 05:19:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.ebuild,v 1.4 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -107,6 +107,7 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.3.0.ebuild b/app-emulation/wine/wine-1.3.0.ebuild
index f8206a82d7fe..957a8ed5acf1 100644
--- a/app-emulation/wine/wine-1.3.0.ebuild
+++ b/app-emulation/wine/wine-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild,v 1.4 2010/09/07 17:10:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild,v 1.5 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -111,6 +111,7 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.3.1.ebuild b/app-emulation/wine/wine-1.3.1.ebuild
index 587b832356c1..94b9b0c65c41 100644
--- a/app-emulation/wine/wine-1.3.1.ebuild
+++ b/app-emulation/wine/wine-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild,v 1.2 2010/09/07 17:10:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild,v 1.3 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -111,6 +111,7 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.3.2.ebuild b/app-emulation/wine/wine-1.3.2.ebuild
index 1e501c301b49..ac89ddfcafd9 100644
--- a/app-emulation/wine/wine-1.3.2.ebuild
+++ b/app-emulation/wine/wine-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild,v 1.3 2010/09/21 21:31:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild,v 1.4 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -114,6 +114,7 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 74eb228111bf..327e35565156 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.60 2010/09/21 21:31:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.61 2010/09/21 21:54:18 vapier Exp $
 
 EAPI="2"
 
@@ -114,6 +114,7 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
+	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die