From db9adcec7f5041821528235ebd47f8be23b854a8 Mon Sep 17 00:00:00 2001
From: Jacob Adams <tookmund@gmail.com>
Date: Sat, 6 Jun 2015 16:52:41 -0400
Subject: [PATCH] Lots of work on new whitelist stuff

---
 releasetools/netbsd2minix/applywhitelist.sh  |   8 ++
 releasetools/netbsd2minix/common.sh          |   8 ++
 releasetools/netbsd2minix/run.sh             |  15 ++-
 releasetools/netbsd2minix/setupminix.sh      |  14 +--
 releasetools/netbsd2minix/setupnetbsd.sh     |   4 +-
 releasetools/netbsd2minix/whitelist/bin      |  28 +++++
 releasetools/netbsd2minix/whitelist/common   |   3 +
 releasetools/netbsd2minix/whitelist/external |   8 ++
 releasetools/netbsd2minix/whitelist/games    |  23 ++++
 releasetools/netbsd2minix/whitelist/gnu      |   4 +
 releasetools/netbsd2minix/whitelist/include  | 109 ++++++++++++++++
 releasetools/netbsd2minix/whitelist/lib      |  26 ++++
 releasetools/netbsd2minix/whitelist/libexec  |   7 ++
 releasetools/netbsd2minix/whitelist/sbin     |  12 ++
 releasetools/netbsd2minix/whitelist/share    |   7 ++
 releasetools/netbsd2minix/whitelist/sys      |  14 +++
 releasetools/netbsd2minix/whitelist/tests    |  22 ++++
 releasetools/netbsd2minix/whitelist/tools    |  59 +++++++++
 releasetools/netbsd2minix/whitelist/usr.bin  | 124 +++++++++++++++++++
 releasetools/netbsd2minix/whitelist/usr.sbin |  16 +++
 releasetools/netbsd2minix/whitelists.sh      |  11 ++
 21 files changed, 504 insertions(+), 18 deletions(-)
 create mode 100755 releasetools/netbsd2minix/applywhitelist.sh
 create mode 100644 releasetools/netbsd2minix/common.sh
 create mode 100644 releasetools/netbsd2minix/whitelists.sh

diff --git a/releasetools/netbsd2minix/applywhitelist.sh b/releasetools/netbsd2minix/applywhitelist.sh
new file mode 100755
index 000000000..b6dbfda4c
--- /dev/null
+++ b/releasetools/netbsd2minix/applywhitelist.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+. ./releasetools/netbsd2minix/common.sh
+# Assume $1 is whitelist working directory
+cd $1
+while read $dir
+do
+	cp -rf $dir $SRC
+done
diff --git a/releasetools/netbsd2minix/common.sh b/releasetools/netbsd2minix/common.sh
new file mode 100644
index 000000000..487d7df88
--- /dev/null
+++ b/releasetools/netbsd2minix/common.sh
@@ -0,0 +1,8 @@
+# Current source tree
+MINIX=.
+# NetBSD2Minix folder
+N2M=$MINIX/releasetools/netbsd2minix
+# NetBSD source tree
+NETBSD=$N2M/netbsd
+# New source tree
+SRC=$N2M/src
diff --git a/releasetools/netbsd2minix/run.sh b/releasetools/netbsd2minix/run.sh
index b5d134fb0..1db184cb6 100755
--- a/releasetools/netbsd2minix/run.sh
+++ b/releasetools/netbsd2minix/run.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
-./setupnetbsd.sh
-./applyblacklist.sh < blacklist.txt
-./setupminix.sh
-cd src
-make build
+. releasetools/netbsd2minix/common.sh
+$N2M/setupnetbsd.sh
+$N2M/whitelists.sh
+$N2M/setupminix.sh
+cd $SRC
+if [ `uname` -eq Minix ]
+then
+	make build
+else
+	./build.sh -m i386 build
diff --git a/releasetools/netbsd2minix/setupminix.sh b/releasetools/netbsd2minix/setupminix.sh
index a583d997f..0642a1fd2 100755
--- a/releasetools/netbsd2minix/setupminix.sh
+++ b/releasetools/netbsd2minix/setupminix.sh
@@ -1,16 +1,6 @@
 #!/bin/sh
-cd ../..
-SRC=releasetools/netbsd2minix/src
+COMMON=./releasetools/netbsd2minix/common
 
-cp -r minix $SRC
+. $COMMON
 
-rm $SRC/build.sh
-cp build.sh $SRC
 
-cp -r distrib $SRC
-
-rm $SRC/Makefile
-cp Makefile $SRC
-
-cp -r releasetools $SRC
-cd $SRC/..
diff --git a/releasetools/netbsd2minix/setupnetbsd.sh b/releasetools/netbsd2minix/setupnetbsd.sh
index 0108a45a8..07c7f84e2 100755
--- a/releasetools/netbsd2minix/setupnetbsd.sh
+++ b/releasetools/netbsd2minix/setupnetbsd.sh
@@ -1 +1,3 @@
-git clone --depth 1 git://github.com/jsonn/src
+. releasetools/netbsd2minix/common.sh
+
+git clone --depth 1 git://github.com/jsonn/src $NETBSD
diff --git a/releasetools/netbsd2minix/whitelist/bin b/releasetools/netbsd2minix/whitelist/bin
index e69de29bb..8a9a7aed4 100644
--- a/releasetools/netbsd2minix/whitelist/bin
+++ b/releasetools/netbsd2minix/whitelist/bin
@@ -0,0 +1,28 @@
+cat
+chmod
+cp
+date
+dd
+df
+echo
+ed
+expr
+hostname
+kill
+ksh
+ln
+ls
+Makefile
+Makefile.inc
+mkdir
+mv
+pax
+ps
+pwd
+rm
+rmdir
+sh
+sleep
+stty
+sync
+test
diff --git a/releasetools/netbsd2minix/whitelist/common b/releasetools/netbsd2minix/whitelist/common
index e69de29bb..76b2b46b5 100644
--- a/releasetools/netbsd2minix/whitelist/common
+++ b/releasetools/netbsd2minix/whitelist/common
@@ -0,0 +1,3 @@
+dist
+include
+lib
diff --git a/releasetools/netbsd2minix/whitelist/external b/releasetools/netbsd2minix/whitelist/external
index e69de29bb..ca56fc5a2 100644
--- a/releasetools/netbsd2minix/whitelist/external
+++ b/releasetools/netbsd2minix/whitelist/external
@@ -0,0 +1,8 @@
+bsd
+gpl3
+historical
+lgpl3
+Makefile
+mit
+public-domain
+README
diff --git a/releasetools/netbsd2minix/whitelist/games b/releasetools/netbsd2minix/whitelist/games
index e69de29bb..53e1bb8b7 100644
--- a/releasetools/netbsd2minix/whitelist/games
+++ b/releasetools/netbsd2minix/whitelist/games
@@ -0,0 +1,23 @@
+adventure
+arithmetic
+banner
+bcd
+caesar
+colorbars
+factor
+fish
+fortune
+Makefile
+Makefile.inc
+monop
+morse
+number
+pig
+ppt
+primes
+rain
+random
+rogue
+snake
+tetris
+wargames
diff --git a/releasetools/netbsd2minix/whitelist/gnu b/releasetools/netbsd2minix/whitelist/gnu
index e69de29bb..8c6b3b617 100644
--- a/releasetools/netbsd2minix/whitelist/gnu
+++ b/releasetools/netbsd2minix/whitelist/gnu
@@ -0,0 +1,4 @@
+dist
+Makefile
+README
+usr.bin
diff --git a/releasetools/netbsd2minix/whitelist/include b/releasetools/netbsd2minix/whitelist/include
index e69de29bb..c2c839f95 100644
--- a/releasetools/netbsd2minix/whitelist/include
+++ b/releasetools/netbsd2minix/whitelist/include
@@ -0,0 +1,109 @@
+aio.h
+a.out.h
+ar.h
+arpa
+assert.h
+atomic.h
+bitstring.h
+bm.h
+cdbr.h
+cdbw.h
+complex.h
+cpio.h
+ctype.h
+db.h
+dirent.h
+disktab.h
+dlfcn.h
+err.h
+errno.h
+fenv.h
+fmtmsg.h
+fnmatch.h
+fstab.h
+fts.h
+ftw.h
+getopt.h
+glob.h
+grp.h
+hesiod.h
+iconv.h
+ieeefp.h
+ifaddrs.h
+inttypes.h
+iso646.h
+kvm.h
+langinfo.h
+libgen.h
+limits.h
+link_aout.h
+link_elf.h
+link.h
+locale.h
+login_cap.h
+lwp.h
+Makefile
+malloc.h
+math.h
+md2.h
+memory.h
+mntopts.h
+monetary.h
+mpool.h
+mqueue.h
+ndbm.h
+netconfig.h
+netdb.h
+netgroup.h
+nlist.h
+nl_types.h
+nsswitch.h
+paths.h
+protocols
+pwd.h
+quota.h
+randomid.h
+ranlib.h
+re_comp.h
+regex.h
+regexp.h
+resolv.h
+res_update.h
+rmt.h
+rpc
+rpcsvc
+sched.h
+search.h
+semaphore.h
+setjmp.h
+sgtty.h
+signal.h
+spawn.h
+ssp
+stab.h
+stdbool.h
+stddef.h
+stdio.h
+stdlib.h
+string.h
+stringlist.h
+strings.h
+struct.h
+sysexits.h
+tar.h
+tgmath.h
+time.h
+ttyent.h
+tzfile.h
+ucontext.h
+ulimit.h
+unistd.h
+util.h
+utime.h
+utmp.h
+utmpx.h
+uuid.h
+vis.h
+wchar.h
+wctype.h
+wordexp.h
diff --git a/releasetools/netbsd2minix/whitelist/lib b/releasetools/netbsd2minix/whitelist/lib
index e69de29bb..5b0257793 100644
--- a/releasetools/netbsd2minix/whitelist/lib
+++ b/releasetools/netbsd2minix/whitelist/lib
@@ -0,0 +1,26 @@
+bumpversion
+checkoldver
+checkver
+checkvers
+csu
+libbz2
+libc
+libcrypt
+libcurses
+libc_vfp
+libedit
+libexecinfo
+libform
+libm
+libmenu
+libpci
+libprop
+libpuffs
+librefuse
+librmt
+libterminfo
+libutil
+libz
+lua
+Makefile
+Makefile.inc
diff --git a/releasetools/netbsd2minix/whitelist/libexec b/releasetools/netbsd2minix/whitelist/libexec
index e69de29bb..3d1039115 100644
--- a/releasetools/netbsd2minix/whitelist/libexec
+++ b/releasetools/netbsd2minix/whitelist/libexec
@@ -0,0 +1,7 @@
+fingerd
+ftpd
+getty
+ld.elf_so
+Makefile
+Makefile.inc
+makewhatis
diff --git a/releasetools/netbsd2minix/whitelist/sbin b/releasetools/netbsd2minix/whitelist/sbin
index e69de29bb..e4ed177e3 100644
--- a/releasetools/netbsd2minix/whitelist/sbin
+++ b/releasetools/netbsd2minix/whitelist/sbin
@@ -0,0 +1,12 @@
+chown
+fsck
+fsck_ext2fs
+init
+Makefile
+Makefile.inc
+mknod
+newfs_ext2fs
+nologin
+ping
+reboot
+shutdown
diff --git a/releasetools/netbsd2minix/whitelist/share b/releasetools/netbsd2minix/whitelist/share
index e69de29bb..2c8fc744f 100644
--- a/releasetools/netbsd2minix/whitelist/share
+++ b/releasetools/netbsd2minix/whitelist/share
@@ -0,0 +1,7 @@
+legal
+Makefile
+Makefile.inc
+misc
+mk
+terminfo
+zoneinfo
diff --git a/releasetools/netbsd2minix/whitelist/sys b/releasetools/netbsd2minix/whitelist/sys
index e69de29bb..177e0d6b9 100644
--- a/releasetools/netbsd2minix/whitelist/sys
+++ b/releasetools/netbsd2minix/whitelist/sys
@@ -0,0 +1,14 @@
+arch
+compat
+conf
+dev
+external
+fs
+lib
+Makefile
+net
+netinet
+netinet6
+sys
+ufs
+uvm
diff --git a/releasetools/netbsd2minix/whitelist/tests b/releasetools/netbsd2minix/whitelist/tests
index e69de29bb..d39979daf 100644
--- a/releasetools/netbsd2minix/whitelist/tests
+++ b/releasetools/netbsd2minix/whitelist/tests
@@ -0,0 +1,22 @@
+bin
+crypto
+dev
+fs
+games
+h_macros.h
+include
+ipf
+kernel
+lib
+libexec
+Makefile
+Makefile.inc
+modules
+net
+README
+rump
+sbin
+share
+sys
+usr.bin
+usr.sbin
diff --git a/releasetools/netbsd2minix/whitelist/tools b/releasetools/netbsd2minix/whitelist/tools
index e69de29bb..86cea17e2 100644
--- a/releasetools/netbsd2minix/whitelist/tools
+++ b/releasetools/netbsd2minix/whitelist/tools
@@ -0,0 +1,59 @@
+awk
+binstall
+binutils
+cat
+cksum
+compat
+file
+gcc
+genassym
+gmake
+gmp
+headerlist
+host-mkdep
+installboot
+join
+lex
+llvm
+llvm-clang
+llvm-clang-tblgen
+llvm-include
+llvm-lib
+llvm-librt
+llvm-lld
+llvm-mcld
+llvm-tblgen
+lorder
+m4
+make
+Makefile
+Makefile.gmakehost
+Makefile.gnuhost
+Makefile.gnuwrap
+Makefile.host
+Makefile.nbincludes
+makewhatis
+mandoc
+mkdep
+mkfs.mfs
+mkheaderlist.sh
+mknod
+mkproto
+mktemp
+mpc
+mpfr
+mtree
+nbperf
+partition
+pax
+pwd_mkdb
+sed
+stat
+strfile
+texinfo
+tic
+toproto
+tsort
+writeisofs
+yacc
+zic
diff --git a/releasetools/netbsd2minix/whitelist/usr.bin b/releasetools/netbsd2minix/whitelist/usr.bin
index e69de29bb..3b5053248 100644
--- a/releasetools/netbsd2minix/whitelist/usr.bin
+++ b/releasetools/netbsd2minix/whitelist/usr.bin
@@ -0,0 +1,124 @@
+apropos
+asa
+banner
+basename
+bdes
+bzip2
+bzip2recover
+cal
+calendar
+checknr
+chpass
+cksum
+col
+colcrt
+colrm
+column
+comm
+csplit
+ctags
+cut
+deroff
+dirname
+du
+env
+expand
+false
+finger
+fold
+fpr
+from
+fsplit
+ftp
+genassym
+getopt
+gzip
+head
+hexdump
+id
+indent
+infocmp
+join
+jot
+lam
+last
+ldd
+leave
+lock
+login
+logname
+lorder
+m4
+machine
+make
+Makefile
+Makefile.inc
+man
+menuc
+mesg
+mkdep
+mkfifo
+mkstr
+mktemp
+msgc
+nbperf
+newgrp
+nice
+nl
+nohup
+passwd
+paste
+patch
+pathchk
+pr
+printenv
+printf
+pwhash
+renice
+rev
+sdiff
+sed
+seq
+shar
+shlock
+shuffle
+soelim
+sort
+split
+stat
+su
+tail
+tee
+tic
+touch
+tput
+tr
+true
+tsort
+tty
+ul
+uname
+unexpand
+unifdef
+uniq
+units
+unvis
+unzip
+users
+uudecode
+uuencode
+uuidgen
+vis
+w
+wall
+wc
+what
+whatis
+whereis
+who
+whois
+write
+xargs
+xinstall
+xstr
+yes
diff --git a/releasetools/netbsd2minix/whitelist/usr.sbin b/releasetools/netbsd2minix/whitelist/usr.sbin
index e69de29bb..2c85f2d81 100644
--- a/releasetools/netbsd2minix/whitelist/usr.sbin
+++ b/releasetools/netbsd2minix/whitelist/usr.sbin
@@ -0,0 +1,16 @@
+chroot
+i2cscan
+installboot
+link
+Makefile
+Makefile.inc
+mtree
+postinstall
+pwd_mkdb
+rdate
+traceroute
+unlink
+user
+vipw
+vnconfig
+zic
diff --git a/releasetools/netbsd2minix/whitelists.sh b/releasetools/netbsd2minix/whitelists.sh
new file mode 100644
index 000000000..dc649543f
--- /dev/null
+++ b/releasetools/netbsd2minix/whitelists.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+. releasetools/netbsd2minix/common.sh
+
+cd $N2M/whitelist
+for $item in `ls`
+do
+	$N2M/applywhitelist.sh $item < $item
+done
+
+cd ..
+./applywhitelist $MINIX < minix.txt