Skip to content

Commit 6876e92

Browse files
karalabekaralabe
committed
Merge remote-tracking branch 'fjl/license-update-1.6'
2 parents 15f32a8 + 0cc492f commit 6876e92

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 <rj@erisindustries.com>
6969

7070
Nchinda Nchinda <nchinda2@gmail.com>
7171

72-
Aron Fischer <homotopycolimit@users.noreply.github.com>
72+
Aron Fischer <github@aron.guru> <homotopycolimit@users.noreply.github.com>
7373

7474
Vlad Gluhovsky <gluk256@users.noreply.github.com>
7575

@@ -90,3 +90,22 @@ Nick Johnson <arachnid@notdot.net>
9090
Henning Diedrich <hd@eonblast.com>
9191
Henning Diedrich <hd@eonblast.com> Drake Burroughs <wildfyre@hotmail.com>
9292

93+
Felix Lange <fjl@twurst.com>
94+
Felix Lange <fjl@twurst.com> <fjl@users.noreply.github.com>
95+
96+
Максим Чусовлянов <mchusovlianov@gmail.com>
97+
98+
Louis Holbrook <dev@holbrook.no>
99+
Louis Holbrook <dev@holbrook.no> <nolash@users.noreply.github.com>
100+
101+
Thomas Bocek <tom@tomp2p.net>
102+
103+
Victor Tran <vu.tran54@gmail.com>
104+
105+
Justin Drake <drakefjustin@gmail.com>
106+
107+
Frank Wang <eternnoir@gmail.com>
108+
109+
Gary Rong <garyrong0905@gmail.com>
110+
111+
Guillaume Nicolas <guin56@gmail.com>

‎AUTHORS

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,51 @@
33
Ales Katona <ales@coinbase.com>
44
Alex Leverington <alex@ethdev.com>
55
Alexandre Van de Sande <alex.vandesande@ethdev.com>
6-
Aron Fischer <homotopycolimit@users.noreply.github.com>
6+
Aron Fischer <github@aron.guru>
77
Bas van Kervel <bas@ethdev.com>
88
Benjamin Brent <benjamin@benjaminbrent.com>
9+
Brian Schroeder <bts@gmail.com>
910
Casey Detrio <cdetrio@gmail.com>
1011
Christoph Jentzsch <jentzsch.software@gmail.com>
1112
Daniel A. Nagy <nagy.da@gmail.com>
13+
Diego Siqueira <DiSiqueira@users.noreply.github.com>
1214
Elliot Shepherd <elliot@identitii.com>
1315
Enrique Fynn <enriquefynn@gmail.com>
1416
Ethan Buchman <ethan@coinculture.info>
1517
Fabian Vogelsteller <fabian@frozeman.de>
1618
Fabio Berger <fabioberger1991@gmail.com>
1719
Felix Lange <fjl@twurst.com>
20+
Frank Wang <eternnoir@gmail.com>
21+
Gary Rong <garyrong0905@gmail.com>
1822
Gregg Dourgarian <greggd@tempworks.com>
23+
Guillaume Nicolas <guin56@gmail.com>
1924
Gustav Simonsson <gustav.simonsson@gmail.com>
2025
Hao Bryan Cheng <haobcheng@gmail.com>
2126
Henning Diedrich <hd@eonblast.com>
2227
Isidoro Ghezzi <isidoro.ghezzi@icloud.com>
2328
Jae Kwon <jkwon.work@gmail.com>
29+
Jamie Pitts <james.pitts@gmail.com>
2430
Jason Carver <jacarver@linkedin.com>
2531
Jeff R. Allen <jra@nella.org>
2632
Jeffrey Wilcke <jeffrey@ethereum.org>
2733
Jens Agerberg <github@agerberg.me>
2834
Jonathan Brown <jbrown@bluedroplet.com>
2935
Joseph Chow <ethereum@outlook.com>
3036
Justin Clark-Casey <justincc@justincc.org>
37+
Justin Drake <drakefjustin@gmail.com>
3138
Kenji Siu <kenji@isuntv.com>
3239
Kobi Gurkan <kobigurk@gmail.com>
3340
Lefteris Karapetsas <lefteris@refu.co>
3441
Leif Jurvetson <leijurv@gmail.com>
42+
Lewis Marshall <lewis@lmars.net>
43+
Louis Holbrook <dev@holbrook.no>
44+
Luca Zeug <luclu@users.noreply.github.com>
3545
Maran Hidskes <maran.hidskes@gmail.com>
3646
Marek Kotewicz <marek.kotewicz@gmail.com>
3747
Martin Holst Swende <martin@swende.se>
3848
Matthew Di Ferrante <mattdf@users.noreply.github.com>
3949
Matthew Wampler-Doty <matthew.wampler.doty@gmail.com>
50+
Micah Zoltu <micah@zoltu.net>
4051
Nchinda Nchinda <nchinda2@gmail.com>
4152
Nick Dodson <silentcicero@outlook.com>
4253
Nick Johnson <arachnid@notdot.net>
@@ -47,17 +58,28 @@ RJ Catalano <rj@erisindustries.com>
4758
Ramesh Nair <ram@hiddentao.com>
4859
Ricardo Catalinas Jiménez <r@untroubled.be>
4960
Rémy Roy <remyroy@remyroy.com>
61+
Shintaro Kaneko <kaneshin0120@gmail.com>
5062
Stein Dekker <dekker.stein@gmail.com>
5163
Steven Roose <stevenroose@gmail.com>
5264
Taylor Gerring <taylor.gerring@gmail.com>
5365
Thomas Bocek <tom@tomp2p.net>
5466
Tosh Camille <tochecamille@gmail.com>
67+
Valentin Wüstholz <wuestholz@users.noreply.github.com>
68+
Victor Farazdagi <simple.square@gmail.com>
69+
Victor Tran <vu.tran54@gmail.com>
5570
Viktor Trón <viktor.tron@gmail.com>
5671
Ville Sundell <github@solarius.fi>
5772
Vincent G <caktux@gmail.com>
5873
Vitalik Buterin <v@buterin.com>
74+
Vivek Anand <vivekanand1101@users.noreply.github.com>
5975
Vlad Gluhovsky <gluk256@users.noreply.github.com>
6076
Yohann Léon <sybiload@gmail.com>
6177
Yoichi Hirai <i@yoichihirai.com>
78+
Zahoor Mohamed <zahoor@zahoor.in>
6279
Zsolt Felföldi <zsfelfoldi@gmail.com>
80+
holisticode <holistic.computing@gmail.com>
81+
ken10100147 <sunhongping@kanjian.com>
82+
ligi <ligi@ligi.de>
83+
xiekeyang <xiekeyang@users.noreply.github.com>
6384
ΞTHΞЯSPHΞЯΞ <{viktor.tron,nagydani,zsfelfoldi}@gmail.com>
85+
Максим Чусовлянов <mchusovlianov@gmail.com>

‎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)