diff --git a/0001-Release.-Intel-CPU-microcode-update.-20191112.patch b/0001-Release.-Intel-CPU-microcode-update.-20191112.patch deleted file mode 100644 index 04fc5ce..0000000 --- a/0001-Release.-Intel-CPU-microcode-update.-20191112.patch +++ /dev/null @@ -1,45 +0,0 @@ -commit e98162b86715772403ba3cf6546d40b28eeadb8c -Author: Justin M. Forbes -Date: Tue Nov 12 13:56:52 2019 -0600 - - Release. Intel CPU microcode update. 20191112 - - Signed-off-by: Justin M. Forbes - -diff --git a/Changelog b/Changelog -index 5ac537a..0524c5e 100644 ---- a/Changelog -+++ b/Changelog -@@ -1,3 +1,6 @@ -+2.1-24 12 Nov 2019, Justin Forbes -+ Intel CPU microcode update. 20191112 -+ - 2.1-23 02 Oct 2019, Anton Arapov - Intel CPU microcode update. 20190918 - -diff --git a/Makefile b/Makefile -index 8f474a0..953f176 100644 ---- a/Makefile -+++ b/Makefile -@@ -7,7 +7,7 @@ - # as published by the Free Software Foundation; either version - # 2 of the License, or (at your option) any later version. - --MICROCODE_INTEL = microcode-20190918.tar.gz -+MICROCODE_INTEL = microcode-20191112.tar.gz - - INS = install - CC = gcc -diff --git a/microcode_ctl.spec b/microcode_ctl.spec -index 32f0446..ad3a93e 100644 ---- a/microcode_ctl.spec -+++ b/microcode_ctl.spec -@@ -1,7 +1,7 @@ - Summary: Tool to transform and deploy CPU microcode update for x86. - Name: microcode_ctl - Version: 2.1 --Release: 23 -+Release: 24 - Group: System Environment/Base - License: GPLv2+ and Redistributable, no modification permitted - URL: https://pagure.io/microcode_ctl/ diff --git a/microcode-20191112.tar.gz b/microcode-20191112.tar.gz deleted file mode 100644 index 1ff2713..0000000 Binary files a/microcode-20191112.tar.gz and /dev/null differ diff --git a/microcode_ctl.spec b/microcode_ctl.spec index ef99495..be63260 100644 --- a/microcode_ctl.spec +++ b/microcode_ctl.spec @@ -4,17 +4,13 @@ Summary: Tool to transform and deploy CPU microcode update for x86 Name: microcode_ctl Version: 2.1 -Release: 33%{?dist} +Release: 32%{?dist} Epoch: 2 License: GPLv2+ and Redistributable, no modification permitted URL: https://pagure.io/microcode_ctl Source0: https://releases.pagure.org/microcode_ctl/%{name}-%{upstream_version}.tar.xz ExclusiveArch: %{ix86} x86_64 -#This should go away with the next release -Source1: microcode-20191112.tar.gz -Patch1: 0001-Release.-Intel-CPU-microcode-update.-20191112.patch - %description The microcode_ctl utility is a companion to the microcode driver written by Tigran Aivazian . @@ -25,8 +21,6 @@ back to the old microcode. %prep %setup -q -n %{name}-%{upstream_version} -cp %{SOURCE1} ./ -%patch1 -p1 %build make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -40,9 +34,6 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} INSDIR=/usr/sbin install clean %changelog -* Tue Nov 12 2019 Justin Forbes 2:2.1-33 -- Update to microcode-20191112 for CVE fixes - * Wed Oct 02 2019 Anton Arapov 2:2.1-32 - Update to upstream 2.1-23. 20190918