[SCM] Samba Website Repository - branch master updated
Lars Müller
lmuelle at samba.org
Wed Jan 11 10:57:37 MST 2012
The branch, master has been updated
via b4789d9 Update copyright policy as discussed on list
from 53c2a44 Make API a directory, so http://devel.samba.org/API/ works.
http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b4789d954b4160f6610adebf3075d05c91d41a18
Author: Lars Müller <lars at samba.org>
Date: Wed Jan 11 18:53:10 2012 +0100
Update copyright policy as discussed on list
-----------------------------------------------------------------------
Summary of changes:
devel/copyright-policy.html | 173 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 147 insertions(+), 26 deletions(-)
Changeset truncated at 500 lines:
diff --git a/devel/copyright-policy.html b/devel/copyright-policy.html
index 9eaadc6..a1d2962 100644
--- a/devel/copyright-policy.html
+++ b/devel/copyright-policy.html
@@ -4,32 +4,153 @@
<h2>Samba Copyright Policy</h2>
-<p>The Samba Team has a policy of asking for contributions to be made
-under the personal copyright of the contributor, instead of a
-corporate copyright.</p>
-
-<p>There are three reasons for the establishment of this policy:</p>
-
-<ol>
- <li>Individual copyrights make copyright registration in the US a
- simpler process.</li>
- <li>If Samba is copyrighted by individuals rather than corporations,
- decisions regarding enforcement and protection of copyright will,
- more likely, be made in the interests of the project, and not
- in the interests of any corporation's shareholders.</li>
- <li>If we ever need to relicense a portion of the code -- as has happened
- in the past with making tdb and ldb LGPL -- contacting individuals
- for permission to do so is much easier than contacting a company,
- especially in the case of companies that have moved on and no longer
- have an interest in Samba.</li>
-</ol>
-
-<h2>Copyright assignment</h2>
-
-<p>If personal copyright is not feasible for a contribution you wish
- to make, then we can also accept contributions which have copyright
- assigned to the Software Freedom Conservancy. Please contact a Samba
- Team member for more information on copyright assignment.
+<p>
+Samba is a project with distributed copyright ownership, which means
+we prefer the copyright on parts of Samba to be held by individuals
+rather than corporations if possible. There are historical legal
+reasons for this, but one of the best ways to explain it is that it's
+much easier to work with individuals who have ownership than corporate
+legal departments if we ever need to make reasonable compromises with
+people using and working with Samba.
+</p>
+
+<p>
+We track the ownership of every part of Samba via <a href=
+"http://git.samba.org/">git</a>, our source code
+control system, so we know the provenance of every piece of code that
+is committed to Samba.
+</p>
+
+<p>
+So if possible, if you're doing Samba changes on behalf of a company
+who normally owns all the work you do please get them to assign
+personal copyright ownership of your changes to you as an individual,
+that makes things very easy for us to work with and avoids bringing
+corporate legal departments into the picture.
+</p>
+
+<p>
+If you can't do this we can still accept patches from you owned by
+your employer under a standard employment contract with corporate
+copyright ownership. It just requires a simple set-up process first.
+</p>
+
+<p>
+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 licenses we use, which are
+<a href="http://www.gnu.org/licenses/gpl-3.0">GPLv3</a> and
+<a href="http://www.gnu.org/licenses/lgpl-3.0">LGPLv3</a> (or later)
+whereas the Linux kernel uses
+<a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GPLv2</a>.
+</p>
+
+<p>
+The process is called signing.
+</p>
+
+<h2>How to sign your work</h2>
+
+<p>
+Once you have permission to contribute to Samba from
+your employer, simply email a copy of the following text
+from your corporate email address to <a href=
+"mailto:contributing at samba.org">contributing at samba.org</a>
+</p>
+
+<pre>
+<code>
+Samba Developer's Certificate of Origin. Version 1.0
+
+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 appropriate
+ version of the GNU General Public License; 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 GNU General Public License, in the
+ appropriate version; or
+
+(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 Samba 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 both
+ the GNU General Public License and the GNU Lesser General Public
+ License as published by the Free Software Foundation; either version
+ 3 of these Licenses, or (at the option of the project) any later
+ version.
+
+ http://www.gnu.org/licenses/gpl-3.0.html
+ http://www.gnu.org/licenses/lgpl-3.0.html
+
+</code>
+</pre>
+
+<p>
+We will maintain a copy of that email as a record that you have the
+rights to contribute code to Samba under the required licenses whilst
+working for the company where the email came from.
+</p>
+
+<p>
+Then when sending in a patch via the normal mechanisms described
+above, add a line that states:
+</p>
+
+<pre>
+<code>
+ Signed-off-by: Random J Developer <random at developer.example.org>
+
+</code>
+</pre>
+
+<p>
+using your real name and the email address you sent the original email
+you used to send the Samba Developer's Certificate of Origin to us
+(sorry, no pseudonyms or anonymous contributions.)
+</p>
+
+<p>
+That's it ! Such code can then quite happily contain changes that have
+copyright messages such as :
+</p>
+
+<pre>
+<code>
+ (C) Example Corporation.
+
+</code>
+</pre>
+
+<p>
+and can be merged into the Samba codebase in the same way as patches
+from any other individual. You don't need to send in a copy of the
+Samba 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.
+</p>
+
+<p>
+Have fun and happy Samba hacking !
+</p>
+
+<p>
+The Samba Team.
+</p>
<!--#include virtual="/samba/footer.html" -->
--
Samba Website Repository
More information about the samba-cvs
mailing list