From c4f1badaa7859aab2ac1ae08359668e84fa2e1f0 Mon Sep 17 00:00:00 2001 From: BJ Neilsen Date: Thu, 28 Aug 2014 14:37:02 -0600 Subject: [PATCH] Update to MIT license --- LICENSE.txt | 26 +++++++++++++++++--------- protobuf.gemspec | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index dd94252a..cddcfe29 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,14 +1,22 @@ - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 +The MIT License (MIT) -Copyright (C) 2004 Sam Hocevar +Copyright (c) 2014 BJ Neilsen -Everyone is permitted to copy and distribute verbatim or modified -copies of this license document, and changing it is allowed as long -as the name is changed. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. - 0. You just DO WHAT THE FUCK YOU WANT TO. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/protobuf.gemspec b/protobuf.gemspec index bfec5bdb..0071c58a 100644 --- a/protobuf.gemspec +++ b/protobuf.gemspec @@ -6,7 +6,7 @@ require "protobuf/version" s.name = 'protobuf' s.version = ::Protobuf::VERSION s.date = ::Time.now.strftime('%Y-%m-%d') - s.license = 'WTFPL' + s.license = 'MIT' s.authors = ['BJ Neilsen', 'Brandon Dewitt', 'Devin Christensen', 'Adam Hutchison'] s.email = ['bj.neilsen+protobuf@gmail.com', 'brandonsdewitt+protobuf@gmail.com', 'quixoten@gmail.com', 'liveh2o@gmail.com']