From c43359c28adec343bc0b094ba6dad65e0c9563f1 Mon Sep 17 00:00:00 2001 From: tls Date: Wed, 30 May 2007 16:23:22 +0000 Subject: [PATCH] libssp is gone. --- distrib/i386/ramdisks/common/list.ramdisk | 4 ++-- distrib/sets/lists/base/shl.elf | 6 +----- distrib/sets/lists/base/shl.mi | 4 +--- distrib/sets/lists/comp/mi | 5 +---- distrib/sets/lists/comp/shl.mi | 3 +-- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/distrib/i386/ramdisks/common/list.ramdisk b/distrib/i386/ramdisks/common/list.ramdisk index 79abee65f51f..053fb95eea2f 100644 --- a/distrib/i386/ramdisks/common/list.ramdisk +++ b/distrib/i386/ramdisks/common/list.ramdisk @@ -1,4 +1,4 @@ -# $NetBSD: list.ramdisk,v 1.4 2007/05/28 12:06:17 tls Exp $ +# $NetBSD: list.ramdisk,v 1.5 2007/05/30 16:23:22 tls Exp $ SRCDIRS usr.bin/less SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin @@ -61,7 +61,7 @@ SPECIAL route srcdir distrib/utils/x_route ARGVLN sh -sh # libhack.o is built by Makefile & included Makefile.inc -LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lssp +LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group diff --git a/distrib/sets/lists/base/shl.elf b/distrib/sets/lists/base/shl.elf index 546690336ba4..4cb0013fd8d8 100644 --- a/distrib/sets/lists/base/shl.elf +++ b/distrib/sets/lists/base/shl.elf @@ -1,4 +1,4 @@ -# $NetBSD: shl.elf,v 1.128 2007/04/01 18:52:28 tnozaki Exp $ +# $NetBSD: shl.elf,v 1.129 2007/05/30 16:23:22 tls Exp $ # Note: libtermcap and libtermlib are hardlinked and share the same version. ./lib/libc.so base-sys-shlib ./lib/libc.so.12 base-sys-shlib @@ -20,8 +20,6 @@ ./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/libtermcap.so base-sys-shlib ./lib/libtermcap.so.0 base-sys-shlib ./lib/libtermlib.so base-sys-shlib @@ -196,8 +194,6 @@ ./usr/lib/libssh.so.6 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/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 diff --git a/distrib/sets/lists/base/shl.mi b/distrib/sets/lists/base/shl.mi index db5e58f23f20..37a74d93f082 100644 --- a/distrib/sets/lists/base/shl.mi +++ b/distrib/sets/lists/base/shl.mi @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.391 2007/05/28 15:02:30 blymn Exp $ +# $NetBSD: shl.mi,v 1.392 2007/05/30 16:23:23 tls Exp $ # Note: libtermcap and libtermlib are hardlinked and share the same version. ./lib/libc.so.12.150 base-sys-shlib ./lib/libcrypt.so.0.2 base-sys-shlib @@ -10,7 +10,6 @@ ./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/libtermcap.so.0.6 base-sys-shlib ./lib/libtermlib.so.0.6 base-sys-shlib ./lib/libutil.so.7.13 base-sys-shlib @@ -98,7 +97,6 @@ ./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/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 diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index 11ba2e1e1ea1..1396dd308aef 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1030 2007/05/23 23:41:51 christos Exp $ +# $NetBSD: mi,v 1.1031 2007/05/30 16:23:23 tls Exp $ ./etc/mtree/set.comp comp-sys-root ./usr/bin/addr2line comp-debug-bin bfd ./usr/bin/ar comp-util-bin bfd @@ -2190,8 +2190,6 @@ ./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/libstdc++.a comp-cxx-lib ./usr/lib/libstdc++_p.a comp-cxx-proflib profile ./usr/lib/libsupc++.a comp-cxx-lib @@ -3067,7 +3065,6 @@ ./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-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 diff --git a/distrib/sets/lists/comp/shl.mi b/distrib/sets/lists/comp/shl.mi index c27a02069dec..626f94d6ee7e 100644 --- a/distrib/sets/lists/comp/shl.mi +++ b/distrib/sets/lists/comp/shl.mi @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.55 2007/02/23 19:12:35 pooka Exp $ +# $NetBSD: shl.mi,v 1.56 2007/05/30 16:23:23 tls Exp $ ./usr/lib/crtbeginT.o comp-c-lib ./usr/lib/libasn1_pic.a comp-c-piclib kerberos ./usr/lib/libbluetooth_pic.a comp-c-piclib @@ -63,7 +63,6 @@ ./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/libstdc++_pic.a comp-cxx-piclib ./usr/lib/libtermcap_pic.a comp-c-piclib ./usr/lib/libtermlib_pic.a comp-c-piclib