X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=COPYRIGHT;h=4bd99879710422a2e70b08ac1a920cd019ac1655;hp=8cd7d73c4be0e900bd33afcf54fa607d8e05d71a;hb=a6d272127bb6a2eb09dc182cc39c49e77310ade4;hpb=3f0636970b4bb0aaff7eb48bf144603a021c89a4

diff --git a/COPYRIGHT b/COPYRIGHT
index 8cd7d73c..4bd99879 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
 musl as a whole is licensed under the following standard MIT license:
 
-Copyright © 2005-2012 Rich Felker
+Copyright © 2005-2013 Rich Felker
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -43,8 +43,13 @@ and labelled as such. All have been licensed under extremely
 permissive terms. See the comments in the individual files for
 details.
 
-The implementation of DES for crypt (src/misc/crypt.c) is Copyright ©
-1994 David Burren. It is licensed under a BSD license.
+The implementation of DES for crypt (src/misc/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
+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.
 
 The smoothsort implementation (src/stdlib/qsort.c) is Copyright © 2011
 Valentin Ochs and is licensed under an MIT-style license.
@@ -60,19 +65,28 @@ were released into the public domain; others are licensed under the
 standard MIT license terms at the top of this file. See individual
 files for their copyright status.
 
-All files which have no copyright comments are original works
-Copyright © 2005-2012 Rich Felker, the main author of this library.
+The mips and microblaze ports were originally written by Richard
+Pennington for use in the ellcc project. The original code was adapted
+by Rich Felker for build system and code conventions during upstream
+integration. It is licensed under the standard MIT terms.
+
+The powerpc port was also originally written by Richard Pennington,
+and later supplemented and integrated by John Spencer. It is licensed
+under the standard MIT terms.
+
+All other files which have no copyright comments are original works
+Copyright © 2005-2013 Rich Felker, the main author of this library.
 The decision to exclude such comments is intentional, as it should be
 possible to carry around the complete source code on tiny storage
-media. All public header files (include/*) should be treated as Public
-Domain as they intentionally contain no content which can be covered
-by copyright. Some source modules may fall in this category as well.
-If you believe that a file is so trivial that it should be in the
-Public Domain, please contact me and, if I agree, I will explicitly
-release it from copyright.
+media. All public header files (include/* and arch/*/bits/*) should be
+treated as Public Domain as they intentionally contain no content
+which can be covered by copyright. Some source modules may fall in
+this category as well. If you believe that a file is so trivial that
+it should be in the Public Domain, please contact me and, if I agree,
+I will explicitly release it from copyright.
 
 The following files are trivial, in my opinion not copyrightable in
 the first place, and hereby explicitly released to the Public Domain:
 
-All public headers: include/*
+All public headers: include/*, arch/*/bits/*
 Startup files: crt/*