From 32d2f8cfc91ab53018aac85fcdf68a6f7210e912 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 6 Feb 2016 20:40:32 +0000 Subject: [PATCH] debian/copyright: Add licence information for drivers/crypto/vmx/*.pl Another GPL-compatible licence that needs an extra notice. --- debian/changelog | 1 + debian/copyright | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/debian/changelog b/debian/changelog index 24c588a62..0f88ffd40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -134,6 +134,7 @@ linux (4.3.5-1) UNRELEASED; urgency=medium * pipe: limit the per-user amount of pages allocated in pipes (CVE-2013-4312) * [powerpc*] Enable CRYPTO_DEV_VMX and enable CRYPTO_DEV_VMX_ENCRYPT as module (Closes: #813640) + * debian/copyright: Add licence information for drivers/crypto/vmx/*.pl [ Salvatore Bonaccorso ] * netfilter: nf_nat_redirect: add missing NULL pointer check (CVE-2015-8787) diff --git a/debian/copyright b/debian/copyright index b45eff04c..af6f613ba 100644 --- a/debian/copyright +++ b/debian/copyright @@ -26,6 +26,43 @@ Copyright: 1996-2006 Manoj Srivastava 2005-2012 Debian kernel team License: GPL-2 +Files: drivers/crypto/vmx/*.pl +Copyright: 2006,2014 Andy Polyakov +License: CRYPTOGAMS + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + * Redistributions of source code must retain copyright notices, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the + distribution. + * Neither the name of the CRYPTOGAMS nor the names of its copyright + holder and contributors may be used to endorse or promote products + derived from this software without specific prior written + permission. + . + ALTERNATIVELY, provided that this notice is retained in full, this + product may be distributed under the terms of the GNU General Public + License (GPL), in which case the provisions of the GPL apply INSTEAD + OF those given above. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + Files: fs/nls/mac-* Copyright: 1991-2012 Unicode, Inc. License: Unicode-data