From 88eebbb3f34ad74e25c3b43d640bca76e4bfe133 Mon Sep 17 00:00:00 2001 From: deraadt Date: Tue, 7 Jan 2014 02:27:53 +0000 Subject: [PATCH] SRCDRS usr.bin usr.sbin is a bad idea (because of PIE). The places we pick binaries up must be compiled -static or at least in some safe model for reuse. Since we now use distrib/special for those, we can safely remove usr.bin and usr.sbin from this list. --- distrib/alpha/common/list | 4 ++-- distrib/amd64/common/list | 4 ++-- distrib/armish/ramdisk/list | 4 ++-- distrib/armv7/ramdisk/list | 4 ++-- distrib/aviion/ramdisk/list | 4 ++-- distrib/hp300/ramdisk/list | 4 ++-- distrib/hppa/list | 4 ++-- distrib/i386/common/list | 4 ++-- distrib/landisk/ramdisk/list | 4 ++-- distrib/loongson/ramdisk/list | 4 ++-- distrib/luna88k/ramdisk/list | 4 ++-- distrib/macppc/ramdisk/list | 4 ++-- distrib/miniroot/list | 4 ++-- distrib/mvme68k/ramdisk/list | 4 ++-- distrib/mvme88k/ramdisk/list | 4 ++-- distrib/octeon/ramdisk/list | 4 ++-- distrib/ramdisk/list | 4 ++-- distrib/sgi/ramdisk/list | 4 ++-- distrib/socppc/ramdisk/list | 4 ++-- distrib/sparc64/bsd.rd/list | 4 ++-- distrib/sparc64/ramdisk/list | 4 ++-- distrib/sparc64/ramdiskB/list | 4 ++-- distrib/vax/common/list | 4 ++-- distrib/zaurus/ramdisk/list | 4 ++-- 24 files changed, 48 insertions(+), 48 deletions(-) diff --git a/distrib/alpha/common/list b/distrib/alpha/common/list index f36eea15921..599042482c3 100644 --- a/distrib/alpha/common/list +++ b/distrib/alpha/common/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.32 2012/10/16 16:45:04 deraadt Exp $ +# $OpenBSD: list,v 1.33 2014/01/07 02:27:53 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/amd64/common/list b/distrib/amd64/common/list index 8cb6818d9b5..591a62c74b6 100644 --- a/distrib/amd64/common/list +++ b/distrib/amd64/common/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.26 2012/10/15 17:21:04 deraadt Exp $ +# $OpenBSD: list,v 1.27 2014/01/07 02:27:55 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/armish/ramdisk/list b/distrib/armish/ramdisk/list index b927557bc9c..da40959c83c 100644 --- a/distrib/armish/ramdisk/list +++ b/distrib/armish/ramdisk/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.15 2012/10/30 18:39:43 krw Exp $ +# $OpenBSD: list,v 1.16 2014/01/07 02:27:55 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list index 4f6315a4503..73a23207558 100644 --- a/distrib/armv7/ramdisk/list +++ b/distrib/armv7/ramdisk/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.2 2013/10/28 14:10:41 patrick Exp $ +# $OpenBSD: list,v 1.3 2014/01/07 02:27:55 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/aviion/ramdisk/list b/distrib/aviion/ramdisk/list index 490965578ab..4167d92e573 100644 --- a/distrib/aviion/ramdisk/list +++ b/distrib/aviion/ramdisk/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.1 2013/10/15 13:28:05 miod Exp $ +# $OpenBSD: list,v 1.2 2014/01/07 02:27:55 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list index 5fa264b91c3..e9c94e6c63d 100644 --- a/distrib/hp300/ramdisk/list +++ b/distrib/hp300/ramdisk/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.58 2012/10/30 18:39:44 krw Exp $ +# $OpenBSD: list,v 1.59 2014/01/07 02:27:55 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin COPY ${OBJDIR}/instbin instbin LINK instbin bin/arch diff --git a/distrib/hppa/list b/distrib/hppa/list index ac992711bf0..051a11c529d 100644 --- a/distrib/hppa/list +++ b/distrib/hppa/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.19 2012/10/30 18:39:44 krw Exp $ +# $OpenBSD: list,v 1.20 2014/01/07 02:27:55 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/i386/common/list b/distrib/i386/common/list index 635246cfa27..178ca97370b 100644 --- a/distrib/i386/common/list +++ b/distrib/i386/common/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.28 2012/10/30 18:39:44 krw Exp $ +# $OpenBSD: list,v 1.29 2014/01/07 02:27:55 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/landisk/ramdisk/list b/distrib/landisk/ramdisk/list index e98bebf2470..95f9aa4ad2d 100644 --- a/distrib/landisk/ramdisk/list +++ b/distrib/landisk/ramdisk/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.23 2012/10/30 18:39:44 krw Exp $ +# $OpenBSD: list,v 1.24 2014/01/07 02:27:55 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/loongson/ramdisk/list b/distrib/loongson/ramdisk/list index c962adcd6f2..e14852f6fc3 100644 --- a/distrib/loongson/ramdisk/list +++ b/distrib/loongson/ramdisk/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.9 2012/10/30 18:39:44 krw Exp $ +# $OpenBSD: list,v 1.10 2014/01/07 02:27:55 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/luna88k/ramdisk/list b/distrib/luna88k/ramdisk/list index 8f58da19929..8037d90c792 100644 --- a/distrib/luna88k/ramdisk/list +++ b/distrib/luna88k/ramdisk/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.17 2012/10/30 18:39:44 krw Exp $ +# $OpenBSD: list,v 1.18 2014/01/07 02:27:55 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list index c34f53de447..2034a784c42 100644 --- a/distrib/macppc/ramdisk/list +++ b/distrib/macppc/ramdisk/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.45 2012/10/30 18:39:44 krw Exp $ +# $OpenBSD: list,v 1.46 2014/01/07 02:27:55 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/miniroot/list b/distrib/miniroot/list index 78f064d49e8..ce24ac77e2b 100644 --- a/distrib/miniroot/list +++ b/distrib/miniroot/list @@ -1,8 +1,8 @@ -# $OpenBSD: list,v 1.47 2010/10/18 04:07:48 deraadt Exp $ +# $OpenBSD: list,v 1.48 2014/01/07 02:27:55 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/mvme68k/ramdisk/list b/distrib/mvme68k/ramdisk/list index 90881066496..f7e3ccf2bf8 100644 --- a/distrib/mvme68k/ramdisk/list +++ b/distrib/mvme68k/ramdisk/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.42 2012/10/30 18:39:44 krw Exp $ +# $OpenBSD: list,v 1.43 2014/01/07 02:27:55 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/mvme88k/ramdisk/list b/distrib/mvme88k/ramdisk/list index e3b0501ec66..e05b80a5487 100644 --- a/distrib/mvme88k/ramdisk/list +++ b/distrib/mvme88k/ramdisk/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.40 2012/10/30 18:39:44 krw Exp $ +# $OpenBSD: list,v 1.41 2014/01/07 02:27:56 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/octeon/ramdisk/list b/distrib/octeon/ramdisk/list index 96972afb303..b43e64be585 100644 --- a/distrib/octeon/ramdisk/list +++ b/distrib/octeon/ramdisk/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.1 2013/03/26 18:03:53 jasper Exp $ +# $OpenBSD: list,v 1.2 2014/01/07 02:27:56 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list index 41d7ac53e3c..c2efc5d8c6e 100644 --- a/distrib/ramdisk/list +++ b/distrib/ramdisk/list @@ -1,8 +1,8 @@ -# $OpenBSD: list,v 1.40 2012/10/30 18:39:44 krw Exp $ +# $OpenBSD: list,v 1.41 2014/01/07 02:27:56 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list index fe043a409aa..637f254c611 100644 --- a/distrib/sgi/ramdisk/list +++ b/distrib/sgi/ramdisk/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.34 2012/10/30 18:39:44 krw Exp $ +# $OpenBSD: list,v 1.35 2014/01/07 02:27:56 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/socppc/ramdisk/list b/distrib/socppc/ramdisk/list index 627ebd7d5fe..e415d0ef8e8 100644 --- a/distrib/socppc/ramdisk/list +++ b/distrib/socppc/ramdisk/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.15 2012/10/30 18:39:44 krw Exp $ +# $OpenBSD: list,v 1.16 2014/01/07 02:27:56 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/sparc64/bsd.rd/list b/distrib/sparc64/bsd.rd/list index 88dad28129b..6bfb7a92505 100644 --- a/distrib/sparc64/bsd.rd/list +++ b/distrib/sparc64/bsd.rd/list @@ -1,8 +1,8 @@ -# $OpenBSD: list,v 1.40 2012/10/30 18:39:44 krw Exp $ +# $OpenBSD: list,v 1.41 2014/01/07 02:27:56 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/sparc64/ramdisk/list b/distrib/sparc64/ramdisk/list index f2ae663100d..00085bf9dee 100644 --- a/distrib/sparc64/ramdisk/list +++ b/distrib/sparc64/ramdisk/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.37 2012/10/15 18:17:39 deraadt Exp $ +# $OpenBSD: list,v 1.38 2014/01/07 02:27:56 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/sparc64/ramdiskB/list b/distrib/sparc64/ramdiskB/list index af687c699eb..de8c55d1020 100644 --- a/distrib/sparc64/ramdiskB/list +++ b/distrib/sparc64/ramdiskB/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.31 2012/10/15 18:17:39 deraadt Exp $ +# $OpenBSD: list,v 1.32 2014/01/07 02:27:56 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin diff --git a/distrib/vax/common/list b/distrib/vax/common/list index abbf16fc72a..e429813ee63 100644 --- a/distrib/vax/common/list +++ b/distrib/vax/common/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.23 2010/10/18 04:08:32 deraadt Exp $ +# $OpenBSD: list,v 1.24 2014/01/07 02:27:56 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin SRCDIRS sys/arch/vax/stand # copy the crunched binary, link to it, and kill it diff --git a/distrib/zaurus/ramdisk/list b/distrib/zaurus/ramdisk/list index 5571fd5cf1d..1d55148c1c0 100644 --- a/distrib/zaurus/ramdisk/list +++ b/distrib/zaurus/ramdisk/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.19 2012/10/30 18:39:44 krw Exp $ +# $OpenBSD: list,v 1.20 2014/01/07 02:27:56 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS bin sbin usr.bin usr.sbin +SRCDIRS bin sbin # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin -- 2.20.1