From d1b196599810127b20bc52132413cf6589170df9 Mon Sep 17 00:00:00 2001 From: deraadt Date: Wed, 8 Jan 2014 21:53:33 +0000 Subject: [PATCH] Switch to using the base sha256 command, rather than some customized abomination. install.sub chunk tested by rpe --- distrib/alpha/bsd.rd/list.local | 2 -- distrib/alpha/common/list | 4 ++- distrib/amd64/common/list | 4 ++- distrib/amd64/ramdisk_cd/list.local | 4 +-- distrib/armish/ramdisk/list | 5 +-- distrib/armv7/ramdisk/list | 5 +-- distrib/aviion/ramdisk/list | 5 +-- distrib/hp300/ramdisk/list | 5 +-- distrib/hppa/list | 5 +-- distrib/i386/common/list | 4 ++- distrib/i386/ramdisk_cd/list.local | 3 +- distrib/landisk/ramdisk/list | 5 +-- distrib/loongson/ramdisk/list | 5 +-- distrib/luna88k/ramdisk/list | 5 +-- distrib/macppc/ramdisk/list | 5 +-- distrib/miniroot/install.sub | 9 ++--- distrib/miniroot/list | 5 +-- distrib/mvme68k/ramdisk/list | 5 +-- distrib/mvme88k/ramdisk/list | 5 +-- distrib/octeon/ramdisk/list | 5 +-- distrib/ramdisk/list | 5 +-- distrib/sgi/ramdisk/list | 5 +-- distrib/socppc/ramdisk/list | 5 +-- distrib/sparc/ramdisk/list.local | 4 +-- distrib/sparc64/bsd.rd/list | 5 +-- distrib/sparc64/ramdisk/list | 4 ++- distrib/sparc64/ramdiskB/list | 4 ++- distrib/special/Makefile | 4 +-- distrib/special/sha256/Makefile | 5 --- distrib/special/sha256/sha256.c | 56 ----------------------------- distrib/vax/common/list | 5 +-- distrib/zaurus/ramdisk/list | 5 +-- 32 files changed, 80 insertions(+), 122 deletions(-) delete mode 100644 distrib/special/sha256/Makefile delete mode 100644 distrib/special/sha256/sha256.c diff --git a/distrib/alpha/bsd.rd/list.local b/distrib/alpha/bsd.rd/list.local index c2950a9252b..3dd16e15ad8 100644 --- a/distrib/alpha/bsd.rd/list.local +++ b/distrib/alpha/bsd.rd/list.local @@ -1,5 +1,3 @@ -LINK instbin bin/sha256 - LINK instbin sbin/mount_cd9660 LINK instbin sbin/dhclient LINK instbin bin/mt bin/eject diff --git a/distrib/alpha/common/list b/distrib/alpha/common/list index 011299a4f68..9d4bd6c900f 100644 --- a/distrib/alpha/common/list +++ b/distrib/alpha/common/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.34 2014/01/08 06:17:21 deraadt Exp $ +# $OpenBSD: list,v 1.35 2014/01/08 21:53:34 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -17,6 +17,7 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio @@ -43,6 +44,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/more usr/bin/less LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/amd64/common/list b/distrib/amd64/common/list index 591a62c74b6..35554c57415 100644 --- a/distrib/amd64/common/list +++ b/distrib/amd64/common/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.27 2014/01/07 02:27:55 deraadt Exp $ +# $OpenBSD: list,v 1.28 2014/01/08 21:53:34 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -18,6 +18,7 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv @@ -50,6 +51,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/amd64/ramdisk_cd/list.local b/distrib/amd64/ramdisk_cd/list.local index ea8d11aa142..059cf5fd3e4 100644 --- a/distrib/amd64/ramdisk_cd/list.local +++ b/distrib/amd64/ramdisk_cd/list.local @@ -1,8 +1,6 @@ -# $OpenBSD: list.local,v 1.22 2012/10/30 18:39:43 krw Exp $ +# $OpenBSD: list.local,v 1.23 2014/01/08 21:53:35 deraadt Exp $ # add local links; use bin/sh since instbin has already been unlinked -LINK instbin bin/sha256 - LINK instbin sbin/ping6 LINK instbin sbin/rtsol diff --git a/distrib/armish/ramdisk/list b/distrib/armish/ramdisk/list index da40959c83c..deed1858db7 100644 --- a/distrib/armish/ramdisk/list +++ b/distrib/armish/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.16 2014/01/07 02:27:55 deraadt Exp $ +# $OpenBSD: list,v 1.17 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -19,12 +19,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync @@ -58,6 +58,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify LINK instbin sbin/bioctl # copy the MAKEDEV script and make some devices diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list index 73a23207558..4a21dc07c5d 100644 --- a/distrib/armv7/ramdisk/list +++ b/distrib/armv7/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.3 2014/01/07 02:27:55 deraadt Exp $ +# $OpenBSD: list,v 1.4 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -19,12 +19,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync @@ -60,6 +60,7 @@ LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin usr/sbin/mkuboot LINK instbin sbin/sysctl +LINK instbin usr/bin/signify LINK instbin sbin/bioctl # this is the list from distrib/miniroot/makeconf.awk with -lz added. diff --git a/distrib/aviion/ramdisk/list b/distrib/aviion/ramdisk/list index 4167d92e573..4c4dd9eba0f 100644 --- a/distrib/aviion/ramdisk/list +++ b/distrib/aviion/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.2 2014/01/07 02:27:55 deraadt Exp $ +# $OpenBSD: list,v 1.3 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -19,12 +19,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin sbin/dhclient @@ -52,6 +52,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list index e9c94e6c63d..9ab0679bf6f 100644 --- a/distrib/hp300/ramdisk/list +++ b/distrib/hp300/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.59 2014/01/07 02:27:55 deraadt Exp $ +# $OpenBSD: list,v 1.60 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -18,12 +18,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync @@ -52,6 +52,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/hppa/list b/distrib/hppa/list index 051a11c529d..093c97f81f0 100644 --- a/distrib/hppa/list +++ b/distrib/hppa/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.20 2014/01/07 02:27:55 deraadt Exp $ +# $OpenBSD: list,v 1.21 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -19,12 +19,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync @@ -50,6 +50,7 @@ LINK instbin usr/bin/ftp LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify # various files that we need in /etc for the install COPY ${DESTDIR}/etc/group etc/group diff --git a/distrib/i386/common/list b/distrib/i386/common/list index 178ca97370b..6eb284c5be8 100644 --- a/distrib/i386/common/list +++ b/distrib/i386/common/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.29 2014/01/07 02:27:55 deraadt Exp $ +# $OpenBSD: list,v 1.30 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -18,6 +18,7 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv @@ -51,6 +52,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/i386/ramdisk_cd/list.local b/distrib/i386/ramdisk_cd/list.local index 9b2c47353fd..73b0cd62ffe 100644 --- a/distrib/i386/ramdisk_cd/list.local +++ b/distrib/i386/ramdisk_cd/list.local @@ -1,7 +1,6 @@ -# $OpenBSD: list.local,v 1.31 2014/01/06 22:22:31 deraadt Exp $ +# $OpenBSD: list.local,v 1.32 2014/01/08 21:53:35 deraadt Exp $ # add local links; use bin/sh since instbin has already been unlinked -LINK instbin bin/sha256 LINK instbin sbin/mount_ext2fs LINK instbin sbin/mount_msdos LINK instbin sbin/ping6 diff --git a/distrib/landisk/ramdisk/list b/distrib/landisk/ramdisk/list index 95f9aa4ad2d..c32b3db17fd 100644 --- a/distrib/landisk/ramdisk/list +++ b/distrib/landisk/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.24 2014/01/07 02:27:55 deraadt Exp $ +# $OpenBSD: list,v 1.25 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -19,12 +19,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync @@ -58,6 +58,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify # firmware we might need COPY ${DESTDIR}/etc/firmware/kue etc/firmware/kue diff --git a/distrib/loongson/ramdisk/list b/distrib/loongson/ramdisk/list index e14852f6fc3..1c165a63217 100644 --- a/distrib/loongson/ramdisk/list +++ b/distrib/loongson/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.10 2014/01/07 02:27:55 deraadt Exp $ +# $OpenBSD: list,v 1.11 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -19,12 +19,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync @@ -60,6 +60,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/luna88k/ramdisk/list b/distrib/luna88k/ramdisk/list index 8037d90c792..4c51a9bdaef 100644 --- a/distrib/luna88k/ramdisk/list +++ b/distrib/luna88k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.18 2014/01/07 02:27:55 deraadt Exp $ +# $OpenBSD: list,v 1.19 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -19,12 +19,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin sbin/dhclient @@ -52,6 +52,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list index 2034a784c42..35829ea5195 100644 --- a/distrib/macppc/ramdisk/list +++ b/distrib/macppc/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.46 2014/01/07 02:27:55 deraadt Exp $ +# $OpenBSD: list,v 1.47 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -19,12 +19,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync @@ -58,6 +58,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify LINK instbin sbin/bioctl # copy the MAKEDEV script and make some devices diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 93e55eb31a8..df169cf0a49 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.725 2014/01/07 23:58:44 rpe Exp $ +# $OpenBSD: install.sub,v 1.726 2014/01/08 21:53:35 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -1195,19 +1195,16 @@ install_files() { [[ $resp = n ]] && return - shacmd="cat" - [[ -x /bin/sha256 ]] && shacmd="sha256 /tmp/h" - for _f in $THESETS ; do isin $_f $_get_sets || continue echo -n "Getting $_f ..." rm -f /tmp/h case $_f in *.tgz) ftp -Vmo - "$_src/$_f" | - $shacmd | tar zxphf - -C /mnt + sha256 -p -h /tmp/h | tar zxphf - -C /mnt ;; *) ftp -Vmo - "$_src/$_f" | - $shacmd > "/mnt/$_f" + sha256 -p -h /tmp/h > "/mnt/$_f" ;; esac if (($? != 0)); then diff --git a/distrib/miniroot/list b/distrib/miniroot/list index ce24ac77e2b..e3087499577 100644 --- a/distrib/miniroot/list +++ b/distrib/miniroot/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.48 2014/01/07 02:27:55 deraadt Exp $ +# $OpenBSD: list,v 1.49 2014/01/08 21:53:35 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special @@ -20,12 +20,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync @@ -51,6 +51,7 @@ LINK instbin usr/bin/ftp LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify # various files that we need in /etc for the install COPY ${DESTDIR}/etc/group etc/group diff --git a/distrib/mvme68k/ramdisk/list b/distrib/mvme68k/ramdisk/list index f7e3ccf2bf8..4e08e5ff535 100644 --- a/distrib/mvme68k/ramdisk/list +++ b/distrib/mvme68k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.43 2014/01/07 02:27:55 deraadt Exp $ +# $OpenBSD: list,v 1.44 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -19,12 +19,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin sbin/dhclient @@ -52,6 +52,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/mvme88k/ramdisk/list b/distrib/mvme88k/ramdisk/list index e05b80a5487..ea01be69bac 100644 --- a/distrib/mvme88k/ramdisk/list +++ b/distrib/mvme88k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.41 2014/01/07 02:27:56 deraadt Exp $ +# $OpenBSD: list,v 1.42 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -19,12 +19,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin sbin/dhclient @@ -52,6 +52,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/octeon/ramdisk/list b/distrib/octeon/ramdisk/list index b43e64be585..18e8dda0444 100644 --- a/distrib/octeon/ramdisk/list +++ b/distrib/octeon/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.2 2014/01/07 02:27:56 deraadt Exp $ +# $OpenBSD: list,v 1.3 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -19,12 +19,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync @@ -57,6 +57,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list index c2efc5d8c6e..2765506794a 100644 --- a/distrib/ramdisk/list +++ b/distrib/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.41 2014/01/07 02:27:56 deraadt Exp $ +# $OpenBSD: list,v 1.42 2014/01/08 21:53:35 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special @@ -19,12 +19,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync @@ -46,6 +46,7 @@ LINK instbin sbin/reboot sbin/halt LINK instbin sbin/route LINK instbin sbin/rtsol LINK instbin sbin/sysctl +LINK instbin usr/bin/signify LINK instbin sbin/umount LINK instbin usr/bin/arch LINK instbin usr/bin/ftp diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list index 637f254c611..565ac43275a 100644 --- a/distrib/sgi/ramdisk/list +++ b/distrib/sgi/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.35 2014/01/07 02:27:56 deraadt Exp $ +# $OpenBSD: list,v 1.36 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -19,12 +19,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync @@ -54,6 +54,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify LINK instbin sbin/bioctl # copy the MAKEDEV script and make some devices diff --git a/distrib/socppc/ramdisk/list b/distrib/socppc/ramdisk/list index e415d0ef8e8..afdf040a239 100644 --- a/distrib/socppc/ramdisk/list +++ b/distrib/socppc/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.16 2014/01/07 02:27:56 deraadt Exp $ +# $OpenBSD: list,v 1.17 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -19,12 +19,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync @@ -57,6 +57,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/sparc/ramdisk/list.local b/distrib/sparc/ramdisk/list.local index b1deb1750f3..189780897e5 100644 --- a/distrib/sparc/ramdisk/list.local +++ b/distrib/sparc/ramdisk/list.local @@ -1,9 +1,7 @@ -# $OpenBSD: list.local,v 1.4 2012/10/17 02:06:41 deraadt Exp $ +# $OpenBSD: list.local,v 1.5 2014/01/08 21:53:35 deraadt Exp $ # $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $ # Sparc extra's -LINK instbin bin/sha256 - LINK instbin sbin/disklabel #LINK instbin sbin/restore LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep diff --git a/distrib/sparc64/bsd.rd/list b/distrib/sparc64/bsd.rd/list index 6bfb7a92505..08fa0ea9978 100644 --- a/distrib/sparc64/bsd.rd/list +++ b/distrib/sparc64/bsd.rd/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.41 2014/01/07 02:27:56 deraadt Exp $ +# $OpenBSD: list,v 1.42 2014/01/08 21:53:35 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special @@ -20,12 +20,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync @@ -56,6 +56,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify LINK instbin sbin/bioctl SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV diff --git a/distrib/sparc64/ramdisk/list b/distrib/sparc64/ramdisk/list index 00085bf9dee..114f58df9e7 100644 --- a/distrib/sparc64/ramdisk/list +++ b/distrib/sparc64/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.38 2014/01/07 02:27:56 deraadt Exp $ +# $OpenBSD: list,v 1.39 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -20,6 +20,7 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv @@ -50,6 +51,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV SPECIAL cd dev; sh MAKEDEV ramdisk diff --git a/distrib/sparc64/ramdiskB/list b/distrib/sparc64/ramdiskB/list index de8c55d1020..6210eb7490c 100644 --- a/distrib/sparc64/ramdiskB/list +++ b/distrib/sparc64/ramdiskB/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.32 2014/01/07 02:27:56 deraadt Exp $ +# $OpenBSD: list,v 1.33 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -20,6 +20,7 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv @@ -48,6 +49,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV SPECIAL cd dev; sh MAKEDEV ramdisk diff --git a/distrib/special/Makefile b/distrib/special/Makefile index 07b3671cd5d..36897f56ba8 100644 --- a/distrib/special/Makefile +++ b/distrib/special/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.27 2014/01/08 14:20:52 deraadt Exp $ +# $OpenBSD: Makefile,v 1.28 2014/01/08 21:53:35 deraadt Exp $ SUBDIR= libstubs \ arch date dd dhclient dmesg ed ftp grep gzip ifconfig init \ - kbd less md5 more mt newfs ping restore sed sha256 sysctl + kbd less md5 more mt newfs ping restore sed sysctl signify install: diff --git a/distrib/special/sha256/Makefile b/distrib/special/sha256/Makefile deleted file mode 100644 index e786b35bb3c..00000000000 --- a/distrib/special/sha256/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $OpenBSD: Makefile,v 1.2 2009/10/28 07:36:49 deraadt Exp $ - -PROG= sha256 - -.include diff --git a/distrib/special/sha256/sha256.c b/distrib/special/sha256/sha256.c deleted file mode 100644 index b579b7fe59a..00000000000 --- a/distrib/special/sha256/sha256.c +++ /dev/null @@ -1,56 +0,0 @@ -/* $OpenBSD: sha256.c,v 1.1 2009/04/17 03:48:35 deraadt Exp $ */ - -/* - * Copyright (c) 2009 Theo de Raadt - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -#include -#include -#include -#include -#include -#include -#include - -int -main(int argc, char *argv[]) -{ - u_int8_t results[SHA256_DIGEST_LENGTH]; - size_t nread, nwrite, i; - char buf[BUFSIZ]; - SHA2_CTX ctx; - FILE *fp; - - if (argv[1] == NULL) { - fprintf(stderr, "usage: sha256 outfile\n"); - exit(1); - } - - fp = fopen(argv[1], "w"); - - SHA256Init(&ctx); - while ((nread = read(STDIN_FILENO, buf, sizeof buf)) > 0) { - SHA256Update(&ctx, (u_int8_t *)buf, nread); - for (i = 0; i < nread ; ) { - nwrite = write(STDOUT_FILENO, buf + i, nread - i); - if (nwrite == -1) - exit(1); - i += nwrite; - } - } - SHA256End(&ctx, results); - fprintf(fp, "%s\n", results); - fclose(fp); - exit(0); -} diff --git a/distrib/vax/common/list b/distrib/vax/common/list index e429813ee63..9b8c282a572 100644 --- a/distrib/vax/common/list +++ b/distrib/vax/common/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.24 2014/01/07 02:27:56 deraadt Exp $ +# $OpenBSD: list,v 1.25 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -19,11 +19,11 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync @@ -52,6 +52,7 @@ LINK instbin usr/bin/ftp LINK instbin usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify LINK instbin usr/bin/tar LINK instbin usr/sbin/chown #LINK instbin usr/sbin/bad144 diff --git a/distrib/zaurus/ramdisk/list b/distrib/zaurus/ramdisk/list index 1d55148c1c0..26d362930e6 100644 --- a/distrib/zaurus/ramdisk/list +++ b/distrib/zaurus/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.20 2014/01/07 02:27:56 deraadt Exp $ +# $OpenBSD: list,v 1.21 2014/01/08 21:53:35 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -19,12 +19,12 @@ LINK instbin bin/ksh bin/sh ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls +LINK instbin bin/md5 bin/sha256 bin/sha512 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv LINK instbin bin/pax bin/tar bin/cpio LINK instbin bin/rm -LINK instbin bin/sha256 LINK instbin bin/sleep LINK instbin bin/stty LINK instbin bin/sync @@ -58,6 +58,7 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl +LINK instbin usr/bin/signify LINK instbin usr/sbin/ztsscale LINK instbin sbin/bioctl -- 2.20.1