Accepting request 561688 from Kernel:HEAD

OBS-URL: https://build.opensuse.org/request/show/561688
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-firmware?expand=0&rev=96

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git</param>
-          <param name="changesrevision">2567e092339cd3403d697dc2e0967c31b7acb989</param></service></servicedata>
+          <param name="changesrevision">65b1c68c63f974d72610db38dfae49861117cae2</param></service></servicedata>

kernel-firmware-20171221.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e947ea8e35bdcd303703f7581eb7aabac680d08da7e28b067bca082fc9b9c8f3
-size 66619596

kernel-firmware-20180104.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:202c05e844d16de1a0a507c931c62104bc265f4d11948651b6b255c167975265
+size 66634916

kernel-firmware.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Jan  4 15:39:35 UTC 2018 - mpluskal@suse.com
+
+- Update to version 20180104:
+  * wl18xx: update firmware file 8.9.0.0.76
+  * wl127x/wl128x: update firmwares
+  * rtlwifi: rtl8723de: Add firmware for new driver/device
+  * linux-firmware: DMC firmware for cannonlake v1.07
+
+-------------------------------------------------------------------
+Mon Dec 25 16:38:52 UTC 2017 - meissner@suse.com
+
+- Add microcode_amd_fam17h.bin (bsc#1068032 CVE-2017-5715)
+
 -------------------------------------------------------------------
 Sat Dec 23 08:34:13 UTC 2017 - mpluskal@suse.com
 

kernel-firmware.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package kernel-firmware
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,14 @@
 
 
 %define __ksyms_path ^/lib/firmware
-%define version_unconverted 20171221
-
+%define version_unconverted 20180104
 Name:           kernel-firmware
-Version:        20171221
+Version:        20180104
 Release:        0
 Summary:        Linux kernel firmware files
 License:        SUSE-Firmware AND GPL-2.0 AND GPL-2.0+ AND MIT
 Group:          System/Kernel
-Url:            https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
+URL:            https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
 # Created with umask 022; cd /_tmp
 # After git clone https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 # cd linux-firmware
@@ -38,6 +37,8 @@ Source8:        ql2600_fw.bin
 Source9:        ql2700_fw.bin
 Source10:       ql8300_fw.bin
 Source99:       %{name}-rpmlintrc
+# CVE-2017-5715
+Source200:      microcode_amd_fam17h.bin
 BuildRequires:  fdupes
 BuildRequires:  suse-module-tools
 Requires(post): coreutils
@@ -71,7 +72,6 @@ Provides:       ath3k-firmware
 Obsoletes:      ath3k-firmware
 Provides:       compat-wireless-firmware = 4.4
 Obsoletes:      compat-wireless-firmware < 4.4
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 %description
@@ -93,7 +93,7 @@ This package contains the microcode files used by AMD CPUs.
 %setup -q
 cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
 # change ./check_whence.py to be a python3 program
-sed -i "s|/usr/bin/python$|/usr/bin/python3|" ./check_whence.py
+sed -i "s|%{_bindir}/python$|%{_bindir}/python3|" ./check_whence.py
 
 %build
 # nothing to do
@@ -102,6 +102,8 @@ sed -i "s|/usr/bin/python$|/usr/bin/python3|" ./check_whence.py
 mkdir -p %{buildroot}/lib/firmware
 cp -avf * %{buildroot}/lib/firmware
 rm -f %{buildroot}/lib/firmware/WHENCE
+# CVE-2017-5715 fix
+cp %{SOURCE200} %{buildroot}/lib/firmware/amd-ucode/
 %fdupes %{buildroot}
 # In alsa-firmware
 rm -f %{buildroot}/lib/firmware/ctefx.bin