Update the SSP patch with the version now in upstream.

Package-Manager: portage-2.1_pre3-r1

22 files changed, 89 insertions, 69 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index ab4ced10e192..b04679a9607b 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.123 2006/01/25 00:03:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.124 2006/01/27 00:35:00 vapier Exp $
+
+  27 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  -files/wine-20041019-no-stack.patch, +files/wine-no-ssp.patch,
+  wine-0.9.ebuild, wine-0.9.1.ebuild, wine-0.9.2.ebuild, wine-0.9.3.ebuild,
+  wine-0.9.4.ebuild, wine-0.9.5-r1.ebuild, wine-0.9.6.ebuild,
+  wine-9999.ebuild, wine-20041019-r3.ebuild, wine-20050111-r2.ebuild,
+  wine-20050211.ebuild, wine-20050310-r1.ebuild, wine-20050419.ebuild,
+  wine-20050524.ebuild, wine-20050628.ebuild, wine-20050725-r1.ebuild,
+  wine-20050830.ebuild, wine-20050930.ebuild:
+  Update the SSP patch with the version now in upstream.
 
   25 Jan 2006; Mike Frysinger <vapier@gentoo.org>
   +files/wine-0.9.6-force-ddraw-gamma.patch, wine-0.9.6.ebuild:
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 3a6a19281424..12a67e5dfe0a 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0ee8efa996e4101ca01fc18eaf1b233c ChangeLog 22653
+MD5 b288433532b46ce839f37c7ab19de3b3 ChangeLog 23222
 MD5 fb8724a36ec3bef0ad3a3c36376b786a files/digest-wine-0.9 63
 MD5 d46df5add2535f22ad43db8247d7a45b files/digest-wine-0.9.1 65
 MD5 cc82e89428aa4f49f2f2ab3544488c02 files/digest-wine-0.9.2 65
@@ -23,7 +23,6 @@ MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-wine-9999 0
 MD5 491474e73029992d0fd9b888d0d1b4ce files/wine-0.9.4-null-thread-check.patch 878
 MD5 125d70d60f356673616cf1effa73d5d1 files/wine-0.9.6-force-ddraw-gamma.patch 862
 MD5 138d22e6669e8997cdf4dc6292db748d files/wine-20041019-alsa-headers.patch 448
-MD5 bcce3a9782f7fdfae1035b456e394ce2 files/wine-20041019-no-stack.patch 180
 MD5 32c5bd022b8547d02b07517dd7a9bc02 files/wine-20050111-upstream-registry-fix.patch.bz2 13584
 MD5 3e8110a5c409098abadc38cee8f440f7 files/wine-20050211-docs.patch 642
 MD5 45243901331840c35f12426a17b31bd2 files/wine-20050310-upstream-colortable.patch 1546
@@ -35,31 +34,32 @@ MD5 d2a0eccb86ce76caa334965b6bdd9251 files/wine-20050930-dont-warn-lib-path.patc
 MD5 c3bac6bd0a3c6a35aaaae8c7888c30f3 files/wine-20050930-no-x.patch 601
 MD5 e1f0b4cbd720c0f77c445d370c0c3b46 files/wine-cvs-winelauncher-temp.patch 1007
 MD5 46ecb0d10e6a2ad66abeb0a2d6dd0a3d files/wine-hangfix-bug2660.patch 476
+MD5 a4727870f6da9ca5370ba0263e220f49 files/wine-no-ssp.patch 676
 MD5 68927499c968ed305a0f5125fb3b7d19 files/wine-wmf.patch 857
 MD5 1668a758aa2007cb99a773b3c5c844c9 files/winearts-kdecvs-fix.patch 325
 MD5 6525c48ba09d08599432ea6c299e52f4 metadata.xml 354
-MD5 6dd5b36cc358ea23d97aa38c8c94a520 wine-0.9.1.ebuild 4150
-MD5 1dab11f89e3d7f4b10bd789bed7d0265 wine-0.9.2.ebuild 4150
-MD5 7631647054ad75a7482c54627b6bc6c0 wine-0.9.3.ebuild 4150
-MD5 05dad88ebc41ff704ccae477c247cbcf wine-0.9.4.ebuild 4201
-MD5 eb706be561b681a9fa0b68ee46e0f095 wine-0.9.5-r1.ebuild 4153
-MD5 899c0866cff91c999e4d24346b01467c wine-0.9.6.ebuild 4180
-MD5 034954140861812f7f678c15391019ba wine-0.9.ebuild 4148
-MD5 901fdaa0cd066cc44ee555ae51e334de wine-20041019-r3.ebuild 3505
-MD5 f70a71dc17b70bded5afc14ac1dd0c7d wine-20050111-r2.ebuild 3647
-MD5 361a9c1394f0ded7bd9a22f24b3e608a wine-20050211.ebuild 4150
-MD5 d32ccd4e240ccdc9271094fd7b52d185 wine-20050310-r1.ebuild 4250
-MD5 835c76a51fd05d0dcc10011048404a56 wine-20050419.ebuild 4190
-MD5 713d0daa395d9cab0d78cb6d0a37372d wine-20050524.ebuild 4253
-MD5 f80914d2c8fe3a11322f3420036e4f2b wine-20050628.ebuild 4254
-MD5 90cc9832c7629f1c96ccf3f46c8c6b3e wine-20050725-r1.ebuild 4304
-MD5 f7c66332c79a2b4da16a88dd2b54e22d wine-20050830.ebuild 4288
-MD5 6fe3fa571face8f4ae589cda0618fc26 wine-20050930.ebuild 4257
-MD5 1755d1d5e576c6a1c9c567f380843050 wine-9999.ebuild 4171
+MD5 9e988b9d7974d8d496108ab7d3e353f2 wine-0.9.1.ebuild 4139
+MD5 b9eff914ba660a215f9b6888a4487be4 wine-0.9.2.ebuild 4139
+MD5 bcd1daeed62677d7d025f36b9c9604d3 wine-0.9.3.ebuild 4139
+MD5 f066443f1d60dca6180bbf5dc7026404 wine-0.9.4.ebuild 4190
+MD5 23b6bcd8c8e5289045767a7efba5a906 wine-0.9.5-r1.ebuild 4142
+MD5 9b8d3b13dde00aac76619be9c363137b wine-0.9.6.ebuild 4169
+MD5 5b0219682a1f79cb46f55c8360e50889 wine-0.9.ebuild 4137
+MD5 f309bdd3f92cbd1c5c6e09a4a68c0441 wine-20041019-r3.ebuild 3494
+MD5 59efeb5f12b2323197e284d344eae34b wine-20050111-r2.ebuild 3636
+MD5 aead3d19df6656469ee2168f15ad39b6 wine-20050211.ebuild 4139
+MD5 8ecf462dc40670c3dcd0fb9c1ac822b0 wine-20050310-r1.ebuild 4239
+MD5 7832679823ce23d29c567af5269cb4a5 wine-20050419.ebuild 4179
+MD5 3c7bf58ba3c7b03f352f48e8c798acdd wine-20050524.ebuild 4242
+MD5 e50cd69e7957a2857e481c858d1949b8 wine-20050628.ebuild 4243
+MD5 fef3b6e6e1be2cd62696496c3def906e wine-20050725-r1.ebuild 4293
+MD5 e7508dd444c69b42cd58a3e7d3fcb650 wine-20050830.ebuild 4277
+MD5 d689a6f1cd379dc3d033bfc66f76c687 wine-20050930.ebuild 4247
+MD5 682d2be1b51759df59002719bfe25346 wine-9999.ebuild 4113
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD1sDj2+ySkm8kpY0RAgXAAJ48kNz7ZVvI7Nmw1EptwL9zYB2hkgCfVSdc
-Ba7XJaZofo5UuBCAfdfjpX8=
-=5yA7
+iD8DBQFD2WrD2+ySkm8kpY0RAqxQAKC77xY75hC6UREpZz/UKrH7u7BCVACdGyP7
+qqZtaJgyUsDY9IV6OA0kzEE=
+=800q
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/wine-20041019-no-stack.patch b/app-emulation/wine/files/wine-20041019-no-stack.patch
deleted file mode 100644
index 49852f3b6513..000000000000
--- a/app-emulation/wine/files/wine-20041019-no-stack.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- loader/Makefile.in
-+++ loader/Makefile.in
-@@ -21,5 +21,6 @@
- 
- @MAKE_RULES@
-+CFLAGS += -fno-pic -fno-stack-protector
- 
- LIBPTHREAD  = @LIBPTHREAD@
- LDEXECFLAGS = @LDEXECFLAGS@
diff --git a/app-emulation/wine/files/wine-no-ssp.patch b/app-emulation/wine/files/wine-no-ssp.patch
new file mode 100644
index 000000000000..f75cfb701914
--- /dev/null
+++ b/app-emulation/wine/files/wine-no-ssp.patch
@@ -0,0 +1,20 @@
+Index: loader/preloader.c
+===================================================================
+RCS file: /home/wine/wine/loader/preloader.c,v
+retrieving revision 1.18
+retrieving revision 1.19
+diff -u -p -r1.18 -r1.19
+--- loader/preloader.c	14 Dec 2005 11:26:30 -0000	1.18
++++ loader/preloader.c	26 Jan 2006 12:45:33 -0000	1.19
+@@ -155,6 +155,11 @@ struct wld_link_map {
+  */
+ void __bb_init_func() { return; }
+ 
++/* similar to the above but for -fstack-protector */
++void *__stack_chk_guard = 0;
++void *__guard = 0;
++void __stack_chk_fail(void) { return; }
++void __stack_smash_handler(void) { return; }
+ 
+ /*
+  * The _start function is the entry and exit point of this program
diff --git a/app-emulation/wine/wine-0.9.1.ebuild b/app-emulation/wine/wine-0.9.1.ebuild
index 190a06d9bb62..942ff12f16c4 100644
--- a/app-emulation/wine/wine-0.9.1.ebuild
+++ b/app-emulation/wine/wine-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.1.ebuild,v 1.4 2006/01/14 18:38:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.1.ebuild,v 1.5 2006/01/27 00:35:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -84,7 +84,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/wine-20050524-alsa-headers.patch
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
diff --git a/app-emulation/wine/wine-0.9.2.ebuild b/app-emulation/wine/wine-0.9.2.ebuild
index 169d605d13aa..2603524fb984 100644
--- a/app-emulation/wine/wine-0.9.2.ebuild
+++ b/app-emulation/wine/wine-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.2.ebuild,v 1.4 2006/01/14 18:38:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.2.ebuild,v 1.5 2006/01/27 00:35:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -84,7 +84,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/wine-20050524-alsa-headers.patch
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
diff --git a/app-emulation/wine/wine-0.9.3.ebuild b/app-emulation/wine/wine-0.9.3.ebuild
index e8f7d3735645..b88082aad38d 100644
--- a/app-emulation/wine/wine-0.9.3.ebuild
+++ b/app-emulation/wine/wine-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.3.ebuild,v 1.5 2006/01/14 18:38:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.3.ebuild,v 1.6 2006/01/27 00:35:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -84,7 +84,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/wine-20050524-alsa-headers.patch
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
diff --git a/app-emulation/wine/wine-0.9.4.ebuild b/app-emulation/wine/wine-0.9.4.ebuild
index c06b064de7de..bf005c98ec08 100644
--- a/app-emulation/wine/wine-0.9.4.ebuild
+++ b/app-emulation/wine/wine-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.4.ebuild,v 1.5 2006/01/14 18:38:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.4.ebuild,v 1.6 2006/01/27 00:35:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -84,7 +84,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/wine-20050524-alsa-headers.patch
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
 	epatch "${FILESDIR}"/${P}-null-thread-check.patch
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
diff --git a/app-emulation/wine/wine-0.9.5-r1.ebuild b/app-emulation/wine/wine-0.9.5-r1.ebuild
index 7d130e043d4a..ffd28d5df793 100644
--- a/app-emulation/wine/wine-0.9.5-r1.ebuild
+++ b/app-emulation/wine/wine-0.9.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.5-r1.ebuild,v 1.1 2006/01/15 09:18:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.5-r1.ebuild,v 1.2 2006/01/27 00:35:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -84,7 +84,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/wine-20050524-alsa-headers.patch
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
diff --git a/app-emulation/wine/wine-0.9.6.ebuild b/app-emulation/wine/wine-0.9.6.ebuild
index ba1209d0981b..6c4bce9c56d8 100644
--- a/app-emulation/wine/wine-0.9.6.ebuild
+++ b/app-emulation/wine/wine-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.6.ebuild,v 1.3 2006/01/25 00:03:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.6.ebuild,v 1.4 2006/01/27 00:35:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -84,7 +84,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/wine-20050524-alsa-headers.patch
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
diff --git a/app-emulation/wine/wine-0.9.ebuild b/app-emulation/wine/wine-0.9.ebuild
index 2d4f91ef53e6..b67ec95f571f 100644
--- a/app-emulation/wine/wine-0.9.ebuild
+++ b/app-emulation/wine/wine-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.ebuild,v 1.4 2006/01/14 18:38:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.ebuild,v 1.5 2006/01/27 00:35:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -84,7 +84,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/wine-20050524-alsa-headers.patch
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
diff --git a/app-emulation/wine/wine-20041019-r3.ebuild b/app-emulation/wine/wine-20041019-r3.ebuild
index 706e9f60c47a..c428212a890d 100644
--- a/app-emulation/wine/wine-20041019-r3.ebuild
+++ b/app-emulation/wine/wine-20041019-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20041019-r3.ebuild,v 1.21 2006/01/14 18:39:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20041019-r3.ebuild,v 1.22 2006/01/27 00:35:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -58,7 +58,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/wine-20050524-alsa-headers.patch
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
 	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
 	epatch "${FILESDIR}"/wine-cvs-winelauncher-temp.patch #101773
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
diff --git a/app-emulation/wine/wine-20050111-r2.ebuild b/app-emulation/wine/wine-20050111-r2.ebuild
index 4b3104f226c0..f7ac5c5d9a4f 100644
--- a/app-emulation/wine/wine-20050111-r2.ebuild
+++ b/app-emulation/wine/wine-20050111-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050111-r2.ebuild,v 1.5 2006/01/14 18:39:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050111-r2.ebuild,v 1.6 2006/01/27 00:35:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -58,7 +58,7 @@ src_unpack() {
 	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
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
 	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
 	epatch "${FILESDIR}"/wine-cvs-winelauncher-temp.patch #101773
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
diff --git a/app-emulation/wine/wine-20050211.ebuild b/app-emulation/wine/wine-20050211.ebuild
index 3eef06abbc8a..79941f2cbe8b 100644
--- a/app-emulation/wine/wine-20050211.ebuild
+++ b/app-emulation/wine/wine-20050211.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050211.ebuild,v 1.19 2006/01/14 18:39:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050211.ebuild,v 1.20 2006/01/27 00:35:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -81,7 +81,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	epatch "${FILESDIR}"/wine-20050211-docs.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
 	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
 	epatch "${FILESDIR}"/wine-cvs-winelauncher-temp.patch #101773
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
diff --git a/app-emulation/wine/wine-20050310-r1.ebuild b/app-emulation/wine/wine-20050310-r1.ebuild
index 57fc30ecc0d9..8389418f7bff 100644
--- a/app-emulation/wine/wine-20050310-r1.ebuild
+++ b/app-emulation/wine/wine-20050310-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050310-r1.ebuild,v 1.12 2006/01/14 18:39:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050310-r1.ebuild,v 1.13 2006/01/27 00:35:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -82,7 +82,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/wine-hangfix-bug2660.patch #98156
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/wine-20050310-upstream-colortable.patch #88715
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
 	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
 	epatch "${FILESDIR}"/wine-cvs-winelauncher-temp.patch #101773
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
diff --git a/app-emulation/wine/wine-20050419.ebuild b/app-emulation/wine/wine-20050419.ebuild
index abdd2fb0101c..dc3cc9d6d707 100644
--- a/app-emulation/wine/wine-20050419.ebuild
+++ b/app-emulation/wine/wine-20050419.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050419.ebuild,v 1.14 2006/01/14 18:39:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050419.ebuild,v 1.15 2006/01/27 00:35:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -81,7 +81,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	epatch "${FILESDIR}"/wine-hangfix-bug2660.patch #98156
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
 	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
 	epatch "${FILESDIR}"/wine-cvs-winelauncher-temp.patch #101773
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
diff --git a/app-emulation/wine/wine-20050524.ebuild b/app-emulation/wine/wine-20050524.ebuild
index 9dd3aa0ad85f..37ee867172b0 100644
--- a/app-emulation/wine/wine-20050524.ebuild
+++ b/app-emulation/wine/wine-20050524.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050524.ebuild,v 1.13 2006/01/14 18:39:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050524.ebuild,v 1.14 2006/01/27 00:35:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -81,7 +81,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	epatch "${FILESDIR}"/wine-hangfix-bug2660.patch #98156
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
 	epatch "${FILESDIR}"/wine-20050725-gcc-32bit.patch
 	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
 	epatch "${FILESDIR}"/wine-cvs-winelauncher-temp.patch #101773
diff --git a/app-emulation/wine/wine-20050628.ebuild b/app-emulation/wine/wine-20050628.ebuild
index 5a916d4990f8..e20c8b1c59aa 100644
--- a/app-emulation/wine/wine-20050628.ebuild
+++ b/app-emulation/wine/wine-20050628.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050628.ebuild,v 1.8 2006/01/14 18:39:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050628.ebuild,v 1.9 2006/01/27 00:35:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -80,7 +80,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/wine-20050524-alsa-headers.patch
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
 	epatch "${FILESDIR}"/wine-20050725-gcc-32bit.patch
 	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
 	epatch "${FILESDIR}"/wine-cvs-winelauncher-temp.patch #101773
diff --git a/app-emulation/wine/wine-20050725-r1.ebuild b/app-emulation/wine/wine-20050725-r1.ebuild
index 85c7f6bed2fd..f1c307057d5e 100644
--- a/app-emulation/wine/wine-20050725-r1.ebuild
+++ b/app-emulation/wine/wine-20050725-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050725-r1.ebuild,v 1.6 2006/01/14 18:39:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050725-r1.ebuild,v 1.7 2006/01/27 00:35:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -80,7 +80,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/wine-20050524-alsa-headers.patch
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
 	epatch "${FILESDIR}"/wine-20050725-gcc-32bit.patch
 	epatch "${FILESDIR}"/wine-20050930-no-x.patch
 	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
diff --git a/app-emulation/wine/wine-20050830.ebuild b/app-emulation/wine/wine-20050830.ebuild
index d8fc87eefcac..fc88978196fb 100644
--- a/app-emulation/wine/wine-20050830.ebuild
+++ b/app-emulation/wine/wine-20050830.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050830.ebuild,v 1.5 2006/01/14 18:39:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050830.ebuild,v 1.6 2006/01/27 00:35:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -80,7 +80,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/wine-20050524-alsa-headers.patch
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
 	epatch "${FILESDIR}"/wine-20050830-gcc-32bit.patch
 	epatch "${FILESDIR}"/wine-20050930-no-x.patch
 	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
diff --git a/app-emulation/wine/wine-20050930.ebuild b/app-emulation/wine/wine-20050930.ebuild
index 09e5f7c5ceb2..9ca56ceae5d9 100644
--- a/app-emulation/wine/wine-20050930.ebuild
+++ b/app-emulation/wine/wine-20050930.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050930.ebuild,v 1.9 2006/01/14 18:39:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050930.ebuild,v 1.10 2006/01/27 00:35:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -84,7 +84,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/wine-20050524-alsa-headers.patch
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
 	epatch "${FILESDIR}"/wine-20050930-no-x.patch
 	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 80840e8fdb14..fe0077125093 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.3 2006/01/05 03:00:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.4 2006/01/27 00:35:00 vapier Exp $
 
 ECVS_SERVER="cvs.winehq.org:/home/wine"
 ECVS_MODULE="wine"
@@ -90,7 +90,6 @@ src_unpack() {
 	epatch "${FILESDIR}"/wine-20050524-alsa-headers.patch
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
-	epatch "${FILESDIR}"/wine-20041019-no-stack.patch #66002
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }