Re: musl licensing

[George Kulakowski <kulakowski@google.com>]

[-- Attachment #1.1: Type: text/plain, Size: 1486 bytes --]

I wanted to mention another small thing, which is simply to update the
names of some files specifically mentioned in COPYRIGHT. I've attached a
diff.

On Fri, Mar 18, 2016 at 12:12 PM Rich Felker <dalias@libc.org> wrote:

> On Fri, Mar 18, 2016 at 11:16:49AM -0700, Christopher Lane wrote:
> > > Some version of the PD text can remain in place but I can clarify that
> > > it's my/our belief about these files and does not negate the fact that
> > > we're licensing the whole project, including these files as part of
> > > it, under the MIT license. Assuming we get a suitable response for #3
> > > above, I can also add the text that the following contributors
> > > (listed) all grant the attribution exception for these files. And for
> > > future port contributors I can ask them to do the same at the time of
> > > contribution.
> > >
> > > Is this acceptable? If it sounds like it may be but there are
> > > questions about the specific language I can prepare a proposed diff
> > > for the COPYRIGHT file for review.
> > >
> >
> > So yeah, this is a good idea.  Please send the diff and I'll get their
> > comments on the specific language.
>
> Please let me know what you (or your lawyers) think of the attached
> diff. As an extra bonus I made an effort to avoid the actual words
> "Public Domain" since they apparently scare people off. Does this
> work? Does anyone from the community (esp. any of the contributors I'd
> be asking to agree) have objections to it?
>
> Rich
>

[-- Attachment #1.2: Type: text/html, Size: 1920 bytes --]

[-- Attachment #2: patch --]
[-- Type: application/octet-stream, Size: 1089 bytes --]

diff --git a/COPYRIGHT b/COPYRIGHT
index f7f1a1f..3865085 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -92,14 +92,14 @@ Copyright © 2008 Stephen L. Moshier
 and labelled as such in comments in the individual source files. All
 have been licensed under extremely permissive terms.
 
-The ARM memcpy code (src/string/armel/memcpy.s) is Copyright © 2008
+The ARM memcpy code (src/string/arm/memcpy_el.S) is Copyright © 2008
 The Android Open Source Project and is licensed under a two-clause BSD
 license. It was taken from Bionic libc, used on Android.
 
-The implementation of DES for crypt (src/misc/crypt_des.c) is
+The implementation of DES for crypt (src/crypt/crypt_des.c) is
 Copyright © 1994 David Burren. It is licensed under a BSD license.
 
-The implementation of blowfish crypt (src/misc/crypt_blowfish.c) was
+The implementation of blowfish crypt (src/crypt/crypt_blowfish.c) was
 originally written by Solar Designer and placed into the public
 domain. The code also comes with a fallback permissive license for use
 in jurisdictions that may not recognize the public domain.