Merge remote-tracking branch 'upstream/master'

10 files changed, 1 insertions, 429 deletions

diff --git a/bin/.cvsignore b/bin/.cvsignore
deleted file mode 100644
index 70186546..00000000
--- a/bin/.cvsignore
+++ /dev/null
@@ -1,244 +0,0 @@
-_*
-9grep
-9lex
-9p
-9pserve
-9sed
-9term
-9yacc
-acid
-acidtypes
-acme
-acmeevent
-adict
-aescbc
-ajuke
-aplay
-ascii
-asn12dsa
-asn12rsa
-astro
-auxclog
-auxpm
-auxstats
-basename
-bc
-bmp
-bunzip2
-bzip2
-cal
-calendar
-cat
-cb
-cleanname
-cmapcube
-cmp
-colors
-comm
-crop
-date
-db
-dc
-delatex
-deroff
-dial
-dict
-diff
-disknfs
-drawterm
-dsa2pub
-dsa2ssh
-dsagen
-dump9660
-echo
-ed
-eqn
-factor
-factotum
-file
-flacinfo
-fmt
-fortune
-freq
-fsize
-getflags
-gif
-goodmk
-grap
-graph
-grep
-grep9
-gunzip
-gview
-gzip
-hget
-hist
-hoc
-htmlfmt
-ico
-iconv
-idiff
-img
-import
-Irc
-join
-jpg
-Juke
-jukefmt
-jukeget
-jukeindex
-jukeinfo
-jukeplay
-jukeput
-jukesearch
-jukesongfile
-lex
-listen1
-look
-lp
-lpdsend
-ls
-lsr
-m4adec
-m4ainfo
-mapd
-mc
-md5sum
-mk
-_mk
-mk9660
-mkdir
-mp3dec
-mp3info
-mtime
-namespace
-ndbipquery
-ndbmkdb
-ndbmkhash
-ndbmkhosts
-ndbquery
-Netfiles
-netfileget
-netfileput
-netfilestat
-netfilelib.rc
-netkey
-news
-notes
-p
-pac4dec
-passwd
-pbd
-pemdecode
-pemencode
-pic
-plot
-plumb
-plumber
-png
-portmap
-ppm
-pr
-primes
-proof
-psdownload
-ramfs
-rc
-read
-readcons
-rio
-rm
-rsa2csr
-rsa2pub
-rsa2ssh
-rsa2x509
-rsafill
-rsagen
-rscc
-sam
-samterm
-scat
-secstore
-secstored
-secuser
-sed
-seq
-sftpcache
-sha1sum
-sleep
-sort
-split
-sprog
-srv
-ssh-agent
-sslpipe
-stats
-strings
-sum
-tail
-tar
-tbl
-tcolors
-tcs
-tee
-test
-testfdpass
-text2post
-tftpd
-time
-togif
-toico
-topng
-toppm
-touch
-tr
-tr2post
-tra*
-troff
-troff2html
-tweak
-unicode
-uniq
-units
-unutf
-unzip
-vac
-vacfs
-vbackup
-vcat
-vftp
-vmount
-vmount0
-vnfs
-volume
-vtdump
-wc
-win
-xd
-yacc
-yuv
-zip
-zork
-rscpp
-u9fs
-ansitize
-bridge
-devdraw
-dns
-dnsdebug
-dnsquery
-dnstcp
-faces
-htmlroff
-ircmux
-mail
-mailfs
-picsvg
-resample
-snarfer
-snoopy
-strip
-tpic
-waitfor
-webscript
-9pfuse
diff --git a/bin/9l b/bin/9l
index 0b57319d..a82a2812 100755
--- a/bin/9l
+++ b/bin/9l
@@ -19,7 +19,7 @@ case "$tag" in
 	5.2.*)
 		extralibs="$extralibs -lkse"
 		;;
-	[5-9].*)
+	[5-9].*|1[0-1].*)
 		extralibs="$extralibs -lpthread"
 		;;
 	esac
diff --git a/bin/codereview b/bin/codereview
deleted file mode 100755
index ffa0e3cd..00000000
--- a/bin/codereview
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/usr/local/plan9/bin/rc
-
-git=git
-show=false
-fn gitshow {
-	echo '%' git $*
-	git $*
-}
-if(! ~ $#* 0 && ~ $1 -v) {
-	git=gitshow
-	show=true
-	shift
-}
-	
-if(~ $#* 0) {
-	echo 'usage: codereview <command> <args>' >[1=2]
-	exit usage
-}
-
-if(~ $#PLAN9 0) {
-	PLAN9=/usr/local/plan9
-}
-if(! test -d $PLAN9/lib/git) {
-	echo 'codereview: cannot find $PLAN9/lib/git' >[1=2]
-	exit git
-}
-
-if(! test -e $PLAN9/.git/hooks/commit-msg) {
-	if($show) {
-		echo '% ln -s ../../lib/git/commit-msg.hook $PLAN9/.git/hooks/commit-msg'
-	}
-	ln -s ../../lib/git/commit-msg.hook $PLAN9/.git/hooks/commit-msg
-}
-
-switch($1) {
-case help
-	9 man 1 codereview
-
-case pending
-	shift
-	if(! ~ $#* 0) {
-		echo 'usage: codereview pending' >[1=2]
-		exit usage
-	}
-	$git branch -v
-
-case create
-	shift
-	if(~ $#* 0) {
-		echo 'usage: codereview create branchname' >[1=2]
-		exit usage
-	}
-	branch=$1
-	shift
-	if(! git branch -l | 9 grep '\* master$' >/dev/null) {
-		echo 'codereview: create not on master branch; use codereview commit' >[1=2]
-		exit master
-	}
-	if($show) {
-		echo '% git branch '$branch' && git commit || git branch -d '$branch >[1=2]
-	}
-	git branch $branch && git checkout $branch && git commit -a $* || git branch -d $branch
-
-case commit
-	shift
-	if(git branch -l | 9 grep '\* master$' >/dev/null) {
-		echo 'codereview: commit on master branch; use codereview create <branchname>' >[1=2]
-		exit master
-	}
-	if(~ `{git merge-base HEAD HEAD} `{git merge-base HEAD master}) {
-		# first commit on branch, somehow.
-		$git commit $*
-		exit $status
-	}
-	$git commit --amend -a $*
-	exit $status
-
-case upload
-	if(git branch -l | 9 grep '\* master$' >/dev/null) {
-		echo 'codereview: upload on master branch' >[1=2]
-		exit master
-	}
-	if(~ `{git merge-base HEAD HEAD} `{git merge-base HEAD master}) {
-		# no commit on branch
-		echo 'codereview: no commits yet on this feature branch' >[1=2]
-		exit commit
-	}
-	if(! 9 grep 'machine plan9port-review.googlesource.com' $HOME/.netrc >/dev/null >[2=1]) {
-		echo 'codereview: warning: cannot find plan9port-review in netrc' >[1=2]
-	}
-	if(! git status | 9 grep 'nothing to commit, working directory clean' >/dev/null) {
-		echo 'codereview: warning: local changes not yet committed' >[1=2]
-		git status
-	}
-	$git push https://plan9port-review.googlesource.com/plan9 HEAD:refs/for/master >[2=1] | 9 sed 's/.*
//'
-
-case sync
-	shift
-	if(! ~ $#* 0) {
-		echo 'usage: codereview sync' >[1=2]
-		exit usage
-	}
-	$git fetch -q
-	
-	branch=`{git branch -l | 9 sed -n 's/^\* //p'}
-	if(~ $branch master) {
-		$git merge -q --ff-only origin/master
-		exit $status
-	}
-
-	if(~ `{git merge-base HEAD HEAD} `{git merge-base HEAD master}) {
-		# no commit on branch
-		git merge -q --ff-only origin/master
-		exit $status
-	}
-
-	# Exactly this commit in master. Fast-forward from master and delete this branch.
-	if(git branch -r --contains HEAD | 9 grep '^ *origin/master$' >/dev/null) {
-		$git checkout -q master
-		$git merge -q --ff-only origin/master
-		$git branch -q -d $branch
-		exit $status
-	}
-	
-	changeid=`{git log -n 1 | 9 sed -n 's/^    Change-Id: //p'}
-	if(~ $#changeid 0) {
-		echo 'codereview: cannot find change id'
-		exit changeid
-	}
-
-	if(git log --grep 'Change-Id: '$changeid origin/master | 9 grep . >/dev/null) {
-		# Something like this got submitted.
-		$git checkout -q master
-		$git merge -q --ff-only origin/master
-		echo 'Change submitted but perhaps not identical to your copy.' >[1=2]
-		echo 'To remove old copy:' git branch -d $branch >[1=2]
-		exit 1
-	}
-	
-	if(git branch -r --contains master | 9 grep '^ *origin/master$' >/dev/null)
-		$git branch -f master origin/master
-	$git rebase -q origin/master
-
-case *
-	echo 'codereview: unrecognized command '$1 >[1=2]
-	exit usage
-}
diff --git a/bin/fossil/.cvsignore b/bin/fossil/.gitkeep
index e69de29b..e69de29b 100644
--- a/bin/fossil/.cvsignore
+++ b/bin/fossil/.gitkeep
diff --git a/bin/fs/.cvsignore b/bin/fs/.cvsignore
deleted file mode 100644
index 972a5d63..00000000
--- a/bin/fs/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*fs
diff --git a/bin/fs/.gitkeep b/bin/fs/.gitkeep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/bin/fs/.gitkeep
diff --git a/bin/lpbin/.cvsignore b/bin/lpbin/.cvsignore
deleted file mode 100644
index 664f53dd..00000000
--- a/bin/lpbin/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-LOCK
-lpsend
-lpdsend
-lpdaemon
diff --git a/bin/upas/.cvsignore b/bin/upas/.cvsignore
deleted file mode 100644
index b370701d..00000000
--- a/bin/upas/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-aliasmail
-filter
-marshal
-nedmail
-qer
-runq
-send
-smtp
-smtpd
-unvf
-vf
diff --git a/bin/venti/.cvsignore b/bin/venti/.cvsignore
deleted file mode 100644
index 086c335c..00000000
--- a/bin/venti/.cvsignore
+++ /dev/null
@@ -1,21 +0,0 @@
-buildindex
-checkarenas
-checkindex
-clumpstats
-copy
-findscore
-fixarenas
-fmtarenas
-fmtbloom
-fmtindex
-fmtisect
-mirrorarenas
-printarena
-rdarena
-read
-sync
-syncindex
-venti
-verifyarena
-wrarena
-write
diff --git a/bin/venti/.gitkeep b/bin/venti/.gitkeep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/bin/venti/.gitkeep