diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-23 18:16:43 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-23 18:16:43 +0100 |
| commit | c4ad167183c0e119e3bf5b81f022d96fade313ea (patch) | |
| tree | 69fae03c7a2de3431db14e371b34a5d3f25739dc /kernel.spec | |
| parent | 6296c1ec42c771f666fbcbc2f367fbc16ee57e7d (diff) | |
| parent | f1641aebd7ac808ebe54e98707697580b01f27e9 (diff) | |
| download | kernel-c4ad167183c0e119e3bf5b81f022d96fade313ea.tar.gz kernel-c4ad167183c0e119e3bf5b81f022d96fade313ea.tar.xz kernel-c4ad167183c0e119e3bf5b81f022d96fade313ea.zip | |
Merge remote-tracking branch 'origin/f33' into f33-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index fb19784bb..3869c1d10 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,6 +54,8 @@ Summary: The Linux kernel %if %{zipmodules} %global zipsed -e 's/\.ko$/\.ko.xz/' +# for parallel xz processes, replace with 1 to go back to single process +%global zcpu `nproc --all` %endif # define buildid .local @@ -886,6 +888,9 @@ Patch131: arm64-dts-allwinner-h6-Pine-H64-Fix-ethernet-node.patch # rhbz 1897038 Patch132: bluetooth-fix-LL-privacy-BLE-device-fails-to-connect.patch +# CVE-2020-28941 rhbz 1899985 1899986 +Patch133: speakup-do-not-let-the-line-discipline-be-used-several-times.patch + # END OF PATCH DEFINITIONS %endif @@ -2367,7 +2372,7 @@ find Documentation -type d | xargs chmod u+w fi \ fi \ if [ "%{zipmodules}" -eq "1" ]; then \ - find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | %{SOURCE79} %{?_smp_mflags}; \ + find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz; \ fi \ %{nil} @@ -3002,6 +3007,11 @@ fi # # %changelog +* Mon Nov 23 09:58:15 CST 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.9.10-200 +- Linux v5.9.10 +- Fix CVE-2020-28941 (rhbz 1899985 1899986) +- Fix CVE-2020-4788 (rhbz 1888433 1900437) + * Thu Nov 19 07:09:26 CST 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.9.9-200 - Linux v5.9.9 - Enable NANDSIM (rhbz 1898638) |