Index: distrib/sets/lists/base/shl.elf =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/base/shl.elf,v retrieving revision 1.125 diff -u -u -r1.125 shl.elf --- distrib/sets/lists/base/shl.elf 22 Nov 2006 23:38:25 -0000 1.125 +++ distrib/sets/lists/base/shl.elf 17 Jul 2007 13:52:15 -0000 @@ -20,8 +20,8 @@ ./lib/libprop.so.0 base-sys-shlib ./lib/libradius.so base-sys-shlib ./lib/libradius.so.1 base-sys-shlib -./lib/libssp.so base-sys-shlib -./lib/libssp.so.0 base-sys-shlib +./lib/libssp.so base-obsolete obsolete +./lib/libssp.so.0 base-obsolete obsolete ./lib/libtermcap.so base-sys-shlib ./lib/libtermcap.so.0 base-sys-shlib ./lib/libtermlib.so base-sys-shlib @@ -191,8 +191,8 @@ ./usr/lib/libssh.so.5 base-secsh-shlib crypto ./usr/lib/libssl.so base-crypto-shlib crypto ./usr/lib/libssl.so.4 base-crypto-shlib crypto -./usr/lib/libssp.so base-sys-shlib -./usr/lib/libssp.so.0 base-sys-shlib +./usr/lib/libssp.so base-obsolete obsolete +./usr/lib/libssp.so.0 base-obsolete obsolete ./usr/lib/libstdc++.so base-sys-shlib gcc ./usr/lib/libstdc++.so.5 base-sys-shlib gcc=3 ./usr/lib/libstdc++.so.6 base-sys-shlib gcc=4 Index: distrib/sets/lists/base/shl.mi =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/base/shl.mi,v retrieving revision 1.381.2.1 diff -u -u -r1.381.2.1 shl.mi --- distrib/sets/lists/base/shl.mi 13 May 2007 10:14:07 -0000 1.381.2.1 +++ distrib/sets/lists/base/shl.mi 17 Jul 2007 13:52:15 -0000 @@ -10,7 +10,7 @@ ./lib/libm.so.0.5 base-sys-shlib ./lib/libprop.so.0.5 base-sys-shlib ./lib/libradius.so.1.0 base-sys-shlib -./lib/libssp.so.0.0 base-sys-shlib +./lib/libssp.so.0.0 base-obsolete obsolete ./lib/libtermcap.so.0.6 base-sys-shlib ./lib/libtermlib.so.0.6 base-sys-shlib ./lib/libutil.so.7.11 base-sys-shlib @@ -96,7 +96,7 @@ ./usr/lib/libskey.so.1.0 base-sys-shlib skey ./usr/lib/libsl.so.2.0 base-krb5-shlib kerberos ./usr/lib/libss.so.4.0 base-krb5-shlib kerberos -./usr/lib/libssp.so.0.0 base-sys-shlib +./usr/lib/libssp.so.0.0 base-obsolete obsolete ./usr/lib/libssh.so.2.0 base-obsolete obsolete ./usr/lib/libssh.so.3.0 base-obsolete obsolete ./usr/lib/libssh.so.4.0 base-obsolete obsolete Index: distrib/sets/lists/comp/mi =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/comp/mi,v retrieving revision 1.981.2.3 diff -u -u -r1.981.2.3 mi --- distrib/sets/lists/comp/mi 25 May 2007 07:28:11 -0000 1.981.2.3 +++ distrib/sets/lists/comp/mi 17 Jul 2007 13:52:35 -0000 @@ -1716,6 +1716,7 @@ ./usr/include/ssp/ssp.h comp-c-include ./usr/include/ssp/stdio.h comp-c-include ./usr/include/ssp/string.h comp-c-include +./usr/include/ssp/strings.h comp-c-include ./usr/include/ssp/unistd.h comp-c-include ./usr/include/stab.h comp-c-include ./usr/include/stdarg.h comp-c-include @@ -2168,8 +2169,8 @@ ./usr/lib/libssh_p.a comp-c-proflib profile,crypto ./usr/lib/libssl.a comp-c-lib crypto ./usr/lib/libssl_p.a comp-c-proflib profile,crypto -./usr/lib/libssp.a comp-c-lib -./usr/lib/libssp_p.a comp-c-proflib profile +./usr/lib/libssp.a comp-obsolete obsolete +./usr/lib/libssp_p.a comp-obsolete obsolete ./usr/lib/libstdc++.a comp-cxx-lib ./usr/lib/libstdc++_p.a comp-cxx-proflib profile ./usr/lib/libsupc++.a comp-cxx-lib @@ -3038,7 +3039,7 @@ ./usr/libdata/lint/llib-lsm.ln comp-obsolete obsolete ./usr/libdata/lint/llib-lssh.ln comp-c-lintlib lint,crypto ./usr/libdata/lint/llib-lssl.ln comp-c-lintlib lint,crypto -./usr/libdata/lint/llib-lssp.ln comp-c-lintlib lint +./usr/libdata/lint/llib-lssp.ln comp-obsolete obsolete ./usr/libdata/lint/llib-lstdc.ln comp-c-lintlib lint ./usr/libdata/lint/llib-ltelnet.ln comp-obsolete obsolete ./usr/libdata/lint/llib-ltermcap.ln comp-c-lintlib lint @@ -5920,6 +5921,7 @@ ./usr/share/man/cat3/srandom.0 comp-c-catman .cat ./usr/share/man/cat3/sscanf.0 comp-c-catman .cat ./usr/share/man/cat3/ssl.0 comp-c-catman crypto,.cat +./usr/share/man/cat3/ssp.0 comp-c-catman .cat ./usr/share/man/cat3/standend.0 comp-c-catman .cat ./usr/share/man/cat3/standout.0 comp-c-catman .cat ./usr/share/man/cat3/start_color.0 comp-c-catman .cat @@ -10174,6 +10176,7 @@ ./usr/share/man/man3/srandom.3 comp-c-man .man ./usr/share/man/man3/sscanf.3 comp-c-man .man ./usr/share/man/man3/ssl.3 comp-c-man crypto,.man +./usr/share/man/man3/ssp.3 comp-c-man .man ./usr/share/man/man3/standend.3 comp-c-man .man ./usr/share/man/man3/standout.3 comp-c-man .man ./usr/share/man/man3/start_color.3 comp-c-man .man Index: distrib/sets/lists/comp/shl.mi =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/comp/shl.mi,v retrieving revision 1.54 diff -u -u -r1.54 shl.mi --- distrib/sets/lists/comp/shl.mi 11 Nov 2006 12:06:54 -0000 1.54 +++ distrib/sets/lists/comp/shl.mi 17 Jul 2007 13:52:35 -0000 @@ -62,7 +62,7 @@ ./usr/lib/libss_pic.a comp-c-piclib kerberos ./usr/lib/libssh_pic.a comp-c-piclib crypto ./usr/lib/libssl_pic.a comp-c-piclib crypto -./usr/lib/libssp_pic.a comp-c-piclib +./usr/lib/libssp_pic.a comp-obsolete obsolete ./usr/lib/libstdc++_pic.a comp-cxx-piclib ./usr/lib/libtermcap_pic.a comp-c-piclib ./usr/lib/libtermlib_pic.a comp-c-piclib Index: include/Makefile =================================================================== RCS file: /cvsroot/src/include/Makefile,v retrieving revision 1.125 diff -u -u -r1.125 Makefile --- include/Makefile 30 Oct 2006 20:22:54 -0000 1.125 +++ include/Makefile 17 Jul 2007 13:58:15 -0000 @@ -31,6 +31,8 @@ INCS+= rpcsvc/yp_prot.h rpcsvc/ypclnt.h +INCS+= ssp/ssp.h ssp/stdio.h ssp/string.h ssp/strings.h ssp/unistd.h + .if (${MACHINE_ARCH} != "vax") INCS+= ieeefp.h .endif Index: include/stdio.h =================================================================== RCS file: /cvsroot/src/include/stdio.h,v retrieving revision 1.66.2.1 diff -u -u -r1.66.2.1 stdio.h --- include/stdio.h 7 May 2007 19:49:10 -0000 1.66.2.1 +++ include/stdio.h 17 Jul 2007 13:58:15 -0000 @@ -1,4 +1,4 @@ -/* $NetBSD: stdio.h,v 1.66.2.1 2007/05/07 19:49:10 pavel Exp $ */ +/* $NetBSD: stdio.h,v 1.69 2007/05/30 21:14:37 tls Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -476,4 +476,6 @@ #define putchar_unlocked(x) putc_unlocked(x, stdout) #endif /* _POSIX_C_SOURCE >= 199506 || _XOPEN_SOURCE >= 500 || _REENTRANT... */ +#include + #endif /* _STDIO_H_ */ Index: include/string.h =================================================================== RCS file: /cvsroot/src/include/string.h,v retrieving revision 1.31 diff -u -u -r1.31 string.h --- include/string.h 12 Aug 2006 23:50:13 -0000 1.31 +++ include/string.h 17 Jul 2007 13:58:15 -0000 @@ -1,4 +1,4 @@ -/* $NetBSD: string.h,v 1.31 2006/08/12 23:50:13 christos Exp $ */ +/* $NetBSD: string.h,v 1.32 2007/05/30 21:14:37 tls Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -91,4 +91,5 @@ #endif __END_DECLS +#include #endif /* !defined(_STRING_H_) */ Index: include/strings.h =================================================================== RCS file: /cvsroot/src/include/strings.h,v retrieving revision 1.10 diff -u -u -r1.10 strings.h --- include/strings.h 3 Feb 2005 04:39:32 -0000 1.10 +++ include/strings.h 17 Jul 2007 13:58:15 -0000 @@ -1,4 +1,4 @@ -/* $NetBSD: strings.h,v 1.10 2005/02/03 04:39:32 perry Exp $ */ +/* $NetBSD: strings.h,v 1.11 2007/05/30 21:14:37 tls Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -68,4 +68,5 @@ #include #endif +#include #endif /* !defined(_STRINGS_H_) */ Index: include/unistd.h =================================================================== RCS file: /cvsroot/src/include/unistd.h,v retrieving revision 1.110 diff -u -u -r1.110 unistd.h --- include/unistd.h 26 Dec 2005 19:01:47 -0000 1.110 +++ include/unistd.h 17 Jul 2007 13:58:21 -0000 @@ -1,4 +1,4 @@ -/* $NetBSD: unistd.h,v 1.110 2005/12/26 19:01:47 perry Exp $ */ +/* $NetBSD: unistd.h,v 1.111 2007/05/30 21:14:37 tls Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -364,4 +364,5 @@ __END_DECLS +#include #endif /* !_UNISTD_H_ */ Index: lib/Makefile =================================================================== RCS file: /cvsroot/src/lib/Makefile,v retrieving revision 1.111.2.1 diff -u -u -r1.111.2.1 Makefile --- lib/Makefile 15 Jan 2007 22:32:28 -0000 1.111.2.1 +++ lib/Makefile 17 Jul 2007 13:58:21 -0000 @@ -7,7 +7,7 @@ libcompat libcrypt \ libcurses libevent libform libintl libkvm libl libm \ libmenu libossaudio libpcap libpci libpmc libposix libprop libpthread \ - libpthread_dbg libpuffs libresolv librmt librpcsvc librt libsdp libssp \ + libpthread_dbg libpuffs libresolv librmt librpcsvc librt libsdp \ libterm libusbhid libutil libwrap liby libz .if (${MKSKEY} != "no") Index: lib/libc/Makefile =================================================================== RCS file: /cvsroot/src/lib/libc/Makefile,v retrieving revision 1.127 diff -u -u -r1.127 Makefile --- lib/libc/Makefile 11 Mar 2006 21:07:18 -0000 1.127 +++ lib/libc/Makefile 17 Jul 2007 13:58:27 -0000 @@ -74,6 +74,7 @@ .include "${.CURDIR}/regex/Makefile.inc" .include "${.CURDIR}/resolv/Makefile.inc" .include "${.CURDIR}/rpc/Makefile.inc" +.include "${.CURDIR}/ssp/Makefile.inc" .include "${.CURDIR}/stdio/Makefile.inc" .include "${.CURDIR}/stdlib/Makefile.inc" .include "${.CURDIR}/string/Makefile.inc" Index: regress/lib/Makefile =================================================================== RCS file: /cvsroot/src/regress/lib/Makefile,v retrieving revision 1.18 diff -u -u -r1.18 Makefile --- regress/lib/Makefile 11 Nov 2006 23:37:18 -0000 1.18 +++ regress/lib/Makefile 17 Jul 2007 13:59:15 -0000 @@ -4,12 +4,6 @@ SUBDIR+= csu libc libevent libposix libpthread librt libutil -.if (${MACHINE_CPU} != "alpha" && \ - ${MACHINE_CPU} != "mips" && \ - ${MACHINE_CPU} != "hppa") -SUBDIR+= libssp -.endif - .if (${MKSKEY} != "no") SUBDIR+= libskey .endif Index: regress/lib/libc/Makefile =================================================================== RCS file: /cvsroot/src/regress/lib/libc/Makefile,v retrieving revision 1.52 diff -u -u -r1.52 Makefile --- regress/lib/libc/Makefile 27 Jul 2006 22:10:32 -0000 1.52 +++ regress/lib/libc/Makefile 17 Jul 2007 13:59:15 -0000 @@ -7,6 +7,9 @@ .include +.if defined(HAS_SSP) && (${HAS_SSP} == "yes") +SUBDIR+= ssp +.endif .if (${MACHINE_ARCH} != "vax" && ${MACHINE_ARCH} != "m68000") SUBDIR+= ieeefp .endif Index: share/mk/bsd.sys.mk =================================================================== RCS file: /cvsroot/src/share/mk/bsd.sys.mk,v retrieving revision 1.140 diff -u -u -r1.140 bsd.sys.mk --- share/mk/bsd.sys.mk 11 Nov 2006 06:28:49 -0000 1.140 +++ share/mk/bsd.sys.mk 17 Jul 2007 14:00:12 -0000 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.sys.mk,v 1.140 2006/11/11 06:28:49 christos Exp $ +# $NetBSD: bsd.sys.mk,v 1.155 2007/06/03 21:07:33 uwe Exp $ # # Build definitions used for NetBSD source tree builds. @@ -38,9 +38,25 @@ CFLAGS+= ${CWARNFLAGS} ${NOGCCERROR:D:U-Werror} LINTFLAGS+= ${DESTDIR:D-d ${DESTDIR}/usr/include} +.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "hppa") || \ + (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb") +HAS_SSP= no +.else +HAS_SSP= yes +.endif + +.if defined(USE_FORT) && (${USE_FORT} != "no") +USE_SSP?= yes +.if !defined(KERNSRCDIR) && !defined(KERN) # not for kernels nor kern modules +CPPFLAGS+= -D_FORTIFY_SOURCE=2 +.endif +.endif + .if defined(USE_SSP) && (${USE_SSP} != "no") && (${BINDIR:Ux} != "/usr/mdec") +.if ${HAS_SSP} == "yes" COPTS+= -fstack-protector -Wstack-protector --param ssp-buffer-size=1 .endif +.endif .if defined(MKSOFTFLOAT) && (${MKSOFTFLOAT} != "no") COPTS+= -msoft-float @@ -123,6 +139,7 @@ TOOL_INDXBIB?= indxbib TOOL_INSTALLBOOT?= installboot TOOL_INSTALL_INFO?= install-info +TOOL_JOIN?= join TOOL_M4?= m4 TOOL_MAKEFS?= makefs TOOL_MAKEINFO?= makeinfo