stack-protector workaround #66002

5 files changed, 28 insertions, 9 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 8dd6f1664de3..59337d20e1c0 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/wine
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.79 2004/10/27 19:51:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.80 2004/10/28 01:35:14 vapier Exp $
+
+  27 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/20041019-no-stack.patch, wine-20041019-r1.ebuild,
+  wine-20041019.ebuild:
+  Filter stack-protector flags on the preloader binary #66002 by vyp08.
 
 *wine-20041019-r1 (27 Oct 2004)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index cbbbbb81ebcc..8b7659fd4a3b 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0a0219ff573492e115baf933263ad85b ChangeLog 14239
+MD5 142299d9b437eab2ec1d405572cc3e46 ChangeLog 14445
 MD5 6525c48ba09d08599432ea6c299e52f4 metadata.xml 354
-MD5 9f446942e55c1e395fcd7515313178ac wine-20041019-r1.ebuild 3476
-MD5 8f7e18727427ca5ced07ac8098dcc943 wine-20041019.ebuild 3673
+MD5 4d56a684f6d2b0b0056c7b3fab3603dc wine-20041019-r1.ebuild 3556
+MD5 56b0990c71158a55583c149383d8b652 wine-20041019.ebuild 3753
 MD5 0b8a40b373bf8ab6c0368dd5a64f5449 wine-20040716.ebuild 3443
 MD5 f619ca99f68a2d81076b45b3c19ddbc5 files/20041019-load-wrappers.patch 1402
 MD5 1668a758aa2007cb99a773b3c5c844c9 files/winearts-kdecvs-fix.patch 325
@@ -12,10 +12,11 @@ MD5 ae28341f05c0916661c1346a28720230 files/QueryActCtxw_Photoshop7.0.diff 686
 MD5 90d546d818e0470698ca6b743abe9fca files/digest-wine-20041019-r1 212
 MD5 64c9b939319110b4f44ef6f431262181 files/digest-wine-20041019 212
 MD5 b1893ef0ed5c38dabcbea9fcc3d35f59 files/digest-wine-20040716 212
+MD5 db29ae371718f3db0a915e65dc76f6f2 files/20041019-no-stack.patch 286
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBgEpcHTu7gpaalycRAk0yAJ4hceySRsopdZ7qXlfzdHguNDMelQCfbAQu
-Ld+RuAbsi22nPOIqHGD3dd8=
-=DZwh
+iD8DBQFBgEz1HTu7gpaalycRAgsKAJ9XOOn0+7vsaRFSVEgg5B6ZWjeswgCdEiAr
+4DCyR61T/LGfLSyhR0e3zq0=
+=SR0B
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/20041019-no-stack.patch b/app-emulation/wine/files/20041019-no-stack.patch
new file mode 100644
index 000000000000..3b9b927c4b41
--- /dev/null
+++ b/app-emulation/wine/files/20041019-no-stack.patch
@@ -0,0 +1,9 @@
+--- loader/Makefile.in.orig	2004-10-27 21:26:15.663148264 -0400
++++ loader/Makefile.in	2004-10-27 21:27:44.434652944 -0400
+@@ -55,3 +55,6 @@
+ 	$(RM) $(WINE_BINARIES) $(MODULE)
+ 
+ ### Dependencies:
++
++preloader.o:
++	$(CC) -c  -fno-pic -fno-stack-protector $(ALLCFLAGS) -o $@ preloader.c
diff --git a/app-emulation/wine/wine-20041019-r1.ebuild b/app-emulation/wine/wine-20041019-r1.ebuild
index 0669fcb63d57..196bf1143b0f 100644
--- a/app-emulation/wine/wine-20041019-r1.ebuild
+++ b/app-emulation/wine/wine-20041019-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20041019-r1.ebuild,v 1.2 2004/10/28 01:24:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20041019-r1.ebuild,v 1.3 2004/10/28 01:35:14 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -41,6 +41,8 @@ src_unpack() {
 	epatch ${FILESDIR}/winearts-kdecvs-fix.patch
 	epatch ${FILESDIR}/${PV}-load-wrappers.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
+
+	test_flag -fstack-protector && epatch ${FILESDIR}/${PV}-no-stack.patch #66002
 }
 
 config_cache() {
diff --git a/app-emulation/wine/wine-20041019.ebuild b/app-emulation/wine/wine-20041019.ebuild
index e2abe509fe32..5cdf2d41b234 100644
--- a/app-emulation/wine/wine-20041019.ebuild
+++ b/app-emulation/wine/wine-20041019.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20041019.ebuild,v 1.4 2004/10/28 01:24:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20041019.ebuild,v 1.5 2004/10/28 01:35:14 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -39,6 +39,8 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
+
+	test_flag -fstack-protector && epatch ${FILESDIR}/${PV}-no-stack.patch #66002
 }
 
 config_cache() {