From: Martin Matuska <martin@matuska.org>
Date: Sat, 6 Oct 2018 20:13:44 +0000 (+0200)
Subject: Add information about BLAKE2 multi-license to COPYING
X-Git-Tag: v3.4.0~173
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f77e06a338a9b5414444de406da5a03f0bda8c00;p=thirdparty%2Flibarchive.git

Add information about BLAKE2 multi-license to COPYING

The BLAKE2 source files are multi-licensed with the ability to choose
between CC0 1.0 Universal, OpenSSL or Apache 2.0 licenses. For libarchive
the CC0 1.0 Universal Public Domain Dedication should be acceptable.
---

diff --git a/COPYING b/COPYING
index 93952b77a..14bbefa0d 100644
--- a/COPYING
+++ b/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