Skip to content

Commit fdc5a7d

Browse files
fjlfjl
committed
Merge pull request #2457 from fjl/license-update-1.4
all: update license information
2 parents 499d63f + d04a2e7 commit fdc5a7d

Some content is hidden

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

61 files changed

+373
-88
lines changed

‎.mailmap‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,7 @@ Jason Carver <[email protected]> <[email protected]>
5959

6060
Joseph Chow <[email protected]>
6161
Joseph Chow <[email protected]> ethers <TODO>
62+
63+
Enrique Fynn <[email protected]>
64+
65+
Vincent G <[email protected]>

‎AUTHORS‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,34 @@
33
Alex Leverington <[email protected]>
44
Alexandre Van de Sande <[email protected]>
55
Bas van Kervel <[email protected]>
6+
Christoph Jentzsch <[email protected]>
67
Daniel A. Nagy <[email protected]>
8+
Drake Burroughs <[email protected]>
9+
Enrique Fynn <[email protected]>
710
Ethan Buchman <[email protected]>
811
Fabian Vogelsteller <[email protected]>
912
Felix Lange <[email protected]>
1013
Gustav Simonsson <[email protected]>
14+
Isidoro Ghezzi <[email protected]>
1115
Jae Kwon <[email protected]>
1216
Jason Carver <[email protected]>
17+
Jeff R. Allen <[email protected]>
1318
Jeffrey Wilcke <[email protected]>
1419
Joseph Chow <[email protected]>
1520
Kobi Gurkan <[email protected]>
21+
Lefteris Karapetsas <[email protected]>
22+
Leif Jurvetson <[email protected]>
1623
Maran Hidskes <[email protected]>
1724
Marek Kotewicz <[email protected]>
1825
Matthew Wampler-Doty <[email protected]>
1926
Nick Dodson <[email protected]>
27+
Peter Pratscher <[email protected]>
2028
Péter Szilágyi <[email protected]>
29+
Ramesh Nair <[email protected]>
30+
Ricardo Catalinas Jiménez <[email protected]>
31+
Rémy Roy <[email protected]>
2132
Taylor Gerring <[email protected]>
2233
Viktor Trón <[email protected]>
34+
Vincent G <[email protected]>
2335
Vitalik Buterin <[email protected]>
2436
Zsolt Felföldi <[email protected]>

‎accounts/abi/event_test.go‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
// Copyright 2016 The go-ethereum Authors
2+
// This file is part of the go-ethereum library.
3+
//
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
6+
// the Free Software Foundation, either version 3 of the License, or
7+
// (at your option) any later version.
8+
//
9+
// The go-ethereum library is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU Lesser General Public License for more details.
13+
//
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/>.
16+
117
package abi
218

319
import (

‎accounts/key_store_plain.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2014 The go-ethereum Authors
1+
// Copyright 2015 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: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var (
4848
"Godeps/", "tests/files/", "build/",
4949
// don't relicense vendored sources
5050
"crypto/sha3/", "crypto/ecies/", "logger/glog/",
51-
"crypto/curve.go",
51+
"crypto/secp256k1/curve.go",
5252
"trie/arc.go",
5353
}
5454

@@ -151,14 +151,24 @@ func main() {
151151
writeLicenses(infoc)
152152
}
153153

154+
func skipFile(path string) bool {
155+
if strings.Contains(path, "/testdata/") {
156+
return true
157+
}
158+
for _, p := range skipPrefixes {
159+
if strings.HasPrefix(path, p) {
160+
return true
161+
}
162+
}
163+
return false
164+
}
165+
154166
func getFiles() []string {
155167
cmd := exec.Command("git", "ls-tree", "-r", "--name-only", "HEAD")
156168
var files []string
157169
err := doLines(cmd, func(line string) {
158-
for _, p := range skipPrefixes {
159-
if strings.HasPrefix(line, p) {
160-
return
161-
}
170+
if skipFile(line) {
171+
return
162172
}
163173
ext := filepath.Ext(line)
164174
for _, wantExt := range extensions {
@@ -283,7 +293,7 @@ func getInfo(files <-chan string, out chan<- *info, wg *sync.WaitGroup) {
283293
// fileInfo finds the lowest year in which the given file was commited.
284294
func fileInfo(file string) (*info, error) {
285295
info := &info{file: file, Year: int64(time.Now().Year())}
286-
cmd := exec.Command("git", "log", "--follow", "--find-copies", "--pretty=format:%ai", "--", file)
296+
cmd := exec.Command("git", "log", "--follow", "--find-renames=80", "--find-copies=80", "--pretty=format:%ai", "--", file)
287297
err := doLines(cmd, func(line string) {
288298
y, err := strconv.ParseInt(line[:4], 10, 64)
289299
if err != nil {

‎cmd/abigen/main.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
// Copyright 2016 The go-ethereum Authors
2-
// This file is part of the go-ethereum library.
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/geth/js.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2014 The go-ethereum Authors
1+
// Copyright 2015 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/utils/client.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
// Copyright 2015 The go-ethereum Authors
2-
// This file is part of the go-ethereum library.
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 utils
1818

‎cmd/utils/jeth.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
// Copyright 2015 The go-ethereum Authors
2-
// This file is part of the go-ethereum library.
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 utils
1818

‎common/natspec/natspec.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//
1414
// You should have received a copy of the GNU Lesser General Public License
1515
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
16-
//
16+
1717
// +build ignore
1818

1919
package natspec

0 commit comments

Comments
 (0)