Merging debian version 20240610-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 27 insertions, 123 deletions

diff --git a/debian/copyright b/debian/copyright
index c5e2632..fc8e06a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,9 +4,6 @@ Upstream-Contact: linux-firmware@kernel.org
 Source: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git
 Files-Excluded:
 # Undistributable because:
-# - licence doesn't mention redistribution
- 3com/3C359.bin
- tr_smctr.bin
 # - licence allows redistribution only as part of a kernel
  emi26/*.fw
  emi62/*.fw
@@ -19,7 +16,6 @@ Files-Excluded:
  wsm_22.bin
 # - licence is supposedly GPL, but no source is visible
  adaptec/starfire_*.bin
- atmsar11.fw
  cpia2/stv0672_vp4.bin
  edgeport/*
  ositech/Xilinx7OD.bin
@@ -29,19 +25,22 @@ Files-Excluded:
  whiteheat.fw
  whiteheat_loader.fw
  yamaha/yss225_registers.bin
-# - licence is GPL, but source is elsewhere
+# - licence is GPL, but some or all source is elsewhere
  atusb/*
+ carl9170*
 # - licence is unknown
+ *.py
+ .*
+ Dockerfile
  LICENCE.*
  LICENSE.*
  Makefile
- README
+ README.md
  WHENCE
  acenic/*
  configure
  copy-firmware.sh
  ess/maestro3_*.fw
- intelliport2.bin
  korg/k1212.dsp
  lgs8g75.fw
  mts_mt9234*.fw
@@ -54,37 +53,48 @@ Files-Excluded:
  yamaha/ds1*.fw
 # Non-free
  3com/typhoon.bin
- RTL8192E/*
  advansys/*
  agere_*_fw.bin
+ airoha/*
  amd/*
  amd-ucode/*
  amdgpu/*
+ amdtee/*
+ amlogic/*
+ amphion/*
  ar3k/*
  ar5523.bin
  ar7010*.fw
  ar9170*.fw
  ar9271.fw
+ arm/*
  as102_*
  ath10k/*
+ ath11k/*
+ ath12k/*
  ath3k-1.fw
  ath6k/*
  ath9k_htc/*
  atmel/*
  brcm/*
  bnx2/*
- bnx2x-*
  bnx2x/*
  cadence/*
  cavium/*
  cbfw-*.bin
+ cirrus/*
  cmmb_*.inp
+ cnm/*
+ contrib/process_linux_firmware.py
+ contrib/templates/rpm.spec
+ cs42l43.bin
  ct2fw-*.bin
  ctefx.bin
  ctfw-*.bin
  ctspeq.bin
  cxgb3/*
  cxgb4/*
+ cypress/*
  dabusb/*
  dpaa2/*
  dvb-fe-xc*.fw
@@ -98,18 +108,18 @@ Files-Excluded:
  go7007/*
  hfi1_*.fw
  htc_*.fw
- i2400m-*.sbcf
- i6050-*.sbcf
  i915/*
  imx/*
  inside-secure/*
  intel/*
  isdbt_*.inp
  iwlwifi-*
+ ixp4xx/*
  kaweth/*.bin
  libertas/*
  lbtf_usb.bin
  liquidio/*
+ lt9611uxc_fw.bin
  matrox/*
  mediatek/*
  mellanox/*
@@ -117,7 +127,6 @@ Files-Excluded:
  microchip/*
  moxa/*
  mrvl/*
- mt76*.bin
  mts_cdma.fw
  mts_edge.fw
  mts_gsm.fw
@@ -126,7 +135,9 @@ Files-Excluded:
  myri10ge_*.dat
  netronome/*
  nvidia/*
+ nxp/*
  phanfw.bin
+ powervr/*
  qat_*.bin
  qca/*
  qcom/*
@@ -147,19 +158,21 @@ Files-Excluded:
  rtw88/*
  s5p-mfc*.fw
  sms1xxx-*
- TDA7706*
  tdmb*
  tehuti/*
+ ti/*
  ti-connectivity/*
  ti-keystone/*
  tigon/*
  tlg2300_firmware.bin
+ tsse_firmware.bin
  ueagle-atm/*
  v4l-cx*.fw
  vntwusb.fw
- vpu_?.bin
  vxge/*
+ wfx/*
  wil6210.*
+ xe/*
 
 Files: GPL-2
 Copyright: 1989, 1991, Free Software Foundation, Inc.
@@ -174,71 +187,6 @@ Copyright: 2001, Convergence integrated media GmbH
            2006, Matthieu CASTET
 License: GPL-2+
 
-Files: carl9170fw/* carl9170-1.fw
-Copyright: 2000-2005, ZyDAS Technology Corporation
-           2007-2009, Atheros Communications, Inc.
-	   2008-2009, Johannes Berg <johannes@sipsolutions.net>
-           2009-2011, Christian Lamparter <chunkeey@googlemail.com>
-License: GPL-2+
-
-Files: carl9170fw/carlfw/src/ashlsi3.S carl9170fw/carlfw/src/udivsi3_i4i-Os.S
-Copyright: 1994-1995, 1997-2006, Free Software Foundation, Inc.
-License: GPL-2+
-
-Files: carl9170fw/carlfw/src/memcpy.S carl9170fw/carlfw/src/memset.S
-Copyright: 1999, Niibe Yutaka
-License: GPL-2
-
-Files: carl9170fw/carlfw/src/printf.c
-Copyright: 2004, 2008, Kustaa Nyholm
-License: LGPL-2.1+
-
-Files: carl9170fw/config/*
-Copyright: 2002-2005, Roman Zippel <zippel@linux-m68k.org>
-           2002-2005, Sam Ravnborg <sam@ravnborg.org>
-License: GPL-2
-
-Files: carl9170fw/extra/FindGPERF.cmake
- carl9170fw/extra/FindPackageHandleStandardArgs.cmake
- carl9170fw/extra/GCCVersion.cmake
-Copyright: 2006-2009, Kitware, Inc.
-           2006-2008, Andreas Schneider <mail@cynapses.org>
-	   2006, Tristan Carel
-           2007, Wengo
-           2007, Mike Jackson
-           2008, Andreas Pakulat <apaku@gmx.de>
-           2008-2009, Philip Lowman <philip@yhbt.com>
-License: BSD-3-clause-Kitware
-
-Files: carl9170fw/extra/FindUSB-1.0.cmake
-Copyright: 2009, Andreas Schneider <mail@cynapses.org>
-License: BSD-3-clause-Schneider
-
-Files: carl9170fw/include/linux/ieee80211.h
-Copyright: 2001-2002, SSH Communications Security Corp and Jouni Malinen <jkmaline@cc.hut.fi>
-           2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
-           2005, Devicescape Software, Inc.
-           2006, Michael Wu <flamingice@sourmilk.net>
-License: GPL-2
-
-Files: carl9170fw/include/shared/fwcmd.h carl9170fw/include/shared/fwdesc.h
- carl9170fw/include/shared/hw.h carl9170fw/include/shared/wlan.h
- carl9170fw/tools/lib/carlfw.c carl9170fw/tools/lib/carlfw.h
- carl9170fw/tools/src/checksum.c carl9170fw/tools/src/eeprom_fix.c
- carl9170fw/tools/src/fwinfo.c carl9170fw/tools/src/miniboot.c
- carl9170fw/tools/src/wol.c
-Copyright: 2008, Johannes Berg <johannes@sipsolutions.net>
-           2009-2011, Christian Lamparter <chunkeey@googlemail.com>
-License: GPL-2
-
-Files: carl9170fw/include/shared/phy.h
-Copyright: 2008-2009 Atheros Communications Inc.
-License: permissive-Atheros
-
-Files: carl9170fw/tools/include/list.h
-Copyright: 2003-2006, Thomas Graf <tgraf@suug.ch>
-License: LGPL-2.1
-
 Files: cis/src/* cis/3CCFEM556.cis cis/3CXEM556.cis cis/COMpad2.cis
  cis/COMpad4.cis cis/DP83903.cis cis/LA-PCM.cis cis/MT5634ZLX.cis
  cis/NE2K.cis cis/PCMLM28.cis cis/PE-200.cis cis/PE520.cis cis/RS-COM-2P.cis
@@ -387,33 +335,6 @@ License: GPL-3
  On Debian systems the text of the GPL version 3 can be found in
  /usr/share/common-licenses/GPL-3.
 
-License: LGPL-2.1
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation, version 2.1.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- On Debian systems the text of the LGPL version 2.1 can be found in
- /usr/share/common-licenses/LGPL-2.1.
-
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- On Debian systems the text of the LGPL version 2.1 can be found in
- /usr/share/common-licenses/LGPL-2.1.
-
 License: MPL-1.1
  The contents of this file are subject to the Mozilla Public License
  Version 1.1 (the "License"); you may not use this file except in
@@ -427,20 +348,3 @@ License: MPL-1.1
  .
  On Debian systems the text of the MPL version 1.1 can be found in
  /usr/share/common-licenses/MPL-1.1.
-
-License: permissive-Atheros
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
- .
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-License: verbatim-FSF
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.