aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2015-04-24 14:09:32 +0200
committerAndreas Schneider <asn@cryptomilk.org>2015-04-24 14:27:49 +0200
commit661b40ee3145c4886af42c828af1042c4942f00a (patch)
treeb52fe6fbb2a3e2657cf658b6a3bf17c47744cc82
parentb5dc8197f78b6639ca75aa93d6c421c0181d0f32 (diff)
downloadlibssh-CoO11.tar.gz
libssh-CoO11.tar.xz
libssh-CoO11.zip
Update the Certificate of Origin to version 1.1CoO11
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r--SubmittingPatches79
1 files changed, 29 insertions, 50 deletions
diff --git a/SubmittingPatches b/SubmittingPatches
index 66b54e76..e3fea96a 100644
--- a/SubmittingPatches
+++ b/SubmittingPatches
@@ -39,67 +39,49 @@ copyright ownership. It just requires a simple set-up process first.
We use a process very similar to the way things are done in the Linux
Kernel community, so it should be very easy to get a sign off from
-your corporate legal department. The only changes we've made are to
-accommodate the license we use, which is LGPLv2 (or later) whereas the
-Linux kernel uses GPLv2.
+your corporate legal department.
The process is called signing.
How to sign your work
----------------------
-Once you have permission to contribute to libssh from your employer, simply
-email a copy of the following text from your corporate email address to:
+The sign-off is a simple line at the end of the explanation for the
+patch, which certifies that you wrote it or otherwise have the right to
+pass it on as an open-source patch. The rules are pretty simple: if you
+can certify the below:
-contributing@libssh.org
+ Developer's Certificate of Origin 1.1
+ By making a contribution to this project, I certify that:
+ (a) The contribution was created in whole or in part by me and I
+ have the right to submit it under the open source license
+ indicated in the file; or
-libssh Developer's Certificate of Origin. Version 1.0
+ (b) The contribution is based upon previous work that, to the best
+ of my knowledge, is covered under an appropriate open source
+ license and I have the right under that license to submit that
+ work with modifications, whether created in whole or in part
+ by me, under the same open source license (unless I am
+ permitted to submit under a different license), as indicated
+ in the file; or
+ (c) The contribution was provided directly to me by some other
+ person who certified (a), (b) or (c) and I have not modified
+ it.
-By making a contribution to this project, I certify that:
+ (d) I understand and agree that this project and the contribution
+ are public and that a record of the contribution (including all
+ personal information I submit with it, including my sign-off) is
+ maintained indefinitely and may be redistributed consistent with
+ this project or the open source license(s) involved.
-(a) The contribution was created in whole or in part by me and I
- have the right to submit it under the appropriate
- version of the GNU General Public License; or
+then you just add a line saying
-(b) The contribution is based upon previous work that, to the best of
- my knowledge, is covered under an appropriate open source license
- and I have the right under that license to submit that work with
- modifications, whether created in whole or in part by me, under
- the GNU General Public License, in the appropriate version; or
+ Signed-off-by: Random J Developer <random@developer.example.org>
-(c) The contribution was provided directly to me by some other
- person who certified (a) or (b) and I have not modified it.
-
-(d) I understand and agree that this project and the contribution are
- public and that a record of the contribution (including all
- metadata and personal information I submit with it, including my
- sign-off) is maintained indefinitely and may be redistributed
- consistent with the libssh Team's policies and the requirements of
- the GNU GPL where they are relevant.
-
-(e) I am granting this work to this project under the terms of the
- GNU Lesser General Public License as published by the
- Free Software Foundation; either version 2.1 of
- the License, or (at the option of the project) any later version.
-
- http://www.gnu.org/licenses/lgpl-2.1.html
-
-
-We will maintain a copy of that email as a record that you have the
-rights to contribute code to libssh under the required licenses whilst
-working for the company where the email came from.
-
-Then when sending in a patch via the normal mechanisms described
-above, add a line that states:
-
- Signed-off-by: Random J Developer <random@developer.example.org>
-
-using your real name and the email address you sent the original email
-you used to send the libssh Developer's Certificate of Origin to us
-(sorry, no pseudonyms or anonymous contributions.)
+using your real name (sorry, no pseudonyms or anonymous contributions.)
That's it! Such code can then quite happily contain changes that have
copyright messages such as:
@@ -107,10 +89,7 @@ copyright messages such as:
(c) Example Corporation.
and can be merged into the libssh codebase in the same way as patches
-from any other individual. You don't need to send in a copy of the
-libssh Developer's Certificate of Origin for each patch, or inside each
-patch. Just the sign-off message is all that is required once we've
-received the initial email.
+from any other individual.
Have fun and happy libssh hacking !