From 85cb7d427a1402018bfd1e328212c2250f1c2f41 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 02 2021 09:32:09 +0000 Subject: import linux-firmware-20200421-80.git78c0348.el7_9 --- diff --git a/.gitignore b/.gitignore index 06bedb7..b0f5536 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,18 @@ +SOURCES/ibt-17-16-1.sfi +SOURCES/ibt-17-2.sfi +SOURCES/ibt-18-16-1.sfi +SOURCES/ibt-18-2.sfi +SOURCES/ibt-19-0-0.sfi +SOURCES/ibt-19-0-1.sfi +SOURCES/ibt-19-0-4.sfi +SOURCES/ibt-19-16-4.sfi +SOURCES/ibt-19-240-1.sfi +SOURCES/ibt-19-240-4.sfi +SOURCES/ibt-19-32-0.sfi +SOURCES/ibt-19-32-1.sfi +SOURCES/ibt-19-32-4.sfi +SOURCES/ibt-20-0-3.sfi +SOURCES/ibt-20-1-3.sfi +SOURCES/ibt-20-1-4.sfi +SOURCES/ibt-hw-37.8.10-fw-22.50.19.14.f.bseq SOURCES/linux-firmware-20200421.tar.gz diff --git a/.linux-firmware.metadata b/.linux-firmware.metadata index 8d9c058..644ed05 100644 --- a/.linux-firmware.metadata +++ b/.linux-firmware.metadata @@ -1 +1,18 @@ +026f02d4902a76b187113bc314f35d533ec544b9 SOURCES/ibt-17-16-1.sfi +006c2c8a4cb4ca86c77e1fe65595f656ee45867d SOURCES/ibt-17-2.sfi +026f02d4902a76b187113bc314f35d533ec544b9 SOURCES/ibt-18-16-1.sfi +026f02d4902a76b187113bc314f35d533ec544b9 SOURCES/ibt-18-2.sfi +858beec242af187021b58b664fe694dfe2fae86e SOURCES/ibt-19-0-0.sfi +858beec242af187021b58b664fe694dfe2fae86e SOURCES/ibt-19-0-1.sfi +858beec242af187021b58b664fe694dfe2fae86e SOURCES/ibt-19-0-4.sfi +858beec242af187021b58b664fe694dfe2fae86e SOURCES/ibt-19-16-4.sfi +858beec242af187021b58b664fe694dfe2fae86e SOURCES/ibt-19-240-1.sfi +858beec242af187021b58b664fe694dfe2fae86e SOURCES/ibt-19-240-4.sfi +858beec242af187021b58b664fe694dfe2fae86e SOURCES/ibt-19-32-0.sfi +858beec242af187021b58b664fe694dfe2fae86e SOURCES/ibt-19-32-1.sfi +858beec242af187021b58b664fe694dfe2fae86e SOURCES/ibt-19-32-4.sfi +858beec242af187021b58b664fe694dfe2fae86e SOURCES/ibt-20-0-3.sfi +858beec242af187021b58b664fe694dfe2fae86e SOURCES/ibt-20-1-3.sfi +858beec242af187021b58b664fe694dfe2fae86e SOURCES/ibt-20-1-4.sfi +851029db5a5467466ad0c1ddfeb21028747c27f6 SOURCES/ibt-hw-37.8.10-fw-22.50.19.14.f.bseq 0fe79d9a46eb538e59c36036ba81355473ca60a2 SOURCES/linux-firmware-20200421.tar.gz diff --git a/SOURCES/ibt-17-16-1.ddc b/SOURCES/ibt-17-16-1.ddc new file mode 100644 index 0000000..6e06779 Binary files /dev/null and b/SOURCES/ibt-17-16-1.ddc differ diff --git a/SOURCES/ibt-17-2.ddc b/SOURCES/ibt-17-2.ddc new file mode 100644 index 0000000..6e06779 Binary files /dev/null and b/SOURCES/ibt-17-2.ddc differ diff --git a/SOURCES/ibt-18-16-1.ddc b/SOURCES/ibt-18-16-1.ddc new file mode 100644 index 0000000..6e06779 Binary files /dev/null and b/SOURCES/ibt-18-16-1.ddc differ diff --git a/SOURCES/ibt-18-2.ddc b/SOURCES/ibt-18-2.ddc new file mode 100644 index 0000000..6e06779 Binary files /dev/null and b/SOURCES/ibt-18-2.ddc differ diff --git a/SOURCES/ibt-19-0-0.ddc b/SOURCES/ibt-19-0-0.ddc new file mode 100644 index 0000000..6e06779 Binary files /dev/null and b/SOURCES/ibt-19-0-0.ddc differ diff --git a/SOURCES/ibt-19-0-1.ddc b/SOURCES/ibt-19-0-1.ddc new file mode 100644 index 0000000..6e06779 Binary files /dev/null and b/SOURCES/ibt-19-0-1.ddc differ diff --git a/SOURCES/ibt-19-0-4.ddc b/SOURCES/ibt-19-0-4.ddc new file mode 100644 index 0000000..6e06779 Binary files /dev/null and b/SOURCES/ibt-19-0-4.ddc differ diff --git a/SOURCES/ibt-19-16-4.ddc b/SOURCES/ibt-19-16-4.ddc new file mode 100644 index 0000000..6e06779 Binary files /dev/null and b/SOURCES/ibt-19-16-4.ddc differ diff --git a/SOURCES/ibt-19-240-1.ddc b/SOURCES/ibt-19-240-1.ddc new file mode 100644 index 0000000..6e06779 Binary files /dev/null and b/SOURCES/ibt-19-240-1.ddc differ diff --git a/SOURCES/ibt-19-240-4.ddc b/SOURCES/ibt-19-240-4.ddc new file mode 100644 index 0000000..6e06779 Binary files /dev/null and b/SOURCES/ibt-19-240-4.ddc differ diff --git a/SOURCES/ibt-19-32-0.ddc b/SOURCES/ibt-19-32-0.ddc new file mode 100644 index 0000000..6e06779 Binary files /dev/null and b/SOURCES/ibt-19-32-0.ddc differ diff --git a/SOURCES/ibt-19-32-1.ddc b/SOURCES/ibt-19-32-1.ddc new file mode 100644 index 0000000..6e06779 Binary files /dev/null and b/SOURCES/ibt-19-32-1.ddc differ diff --git a/SOURCES/ibt-19-32-4.ddc b/SOURCES/ibt-19-32-4.ddc new file mode 100644 index 0000000..6e06779 Binary files /dev/null and b/SOURCES/ibt-19-32-4.ddc differ diff --git a/SOURCES/ibt-20-0-3.ddc b/SOURCES/ibt-20-0-3.ddc new file mode 100644 index 0000000..6e06779 Binary files /dev/null and b/SOURCES/ibt-20-0-3.ddc differ diff --git a/SOURCES/ibt-20-1-3.ddc b/SOURCES/ibt-20-1-3.ddc new file mode 100644 index 0000000..6e06779 Binary files /dev/null and b/SOURCES/ibt-20-1-3.ddc differ diff --git a/SOURCES/ibt-20-1-4.ddc b/SOURCES/ibt-20-1-4.ddc new file mode 100644 index 0000000..6e06779 Binary files /dev/null and b/SOURCES/ibt-20-1-4.ddc differ diff --git a/SPECS/linux-firmware.spec b/SPECS/linux-firmware.spec index 624e430..6237b15 100644 --- a/SPECS/linux-firmware.spec +++ b/SPECS/linux-firmware.spec @@ -1,5 +1,5 @@ %global checkout 78c0348 -%global firmware_release 79 +%global firmware_release 80 %define _binary_payload w9.xzdio @@ -13,6 +13,45 @@ License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted URL: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ # Source0 creation: "git archive --format=tar [gitid] | gzip > [srcdir]/%{name}-%{version}.tar.gz" Source0: %{name}-%{version}.tar.gz + +# zstream requests +# We usually update the whole tarball, pulling all changes from upstream. +# But zstream requests should be handled only by updating the specific firmwares. +# BZ#1895787 request (CVE-2020-12321) +Source1: ibt-17-16-1.ddc +Source2: ibt-17-16-1.sfi +Source3: ibt-17-2.ddc +Source4: ibt-17-2.sfi +Source5: ibt-18-16-1.ddc +Source6: ibt-18-16-1.sfi +Source7: ibt-18-2.ddc +Source8: ibt-18-2.sfi +Source9: ibt-19-0-0.ddc +Source10: ibt-19-0-0.sfi +Source11: ibt-19-0-1.ddc +Source12: ibt-19-0-1.sfi +Source13: ibt-19-0-4.ddc +Source14: ibt-19-0-4.sfi +Source15: ibt-19-16-4.ddc +Source16: ibt-19-16-4.sfi +Source17: ibt-19-240-1.ddc +Source18: ibt-19-240-1.sfi +Source19: ibt-19-240-4.ddc +Source20: ibt-19-240-4.sfi +Source21: ibt-19-32-0.ddc +Source22: ibt-19-32-0.sfi +Source23: ibt-19-32-1.ddc +Source24: ibt-19-32-1.sfi +Source25: ibt-19-32-4.ddc +Source26: ibt-19-32-4.sfi +Source27: ibt-20-0-3.ddc +Source28: ibt-20-0-3.sfi +Source29: ibt-20-1-3.ddc +Source30: ibt-20-1-3.sfi +Source31: ibt-20-1-4.ddc +Source32: ibt-20-1-4.sfi +Source33: ibt-hw-37.8.10-fw-22.50.19.14.f.bseq + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Provides: kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0 @@ -224,6 +263,40 @@ contained inside the provided LICENSE file. Please read it carefully. %prep # Setup Source0 %setup -q -c -n linux-firmware-%{checkout} +# BZ#1895783 zstream request +cp %{_sourcedir}/ibt-17-16-1.ddc intel/ +cp %{_sourcedir}/ibt-17-16-1.sfi intel/ +cp %{_sourcedir}/ibt-17-2.ddc intel/ +cp %{_sourcedir}/ibt-17-2.sfi intel/ +cp %{_sourcedir}/ibt-18-16-1.ddc intel/ +cp %{_sourcedir}/ibt-18-16-1.sfi intel/ +cp %{_sourcedir}/ibt-18-2.ddc intel/ +cp %{_sourcedir}/ibt-18-2.sfi intel/ +cp %{_sourcedir}/ibt-19-0-0.ddc intel/ +cp %{_sourcedir}/ibt-19-0-0.sfi intel/ +cp %{_sourcedir}/ibt-19-0-1.ddc intel/ +cp %{_sourcedir}/ibt-19-0-1.sfi intel/ +cp %{_sourcedir}/ibt-19-0-4.ddc intel/ +cp %{_sourcedir}/ibt-19-0-4.sfi intel/ +cp %{_sourcedir}/ibt-19-16-4.ddc intel/ +cp %{_sourcedir}/ibt-19-16-4.sfi intel/ +cp %{_sourcedir}/ibt-19-240-1.ddc intel/ +cp %{_sourcedir}/ibt-19-240-1.sfi intel/ +cp %{_sourcedir}/ibt-19-240-4.ddc intel/ +cp %{_sourcedir}/ibt-19-240-4.sfi intel/ +cp %{_sourcedir}/ibt-19-32-0.ddc intel/ +cp %{_sourcedir}/ibt-19-32-0.sfi intel/ +cp %{_sourcedir}/ibt-19-32-1.ddc intel/ +cp %{_sourcedir}/ibt-19-32-1.sfi intel/ +cp %{_sourcedir}/ibt-19-32-4.ddc intel/ +cp %{_sourcedir}/ibt-19-32-4.sfi intel/ +cp %{_sourcedir}/ibt-20-0-3.ddc intel/ +cp %{_sourcedir}/ibt-20-0-3.sfi intel/ +cp %{_sourcedir}/ibt-20-1-3.ddc intel/ +cp %{_sourcedir}/ibt-20-1-3.sfi intel/ +cp %{_sourcedir}/ibt-20-1-4.ddc intel/ +cp %{_sourcedir}/ibt-20-1-4.sfi intel/ +cp %{_sourcedir}/ibt-hw-37.8.10-fw-22.50.19.14.f.bseq intel/ %build @@ -389,6 +462,9 @@ rm -rf $RPM_BUILD_ROOT %doc WHENCE LICENCE.* LICENSE.* %changelog +* Sat Dec 12 2020 Augusto Caringi - 20200421-80.git78c0348 +- Update Intel Bluetooth firmwares (rhbz 1895787) + * Tue May 5 2020 Jan Stancek - 20200421-79.git78c0348 - Update to latest upstream linux-firmware image for assorted updates (rhbz 1828390)