Merge remote-tracking branch 'fjl/license-update-1.6'

Author: karalabe

.mailmap

@@ -69,7 +69,7 @@ RJ Catalano <[email protected]>
 
 Nchinda Nchinda <[email protected]>
 
-Aron Fischer <[email protected]>
+Aron Fischer <[email protected]> <[email protected]>
 
 Vlad Gluhovsky <[email protected]>
 
@@ -90,3 +90,22 @@ Nick Johnson <[email protected]>
 Henning Diedrich <[email protected]>
 Henning Diedrich <[email protected]> Drake Burroughs <[email protected]>
 
+Felix Lange <[email protected]>
+Felix Lange <[email protected]> <[email protected]>
+
+Максим Чусовлянов <[email protected]>
+
+Louis Holbrook <[email protected]>
+Louis Holbrook <[email protected]> <[email protected]>
+
+Thomas Bocek <[email protected]>
+
+Victor Tran <[email protected]>
+
+Justin Drake <[email protected]>
+
+Frank Wang <[email protected]>
+
+Gary Rong <[email protected]>
+
+Guillaume Nicolas <[email protected]>

AUTHORS

@@ -3,40 +3,51 @@
 Ales Katona <[email protected]>
 Alex Leverington <[email protected]>
 Alexandre Van de Sande <[email protected]>
-Aron Fischer <[email protected]>
+Aron Fischer <[email protected]>
 Bas van Kervel <[email protected]>
 Benjamin Brent <[email protected]>
+Brian Schroeder <[email protected]>
 Casey Detrio <[email protected]>
 Christoph Jentzsch <[email protected]>
 Daniel A. Nagy <[email protected]>
+Diego Siqueira <[email protected]>
 Elliot Shepherd <[email protected]>
 Enrique Fynn <[email protected]>
 Ethan Buchman <[email protected]>
 Fabian Vogelsteller <[email protected]>
 Fabio Berger <[email protected]>
 Felix Lange <[email protected]>
+Frank Wang <[email protected]>
+Gary Rong <[email protected]>
 Gregg Dourgarian <[email protected]>
+Guillaume Nicolas <[email protected]>
 Gustav Simonsson <[email protected]>
 Hao Bryan Cheng <[email protected]>
 Henning Diedrich <[email protected]>
 Isidoro Ghezzi <[email protected]>
 Jae Kwon <[email protected]>
+Jamie Pitts <[email protected]>
 Jason Carver <[email protected]>
 Jeff R. Allen <[email protected]>
 Jeffrey Wilcke <[email protected]>
 Jens Agerberg <[email protected]>
 Jonathan Brown <[email protected]>
 Joseph Chow <[email protected]>
 Justin Clark-Casey <[email protected]>
+Justin Drake <[email protected]>
 Kenji Siu <[email protected]>
 Kobi Gurkan <[email protected]>
 Lefteris Karapetsas <[email protected]>
 Leif Jurvetson <[email protected]>
+Lewis Marshall <[email protected]>
+Louis Holbrook <[email protected]>
+Luca Zeug <[email protected]>
 Maran Hidskes <[email protected]>
 Marek Kotewicz <[email protected]>
 Martin Holst Swende <[email protected]>
 Matthew Di Ferrante <[email protected]>
 Matthew Wampler-Doty <[email protected]>
+Micah Zoltu <[email protected]>
 Nchinda Nchinda <[email protected]>
 Nick Dodson <[email protected]>
 Nick Johnson <[email protected]>
@@ -47,17 +58,28 @@ RJ Catalano <[email protected]>
 Ramesh Nair <[email protected]>
 Ricardo Catalinas Jiménez <[email protected]>
 Rémy Roy <[email protected]>
+Shintaro Kaneko <[email protected]>
 Stein Dekker <[email protected]>
 Steven Roose <[email protected]>
 Taylor Gerring <[email protected]>
 Thomas Bocek <[email protected]>
 Tosh Camille <[email protected]>
+Valentin Wüstholz <[email protected]>
+Victor Farazdagi <[email protected]>
+Victor Tran <[email protected]>
 Viktor Trón <[email protected]>
 Ville Sundell <[email protected]>
 Vincent G <[email protected]>
 Vitalik Buterin <[email protected]>
+Vivek Anand <[email protected]>
 Vlad Gluhovsky <[email protected]>
 Yohann Léon <[email protected]>
 Yoichi Hirai <[email protected]>
+Zahoor Mohamed <[email protected]>
 Zsolt Felföldi <[email protected]>
+holisticode <[email protected]>
+ken10100147 <[email protected]>
+ligi <[email protected]>
+xiekeyang <[email protected]>
 ΞTHΞЯSPHΞЯΞ <{viktor.tron,nagydani,zsfelfoldi}@gmail.com>
+Максим Чусовлянов <[email protected]>

accounts/keystore/account_cache.go

@@ -1,4 +1,4 @@
-// Copyright 2016 The go-ethereum Authors
+// Copyright 2017 The go-ethereum Authors
 // This file is part of the go-ethereum library.
 //
 // The go-ethereum library is free software: you can redistribute it and/or modify

accounts/keystore/account_cache_test.go

@@ -1,4 +1,4 @@
-// Copyright 2016 The go-ethereum Authors
+// Copyright 2017 The go-ethereum Authors
 // This file is part of the go-ethereum library.
 //
 // The go-ethereum library is free software: you can redistribute it and/or modify

accounts/keystore/keystore.go

@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2017 The go-ethereum Authors
 // This file is part of the go-ethereum library.
 //
 // The go-ethereum library is free software: you can redistribute it and/or modify

accounts/keystore/keystore_test.go

@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2017 The go-ethereum Authors
 // This file is part of the go-ethereum library.
 //
 // The go-ethereum library is free software: you can redistribute it and/or modify

build/update-license.go

@@ -49,11 +49,13 @@ var (
 		// don't relicense vendored sources
 		"crypto/sha3/", "crypto/ecies/", "log/",
 		"crypto/secp256k1/curve.go",
+		"consensus/ethash/xor.go",
+		"internal/jsre/deps",
+		"cmd/internal/browser",
 		// don't license generated files
 		"contracts/chequebook/contract/",
 		"contracts/ens/contract/",
 		"contracts/release/contract.go",
-		"p2p/discv5/nodeevent_string.go",
 	}
 
 	// paths with this prefix are licensed as GPL. all other files are LGPL.
@@ -284,6 +286,9 @@ func getInfo(files <-chan string, out chan<- *info, wg *sync.WaitGroup) {
 		if !stat.Mode().IsRegular() {
 			continue
 		}
+		if isGenerated(file) {
+			continue
+		}
 		info, err := fileInfo(file)
 		if err != nil {
 			fmt.Printf("ERROR %s: %v\n", file, err)
@@ -294,6 +299,23 @@ func getInfo(files <-chan string, out chan<- *info, wg *sync.WaitGroup) {
 	wg.Done()
 }
 
+func isGenerated(file string) bool {
+	fd, err := os.Open(file)
+	if err != nil {
+		return false
+	}
+	defer fd.Close()
+	buf := make([]byte, 2048)
+	n, _ := fd.Read(buf)
+	buf = buf[:n]
+	for _, l := range bytes.Split(buf, []byte("\n")) {
+		if bytes.HasPrefix(l, []byte("// Code generated")) {
+			return true
+		}
+	}
+	return false
+}
+
 // fileInfo finds the lowest year in which the given file was committed.
 func fileInfo(file string) (*info, error) {
 	info := &info{file: file, Year: int64(time.Now().Year())}

cmd/geth/config.go

@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2017 The go-ethereum Authors
 // This file is part of go-ethereum.
 //
 // go-ethereum is free software: you can redistribute it and/or modify

cmd/swarm/cleandb.go

@@ -1,18 +1,18 @@
-// Copyright 2016 The go-ethereum Authors
-// This file is part of the go-ethereum library.
+// Copyright 2017 The go-ethereum Authors
+// This file is part of go-ethereum.
 //
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
+// go-ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// The go-ethereum library is distributed in the hope that it will be useful,
+// go-ethereum is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+// You should have received a copy of the GNU General Public License
+// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 
 package main
 

cmd/swarm/list.go

@@ -1,4 +1,4 @@
-// Copyright 2016 The go-ethereum Authors
+// Copyright 2017 The go-ethereum Authors
 // This file is part of go-ethereum.
 //
 // go-ethereum is free software: you can redistribute it and/or modify