From f538096e286b9c9e7a74d21882a5d0fa87dc6fbf Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Mon, 27 Oct 2014 09:35:16 +0100 Subject: [PATCH] Resigned PDAFFIRM --- CONTRIBUTORS | 18 +++++++++++++----- PDAFFIRM | 12 +++++++++--- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 3b5eea6a..4fefdd60 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2,22 +2,30 @@ These people have worked on Swarmops and signed off on the PDAFFIRM document. To add your name to the list, type the following commands then commit changes: -echo -e "\n\n[Your Name]" >> CONTRIBUTORS +echo -e "\n\n[Your Name] ([Email])" >> CONTRIBUTORS date >> CONTRIBUTORS gpg --armor --detach-sig PDAFFIRM cat PDAFFIRM.asc >> CONTRIBUTORS rm PDAFFIRM.asc +People who choose to not sign this and contribute to the project +still do not hold any claim to exclusive rights over their code; the +README file clearly states that any pull requests, commits, or +contributions of any kind are irrevocably committed to the public +domain. Signing the PDAFFIRM document is therefore more of a strong +version over and above that statement, rather than a legal minimum +requirement. + -- Sign-offs below this line -- -Rick Falkvinge +Rick Falkvinge (rick.falkvinge@pirateacademy.eu) Mon Oct 27 00:16:00 CET 2014 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 -iEYEABECAAYFAlRNhbQACgkQ7pnTrWI4jx0iTQCfXb6prIrD3/YEnXm2uJBb9nEr -5SEAn2QpAndUanAWqcbNAOawEq/2oSWX -=xhoS +iEYEABECAAYFAlROAwIACgkQ7pnTrWI4jx0RKwCePNKPlIT26BNise02d7ZewXlZ +R2MAn2wdLgkV0dnQQOtE9mpPz0PvkTfi +=Ry/3 -----END PGP SIGNATURE----- diff --git a/PDAFFIRM b/PDAFFIRM index 6a3a81b2..120aff37 100644 --- a/PDAFFIRM +++ b/PDAFFIRM @@ -1,5 +1,5 @@ [This document is for signing by contributors to Swarmops into the -file contributors.txt. This is not necessary at the small scale when +CONTRIBUTORS file. This is not necessary at the small scale when it was implemented, but in case Swarmops grows significantly, it will become so.] @@ -21,11 +21,17 @@ encumbered by rights of exclusivity in any form, unless such contributions are either: 1) an External Library, clearly placed in locations for such - and added after community consensus; + and added after community consensus; or 2) JavaScript code under MIT license, which are added in locations for such and where each script is enumerated in the ScriptLicenses file; or - 3) images where I have an explicit right to redistribute them + 3) code that is freely redistributable without other encumbrance + than repeating its status as unencumbered code, such as the + BCrypt code or similar code people just shouldn't be + re-implementing, in which case the source code needs to + indicate its status as foreign but unencumbered code + (like by including the MIT license in the source itself); or + 4) images where I have an explicit right to redistribute them as part of an application like Swarmops, in which case they are added to the project with a filename that indicates their origin.