This is the mail archive of the elfutils-devel@sourceware.org mailing list for the elfutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] Replace elfutils DCO with standard DCO.


This patch replaces the custom DCO text in CONTRIBUTING with the de
facto standard DCO used by the Linux kernel and maintained at
http://developercertificate.org.

I wrote the elfutils modification to the Linux kernel DCO several
years ago. Based on my recollection and a comparison of the two
versions of the DCO, the changes were meant to simplify some of the
wording in the DCO, to account for the possibility that a source file
might not contain a notice of its applicable license, and to avoid use
of the term 'open source'.

I now believe that it is best not to deviate from the text of the
Linux kernel DCO, as having a standardized DCO text will promote
familiarity with and adoption of the DCO as an alternative to less
desirable contribution policies. It is the view of some Linux kernel
developers that it is best not to have proliferation of DCOs across
different projects.

Signed-off-by: Richard Fontana <fontana@sharpeleven.org>
---
 CONTRIBUTING | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/CONTRIBUTING b/CONTRIBUTING
index 3f5e5aa..f772f0d 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -20,23 +20,31 @@ patch, which certifies that you wrote it or otherwise have the right
 to pass it on as a patch under an appropriate license. The rules are
 pretty simple: if you can certify the below:
 
-        Developer's Certificate of Origin
+        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 the contribution under each
-	    license indicated in, or otherwise designated as being
-	    applicable to, the file.
-
-        (b) The contribution was provided directly to me by some other
-            person who certified (a), and I have not modified it.
-
-        (c) I understand and agree that the 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.
+        (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
+
+        (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.
+
+        (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.
 
 then you just add a line saying
 
-- 
2.4.3

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]