added die if both sandbox and -fstack-protector are chosen

5 files changed, 63 insertions, 40 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index dea32ccbadaf..1eb00fbe43d8 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,12 +1,15 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.56 2003/04/06 18:49:02 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.57 2003/04/19 19:37:34 method Exp $
 
   06 Apr 2003; Martin Schlemmer <azarah@gentoo.org> :
   Fix all 2.3 ebuild to install timezone data if 'build' in USE, bug #16530.
 
 *glibc-2.3.2-r1 (06 Apr 2003)
 
+  19 Apr 2003; Joshua Brindle <method@gentoo.org> glibc-2.3.1-r4.ebuild:
+  give error and die if both sandbox and -fstack-protector are enabled
+
   06 Apr 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r1.ebuild :
   Fix calculation problems in allocate_static_tls that caused a TLS
   enabled app that loads libGL.so to segfault.  Thanks to Gareth Hughes
@@ -21,6 +24,9 @@
 
 *glibc-2.3.1-r4 (21 Mar 2003)
 
+  14 Apr 2003; Joshua Brindle <method@gentoo.org> glibc-2.3.1-r4.ebuild:
+  give error and die if both sandbox and -fstack-protector are enabled
+
   06 Apr 2003; Zach Welch <zwelch@gentoo.org> glibc-2.3.1-r4.ebuild:
   add arm keyword
 
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.1-r4 b/sys-libs/glibc/files/digest-glibc-2.3.1-r4
index 7218370a9259..9756b70968c5 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.1-r4
+++ b/sys-libs/glibc/files/digest-glibc-2.3.1-r4
@@ -51,6 +51,6 @@ MD5 7f8ec486f1669036429acc8b272c453e /files/2.3.1/glibc23-02-hppa-min-kern-unwin
 MD5 cdbf2aacfaae7737f89ae733f148169c /files/2.3.1/glibc-2.3.1-prelinkfix.patch 5005
 MD5 21506827cc2094c80d3c0c0e8ef3569c /files/2.3.1/glibc-2.3.1-ctype-compat-v2.patch 1468
 MD5 1a926f1adc2f321abb31b1e11024e3ac /files/2.3.2/glibc-2.3.2-dl-reloc-calc-fix.patch 1405
-MD5 6b890ef012c35598074eeae0376749d9 /glibc-2.3.1-r4.ebuild 10463
+MD5 9a71eed057916ba91cc493fba541ce7b /glibc-2.3.1-r4.ebuild 10463
 MD5 e8e7ffcb86f921c5b597008bf6f891bd glibc-2.3.1.tar.gz 17882515
 MD5 73a5b953b89c8ebeb534bf59822dde07 glibc-linuxthreads-2.3.1.tar.gz 244012
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.2-r1 b/sys-libs/glibc/files/digest-glibc-2.3.2-r1
index 1d0bc2dc711e..5fb9c1bd6065 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.2-r1
+++ b/sys-libs/glibc/files/digest-glibc-2.3.2-r1
@@ -1,57 +1,57 @@
-MD5 52cfc7627fc62dfb26d8d163aac361f6 /files/glibc-2.2.2-test-lfs-timeout.patch 320
+MD5 82be016c42c7cc353ee563fcbcbc4769 /files/nscd 840
 MD5 135f8145885a2f4f9876fe973f33ddf6 /files/glibc-2.2.4-string2.h.diff 5221
-MD5 b712a49b5113fccb4c8b0ada2a30d390 /files/glibc-manpages-2.2.5.tar.bz2 14610
+MD5 d688e44731d6e4b757382d7646c492c3 /files/glibc-xdr_security.patch 6612
 MD5 c02420990c4908a6336d81ea5192a37e /files/glibc-manpages-2.3.1.tar.bz2 14755
-MD5 82be016c42c7cc353ee563fcbcbc4769 /files/nscd 840
-MD5 d8830438ea871dbfd1acf7a3d0299159 /files/test-__thread.c 53
+MD5 52cfc7627fc62dfb26d8d163aac361f6 /files/glibc-2.2.2-test-lfs-timeout.patch 320
+MD5 b712a49b5113fccb4c8b0ada2a30d390 /files/glibc-manpages-2.2.5.tar.bz2 14610
 MD5 184eddb92615fb991dce41b9edbfa690 /files/glibc-manpages-2.3.2.tar.bz2 14700
-MD5 d688e44731d6e4b757382d7646c492c3 /files/glibc-xdr_security.patch 6612
-MD5 f75ebd335c4b882013cc12229d39c9f7 /files/2.2.5/glibc-2.2.5-alpha-gcc3-fix.diff 475
-MD5 843eaa26ae2c49e894aa365b6f463546 /files/2.2.5/glibc-2.2.5-alpha-pcdyn-fix.diff 471
+MD5 d8830438ea871dbfd1acf7a3d0299159 /files/test-__thread.c 53
 MD5 93c2f3cb1c07d9a39da245b065c74f6c /files/2.2.5/glibc-2.2.5-divdi3.diff 9752
-MD5 b12e1a7de85cd82bcb341863643c9ffd /files/2.2.5/glibc-2.2.5-dns-network-overflow.diff 365
 MD5 7481046043f42ecf4ac0a218abc896fc /files/2.2.5/glibc-2.2.5-gcc311.patch 534
+MD5 e6dc1e4d7839d2bb08c6865466791183 /files/2.2.5/glibc-2.2.5-sunrpc-overflow.diff 2460
+MD5 e9d9d086e8ed29ed49252d4cd0050f66 /files/2.2.5/glibc-2.2.5.restrict_arr.patch 762
+MD5 a12b84b5af2808f5c0223259f7a9610c /files/2.2.5/glibc-2.2.5-sparc-mathinline.patch 1014
 MD5 b07a316cbba4ddc1e1bb094a3056f12f /files/2.2.5/glibc-2.2.5-ppc-semctl.diff 1337
+MD5 56a7a0273e0666eb40b0c6b45d62881d /files/2.2.5/glibc-2.2.5-arm-sysdeps-fix.diff 362
+MD5 843eaa26ae2c49e894aa365b6f463546 /files/2.2.5/glibc-2.2.5-alpha-pcdyn-fix.diff 471
+MD5 5182f441608833569cb9e78536baf8af /files/2.2.5/glibc-2.2.5-arm-errlist-fix.diff 2210
+MD5 993732f56fdecf36f672198112fc5d5c /files/2.2.5/glibc-2.2.5-threadsig.diff 636
+MD5 a50da56218f9aabc347d7e1130961cec /files/2.2.5/glibc-2.2.5.divbyzero.patch 1694
+MD5 b12e1a7de85cd82bcb341863643c9ffd /files/2.2.5/glibc-2.2.5-dns-network-overflow.diff 365
 MD5 c34a3c6bf21274a506090f05b7ea60ff /files/2.2.5/glibc-2.2.5-ppc-sqrtl.diff 715
 MD5 c7783e49497814c3d86bd63bbed2a9b3 /files/2.2.5/glibc-2.2.5-sandbox.diff 438
-MD5 a12b84b5af2808f5c0223259f7a9610c /files/2.2.5/glibc-2.2.5-sparc-mathinline.patch 1014
 MD5 6bdfb930ffdfdeb6b2ee823fefe42513 /files/2.2.5/glibc-2.2.5-sparc-misc.diff 12252
-MD5 96914104dbdc2807c84549c3d20cb47c /files/2.2.5/glibc-2.2.5-sparc32-semctl.patch 6311
+MD5 f75ebd335c4b882013cc12229d39c9f7 /files/2.2.5/glibc-2.2.5-alpha-gcc3-fix.diff 475
 MD5 6afbd6fe65c0e2034587ba6d1da427a3 /files/2.2.5/glibc-2.2.5-sparc64-fixups.diff 1407
-MD5 e6dc1e4d7839d2bb08c6865466791183 /files/2.2.5/glibc-2.2.5-sunrpc-overflow.diff 2460
-MD5 993732f56fdecf36f672198112fc5d5c /files/2.2.5/glibc-2.2.5-threadsig.diff 636
-MD5 a50da56218f9aabc347d7e1130961cec /files/2.2.5/glibc-2.2.5.divbyzero.patch 1694
-MD5 e9d9d086e8ed29ed49252d4cd0050f66 /files/2.2.5/glibc-2.2.5.restrict_arr.patch 762
-MD5 5182f441608833569cb9e78536baf8af /files/2.2.5/glibc-2.2.5-arm-errlist-fix.diff 2210
-MD5 56a7a0273e0666eb40b0c6b45d62881d /files/2.2.5/glibc-2.2.5-arm-sysdeps-fix.diff 362
-MD5 21506827cc2094c80d3c0c0e8ef3569c /files/2.3.1/glibc-2.3.1-ctype-compat-v2.patch 1468
+MD5 96914104dbdc2807c84549c3d20cb47c /files/2.2.5/glibc-2.2.5-sparc32-semctl.patch 6311
+MD5 2474bda0015ede78a23190c3051a599b /files/2.3.1/glibc-2.3.1-tst-rndseek-mips.patch 446
 MD5 66d8b78875e17e2d385a4d52af9698c4 /files/2.3.1/glibc-2.3.1-ctype-compat.patch 728
-MD5 1c4e567ed001f9489e11ee06c1ced0b7 /files/2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053
-MD5 cdbf2aacfaae7737f89ae733f148169c /files/2.3.1/glibc-2.3.1-prelinkfix.patch 5005
-MD5 d84791059f1b4e7b157b3bbefe783208 /files/2.3.1/glibc-2.3.1-stack_end-compat.patch 751
-MD5 941f13d27badc76c1e3704c59acaff26 /files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
-MD5 4f8ecd70003c5ca153ff7c204c54c1cf /files/2.3.1/glibc-2.3.1-elf-machine-rela-mips.patch 1246
+MD5 5a528678247e6bafe92d2483383afd5b /files/2.3.1/glibc23-00-hppa-pthreads.dpatch 29951
 MD5 afaf2540d2803ac066eb2555f2019a6f /files/2.3.1/glibc-2.3.1-exit-syscall-mips.patch 633
+MD5 4f8ecd70003c5ca153ff7c204c54c1cf /files/2.3.1/glibc-2.3.1-elf-machine-rela-mips.patch 1246
+MD5 941f13d27badc76c1e3704c59acaff26 /files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
+MD5 035d42c51f2397339c1518baa06e3a81 /files/2.3.1/glibc23-04-hppa-fcntl64.dpatch 2085
+MD5 41599dc27ba12b5f2428056dc0ebb1d1 /files/2.3.1/glibc23-08-hppa-configure.dpatch 4704
+MD5 1c4e567ed001f9489e11ee06c1ced0b7 /files/2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053
+MD5 75983ceba061c090373c14394d08d32c /files/2.3.1/glibc-2.3.1-typeo_dl-runtime_c.patch 848
+MD5 a49946706c7f248294896eeb64308a09 /files/2.3.1/glibc23-03-hppa-mcontext.dpatch 1402
+MD5 1e95cbf4aed1619831947cdd35c73108 /files/2.3.1/glibc23-hppa-shmlba.dpatch 1754
 MD5 67b125cec4f1f0d26ce4df706451fee6 /files/2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433
-MD5 235976914abfab3408d8d63cb4ffebe2 /files/2.3.1/glibc-2.3.1-inline-syscall-mips.patch 7753
-MD5 23bbb51d1008f3009e6f1867b284c9bc /files/2.3.1/glibc-2.3.1-libgcc-compat-mips.patch 5222
-MD5 f15c6dec40cefa86dae48a7dcb3b779a /files/2.3.1/glibc-2.3.1-librt-mips.patch 396
-MD5 2474bda0015ede78a23190c3051a599b /files/2.3.1/glibc-2.3.1-tst-rndseek-mips.patch 446
 MD5 e1cbb66f3d9823cf5a05ce52b2223acf /files/2.3.1/glibc-2.3.1-ulps-mips.patch 27618
-MD5 1968bc39ae8224c1dee9534781203d2e /files/2.3.1/glibc-2.3.1-locale.patch 8666
-MD5 5a528678247e6bafe92d2483383afd5b /files/2.3.1/glibc23-00-hppa-pthreads.dpatch 29951
+MD5 f15c6dec40cefa86dae48a7dcb3b779a /files/2.3.1/glibc-2.3.1-librt-mips.patch 396
+MD5 d84791059f1b4e7b157b3bbefe783208 /files/2.3.1/glibc-2.3.1-stack_end-compat.patch 751
+MD5 235976914abfab3408d8d63cb4ffebe2 /files/2.3.1/glibc-2.3.1-inline-syscall-mips.patch 7753
 MD5 b8f6b8b0ed8649fc9af439adef7472f2 /files/2.3.1/glibc23-01-hppa-dl-machine.dpatch 12226
-MD5 7f8ec486f1669036429acc8b272c453e /files/2.3.1/glibc23-02-hppa-min-kern-unwind-fde.dpatch 1728
-MD5 a49946706c7f248294896eeb64308a09 /files/2.3.1/glibc23-03-hppa-mcontext.dpatch 1402
-MD5 035d42c51f2397339c1518baa06e3a81 /files/2.3.1/glibc23-04-hppa-fcntl64.dpatch 2085
+MD5 1968bc39ae8224c1dee9534781203d2e /files/2.3.1/glibc-2.3.1-locale.patch 8666
 MD5 a91843899c8ef4b59341313915f177b4 /files/2.3.1/glibc23-05-hppa-buildhack.dpatch 1134
-MD5 2b746db4988cf7f5c6824302561b7eb5 /files/2.3.1/glibc23-06-hppa-tests.dpatch 21021
 MD5 dc18731db5bd28b8bd2074fc9177fd35 /files/2.3.1/glibc23-07-hppa-atomicity.dpatch 2519
-MD5 41599dc27ba12b5f2428056dc0ebb1d1 /files/2.3.1/glibc23-08-hppa-configure.dpatch 4704
-MD5 1e95cbf4aed1619831947cdd35c73108 /files/2.3.1/glibc23-hppa-shmlba.dpatch 1754
-MD5 75983ceba061c090373c14394d08d32c /files/2.3.1/glibc-2.3.1-typeo_dl-runtime_c.patch 848
+MD5 23bbb51d1008f3009e6f1867b284c9bc /files/2.3.1/glibc-2.3.1-libgcc-compat-mips.patch 5222
+MD5 2b746db4988cf7f5c6824302561b7eb5 /files/2.3.1/glibc23-06-hppa-tests.dpatch 21021
+MD5 7f8ec486f1669036429acc8b272c453e /files/2.3.1/glibc23-02-hppa-min-kern-unwind-fde.dpatch 1728
+MD5 cdbf2aacfaae7737f89ae733f148169c /files/2.3.1/glibc-2.3.1-prelinkfix.patch 5005
+MD5 21506827cc2094c80d3c0c0e8ef3569c /files/2.3.1/glibc-2.3.1-ctype-compat-v2.patch 1468
 MD5 1a926f1adc2f321abb31b1e11024e3ac /files/2.3.2/glibc-2.3.2-dl-reloc-calc-fix.patch 1405
-MD5 06e2b51ec865bbedba7bdc6d74f0f6ff /glibc-2.3.2-r1.ebuild 14667
+MD5 7ea2ff3a727906aab7582611ec998953 /glibc-2.3.2-r1.ebuild 15042
 MD5 ede969aad568f48083e413384f20753c glibc-2.3.2.tar.bz2 13377170
 MD5 894b8969cfbdf787c73e139782167607 glibc-linuxthreads-2.3.2.tar.bz2 216310
 MD5 d1f6f3b48ab60c753b6bdeec9208d393 nptl-0.29.tar.bz2 152937
diff --git a/sys-libs/glibc/glibc-2.3.1-r4.ebuild b/sys-libs/glibc/glibc-2.3.1-r4.ebuild
index 9030775b16f4..1a347b4c1a13 100644
--- a/sys-libs/glibc/glibc-2.3.1-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.3.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.1-r4.ebuild,v 1.6 2003/04/06 18:49:02 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.1-r4.ebuild,v 1.7 2003/04/19 19:37:34 method Exp $
 
 IUSE="nls pic build"
 
@@ -73,6 +73,15 @@ pkg_config() {
 }
 
 src_unpack() {
+
+	if [ `is-flag "-fstack-protector"` -a  `has "sandbox" $FEATURES` ] 
+	then
+		eerror "You have both -fstack-protector and sandbox enabled"
+		eerror "glibc will not compile correctly with both of these enabled"
+		eerror "Please disable sandbox by calling emerge with FEATURES=\"-sandbox\""
+		die
+	fi
+
 	unpack glibc-${PV}.tar.gz || die
 	# Extract pre-made man pages.  Otherwise we need perl, which is a no-no.
 	mkdir -p ${S}/man; cd ${S}/man
diff --git a/sys-libs/glibc/glibc-2.3.2-r1.ebuild b/sys-libs/glibc/glibc-2.3.2-r1.ebuild
index 9380b348d9b0..e77447e4cca0 100644
--- a/sys-libs/glibc/glibc-2.3.2-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r1.ebuild,v 1.1 2003/04/06 09:59:53 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r1.ebuild,v 1.2 2003/04/19 19:37:34 method Exp $
 
 IUSE="nls pic build nptl"
 
@@ -230,6 +230,14 @@ pkg_setup() {
 }
 
 src_unpack() {
+        if [ `is-flag "-fstack-protector"` -a  `has "sandbox" $FEATURES` ]
+        then
+                eerror "You have both -fstack-protector and sandbox enabled"
+                eerror "glibc will not compile correctly with both of these enabled"
+                eerror "Please disable sandbox by calling emerge with FEATURES=\"-sandbox\""
+                die
+        fi
+
 	unpack glibc-${MY_PV}.tar.bz2
 	
 	# Extract pre-made man pages.  Otherwise we need perl, which is a no-no.