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.

diff --git a/distrib/alpha/common/list b/distrib/alpha/common/list
index f36eea1..5990424 100644 (file)
--- 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 8cb6818..591a62c 100644 (file)
--- 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 b927557..da40959 100644 (file)
--- 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 4f6315a..73a2320 100644 (file)
--- 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 4909655..4167d92 100644 (file)
--- 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 5fa264b..e9c94e6 100644 (file)
--- 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 ac99271..051a11c 100644 (file)
--- 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 635246c..178ca97 100644 (file)
--- 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 e98bebf..95f9aa4 100644 (file)
--- 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 c962adc..e14852f 100644 (file)
--- 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 8f58da1..8037d90 100644 (file)
--- 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 c34f53d..2034a78 100644 (file)
--- 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 78f064d..ce24ac7 100644 (file)
--- 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 9088106..f7e3ccf 100644 (file)
--- 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 e3b0501..e05b80a 100644 (file)
--- 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 96972af..b43e64b 100644 (file)
--- 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 41d7ac5..c2efc5d 100644 (file)
--- 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 fe043a4..637f254 100644 (file)
--- 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 627ebd7..e415d0e 100644 (file)
--- 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 88dad28..6bfb7a9 100644 (file)
--- 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 f2ae663..00085bf 100644 (file)
--- 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 af687c6..de8c55d 100644 (file)
--- 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 abbf16f..e429813 100644 (file)
--- 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 5571fd5..1d55148 100644 (file)
--- 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