Metadata fixes for linux-firmware

I've been updating Debian's firmware-nonfree package to be based more closely on linux-firmware.git. This included some new checks on the WHENCE file, which uncovered some errors, omissions and oddities.

Ben.

Ben Hutchings (7):
  WHENCE: Remove listing of a nonexistent file
  WHENCE: Expand file wildcard RTL8192E/*
  WHENCE: Fix several licen[cs]e filenames
  Add licence information for kaweth firmware
  Add licence information for e100 microcode
  Add licence information for qla1280 firmware
  WHENCE: Summarise several more custom licences as 'Redistributable'

 LICENCE.e100    | 28 ++++++++++++++++++++++++
 LICENCE.kaweth  | 28 ++++++++++++++++++++++++
 LICENCE.qla1280 | 23 +++++++++++++++++++
 WHENCE          | 68 +++++++++++++++++++++++++++++++--------------------------

 4 files changed, 116 insertions(+), 31 deletions(-)

 create mode 100644 LICENCE.e100
 create mode 100644 LICENCE.kaweth
 create mode 100644 LICENCE.qla1280

Ben Hutchings
A free society is one where it is safe to be unpopular. - Adlai Stevenson

v4l-cx23885-enc.fw was removed by commit c11f374afdd2 ("cx231xx/cx23885: Remove incorrect Conexant CX23885 firmware").

---
 WHENCE | 1 -

 1 file changed, 1 deletion(-)

index e3a3d89..b26cf40 100644
@@ -1111,7 +1111,6 @@ Licence:

 Driver: cx23885 - Conexant PCI Express Broadcast A/V decoder
 File: v4l-cx23885-avcore-01.fw
-File: v4l-cx23885-enc.fw

 Licence:
   Conexant grants permission to use and redistribute these firmware

Ben Hutchings
A free society is one where it is safe to be unpopular. - Adlai Stevenson

No other entry uses a wildcard, so keep things simple for scripts that parse this file.

---
 WHENCE | 5 ++++-

 1 file changed, 4 insertions(+), 1 deletion(-)

index b26cf40..df6c27c 100644
@@ -1807,7 +1807,10 @@ Licence:

 Driver: rtl8192e - Realtek 8192 PCI wireless driver
-File: RTL8192E/*
+File: RTL8192E/boot.img
+File: RTL8192E/data.img
+File: RTL8192E/main.img
+
 Licence: Redistributable, provided by Realtek in their driver source download.

Ben Hutchings
A free society is one where it is safe to be unpopular. - Adlai Stevenson

---
 WHENCE | 10 +++++-----

 1 file changed, 5 insertions(+), 5 deletions(-)

index df6c27c..5ebc631 100644
@@ -1400,7 +1400,7 @@ Driver: dib0700 - DiBcom dib0700 USB DVB bridge driver

 File: dvb-usb-dib0700-1.20.fw
 Version: 1.20

-Licence: Redistributable. See LICENCE.dib0700 for details +Licence: Redistributable. See LICENSE.dib0700 for details
 --------------------------------------------------------------------------

@@ -2622,7 +2622,7 @@ File: go7007/px-m402u.fw
 File: go7007/px-tv402u.fw
 File: go7007/wis-startrek.fw

-Licence: Redistributable. See LICENCE.go7007_firmware for details +Licence: Redistributable. See LICENCE.go7007 for details

 --------------------------------------------------------------------------

@@ -2675,7 +2675,7 @@ Driver: cw1200 - ST-E CW1100/CW1200 WLAN driver
 File: wsm_22.bin
 Version: WSM395
-Licence: Redistributable. See LICENSE.cw1200 for details. +Licence: Redistributable. See LICENCE.cw1200 for details.
 File: sdd_sagrad_1091_1098.bin

@@ -2939,7 +2939,7 @@ File: atmel/wilc1000_fw.bin
 File: atmel/wilc1000_ap_fw.bin
 File: atmel/wilc1000_p2p_fw.bin

-License: Redistributable. See LICENCE.atmel for details +License: Redistributable. See LICENSE.atmel for details

 --------------------------------------------------------------------------

@@ -2950,7 +2950,7 @@ File: hfi1_fabric.fw
 File: hfi1_pcie.fw
 File: hfi1_sbus.fw

-Licence: Redistributable. See LICENCE.hfi1_firmware for details +Licence: Redistributable. See LICENSE.hfi1_firmware for details
 --------------------------------------------------------------------------

Ben Hutchings
A free society is one where it is safe to be unpopular. - Adlai Stevenson

Based on the discussion at <https://bugs.debian.org/502665>, this is BSD-licenced.

---
 LICENCE.kaweth | 28 ++++++++++++++++++++++++++++
 WHENCE         |  2 +-

 2 files changed, 29 insertions(+), 1 deletion(-)

 create mode 100644 LICENCE.kaweth

new file mode 100644
index 0000000..75a59c0
@@ -0,0 +1,28 @@
+Copyright 1999 Kawasaki LSI.
+
+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 Kawasaki LSI.
+4. Neither the name of the company 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 KAWASAKI LSI ``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 KAWASAKI LSI 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.

index 5ebc631..077f42d 100644
@@ -111,7 +111,7 @@ File: kaweth/new_code_fix.bin

 File: kaweth/trigger_code.bin
 File: kaweth/trigger_code_fix.bin

-Licence: Unknown
+Licence: Redistributable. See LICENCE.kaweth for details
 Found in hex form in the kernel source.

Ben Hutchings
A free society is one where it is safe to be unpopular. - Adlai Stevenson

The BSDs include the same code under a typical BSD-ish licence, e.g.
http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/sys/dev/microcode/fxp/rcvbundl.h?rev=1.2

---
 LICENCE.e100 | 28 ++++++++++++++++++++++++++++
 WHENCE       |  4 +---

 2 files changed, 29 insertions(+), 3 deletions(-)

 create mode 100644 LICENCE.e100

new file mode 100644
index 0000000..0553817
@@ -0,0 +1,28 @@
+Copyright (c) 1999-2001, Intel Corporation
+
+All rights reserved.
+
+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. Neither the name of Intel Corporation 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 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.

index 077f42d..6e7ce0a 100644
@@ -588,9 +588,7 @@ File: e100/d101m_ucode.bin

 File: e100/d101s_ucode.bin
 File: e100/d102e_ucode.bin

-Licence: Unknown
-
-Found in hex form in kernel source.
+Licence: Redistributable. See LICENCE.e100 for details
 --------------------------------------------------------------------------

Ben Hutchings
A free society is one where it is safe to be unpopular. - Adlai Stevenson

These files were previously available from ftp://ftp.qlogic.com/outgoing/linux/firmware under a BSD-ish licence.

---
 LICENCE.qla1280 | 23 +++++++++++++++++++++++
 WHENCE          |  6 +-----

 2 files changed, 24 insertions(+), 5 deletions(-)

 create mode 100644 LICENCE.qla1280

new file mode 100644
index 0000000..00cd353
@@ -0,0 +1,23 @@
+Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 QLogic, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms are permitted provided
+that the following conditions are met:
+1. Redistribution of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistribution 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. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.

index 6e7ce0a..f40eb28 100644
@@ -82,11 +82,7 @@ File: qlogic/1040.bin

 File: qlogic/1280.bin
 File: qlogic/12160.bin

-Licence: Allegedly GPLv2+, but no source visible. Marked:
-
-                   QLOGIC LINUX SOFTWARE
-  QLogic ISP1280/ device driver for Linux 2.2.x and 2.4.x -  Copyright (C) 2001 Qlogic Corporation (www.qlogic.com) +Licence: Redistributable. See LICENCE.qla1280 for details
 --------------------------------------------------------------------------

Ben Hutchings
A free society is one where it is safe to be unpopular. - Adlai Stevenson

This makes it easier for downstream distributors to check which files are clearly distributable without unusual restrictions.

---
 WHENCE | 40 +++++++++++++++++++++++++---------------

 1 file changed, 25 insertions(+), 15 deletions(-)

index f40eb28..0d3b3c8 100644
@@ -888,7 +888,8 @@ Driver: cx231xx - Conexant Cx23100/101/102 USB broadcast A/V decoder

 File: v4l-cx231xx-avcore-01.fw

-Licence:
+Licence: Redistributable.
+
   Conexant grants permission to use and redistribute these firmware files for use with Conexant devices, but not as a part of the Linux kernel or in any other form which would require these files themselves @@ -1091,7 +1092,8 @@ File: v4l-cx23418-apu.fw
 File: v4l-cx23418-cpu.fw
 File: v4l-cx23418-dig.fw

-Licence:
+Licence: Redistributable.
+
   Conexant grants permission to use and redistribute these firmware files for use with Conexant devices, but not as a part of the Linux kernel or in any other form which would require these files themselves @@ -1106,7 +1108,8 @@ Driver: cx23885 - Conexant PCI Express Broadcast A/V decoder
 File: v4l-cx23885-avcore-01.fw

-Licence:
+Licence: Redistributable.
+
   Conexant grants permission to use and redistribute these firmware files for use with Conexant devices, but not as a part of the Linux kernel or in any other form which would require these files themselves @@ -1121,7 +1124,8 @@ Driver: cx23840 - Conexant sideport Broadcast A/V decoder
 File: v4l-cx25840.fw

-Licence:
+Licence: Redistributable.
+
   Conexant grants permission to use and redistribute these firmware files for use with Conexant devices, but not as a part of the Linux kernel or in any other form which would require these files themselves @@ -1788,7 +1792,8 @@ Driver: s2255drv

 File: f2255usb.bin

-Licence:
+Licence: Redistributable.
+
   Sensoray grants permission to use and redistribute these firmware files for use with Sensoray devices, but not as a part of the Linux kernel or in any other form which would require these files themselves @@ -1972,7 +1977,7 @@ Version: 4.0.4.3.7

 File: ti-connectivity/wl1251-nvs.bin

-Licence: See LICENCE.wl1251 for details.
+Licence: Redistributable. See LICENCE.wl1251 for details.

 The published NVS files are for testing only.  Every device needs to have a unique NVS which is properly calibrated for best results.
@@ -2034,7 +2039,7 @@ File: ti-connectivity/wl128x-nvs.bin
 Link: ti-connectivity/wl12xx-nvs.bin -> wl127x-nvs.bin
 Link: ti-connectivity/wl1271-nvs.bin -> wl127x-nvs.bin

-Licence: See LICENCE.ti-connectivity for details.
+Licence: Redistributable. See LICENCE.ti-connectivity for details.

 The NVS file includes two parts:
   - radio calibration
@@ -2068,7 +2073,7 @@ Version: 8.8.0.0.13
 File: ti-connectivity/wl18xx-fw-4.bin
 Version: 8.9.0.0.39

-Licence: See LICENCE.ti-connectivity for details.
+Licence: Redistributable. See LICENCE.ti-connectivity for details.

 The driver expects to find the firmwares under a ti-connectivity subdirectory.  So if your system looks for firmwares in /lib/firmware, @@ -2081,7 +2086,7 @@ Driver: TI_ST - Texas Instruments bluetooth driver
 File: ti-connectivity/TIInit_7.2.31.bts

-Licence: See LICENCE.ti-connectivity for details.
+Licence: Redistributable. See LICENCE.ti-connectivity for details.

  TIInit_7.2.31.bts version 7.2.31

@@ -2093,7 +2098,8 @@ Driver: tlg2300 - Telgent 2300 V4L/DVB driver.

 File: tlg2300_firmware.bin

-Licence:
+Licence: Redistributable.
+
   Telegent System grants permission to use and redistribute these firmware files for use with devices containing the chip tlg2300, but not as a part of the Linux kernel or in any other form which would @@ -2437,7 +2443,8 @@ Driver: drxk - Micronas DRX-K demodulator driver
 File: dvb-usb-terratec-h5-drxk.fw

-Licence:
+Licence: Redistributable.
+
 TERRATEC grants permission to use and redistribute these firmware files for use with TERRATEC devices, but not as part of the Linux kernel or in any other form which would require these files themselves @@ -2490,7 +2497,8 @@ File: s5p-mfc-v6-v2.fw
 File: s5p-mfc-v7.fw
 File: s5p-mfc-v8.fw

-Licence:
+Licence: Redistributable.
+
 Samsung grants permission to use and redistribute aforementioned firmware files for the use with Exynos series devices, but not as part of the Linux kernel, or in any other form which would require these files themselves @@ -2579,7 +2587,8 @@ Driver: rp2 -- Comtrol RocketPort 2 serial driver
 File: rp2.fw

-Licence:
+Licence: Redistributable.
+
 Copyright (C) 2013 Comtrol Corporation

 Comtrol grants permission to use and redistribute these firmware
@@ -2645,7 +2654,8 @@ File: moxa/moxa-1618.fw
 File: moxa/moxa-1653.fw
 File: moxa/moxa-1658.fw

-License:
+License: Redistributable.
+
 The software accompanying this license statement (the “Software”)
 is the property of Moxa Inc. (the “Moxa”), and is protected by United States and International Copyright Laws and International
@@ -2952,4 +2962,4 @@ Driver: knav_qmss_queue - TI Keystone 2 QMSS driver
 File: ti-keystone/ks2_qmss_pdsp_acc48_k2_le_1_0_0_9.bin

-Licence: See LICENCE.ti-keystone for details.
+Licence: Redistributable. See LICENCE.ti-keystone for details.

Ben Hutchings
A free society is one where it is safe to be unpopular. - Adlai Stevenson