Copyright fix to GPLv2+

14 files changed, 54 insertions, 90 deletions

diff --git a/elivepatch_client/bin/elivepatch b/elivepatch_client/bin/elivepatch
index c5d1f7f..cd36c2c 100644
--- a/elivepatch_client/bin/elivepatch
+++ b/elivepatch_client/bin/elivepatch
@@ -1,16 +1,8 @@
 #!/usr/bin/env python
-################################################################################
-# elivepatch - A UTILITY FOR LIVE PATCHING GENTOO KERNELS
-################################################################################
-# Distributed under the terms of the GNU General Public License v2
-#
-# Copyright:
-#             (c) 2017 Alice Ferrazzi
-#             Distributed under the terms of the GNU General Public License v2
-#
-# Author(s):
-#             Alice Ferrazzi <alicef@gentoo.org>
+# -*- coding: utf-8 -*-
 #
+# (c) 2017, Alice Ferrazzi <alice.ferrazzi@gmail.com>
+# Distributed under the terms of the GNU General Public License v2 or later
 
 __version__ = "0.0.1"
 
diff --git a/elivepatch_client/client/__init__.py b/elivepatch_client/client/__init__.py
index 961d1aa..7dcd045 100644
--- a/elivepatch_client/client/__init__.py
+++ b/elivepatch_client/client/__init__.py
@@ -1,6 +1,9 @@
-"""
-elivepatch Gentoo live patcher
-"""
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# (c) 2017, Alice Ferrazzi <alice.ferrazzi@gmail.com>
+# Distributed under the terms of the GNU General Public License v2 or later
+
 __version__ = '0.0.1'
 __author__ = 'Alice Ferrazzi'
-__license__ = 'MIT'
\ No newline at end of file
+__license__ = 'GPL-2'
\ No newline at end of file
diff --git a/elivepatch_client/client/argsparser.py b/elivepatch_client/client/argsparser.py
index 1db9d05..0658237 100644
--- a/elivepatch_client/client/argsparser.py
+++ b/elivepatch_client/client/argsparser.py
@@ -1,5 +1,9 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
+#
+# (c) 2017, Alice Ferrazzi <alice.ferrazzi@gmail.com>
+# Distributed under the terms of the GNU General Public License v2 or later
+
 
 import argparse
 try:
diff --git a/elivepatch_client/client/checkers.py b/elivepatch_client/client/checkers.py
index 6bbcade..15eda29 100644
--- a/elivepatch_client/client/checkers.py
+++ b/elivepatch_client/client/checkers.py
@@ -1,4 +1,9 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# (c) 2017, Alice Ferrazzi <alice.ferrazzi@gmail.com>
+# Distributed under the terms of the GNU General Public License v2 or later
+
 import os
 from git import Repo
 from elivepatch_client.client import restful
diff --git a/elivepatch_client/client/cli.py b/elivepatch_client/client/cli.py
index 3694845..ce7fde8 100644
--- a/elivepatch_client/client/cli.py
+++ b/elivepatch_client/client/cli.py
@@ -1,19 +1,8 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#################################################################################
-# ELIVEPATCH ACTIONS
-#################################################################################
-# File:       cli.py
-#
-#             Handles elivepatch actions via the command line interface.
-#
-# Copyright:
-#             (c) 2017 Alice Ferrazzi
-#             Distributed under the terms of the GNU General Public License v2
-#
-# Author(s):
-#             Alice Ferrazzi <alicef@gentoo.org>
 #
+# (c) 2017, Alice Ferrazzi <alice.ferrazzi@gmail.com>
+# Distributed under the terms of the GNU General Public License v2 or later
 
 import os, sys
 from elivepatch_client.client.checkers import CVE
diff --git a/elivepatch_client/client/constants.py b/elivepatch_client/client/constants.py
index 2d96343..719f254 100644
--- a/elivepatch_client/client/constants.py
+++ b/elivepatch_client/client/constants.py
@@ -1,5 +1,9 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
+#
+# (c) 2017, Alice Ferrazzi <alice.ferrazzi@gmail.com>
+# Distributed under the terms of the GNU General Public License v2 or later
+
 
 from __future__ import unicode_literals
 
diff --git a/elivepatch_client/client/restful.py b/elivepatch_client/client/restful.py
index f6ee7f2..60c89a3 100644
--- a/elivepatch_client/client/restful.py
+++ b/elivepatch_client/client/restful.py
@@ -1,5 +1,9 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
+#
+# (c) 2017, Alice Ferrazzi <alice.ferrazzi@gmail.com>
+# Distributed under the terms of the GNU General Public License v2 or later
+
 import json, base64
 import requests
 from requests.auth import HTTPBasicAuth
diff --git a/elivepatch_client/client/version.py b/elivepatch_client/client/version.py
index 7ef7a98..7dac792 100644
--- a/elivepatch_client/client/version.py
+++ b/elivepatch_client/client/version.py
@@ -1,17 +1,9 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#################################################################################
-# ELIVEPATCH_CLIENT VERSION
-#################################################################################
-# File:       version.py
-#
-#             Current version number
-#
-# Copyright:
-#             (c) 2017 Alice Ferrazzi <alicef@gentoo.org>
-#             Distributed under the terms of the GNU General Public License v2
-#
 #
+# (c) 2017, Alice Ferrazzi <alice.ferrazzi@gmail.com>
+# Distributed under the terms of the GNU General Public License v2 or later
+
 
 from __future__ import unicode_literals
 
diff --git a/elivepatch_client/setup.py b/elivepatch_client/setup.py
index b5c37c1..b8fa06a 100644
--- a/elivepatch_client/setup.py
+++ b/elivepatch_client/setup.py
@@ -7,6 +7,6 @@ setup(
     url='https://gentoo.org',
     author='Alice Ferrazzi',
     author_email='alice.ferrazzi@gmail.com',
-    license='GNU GPLv2',
+    license='GNU GPLv2+',
     packages=find_packages(),
 )
diff --git a/elivepatch_server/elivepatch b/elivepatch_server/elivepatch
index 827960e..99a1d94 100644
--- a/elivepatch_server/elivepatch
+++ b/elivepatch_server/elivepatch
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
 # (c) 2017, Alice Ferrazzi <alice.ferrazzi@gmail.com>
-# Distributed under the terms of the GNU General Public License v2
+# Distributed under the terms of the GNU General Public License v2 or later
+
 
 from flask import Flask, jsonify, abort, make_response
 from flask_restful  import Api, Resource, reqparse, fields, marshal
diff --git a/elivepatch_server/resources/AgentInfo.py b/elivepatch_server/resources/AgentInfo.py
index b8f08a5..00be63f 100644
--- a/elivepatch_server/resources/AgentInfo.py
+++ b/elivepatch_server/resources/AgentInfo.py
@@ -1,19 +1,8 @@
-# (c) 2015, Alice Ferrazzi <alice.ferrazzi@gmail.com>
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 #
-# This file is part of elivepatch
-#
-# elivepatch is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# elivepatch 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
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with elivepatch.  If not, see <http://www.gnu.org/licenses/>.
+# (c) 2017, Alice Ferrazzi <alice.ferrazzi@gmail.com>
+# Distributed under the terms of the GNU General Public License v2 or later
 
 from flask import Flask, jsonify, abort, make_response
 from flask_restful import Api, Resource, reqparse, fields, marshal
diff --git a/elivepatch_server/resources/dispatcher.py b/elivepatch_server/resources/dispatcher.py
index 8fcb2ae..f1bc926 100644
--- a/elivepatch_server/resources/dispatcher.py
+++ b/elivepatch_server/resources/dispatcher.py
@@ -1,19 +1,9 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#################################################################################
-# ELIVEPATCH SERVER DISPATCHER
-#################################################################################
-# File:       cli.py
-#
-#             Handles elivepatch actions via the command line interface.
-#
-# Copyright:
-#             (c) 2017 Alice Ferrazzi
-#             Distributed under the terms of the GNU General Public License v2
-#
-# Author(s):
-#             Alice Ferrazzi <alicef@gentoo.org>
 #
+# (c) 2017, Alice Ferrazzi <alice.ferrazzi@gmail.com>
+# Distributed under the terms of the GNU General Public License v2 or later
+
 
 from flask import Flask, jsonify, abort, make_response
 from flask_restful import Api, Resource, reqparse, fields, marshal
diff --git a/elivepatch_server/resources/livepatch.py b/elivepatch_server/resources/livepatch.py
index c22de16..f4ed849 100644
--- a/elivepatch_server/resources/livepatch.py
+++ b/elivepatch_server/resources/livepatch.py
@@ -1,19 +1,8 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#################################################################################
-# ELIVEPATCH SERVER LIVEPATCH
-#################################################################################
-# File:       livepatch.py
-#
-#             Handles elivepatch actions via the command line interface.
-#
-# Copyright:
-#             (c) 2017 Alice Ferrazzi
-#             Distributed under the terms of the GNU General Public License v2
-#
-# Author(s):
-#             Alice Ferrazzi <alicef@gentoo.org>
 #
+# (c) 2017, Alice Ferrazzi <alice.ferrazzi@gmail.com>
+# Distributed under the terms of the GNU General Public License v2 or later
 
 import subprocess
 import os
diff --git a/elivepatch_server/setup.py b/elivepatch_server/setup.py
index 13b2378..6de3be4 100644
--- a/elivepatch_server/setup.py
+++ b/elivepatch_server/setup.py
@@ -7,6 +7,6 @@ setup(
     url='https://gentoo.org',
     author='Alice Ferrazzi',
     author_email='alice.ferrazzi@gmail.com',
-    license='GNU GPLv2',
+    license='GNU GPLv2+',
     packages=find_packages(),
 )