diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-13 14:30:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-02-13 17:57:52 (GMT) |
| commit | 5d8b3aec0cb8652ae867ff08d2e7bfa2060138dd (patch) | |
| tree | 3d39cf776650ac89bedec4fc1d251ff70e6fc8d7 /Utilities/cmlibarchive/COPYING | |
| parent | 9a27ecd4162aebfb595b7a02b958b7dfb95256d8 (diff) | |
| parent | 8cce62295a5ddca3e0d1fd7cff0229054972dfe3 (diff) | |
| download | CMake-5d8b3aec0cb8652ae867ff08d2e7bfa2060138dd.zip CMake-5d8b3aec0cb8652ae867ff08d2e7bfa2060138dd.tar.gz CMake-5d8b3aec0cb8652ae867ff08d2e7bfa2060138dd.tar.bz2 | |
Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
LibArchive 2020-02-11 (3288ebb0)
Also manually restore content from upstream libarchive's main
`CMakeLists.txt` file that was removed by previous commits and
exclude it with `IF(0)` blocks. Do this as an evil merge so
that `git blame -C` can follow the content to upstream.
Diffstat (limited to 'Utilities/cmlibarchive/COPYING')
| -rw-r--r-- | Utilities/cmlibarchive/COPYING | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/COPYING b/Utilities/cmlibarchive/COPYING index 93952b7..14bbefa 100644 --- a/Utilities/cmlibarchive/COPYING +++ b/Utilities/cmlibarchive/COPYING @@ -23,6 +23,13 @@ the actual statements in the files are controlling. * The following source files are in the public domain: libarchive/archive_getdate.c +* The following source files are triple-licensed with the ability to choose + from CC0 1.0 Universal, OpenSSL or Apache 2.0 licenses: + libarchive/archive_blake2.h + libarchive/archive_blake2_impl.h + libarchive/archive_blake2s_ref.c + libarchive/archive_blake2sp_ref.c + * The build files---including Makefiles, configure scripts, and auxiliary scripts used as part of the compile process---have widely varying licensing terms. Please check individual files before @@ -34,7 +41,7 @@ do use the license below. The varying licensing of the build scripts seems to be an unavoidable mess. -Copyright (c) 2003-2009 <author(s)> +Copyright (c) 2003-2018 <author(s)> All rights reserved. Redistribution and use in source and binary forms, with or without |