Disable SSP for kernel, of course.

Package-Manager: portage-2.1_pre10

4 files changed, 30 insertions, 18 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index dbcc56f3abfa..2a6288549187 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.8 2006/04/30 20:17:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.9 2006/05/01 03:10:10 flameeyes Exp $
+
+  01 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  freebsd-sources-6.0-r4.ebuild, freebsd-sources-6.1_rc1.ebuild:
+  Disable SSP for kernel, of course.
 
 *freebsd-sources-6.1_rc1 (30 Apr 2006)
 
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 93a32963d6b4..596204ccda3e 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -47,18 +47,18 @@ RMD160 1c8ce1849d767a995f075fe43b7313b341bd0805 files/freebsd-sources-gentoo.pat
 SHA256 e5e7186858259e7d6d21e925dde640a68b27255cf69ab089ee82675568e7d9a7 files/freebsd-sources-gentoo.patch 1191
 DIST freebsd-sys-6.0.tar.bz2 16069887 RMD160 02b446bb5a3dde2f91ecba2617a887e817d038a9 SHA256 416fc69ab15d28686d461ca115964091409abc9e5855260d89e2370cad77ad70 size 16069887
 DIST freebsd-sys-6.1_rc1.tar.bz2 17096208 RMD160 26bbd25ed3f3b883c6e06e849a20d47a867733b4 SHA256 612c4f37658a5e355933bc8e6c1748e5624b62c1490f7640ef9d676f96e09c29 size 17096208
-EBUILD freebsd-sources-6.0-r4.ebuild 1916 RMD160 6511c5b9c3212fd2d4075662e9b44b92da6fa815 SHA1 0e99eac6aa3d7c75aced128360badb39b6fa423a SHA256 0a562948ab908c26d4d09d3c06873db6b5c7519ca21bdd9286b4911ac8cb484b size 1916
-MD5 50b3a06fdf221b6339dfdd06179bf783 freebsd-sources-6.0-r4.ebuild 1916
-RMD160 6511c5b9c3212fd2d4075662e9b44b92da6fa815 freebsd-sources-6.0-r4.ebuild 1916
-SHA256 0a562948ab908c26d4d09d3c06873db6b5c7519ca21bdd9286b4911ac8cb484b freebsd-sources-6.0-r4.ebuild 1916
-EBUILD freebsd-sources-6.1_rc1.ebuild 1878 RMD160 aaa5ab3c026c0a190d9b92af45e023cdded36df3 SHA1 ffc2c44443c2173afd4ae17c3fa0d0f5cdfac000 SHA256 95998e1e712dbc826b6bcc24e15bde2861bdd6410238358e7689e406c25a3d23 size 1878
-MD5 23c0601cf22374445dd707fcae2ccf6f freebsd-sources-6.1_rc1.ebuild 1878
-RMD160 aaa5ab3c026c0a190d9b92af45e023cdded36df3 freebsd-sources-6.1_rc1.ebuild 1878
-SHA256 95998e1e712dbc826b6bcc24e15bde2861bdd6410238358e7689e406c25a3d23 freebsd-sources-6.1_rc1.ebuild 1878
-MISC ChangeLog 5024 RMD160 bbbec8f02b9f2f53a54a675f8eef1f8d4dd0abf1 SHA1 c4cb5bf04779f3c717a8fbe339f1d5b98fae74ff SHA256 2c99ef6721aa38045a14dd4c70d733f07be44b840781b5467b09794d070fe2a3 size 5024
-MD5 3ff6ca17e52ea9d84d1310ec49b60897 ChangeLog 5024
-RMD160 bbbec8f02b9f2f53a54a675f8eef1f8d4dd0abf1 ChangeLog 5024
-SHA256 2c99ef6721aa38045a14dd4c70d733f07be44b840781b5467b09794d070fe2a3 ChangeLog 5024
+EBUILD freebsd-sources-6.0-r4.ebuild 2090 RMD160 845d1ef4c577205fa735ce5d11cee0b340b87181 SHA1 2ed100aea8b5964045a3d3c2e679a1514c535767 SHA256 03bc841690e36a1159faf7987c8255fd6533b84943b43524913341b9ebc12e98 size 2090
+MD5 aff23c6739f5cd117e5266494e740154 freebsd-sources-6.0-r4.ebuild 2090
+RMD160 845d1ef4c577205fa735ce5d11cee0b340b87181 freebsd-sources-6.0-r4.ebuild 2090
+SHA256 03bc841690e36a1159faf7987c8255fd6533b84943b43524913341b9ebc12e98 freebsd-sources-6.0-r4.ebuild 2090
+EBUILD freebsd-sources-6.1_rc1.ebuild 2052 RMD160 b9cad32abbb0a96116cde8922631e810237e6353 SHA1 fc6fcf3ccc23bf1165e5c7c1a6c191b8a355443c SHA256 eaa0e24caf307528f986e57ee751004b0a688cf930e1bce93c601ab3e53bf1ad size 2052
+MD5 44eef6cc528d85ed003eed4585a6ee97 freebsd-sources-6.1_rc1.ebuild 2052
+RMD160 b9cad32abbb0a96116cde8922631e810237e6353 freebsd-sources-6.1_rc1.ebuild 2052
+SHA256 eaa0e24caf307528f986e57ee751004b0a688cf930e1bce93c601ab3e53bf1ad freebsd-sources-6.1_rc1.ebuild 2052
+MISC ChangeLog 5180 RMD160 548988203d53c54a68f472f3b387ff11b4bab07f SHA1 87568662a59bc7286a32026bde3d5a85d086434a SHA256 c6b67a4602c711185991ad44bbf229729a8f59f42d86677156812f13d3630634 size 5180
+MD5 b2cda1c9bc92fc11570478d50af4e709 ChangeLog 5180
+RMD160 548988203d53c54a68f472f3b387ff11b4bab07f ChangeLog 5180
+SHA256 c6b67a4602c711185991ad44bbf229729a8f59f42d86677156812f13d3630634 ChangeLog 5180
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -72,7 +72,7 @@ SHA256 504156c3acaa74fdc7ad0234ed9f9fb86814eddcc1c373eb43d646f0029238e8 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVRtxAiZjviIA2XgRAngeAKDKioxbpYSMjgWA2XsaGJdZm8xljACfdkHB
-36ovQVry53ClX7jDc3g8m0Y=
-=WUJf
+iD8DBQFEVXwiAiZjviIA2XgRAq2nAJ9eT82r0Tn9bnSB2lpaysM5QsAWGACePkcu
+J0IK+4q4wa9+H03JpsTGfn4=
+=2QMP
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r4.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r4.ebuild
index a0b2c9af9269..58fd1cc6969a 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r4.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r4.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/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r4.ebuild,v 1.1 2006/04/19 23:44:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r4.ebuild,v 1.2 2006/05/01 03:10:10 flameeyes Exp $
 
 inherit bsdmk freebsd
 
@@ -40,6 +40,10 @@ src_unpack() {
 	epatch "${FILESDIR}/SA-06-14-fpu.patch"
 
 	sed -i -e "s:%GENTOOPVR%:${PVR}:" conf/newvers.sh
+
+	# Disable SSP for the kernel
+	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
+		's:-ffreestanding:-ffreestanding -fno-stack-protector -fno-stack-protector-all:g'
 }
 
 src_compile() {
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc1.ebuild
index dd6863a33341..2ee3327c7bde 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc1.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/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc1.ebuild,v 1.1 2006/04/30 20:17:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc1.ebuild,v 1.2 2006/05/01 03:10:10 flameeyes Exp $
 
 inherit bsdmk freebsd
 
@@ -39,6 +39,10 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-6.0-werror.patch"
 
 	epatch "${FILESDIR}/SA-06-14-fpu.patch"
+
+	# Disable SSP for the kernel
+	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
+		's:-ffreestanding:-ffreestanding -fno-stack-protector -fno-stack-protector-all:g'
 }
 
 src_compile() {