import kernel-3.10.0-1062.1.2.el7

Author: CentOS Sources

.gitignore

@@ -1,8 +1,5 @@
 SOURCES/kernel-abi-whitelists-1062.tar.bz2
 SOURCES/kernel-kabi-dw-1062.tar.bz2
-SOURCES/linux-3.10.0-1062.1.1.el7.tar.xz
+SOURCES/linux-3.10.0-1062.1.2.el7.tar.xz
 SOURCES/rheldup3.x509
 SOURCES/rhelkpatch1.x509
-SOURCES/centos-kpatch.x509
-SOURCES/centos-ldup.x509
-SOURCES/centos.cer

.kernel.metadata

@@ -1,8 +1,5 @@
 d6914bd8d9b24dcd384d2da39fa8b04fa3de713a SOURCES/kernel-abi-whitelists-1062.tar.bz2
 e01030ef3029e113eeff62bf9ea0dcf09b86d4e2 SOURCES/kernel-kabi-dw-1062.tar.bz2
-201ca66921e47e94fa8934cd2e0faadca5b25829 SOURCES/linux-3.10.0-1062.1.1.el7.tar.xz
+af6f6e7a6b81080f580a3f9f10e3bcc4df68bab5 SOURCES/linux-3.10.0-1062.1.2.el7.tar.xz
 95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
 d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509
-5a7d05a8298cf38d43689470e8e43230d8add0f9 SOURCES/centos-kpatch.x509
-c61172887746663d3bdd9acaa263cbfacf99e8b3 SOURCES/centos-ldup.x509
-6e9105eb51e55a46761838f289a917611cad8091 SOURCES/centos.cer

SOURCES/Makefile.common

@@ -9,7 +9,7 @@ RPMVERSION:=3.10.0
 # marker is git tag which we base off of for exporting patches
 MARKER:=v3.10
 PREBUILD:=
-BUILD:=1062.1.1
+BUILD:=1062.1.2
 DIST:=.el7
 SPECFILE:=kernel.spec
 RPM:=$(REDHAT)/rpm

SOURCES/centos-ca-secureboot.der

@@ -5,9 +5,9 @@ prompt = no
 x509_extensions = myexts
 
 [ req_distinguished_name ]
-O = CentOS
-CN = CentOS Linux kernel signing key
-emailAddress = security@centos.org
+O = Red Hat
+CN = Red Hat Enterprise Linux kernel signing key
+emailAddress = secalert@redhat.com
 
 [ myexts ]
 basicConstraints=critical,CA:FALSE

SOURCES/centossecureboot001.crt

@@ -14,10 +14,10 @@ Summary: The Linux kernel
 %global distro_build 1062
 
 %define rpmversion 3.10.0
-%define pkgrelease 1062.1.1.el7
+%define pkgrelease 1062.1.2.el7
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 1062.1.1%{?dist}
+%define specrelease 1062.1.2%{?dist}
 
 %define pkg_release %{specrelease}%{?buildid}
 
@@ -281,7 +281,7 @@ Summary: The Linux kernel
 # problems with the newer kernel or lack certain things that make
 # integration in the distro harder than needed.
 #
-%define package_conflicts initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, iwl4965-firmware < 228.57.2, selinux-policy-targeted < 3.13.1-201, squashfs-tools < 4.0, wireless-tools < 29-3, xfsprogs < 4.3.0, kmod < 20-9, kexec-tools < 2.0.14-3, shim-x64 < 12-2
+%define package_conflicts initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, iwl4965-firmware < 228.57.2, selinux-policy-targeted < 3.13.1-201, squashfs-tools < 4.0, wireless-tools < 29-3, xfsprogs < 4.3.0, kmod < 20-9, kexec-tools < 2.0.14-3
 
 # We moved the drm include files into kernel-headers, make sure there's
 # a recent enough libdrm-devel on the system that doesn't have those.
@@ -396,16 +396,16 @@ Source10: sign-modules
 Source11: x509.genkey
 Source12: extra_certificates
 %if %{?released_kernel}
-Source13: centos-ca-secureboot.der
-Source14: centossecureboot001.crt
-%define  pesign_name centossecureboot001
+Source13: securebootca.cer
+Source14: secureboot.cer
+%define pesign_name redhatsecureboot301
 %else
-Source13: centos-ca-secureboot.der
-Source14: centossecureboot001.crt
-%define  pesign_name centossecureboot001
+Source13: redhatsecurebootca2.cer
+Source14: redhatsecureboot003.cer
+%define pesign_name redhatsecureboot003
 %endif
-Source15: centos-ldup.x509
-Source16: centos-kpatch.x509
+Source15: rheldup3.x509
+Source16: rhelkpatch1.x509
 
 Source18: check-kabi
 
@@ -449,9 +449,6 @@ Source9999: lastcommit.stat
 
 # empty final patch to facilitate testing of kernel patches
 Patch999999: linux-kernel-test.patch
-Patch1000: debrand-single-cpu.patch
-Patch1001: debrand-rh_taint.patch
-Patch1002: debrand-rh-i686-cpu.patch
 
 BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
 
@@ -635,11 +632,11 @@ kernel-gcov includes the gcov graph and source files for gcov coverage collectio
 %endif
 
 %package -n kernel-abi-whitelists
-Summary: The CentOS Linux kernel ABI symbol whitelists
+Summary: The Red Hat Enterprise Linux kernel ABI symbol whitelists
 Group: System Environment/Kernel
 AutoReqProv: no
 %description -n kernel-abi-whitelists
-The kABI package contains information pertaining to the CentOS
+The kABI package contains information pertaining to the Red Hat Enterprise
 Linux kernel ABI, including lists of kernel symbols that are needed by
 external Linux kernel modules, and a yum plugin to aid enforcement.
 
@@ -792,9 +789,6 @@ cd linux-%{KVRA}
 cp $RPM_SOURCE_DIR/kernel-%{version}-*.config .
 
 ApplyOptionalPatch linux-kernel-test.patch
-ApplyOptionalPatch debrand-single-cpu.patch
-ApplyOptionalPatch debrand-rh_taint.patch
-ApplyOptionalPatch debrand-rh-i686-cpu.patch
 
 # Any further pre-build tree manipulations happen here.
 
@@ -1776,8 +1770,8 @@ fi
 %kernel_variant_files %{with_kdump} kdump
 
 %changelog
-* Tue Sep 03 2019 CentOS Sources <bugs@centos.org> - 3.10.0-1062.1.1.el7
-- Apply debranding changes
+* Mon Sep 16 2019 Bruno Meneguele <bmeneg@redhat.com> [3.10.0-1062.1.2.el7]
+- [vhost] vhost: make sure log_num < in_num (Eugenio Perez) [1750879 1750880] {CVE-2019-14835}
 
 * Tue Aug 13 2019 Bruno Meneguele <bmeneg@redhat.com> [3.10.0-1062.1.1.el7]
 - [fs] nfsv4.1: Avoid false retries when RPC calls are interrupted (Benjamin Coddington) [1739077 1732427]