Update Linux proprietary license expectations #2058

pombredanne · pombredanne · commit b7bd395601ff · 2020-09-08T12:39:47.000+02:00
Signed-off-by: Philippe Ombredanne &lt;pombredanne@nexb.com&gt;
diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-amd-graphics.copyright.expected.json b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-amd-graphics.copyright.expected.json
@@ -1,5 +1,5 @@
 [
   "Binary redistribution (AMD permissive)\nBinary redistribution (AMD restrictive)",
-  "mit AND other-permissive AND unknown AND zipeg",
+  "mit AND other-permissive AND proprietary-license AND unknown AND zipeg",
   "2000-2009, Advanced Micro Devices, Inc.\n2009-2016, Advanced Micro Devices, Inc."
 ]
diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-atheros.copyright.expected.json b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-atheros.copyright.expected.json
@@ -1,5 +1,5 @@
 [
   "Binary redistribution (Atheros)\nOpen ath9k HTC firmware\nBinary redistribution (Qualcomm Atheros)",
-  "bsd-no-mod AND clear-bsd AND ecos-exception-2.0 AND gpl-1.0-plus AND gpl-2.0-plus AND intel AND isc AND marvell-firmware AND mit AND unknown",
+  "bsd-no-mod AND clear-bsd AND ecos-exception-2.0 AND gpl-1.0-plus AND gpl-2.0-plus AND intel AND isc AND mit AND proprietary-license AND unknown",
   "2008-2010, Atheros Communications, Inc.\n1998-2002, Red Hat, Inc.\n2002, Gary Thomas\n2002-2005, Sam Leffler, Errno Consulting\n2002-2013, Qualcomm Atheros, Inc.\n2013, Tensilica Inc.\n1986, Gary S. Brown\n1988, 1990-1991, 1993, The Regents of the University of California\n1998, The NetBSD Foundation, Inc.\n1998, Todd C. Miller\n1999-2006, Tensilica Inc.\n2000-2001, Aaron D. Gifford\n2002-2004, Sam Leffler, Errno Consulting\n2002-2013, Jouni Malinen\n2003-2006, Marcus Geelnard\n2006-2007, 2012-2013, Atheros Communications Inc.\n2010-2011, embWiSe Technologies\n2011, The FreeBSD Foundation\n2011, Qualcomm Technologies, Inc.\n2011-2015, Qualcomm Atheros, Inc.\n2013, Synopsys, Inc.\n2011-2012, 2014-2015, Qualcomm Atheros, Inc.\n2015-2016, The Android Open Source Project\n2015, Qualcomm Atheros, Inc."
 ]
diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-intel-sound.copyright.expected.json b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-intel-sound.copyright.expected.json
@@ -1,5 +1,5 @@
 [
   "Binary redistribution (Intel 1)\nBinary redistribution (Intel 2)\nBinary redistribution (Intel 3)",
-  "amd-historical AND bsd-new AND bsd-simplified AND delorie-historical AND free-unknown AND intel AND intel-osl-1993 AND newlib-historical AND nilsson-historical AND osf-1990 AND standard-ml-nj AND sunpro AND unknown AND x11-hanson AND x11-lucent",
+  "amd-historical AND bsd-new AND bsd-simplified AND delorie-historical AND free-unknown AND intel AND intel-osl-1993 AND newlib-historical AND nilsson-historical AND osf-1990 AND proprietary-license AND standard-ml-nj AND sunpro AND unknown AND x11-hanson AND x11-lucent",
   "2014, Intel Corporation.\n2014, Intel Corporation\n1981-2000, The Regents of the University of California\n1984, 2000, S.L. Moshier\n1986, Hewlett-Packard Company\n1989, 1990, Advanced Micro Devices, Inc.\n1991, AT&T\n1993, Sun Microsystems, Inc.\n1994-2014, Red Hat Inc. and other newlib contributors\n1993, 2014-15, Intel Corporation"
 ]
diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-libertas.copyright.expected.json b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-libertas.copyright.expected.json
@@ -1,5 +1,5 @@
 [
   "Binary redistribution (Marvell 1)\nBinary redistribution (Marvell 2)",
-  "intel AND marvell-firmware AND unknown",
+  "marvell-firmware AND proprietary-license AND unknown",
   "Marvell International Ltd.\n2006, One Laptop per Child and Marvell Corporation."
 ]
diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-qlogic.copyright.expected.json b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-qlogic.copyright.expected.json
@@ -1,5 +1,5 @@
 [
   "Binary redistribution (QLogic 1)\nThe OpenIB.org BSD license\nBinary redistribution (QLogic 2)\nBinary redistribution (QLogic BR-series)\nBinary redistribution (QLogic 3)",
-  "bsd-new AND gpl-2.0 AND linux-openib AND other-permissive AND qlogic-microcode AND unknown",
+  "bsd-new AND linux-openib AND other-permissive AND proprietary-license AND qlogic-microcode AND unknown",
   "1995, 1996, 1997, 1998, 1999, 2000, QLogic, Inc.\n2007, 2008. QLogic Corporation\n2003-2006, QLogic Corporation\n2013-2014, Brocade Communications Systems, Inc.\n2014-2015, QLogic Corporation.\n2015-2016, QLogic Corporation"
 ]
diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-realtek.copyright.expected.json b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-realtek.copyright.expected.json
@@ -1,5 +1,5 @@
 [
   "Binary redistribution (Realtek permissive)\nBinary redistribution (Realtek restrictive)",
-  "intel AND other-permissive AND unknown",
+  "intel AND other-permissive AND proprietary-license AND unknown",
   "2010-2013, Realtek Semiconductor Corporation\n2009-2010, Realtek Semiconductor Corporation"
 ]
diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ti-connectivity.copyright.expected.json b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ti-connectivity.copyright.expected.json
@@ -1,5 +1,5 @@
 [
   "Binary redistribution (wl1251)",
-  "bsd-source-code AND other-permissive AND unknown",
+  "bsd-source-code AND other-permissive AND proprietary-license AND unknown",
   "2000-2016, Texas Instruments Incorporated"
 ]

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`[`
`2`	`2`	`"Binary redistribution (AMD permissive)\nBinary redistribution (AMD restrictive)",`
`3`		`- "mit AND other-permissive AND unknown AND zipeg",`
	`3`	`+ "mit AND other-permissive AND proprietary-license AND unknown AND zipeg",`
`4`	`4`	`"2000-2009, Advanced Micro Devices, Inc.\n2009-2016, Advanced Micro Devices, Inc."`
`5`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`[`
`2`	`2`	`"Binary redistribution (Atheros)\nOpen ath9k HTC firmware\nBinary redistribution (Qualcomm Atheros)",`
`3`		`- "bsd-no-mod AND clear-bsd AND ecos-exception-2.0 AND gpl-1.0-plus AND gpl-2.0-plus AND intel AND isc AND marvell-firmware AND mit AND unknown",`
	`3`	`+ "bsd-no-mod AND clear-bsd AND ecos-exception-2.0 AND gpl-1.0-plus AND gpl-2.0-plus AND intel AND isc AND mit AND proprietary-license AND unknown",`
`4`	`4`	"2008-2010, Atheros Communications, Inc.\n1998-2002, Red Hat, Inc.\n2002, Gary Thomas\n2002-2005, Sam Leffler, Errno Consulting\n2002-2013, Qualcomm Atheros, Inc.\n2013, Tensilica Inc.\n1986, Gary S. Brown\n1988, 1990-1991, 1993, The Regents of the University of California\n1998, The NetBSD Foundation, Inc.\n1998, Todd C. Miller\n1999-2006, Tensilica Inc.\n2000-2001, Aaron D. Gifford\n2002-2004, Sam Leffler, Errno Consulting\n2002-2013, Jouni Malinen\n2003-2006, Marcus Geelnard\n2006-2007, 2012-2013, Atheros Communications Inc.\n2010-2011, embWiSe Technologies\n2011, The FreeBSD Foundation\n2011, Qualcomm Technologies, Inc.\n2011-2015, Qualcomm Atheros, Inc.\n2013, Synopsys, Inc.\n2011-2012, 2014-2015, Qualcomm Atheros, Inc.\n2015-2016, The Android Open Source Project\n2015, Qualcomm Atheros, Inc."
`5`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`[`
`2`	`2`	`"Binary redistribution (Intel 1)\nBinary redistribution (Intel 2)\nBinary redistribution (Intel 3)",`
`3`		`- "amd-historical AND bsd-new AND bsd-simplified AND delorie-historical AND free-unknown AND intel AND intel-osl-1993 AND newlib-historical AND nilsson-historical AND osf-1990 AND standard-ml-nj AND sunpro AND unknown AND x11-hanson AND x11-lucent",`
	`3`	`+ "amd-historical AND bsd-new AND bsd-simplified AND delorie-historical AND free-unknown AND intel AND intel-osl-1993 AND newlib-historical AND nilsson-historical AND osf-1990 AND proprietary-license AND standard-ml-nj AND sunpro AND unknown AND x11-hanson AND x11-lucent",`
`4`	`4`	`"2014, Intel Corporation.\n2014, Intel Corporation\n1981-2000, The Regents of the University of California\n1984, 2000, S.L. Moshier\n1986, Hewlett-Packard Company\n1989, 1990, Advanced Micro Devices, Inc.\n1991, AT&T\n1993, Sun Microsystems, Inc.\n1994-2014, Red Hat Inc. and other newlib contributors\n1993, 2014-15, Intel Corporation"`
`5`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`[`
`2`	`2`	`"Binary redistribution (Marvell 1)\nBinary redistribution (Marvell 2)",`
`3`		`- "intel AND marvell-firmware AND unknown",`
	`3`	`+ "marvell-firmware AND proprietary-license AND unknown",`
`4`	`4`	`"Marvell International Ltd.\n2006, One Laptop per Child and Marvell Corporation."`
`5`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`[`
`2`	`2`	`"Binary redistribution (QLogic 1)\nThe OpenIB.org BSD license\nBinary redistribution (QLogic 2)\nBinary redistribution (QLogic BR-series)\nBinary redistribution (QLogic 3)",`
`3`		`- "bsd-new AND gpl-2.0 AND linux-openib AND other-permissive AND qlogic-microcode AND unknown",`
	`3`	`+ "bsd-new AND linux-openib AND other-permissive AND proprietary-license AND qlogic-microcode AND unknown",`
`4`	`4`	`"1995, 1996, 1997, 1998, 1999, 2000, QLogic, Inc.\n2007, 2008. QLogic Corporation\n2003-2006, QLogic Corporation\n2013-2014, Brocade Communications Systems, Inc.\n2014-2015, QLogic Corporation.\n2015-2016, QLogic Corporation"`
`5`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`[`
`2`	`2`	`"Binary redistribution (Realtek permissive)\nBinary redistribution (Realtek restrictive)",`
`3`		`- "intel AND other-permissive AND unknown",`
	`3`	`+ "intel AND other-permissive AND proprietary-license AND unknown",`
`4`	`4`	`"2010-2013, Realtek Semiconductor Corporation\n2009-2010, Realtek Semiconductor Corporation"`
`5`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`[`
`2`	`2`	`"Binary redistribution (wl1251)",`
`3`		`- "bsd-source-code AND other-permissive AND unknown",`
	`3`	`+ "bsd-source-code AND other-permissive AND proprietary-license AND unknown",`
`4`	`4`	`"2000-2016, Texas Instruments Incorporated"`
`5`	`5`	`]`