diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-23 18:16:45 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-23 18:16:45 +0100 |
| commit | 19ad0c91f8edff1b66f54725959976325bfac903 (patch) | |
| tree | 82bedd608ff9228c8bcedb520454d40b0ef89dd1 /kernel.spec | |
| parent | 305fe7a7b1c0bcc56921ac1fffeb437a451852ff (diff) | |
| parent | 2988c49e116cb18403972d24a959ad606e2fba19 (diff) | |
| download | kernel-19ad0c91f8edff1b66f54725959976325bfac903.tar.gz kernel-19ad0c91f8edff1b66f54725959976325bfac903.tar.xz kernel-19ad0c91f8edff1b66f54725959976325bfac903.zip | |
Merge remote-tracking branch 'origin/f32' into f32-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 cc3070699..6105658cd 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:59:05 CST 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.9.10-100 +- Linux v5.9.10 +- Fix CVE-2020-28941 (rhbz 1899985 1899986) +- Fix CVE-2020-4788 (rhbz 1888433 1900437) + * Thu Nov 19 07:12:19 CST 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.9.9-100 - Linux v5.9.9 |