Commit the first try patch for ssp, thanks to solar.

Package-Manager: portage-2.1_pre10

4 files changed, 85 insertions, 10 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 5f340c531058..bd7089b94566 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.10 2006/04/27 16:22:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.11 2006/04/30 03:27:40 flameeyes Exp $
+
+  30 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/freebsd-lib-6.0-ssp.patch, freebsd-lib-6.0-r2.ebuild:
+  Commit the first try patch for ssp, thanks to solar.
 
   27 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   freebsd-lib-6.0-r2.ebuild:
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 800e34497d3c..3ff107aba318 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX freebsd-lib-6.0-binutils-asm.patch 1096 RMD160 1d2c2e60f2c8ca49fb8b01c65aca65b5cd59ea23 SHA1 1533aef95476da5b631d2ffb9b4892773ee5b2ae SHA256 5794228b1754d0b0a9a46fbae7e117ca91ca7da1d842339b279a4185014cbfd9 size 1096
 MD5 7cb2f45f53fcb2792c6fca10be03d948 files/freebsd-lib-6.0-binutils-asm.patch 1096
 RMD160 1d2c2e60f2c8ca49fb8b01c65aca65b5cd59ea23 files/freebsd-lib-6.0-binutils-asm.patch 1096
@@ -14,6 +17,10 @@ AUX freebsd-lib-6.0-pmc.patch 338 RMD160 bb284cc2f9eafd3f65090087af215c3da679fef
 MD5 d2f9a1d35ae1aba75cc56b4ee3e12b68 files/freebsd-lib-6.0-pmc.patch 338
 RMD160 bb284cc2f9eafd3f65090087af215c3da679fefa files/freebsd-lib-6.0-pmc.patch 338
 SHA256 36ca464f0aa1ed8784c8f1edc4a3580704c9a7813963684305250d806000075f files/freebsd-lib-6.0-pmc.patch 338
+AUX freebsd-lib-6.0-ssp.patch 1582 RMD160 2d6e4a6aa6e784ce38a29084fedb0dd1c5f2245f SHA1 d59babbf5446af72fd9fc6fd946b3b4c3fafce54 SHA256 6785edac7f8c5667c21e6a017962553f026f7e05a31f0ae3617b13b6e400795a size 1582
+MD5 72a0b623ceb64c2770453252ce8f81d3 files/freebsd-lib-6.0-ssp.patch 1582
+RMD160 2d6e4a6aa6e784ce38a29084fedb0dd1c5f2245f files/freebsd-lib-6.0-ssp.patch 1582
+SHA256 6785edac7f8c5667c21e6a017962553f026f7e05a31f0ae3617b13b6e400795a files/freebsd-lib-6.0-ssp.patch 1582
 AUX freebsd-lib-bsdxml.patch 339 RMD160 27b501cda2ac76230a72dfc3ee6593cb50f8d4b0 SHA1 3b456d272de5d0c56bc650fe60f38524857f8b31 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9 size 339
 MD5 0fa8fbe7549748636959ef4bc4ea9660 files/freebsd-lib-bsdxml.patch 339
 RMD160 27b501cda2ac76230a72dfc3ee6593cb50f8d4b0 files/freebsd-lib-bsdxml.patch 339
@@ -30,14 +37,14 @@ DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae
 DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
 DIST freebsd-sys-6.0.tar.bz2 16069887 RMD160 02b446bb5a3dde2f91ecba2617a887e817d038a9 SHA256 416fc69ab15d28686d461ca115964091409abc9e5855260d89e2370cad77ad70 size 16069887
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-EBUILD freebsd-lib-6.0-r2.ebuild 6320 RMD160 61cc36b983315e1bb4361e6e6afcfde3195fa04e SHA1 08e5b4422418d554c41f5366aac85b2fd69a9e9f SHA256 7f710aea5cee2c68442963db5ddd18ff7700d488f15c55914265568392167c46 size 6320
-MD5 bcbf7e9ad990461ffcea50cf51fc938d freebsd-lib-6.0-r2.ebuild 6320
-RMD160 61cc36b983315e1bb4361e6e6afcfde3195fa04e freebsd-lib-6.0-r2.ebuild 6320
-SHA256 7f710aea5cee2c68442963db5ddd18ff7700d488f15c55914265568392167c46 freebsd-lib-6.0-r2.ebuild 6320
-MISC ChangeLog 7042 RMD160 76225042652214a3d5d752ab88623da0548347e4 SHA1 bfabfd1a82de1067b65cb7c689ee7b2b7f7ca8e2 SHA256 f0db8e701d32d93f4b7ba43ecb33d30fd1b80e38f9a8a938d121eb9fc28476e7 size 7042
-MD5 31e25824796c04f62c2f4bdd277a36fa ChangeLog 7042
-RMD160 76225042652214a3d5d752ab88623da0548347e4 ChangeLog 7042
-SHA256 f0db8e701d32d93f4b7ba43ecb33d30fd1b80e38f9a8a938d121eb9fc28476e7 ChangeLog 7042
+EBUILD freebsd-lib-6.0-r2.ebuild 6551 RMD160 ff76aa99bf4b051bb6b11c4587742809ed5c35a0 SHA1 76171e5a637171eb31282c4c8399ad8b769c5c7e SHA256 deaa1efea7f9e9215a7c78912345835a0ce024c48cf5bf9ec387a53e405bd675 size 6551
+MD5 ac7c820dd6026823f491675944556350 freebsd-lib-6.0-r2.ebuild 6551
+RMD160 ff76aa99bf4b051bb6b11c4587742809ed5c35a0 freebsd-lib-6.0-r2.ebuild 6551
+SHA256 deaa1efea7f9e9215a7c78912345835a0ce024c48cf5bf9ec387a53e405bd675 freebsd-lib-6.0-r2.ebuild 6551
+MISC ChangeLog 7214 RMD160 6378e1c153cbf55bb9f86aac8fd2ad8bd2356b9f SHA1 c10b61ff374435944ac4059ced69f40beb461f09 SHA256 8597edbf225047ffc4b49ba6f39588d7d1561129ef0cfefd544eefc728987965 size 7214
+MD5 7d21c2cb3ffb034a70aff34dd35147ab ChangeLog 7214
+RMD160 6378e1c153cbf55bb9f86aac8fd2ad8bd2356b9f ChangeLog 7214
+SHA256 8597edbf225047ffc4b49ba6f39588d7d1561129ef0cfefd544eefc728987965 ChangeLog 7214
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -45,3 +52,10 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 c15a1a49762c0863cbfa4bd5be03f174 files/digest-freebsd-lib-6.0-r2 2072
 RMD160 6c9ffd60849a62554acd27568cc21f1b76692ca3 files/digest-freebsd-lib-6.0-r2 2072
 SHA256 f0deccdb9489aa7f2a1dcad0b619427916876a3a58d1b020d754852396c59766 files/digest-freebsd-lib-6.0-r2 2072
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEVC7CAiZjviIA2XgRAr1xAJ9IwiNnxfS56Ln0AUz/8DgDUGrjDACdFJph
+xjCWQBpD7Un/xGT+Hq77Ejc=
+=CM2g
+-----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-ssp.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-ssp.patch
new file mode 100644
index 000000000000..98e07710f123
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-ssp.patch
@@ -0,0 +1,51 @@
+Index: fbsd-6/lib/libc/sys/Makefile.inc
+===================================================================
+--- fbsd-6.orig/lib/libc/sys/Makefile.inc
++++ fbsd-6/lib/libc/sys/Makefile.inc
+@@ -18,7 +18,7 @@
+ .endif
+ 
+ # Sources common to both syscall interfaces:
+-SRCS+=	ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c __error.c
++SRCS+=	ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c __error.c ssp.c
+ 
+ # Add machine dependent asm sources:
+ SRCS+=${MDASM}
+Index: fbsd-6/lib/libc/sys/ssp.c
+===================================================================
+--- /dev/null
++++ fbsd-6/lib/libc/sys/ssp.c
+@@ -0,0 +1,13 @@
++#include <stdlib.h>
++#include <sys/param.h>
++#include <sys/sysctl.h>
++
++unsigned long __guard = 0UL;
++void __guard_setup(void) __attribute__ ((constructor));
++void __stack_smash_handler(char func[], int damaged __attribute__ ((unused)));
++void __guard_setup(void) { if (__guard != 0UL) return; __guard = 0xFF0A0D00UL; }
++
++void __stack_smash_handler(char func[], int damaged) { 
++	_exit(127);
++}
++
+Index: fbsd-6/lib/csu/i386-elf/crt1.c
+===================================================================
+--- fbsd-6.orig/lib/csu/i386-elf/crt1.c
++++ fbsd-6/lib/csu/i386-elf/crt1.c
+@@ -44,6 +44,7 @@ extern void _fini(void);
+ extern void _init(void);
+ extern int main(int, char **, char **);
+ extern void _start(char *, ...);
++extern void __guard_setup(void);
+ 
+ #ifdef GCRT
+ extern void _mcleanup(void);
+@@ -106,6 +107,7 @@ _start(char *ap, ...)
+ 	monstartup(&eprol, &etext);
+ #endif
+ 	_init();
++	__guard_setup();
+ 	exit( main(argc, argv, env) );
+ }
+ 
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild
index 5f1c6de2bc61..518ff3e1e27b 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.0-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/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild,v 1.4 2006/04/27 16:22:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild,v 1.5 2006/04/30 03:27:40 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic toolchain-funcs
 
@@ -67,6 +67,8 @@ pkg_setup() {
 		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
 		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
 	fi
+
+	einfo "Using mymakeopts: ${mymakeopts}"
 }
 
 PATCHES="${FILESDIR}/${PN}-bsdxml.patch
@@ -107,6 +109,9 @@ src_unpack() {
 
 	[[ -n $(install --version 2> /dev/null | grep GNU) ]] && \
 		sed -i -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
+
+	sed -i -e 's:-o/dev/stdout:-t:' ${S}/libc/net/Makefile.inc
+	use ssp && epatch "${FILESDIR}/${PN}-${RV}-ssp.patch"
 }
 
 src_compile() {
@@ -141,6 +146,7 @@ src_compile() {
 		cd "${S}/msun"
 		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
 	else
+		append-flags -fno-stack-protector # Don't use ssp until properly fixed
 		cd "${S}"
 		freebsd_src_compile
 	fi