From 185c0e0aac66dc7470164f5d9b558b2ba305b933 Mon Sep 17 00:00:00 2001 From: rugk Date: Tue, 22 Dec 2015 19:13:13 +0100 Subject: [PATCH 1/5] Composer: Change to correct license & HTTPS It's AGPL, not GPL. Official identifier from https://spdx.org/licenses/AGPL-3.0.html used. --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 272ad55..6cfa577 100644 --- a/composer.json +++ b/composer.json @@ -3,20 +3,20 @@ "type": "roundcube-plugin", "description": "Hook Mailvelope's OpenPGP-support in Roundcube", "keywords": ["mail","openpgp"], - "homepage": "http://github.com/posteo/mailvelope_client", - "license": "GPL-3.0+", + "homepage": "https://github.com/posteo/mailvelope_client", + "license": "AGPL-3.0", "authors": [ { "name": "Enoch Root", "email": "opensource@posteo.de", - "homepage": "http://posteo.de/", + "homepage": "https://posteo.de/", "role": "Developer" } ], "repositories": [ { "type": "composer", - "url": "http://plugins.roundcube.net/" + "url": "https://plugins.roundcube.net/" } ], "require": { From e1b9c0acb137da5fa384106c57360ce6e06299de Mon Sep 17 00:00:00 2001 From: rugk Date: Tue, 22 Dec 2015 19:26:05 +0100 Subject: [PATCH 2/5] Add "any later version" to license details in composer I think I found a statement taht you can do this universally for every version. [Here](https://spdx.org/sites/spdx/files/SPDX-2.0.pdf) it does state this on page 82: > An SPDX License List Short Form Identifier with a unary "+" operator suffix to represent the current version of the license or any later version. For example: GPL-2.0+ --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6cfa577..1ac9807 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "description": "Hook Mailvelope's OpenPGP-support in Roundcube", "keywords": ["mail","openpgp"], "homepage": "https://github.com/posteo/mailvelope_client", - "license": "AGPL-3.0", + "license": "AGPL-3.0+", "authors": [ { "name": "Enoch Root", From fe4f840d46c250ef807454f27750ce82eca167ba Mon Sep 17 00:00:00 2001 From: rugk Date: Tue, 22 Dec 2015 19:27:07 +0100 Subject: [PATCH 3/5] Add license header to JS file --- mailvelope_client.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/mailvelope_client.js b/mailvelope_client.js index 18c2024..aa1c22c 100644 --- a/mailvelope_client.js +++ b/mailvelope_client.js @@ -1,3 +1,20 @@ +/* +Copyright (c) 2015 The "Mailvelope client plugin for Roundcube" Authors + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program 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 Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . +*/ + function MailvelopeClient(debug) { // From b7b361078509f38105f8f6e50f9ea47b750abb58 Mon Sep 17 00:00:00 2001 From: rugk Date: Tue, 22 Dec 2015 19:33:39 +0100 Subject: [PATCH 4/5] Add license header to PHP file and correct PHPDOC PHPDOC license: At least no GNU should be added. [The examples](http://phpdoc.org/docs/latest/references/phpdoc/tags/license.html) show it always like "GPL". But they also state this: > phpDocumentor supports several permutations of the names above and it is RECOMMENDED to try out the form that you desire. So I interpreted this in a way that you can use something like AGPL too. --- mailvelope_client.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/mailvelope_client.php b/mailvelope_client.php index e66713c..ddbd9b4 100644 --- a/mailvelope_client.php +++ b/mailvelope_client.php @@ -1,10 +1,26 @@ . +*/ /** * A client for mailvelopes client-API. * * @copyright Copyright (c) 2015 Posteo e.K - * @license GNU GPLv3+ + * @license AGPLv3+ */ class mailvelope_client extends rcube_plugin { public function init() { From 2c5e5c7094e4084b644657436e062ef095d7a284 Mon Sep 17 00:00:00 2001 From: rugk Date: Tue, 22 Dec 2015 19:39:34 +0100 Subject: [PATCH 5/5] Readme: HTTPS link, synatx-highlighting, markdown * Use HTTPS link * syntax-highlight commands * Use (better) markdown links --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index cd1c5db..fc54a71 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Roundcube plugin to use Mailvelope's OpenPGP-support -This plugin makes Roundcube webmail use the client-API -of Mailvelope in order to create handle OpenPGP +This plugin makes [Roundcube webmail](https://roundcube.net/) use the client-API +of [Mailvelope](https://www.mailvelope.com/) in order to create handle OpenPGP emails. It's useful only for users that have Mailvelope installed in their browser. Users without Mailvelope won't note any difference. @@ -16,9 +16,11 @@ Confirmed to be working with Roundcube v1.0.x. To use the plugin drop the code into Roundcube's plugins-folder and enable it in Roundcube's config. E.g.: - cd $roundcube/plugins - git clone git://github.com/posteo/mailvelope_client - vim ../config/config.inc.php +```Shell +cd $roundcube/plugins +git clone git://github.com/posteo/mailvelope_client +vim ../config/config.inc.php +``` ## Contribution