Skip to content

Commit 0cc492f

Browse files
committed
all: update license information
1 parent b35aa21 commit 0cc492f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+270
-79
lines changed

.mailmap

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ RJ Catalano <[email protected]>
6969

7070
Nchinda Nchinda <[email protected]>
7171

72-
Aron Fischer <[email protected]>
72+
7373

7474
Vlad Gluhovsky <[email protected]>
7575

@@ -90,3 +90,22 @@ Nick Johnson <[email protected]>
9090
Henning Diedrich <[email protected]>
9191
Henning Diedrich <[email protected]> Drake Burroughs <[email protected]>
9292

93+
Felix Lange <[email protected]>
94+
95+
96+
Максим Чусовлянов <[email protected]>
97+
98+
Louis Holbrook <[email protected]>
99+
100+
101+
Thomas Bocek <[email protected]>
102+
103+
Victor Tran <[email protected]>
104+
105+
Justin Drake <[email protected]>
106+
107+
Frank Wang <[email protected]>
108+
109+
Gary Rong <[email protected]>
110+
111+
Guillaume Nicolas <[email protected]>

AUTHORS

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,51 @@
33
Ales Katona <[email protected]>
44
Alex Leverington <[email protected]>
55
Alexandre Van de Sande <[email protected]>
6-
Aron Fischer <[email protected]>
6+
Aron Fischer <[email protected]>
77
Bas van Kervel <[email protected]>
88
Benjamin Brent <[email protected]>
9+
Brian Schroeder <[email protected]>
910
Casey Detrio <[email protected]>
1011
Christoph Jentzsch <[email protected]>
1112
Daniel A. Nagy <[email protected]>
13+
Diego Siqueira <[email protected]>
1214
Elliot Shepherd <[email protected]>
1315
Enrique Fynn <[email protected]>
1416
Ethan Buchman <[email protected]>
1517
Fabian Vogelsteller <[email protected]>
1618
Fabio Berger <[email protected]>
1719
Felix Lange <[email protected]>
20+
Frank Wang <[email protected]>
21+
Gary Rong <[email protected]>
1822
Gregg Dourgarian <[email protected]>
23+
Guillaume Nicolas <[email protected]>
1924
Gustav Simonsson <[email protected]>
2025
Hao Bryan Cheng <[email protected]>
2126
Henning Diedrich <[email protected]>
2227
Isidoro Ghezzi <[email protected]>
2328
29+
Jamie Pitts <[email protected]>
2430
Jason Carver <[email protected]>
2531
Jeff R. Allen <[email protected]>
2632
Jeffrey Wilcke <[email protected]>
2733
Jens Agerberg <[email protected]>
2834
Jonathan Brown <[email protected]>
2935
Joseph Chow <[email protected]>
3036
Justin Clark-Casey <[email protected]>
37+
Justin Drake <[email protected]>
3138
Kenji Siu <[email protected]>
3239
Kobi Gurkan <[email protected]>
3340
Lefteris Karapetsas <[email protected]>
3441
Leif Jurvetson <[email protected]>
42+
Lewis Marshall <[email protected]>
43+
Louis Holbrook <[email protected]>
44+
Luca Zeug <[email protected]>
3545
Maran Hidskes <[email protected]>
3646
Marek Kotewicz <[email protected]>
3747
Martin Holst Swende <[email protected]>
3848
Matthew Di Ferrante <[email protected]>
3949
Matthew Wampler-Doty <[email protected]>
50+
Micah Zoltu <[email protected]>
4051
Nchinda Nchinda <[email protected]>
4152
Nick Dodson <[email protected]>
4253
Nick Johnson <[email protected]>
@@ -47,17 +58,28 @@ RJ Catalano <[email protected]>
4758
Ramesh Nair <[email protected]>
4859
Ricardo Catalinas Jiménez <[email protected]>
4960
Rémy Roy <[email protected]>
61+
Shintaro Kaneko <[email protected]>
5062
Stein Dekker <[email protected]>
5163
Steven Roose <[email protected]>
5264
Taylor Gerring <[email protected]>
5365
Thomas Bocek <[email protected]>
5466
Tosh Camille <[email protected]>
67+
Valentin Wüstholz <[email protected]>
68+
Victor Farazdagi <[email protected]>
69+
Victor Tran <[email protected]>
5570
Viktor Trón <[email protected]>
5671
Ville Sundell <[email protected]>
5772
Vincent G <[email protected]>
5873
Vitalik Buterin <[email protected]>
74+
Vivek Anand <[email protected]>
5975
Vlad Gluhovsky <[email protected]>
6076
Yohann Léon <[email protected]>
6177
Yoichi Hirai <[email protected]>
78+
Zahoor Mohamed <[email protected]>
6279
Zsolt Felföldi <[email protected]>
80+
holisticode <[email protected]>
81+
ken10100147 <[email protected]>
82+
83+
xiekeyang <[email protected]>
6384
ΞTHΞЯSPHΞЯΞ <{viktor.tron,nagydani,zsfelfoldi}@gmail.com>
85+
Максим Чусовлянов <[email protected]>

accounts/keystore/account_cache.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2016 The go-ethereum Authors
1+
// Copyright 2017 The go-ethereum Authors
22
// This file is part of the go-ethereum library.
33
//
44
// The go-ethereum library is free software: you can redistribute it and/or modify

accounts/keystore/account_cache_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2016 The go-ethereum Authors
1+
// Copyright 2017 The go-ethereum Authors
22
// This file is part of the go-ethereum library.
33
//
44
// The go-ethereum library is free software: you can redistribute it and/or modify

accounts/keystore/keystore.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2015 The go-ethereum Authors
1+
// Copyright 2017 The go-ethereum Authors
22
// This file is part of the go-ethereum library.
33
//
44
// The go-ethereum library is free software: you can redistribute it and/or modify

accounts/keystore/keystore_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2015 The go-ethereum Authors
1+
// Copyright 2017 The go-ethereum Authors
22
// This file is part of the go-ethereum library.
33
//
44
// The go-ethereum library is free software: you can redistribute it and/or modify

build/update-license.go

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,13 @@ var (
4949
// don't relicense vendored sources
5050
"crypto/sha3/", "crypto/ecies/", "log/",
5151
"crypto/secp256k1/curve.go",
52+
"consensus/ethash/xor.go",
53+
"internal/jsre/deps",
54+
"cmd/internal/browser",
5255
// don't license generated files
5356
"contracts/chequebook/contract/",
5457
"contracts/ens/contract/",
5558
"contracts/release/contract.go",
56-
"p2p/discv5/nodeevent_string.go",
5759
}
5860

5961
// 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) {
284286
if !stat.Mode().IsRegular() {
285287
continue
286288
}
289+
if isGenerated(file) {
290+
continue
291+
}
287292
info, err := fileInfo(file)
288293
if err != nil {
289294
fmt.Printf("ERROR %s: %v\n", file, err)
@@ -294,6 +299,23 @@ func getInfo(files <-chan string, out chan<- *info, wg *sync.WaitGroup) {
294299
wg.Done()
295300
}
296301

302+
func isGenerated(file string) bool {
303+
fd, err := os.Open(file)
304+
if err != nil {
305+
return false
306+
}
307+
defer fd.Close()
308+
buf := make([]byte, 2048)
309+
n, _ := fd.Read(buf)
310+
buf = buf[:n]
311+
for _, l := range bytes.Split(buf, []byte("\n")) {
312+
if bytes.HasPrefix(l, []byte("// Code generated")) {
313+
return true
314+
}
315+
}
316+
return false
317+
}
318+
297319
// fileInfo finds the lowest year in which the given file was committed.
298320
func fileInfo(file string) (*info, error) {
299321
info := &info{file: file, Year: int64(time.Now().Year())}

cmd/geth/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2015 The go-ethereum Authors
1+
// Copyright 2017 The go-ethereum Authors
22
// This file is part of go-ethereum.
33
//
44
// go-ethereum is free software: you can redistribute it and/or modify

cmd/swarm/cleandb.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
// Copyright 2016 The go-ethereum Authors
2-
// This file is part of the go-ethereum library.
1+
// Copyright 2017 The go-ethereum Authors
2+
// This file is part of go-ethereum.
33
//
4-
// The go-ethereum library is free software: you can redistribute it and/or modify
5-
// it under the terms of the GNU Lesser General Public License as published by
4+
// go-ethereum is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU General Public License as published by
66
// the Free Software Foundation, either version 3 of the License, or
77
// (at your option) any later version.
88
//
9-
// The go-ethereum library is distributed in the hope that it will be useful,
9+
// go-ethereum is distributed in the hope that it will be useful,
1010
// but WITHOUT ANY WARRANTY; without even the implied warranty of
1111
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
// GNU Lesser General Public License for more details.
12+
// GNU General Public License for more details.
1313
//
14-
// You should have received a copy of the GNU Lesser General Public License
15-
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
14+
// You should have received a copy of the GNU General Public License
15+
// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
1616

1717
package main
1818

cmd/swarm/list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2016 The go-ethereum Authors
1+
// Copyright 2017 The go-ethereum Authors
22
// This file is part of go-ethereum.
33
//
44
// go-ethereum is free software: you can redistribute it and/or modify

0 commit comments

Comments
 (0)