From f4acdea402ab3e3387a74c89dcca555bbc6dd9a7 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Wed, 22 Jul 2015 00:35:37 +0200 Subject: crypto: fix license of curve.go crypto/curve.go is not our code and has its own license. This commit excludes it in update-license.go and removes our GPL header. --- build/update-license.go | 1 + 1 file changed, 1 insertion(+) (limited to 'build') diff --git a/build/update-license.go b/build/update-license.go index abb17f872..98c122193 100644 --- a/build/update-license.go +++ b/build/update-license.go @@ -48,6 +48,7 @@ var ( "Godeps/", "tests/files/", "build/", // don't relicense vendored packages "crypto/sha3/", "crypto/ecies/", "logger/glog/", + "crypto/curve.go", } // paths with this prefix are licensed as GPL. all other files are LGPL. -- cgit v1.2.3 From 3f047be5aa93b6222506445414ca909dd59c7eeb Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Wed, 22 Jul 2015 18:48:40 +0200 Subject: all: update license headers to distiguish GPL/LGPL All code outside of cmd/ is licensed as LGPL. The headers now reflect this by calling the whole work "the go-ethereum library". --- build/update-license.go | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'build') diff --git a/build/update-license.go b/build/update-license.go index 98c122193..3c18ee40f 100644 --- a/build/update-license.go +++ b/build/update-license.go @@ -66,20 +66,20 @@ var ( // its input is an info structure. var licenseT = template.Must(template.New("").Parse(` // Copyright {{.Year}} The go-ethereum Authors -// This file is part of go-ethereum. +// This file is part of {{.Whole false}}. // // go-ethereum is free software: you can redistribute it and/or modify // it under the terms of the GNU {{.License}} as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // -// go-ethereum is distributed in the hope that it will be useful, +// {{.Whole true}} 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 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU {{.License}} for more details. // // You should have received a copy of the GNU {{.License}} -// along with go-ethereum. If not, see . +// along with {{.Whole false}}. If not, see . `[1:])) @@ -91,17 +91,25 @@ type info struct { func (i info) License() string { if i.gpl() { return "General Public License" - } else { - return "Lesser General Public License" } + return "Lesser General Public License" } func (i info) ShortLicense() string { if i.gpl() { return "GPL" - } else { - return "LGPL" } + return "LGPL" +} + +func (i info) Whole(startOfSentence bool) string { + if i.gpl() { + return "go-ethereum" + } + if startOfSentence { + return "The go-ethereum library" + } + return "the go-ethereum library" } func (i info) gpl() bool { -- cgit v1.2.3