David.Comay at Sun.COM wrote:
[snip]
> I know you don't want to deal with licenses so my suggestion is to
> contact Bonnie Corwin
CC:'ing Bonnie...
> and explain precisely what files you're changing
> and in what way.
See below...
> It's my understanding that the usual thing is
>
> Don't add a Sun copyright to upstream files that you're not
> changing.
>
> Do any a Sun copyright to any files being created that aren't
> coming from upstream (for example, OpenSolaris specific
> Makefiles.)
>
> Do add a Sun copyright to files which have a significant
> change. The definition of the latter is sometimes hard to
> define but changing it to make it compile or work under
> OpenSolaris clearly falls in the "add" category. In any case,
> please check with Bonnie.
I did a quick check over the codebase. The files are either 100%
upstream (under CPL license) or CDDL licensed with Sun copyright -
except one file: usr/src/lib/libshell/common/data/builtins.c has the
following change applied to include the list of builtin commands (from
"solaris_cmdlist.h" as specified by PSARC 2006/550):
-- snip --
Index: src/lib/libshell/common/data/builtins.c
===================================================================
--- src/lib/libshell/common/data/builtins.c (revision 515)
+++ src/lib/libshell/common/data/builtins.c (working copy)
@@ -120,7 +120,9 @@
"wait", NV_BLTIN|BLT_ENV|BLT_EXIT, bltin(wait),
"type", NV_BLTIN|BLT_ENV, bltin(whence),
"whence", NV_BLTIN|BLT_ENV, bltin(whence),
-#if SHOPT_CMDLIB_BLTIN
+#if SHOPT_CMDLIB_SOLARIS_BLTINS
+#include "solaris_cmdlist.h"
+#elif SHOPT_CMDLIB_BLTIN
#define Q(f) #f /* libpp cpp workaround -- fixed
2005-04-11 */
#define CMDLIST(f) BDIR Q(f), NV_BLTIN|NV_NOFREE, bltin(f),
#include <cmdlist.h>
-- snip --
Question is now whether usr/src/lib/libshell/common/data/builtins.c now
needs a "Sun copyright" or not. My preference would be to avoid adding
any Sun/CDDL license/copyright/etc. template in this case (1. I don't
like adding a Sun copyright to David&&Glenn sources unless it's
completely unavoidable and 2. the change would add a giant section to
usr/src/lib/libshell/misc/ksh93_solaris_builtin_patch.diff with exactly
zero techincal value) - the change is quite small (just counting the
lines) while the major change is done in "solaris_cmdlist.h" (which is
CDDL-licensed and has a Sun copyright) ; alternatively the "rule" to
contribute Sun code under the AT&T license could be applied in this case
(see
http://mail.opensolaris.org/pipermail/ksh93-integration-discuss/2007-January/002001.html).
----
Bye,
Roland
--
__ . . __
(o.\ \/ /.o) roland.mainz at nrubsig.org
\__\/\/__/ MPEG specialist, C&&JAVA&&Sun&&Unix programmer
/O /==\ O\ TEL +49 641 7950090
(;O/ \/ \O;)
