Update copyright file

Update a couple of top-level changes, copy in gnu-efi information from
the gnu-efi package

2 files changed, 164 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index bf643942..a99f4985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,12 +13,6 @@ shim (15+1613861442.888f5b5-1) unstable; urgency=medium
       tarball.
       - Added an extra rule to generate the extra tarball. Thanks to
         Dmitri John Ledkov for help.
-  * New patches:
-    + fix-Make.coverity-bashisms.patch
-      (Trivial changes to remove bashisms in Make.coverity)
-    + cast-CHAR8-string-handling.patch
-      (Cast CHAR8 strings to use (const char *) when using string
-       functions)
   * Switch to using gcc-10 rather than gcc-9. Closes: #978521
   * Add dbx entries for all our existing grub binaries
     + They're insecure, let's break the chainloading hole.
diff --git a/debian/copyright b/debian/copyright
index 63723ead..bb2a0abb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,15 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: shim
-Upstream-Contact: Matthew Garrett <mjg59@coreos.com>
+Upstream-Contact: Peter Jones <pjones@redhat.com>
 Source: https://github.com/rhboot/shim
 
 Files: *
-Copyright: 2012-2013 Red Hat, Inc
+Copyright: 2012-2021 Red Hat, Inc
  	2009-2016 Intel Corporation
 License: BSD-2-Clause
 
 Files: debian/patches/*
-Copyright: 2016 Canonical Ltd.
+Copyright: 2021 Steve McIntyre
 License: BSD-2-Clause
 
 Files: crypt_blowfish.*
@@ -227,6 +227,167 @@ License: BSD-3-Clause-Intel
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+Files: gnu-efi/*
+Copyright: 1999-2014 Hewlett-Packard Co.
+           2013 Jerry Hoemann <jerry.hoemann@hp.com>
+           2013 David Decotigny <decot@googlers.com>
+           2005 Intel Co
+           2014 Linaro Ltd. <ard.biesheuvel@linaro.org>
+License: BSD-3-clause-HP
+
+Files: gnu-efi/inc/* gnu-efi/lib/*
+Copyright: 1996-2013 Intel Corporation
+           2008-2009, Apple Inc. All rights reserved.
+           2011,2013 ARM. All rights reserved.
+License: BSD-2-clause-Intel
+
+Files: gnu-efi/lib/Makefile gnu-efi/lib/x86_64/callwrap.c
+Copyright: 1999-2001 Hewlett-Packard Co.
+           2007-2010 Intel Corp
+License: BSD-3-clause-HP
+
+Files: gnu-efi/inc/efipoint.h
+Copyright: 2014 by John Cronin
+License: Expat
+
+Files: gnu-efi/inc/protocol/efidbg.h gnu-efi/inc/protocol/ia64/eficontext.h
+Copyright: 1999-2007 Intel Corp.
+License: BSD-4-clause-Intel
+
+Files: gnu-efi/inc/aarch64/efibind.h
+       gnu-efi/inc/arm/efibind.h
+       gnu-efi/gnuefi/crt0-efi-arm.S
+       gnu-efi/gnuefi/crt0-efi-aarch64.S
+       gnu-efi/lib/aarch64/initplat.c
+       gnu-efi/lib/aarch64/math.c
+       gnu-efi/lib/arm/initplat.c
+       gnu-efi/lib/arm/math.c
+Copyright: 2014 - 2015 Linaro Ltd.
+License: BSD-2-clause-Linaro or GPL-2+
+
+License: BSD-2-clause-Linaro
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice and this list of conditions, without modification.
+ 2. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+License: BSD-3-clause-HP
+ 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 the above copyright
+   notice, 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 Hewlett-Packard Co. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 ANYDIRECT, 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.
+
+License: BSD-2-clause-Intel
+ 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 the above copyright notice, 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.
+ .
+ THIS SOFTWARE IS PROVIDED ``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 INTEL 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. THE EFI SPECIFICATION AND ALL OTHER INFORMATION
+ ON THIS WEB SITE ARE PROVIDED "AS IS" WITH NO WARRANTIES, AND ARE SUBJECT
+ TO CHANGE WITHOUT NOTICE.
+
+License: BSD-4-clause-Intel
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ .
+ 2. 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.
+ .
+ 3. All advertising materials mentioning features or use of this software
+    must display the following acknowledgement:
+ .
+   This product includes software developed by Intel Corporation and
+   its contributors.
+ .
+ 4. Neither the name of Intel Corporation or its contributors may be
+    used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION 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 INTEL CORPORATION 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.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+License: GPL-2+
+ Alternatively, this software may be distributed under the terms of the
+ GNU General Public License as published by the Free Software Foundation;
+ either version 2 of the License, or (at your option) any later version.
+ .
+ On Debian systems, the full text of the GNU General Public License version
+ 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
+
 License: BSD-2-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions