From fcc10287df8a1f5306ebe26a7a9512ca31b63165 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 22 2014 17:02:42 +0000 Subject: import kernel-3.10.0-123.8.1.el7 --- diff --git a/.gitignore b/.gitignore index d907264..86759b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -SOURCES/linux-3.10.0-123.6.3.el7.tar.xz -SOURCES/centos.cer +SOURCES/linux-3.10.0-123.8.1.el7.tar.xz +SOURCES/rheldup3.x509 +SOURCES/rhelkpatch1.x509 diff --git a/.kernel.metadata b/.kernel.metadata index b1295a8..8682ecb 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,2 +1,3 @@ -651cb172983e94bd5c07d7f206aef8d748f5abbb SOURCES/linux-3.10.0-123.6.3.el7.tar.xz -6e9105eb51e55a46761838f289a917611cad8091 SOURCES/centos.cer +5fdabe222a022de44323f7665a8847ede21491e9 SOURCES/linux-3.10.0-123.8.1.el7.tar.xz +95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509 +d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509 diff --git a/SOURCES/Makefile.common b/SOURCES/Makefile.common index d3b4294..0f3acf6 100644 --- a/SOURCES/Makefile.common +++ b/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:=123.6.3 +BUILD:=123.8.1 DIST:=.el7 SPECFILE:=kernel.spec RPM:=$(REDHAT)/rpm diff --git a/SOURCES/centos-kpatch.x509 b/SOURCES/centos-kpatch.x509 deleted file mode 100644 index ca57a43..0000000 Binary files a/SOURCES/centos-kpatch.x509 and /dev/null differ diff --git a/SOURCES/centos-ldup.x509 b/SOURCES/centos-ldup.x509 deleted file mode 100644 index 9c65dd3..0000000 Binary files a/SOURCES/centos-ldup.x509 and /dev/null differ diff --git a/SOURCES/debrand-rh-i686-cpu.patch b/SOURCES/debrand-rh-i686-cpu.patch deleted file mode 100644 index 739855c..0000000 --- a/SOURCES/debrand-rh-i686-cpu.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/arch/x86/boot/main.c 2014-06-04 10:05:04.000000000 -0700 -+++ b/arch/x86/boot/main.c 2014-07-09 12:54:40.000000000 -0700 -@@ -146,7 +146,7 @@ void main(void) - - /* Make sure we have all the proper CPU support */ - if (validate_cpu()) { -- puts("This processor is unsupported in RHEL7.\n"); -+ puts("This processor is unsupported in CentOS 7.\n"); - die(); - } - diff --git a/SOURCES/debrand-rh_taint.patch b/SOURCES/debrand-rh_taint.patch deleted file mode 100644 index 8ef4557..0000000 --- a/SOURCES/debrand-rh_taint.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 69c0d42cfa26515196896dea086857c2caccb6eb Mon Sep 17 00:00:00 2001 -From: Jim Perrin -Date: Thu, 19 Jun 2014 10:05:12 -0500 -Subject: [PATCH] branding patch for rh_taint - ---- - kernel/rh_taint.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/rh_taint.c b/kernel/rh_taint.c -index 59a74b0..0708e15 100644 ---- a/kernel/rh_taint.c -+++ b/kernel/rh_taint.c -@@ -8,7 +8,7 @@ - void mark_hardware_unsupported(const char *msg) - { - /* Print one single message */ -- pr_crit("Warning: %s - this hardware has not undergone testing by Red Hat and might not be certified. Please consult https://hardware.redhat.com for certified hardware.\n", msg); -+ pr_crit("Warning: %s - this hardware has not undergone upstream testing. Please consult http://wiki.centos.org/FAQ for more information\n", msg); - } - EXPORT_SYMBOL(mark_hardware_unsupported); - --- -1.8.3.1 - diff --git a/SOURCES/debrand-single-cpu.patch b/SOURCES/debrand-single-cpu.patch deleted file mode 100644 index 9d2e08b..0000000 --- a/SOURCES/debrand-single-cpu.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 66185f5c6f881847776702e3a7956c504400f4f2 Mon Sep 17 00:00:00 2001 -From: Jim Perrin -Date: Thu, 19 Jun 2014 09:53:13 -0500 -Subject: [PATCH] branding patch for single-cpu systems - ---- - arch/x86/kernel/setup.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index b289118..9d25982 100644 ---- a/arch/x86/kernel/setup.c -+++ b/arch/x86/kernel/setup.c -@@ -846,7 +846,7 @@ static void rh_check_supported(void) - if (((boot_cpu_data.x86_max_cores * smp_num_siblings) == 1) && - !x86_hyper && !cpu_has_hypervisor && !is_kdump_kernel()) { - pr_crit("Detected single cpu native boot.\n"); -- pr_crit("Important: In Red Hat Enterprise Linux 7, single threaded, single CPU 64-bit physical systems are unsupported by Red Hat. Please contact your Red Hat support representative for a list of certified and supported systems."); -+ pr_crit("Important: In CentOS 7, single threaded, single CPU 64-bit physical systems are unsupported. Please see http://wiki.centos.org/FAQ for more information"); - } - - /* The RHEL7 kernel does not support this hardware. The kernel will --- -1.8.3.1 - diff --git a/SOURCES/secureboot.cer b/SOURCES/secureboot.cer new file mode 100644 index 0000000..4ff8b79 Binary files /dev/null and b/SOURCES/secureboot.cer differ diff --git a/SOURCES/securebootca.cer b/SOURCES/securebootca.cer new file mode 100644 index 0000000..b235400 Binary files /dev/null and b/SOURCES/securebootca.cer differ diff --git a/SOURCES/x509.genkey b/SOURCES/x509.genkey index d98f8fe..b1bbe38 100644 --- a/SOURCES/x509.genkey +++ b/SOURCES/x509.genkey @@ -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 diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 7599eab..3f47527 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -11,7 +11,7 @@ Summary: The Linux kernel %global released_kernel 1 %define rpmversion 3.10.0 -%define pkgrelease 123.6.3.el7 +%define pkgrelease 123.8.1.el7 %define pkg_release %{pkgrelease}%{?buildid} @@ -338,9 +338,10 @@ Source10: sign-modules %define modsign_cmd %{SOURCE10} Source11: x509.genkey Source12: extra_certificates -Source13: centos.cer -Source15: centos-ldup.x509 -Source16: centos-kpatch.x509 +Source13: securebootca.cer +Source14: secureboot.cer +Source15: rheldup3.x509 +Source16: rhelkpatch1.x509 Source18: check-kabi @@ -367,9 +368,6 @@ Source2000: cpupower.service Source2001: cpupower.config # empty final patch to facilitate testing of kernel patches -Patch1000: debrand-single-cpu.patch -Patch1001: debrand-rh_taint.patch -Patch1002: debrand-rh-i686-cpu.patch Patch999999: linux-kernel-test.patch BuildRoot: %{_tmppath}/kernel-%{KVRA}-root @@ -523,11 +521,11 @@ This package provides debug information for package kernel-tools. %endif # with_tools %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. @@ -670,12 +668,6 @@ cd linux-%{KVRA} # Drop some necessary files from the source dir into the buildroot cp $RPM_SOURCE_DIR/kernel-%{version}-*.config . -# CentOS Branding Modification -ApplyOptionalPatch debrand-rh_taint.patch -ApplyOptionalPatch debrand-single-cpu.patch -ApplyOptionalPatch debrand-rh-i686-cpu.patch -# End of CentOS Modification - ApplyOptionalPatch linux-kernel-test.patch # Any further pre-build tree manipulations happen here. @@ -827,7 +819,7 @@ BuildKernel() { fi # EFI SecureBoot signing, x86_64-only %ifarch x86_64 - %pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE13} -c %{SOURCE13} + %pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE13} -c %{SOURCE14} -n redhatsecureboot301 mv $KernelImage.signed $KernelImage %endif $CopyKernel $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer @@ -1482,17 +1474,53 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Wed Aug 06 2014 Johnny Hughes - 3.10.0-123.6.3.el7 -- Additional debranding changes - -* Wed Aug 06 2014 CentOS Sources - 3.10.0-123.6.3.el7 -- Apply debranding changes - -* Wed Jul 16 2014 Phillip Lougher [3.10.0-123.6.3.el7] -- [net] l2tp_ppp: fail when socket option level is not SOL_PPPOL2TP (Petr Matousek) [1119465 1119466] {CVE-2014-4943} - -* Wed Jul 09 2014 Phillip Lougher [3.10.0-123.6.2.el7] -- [s390] ptrace: correct insufficient sanitization when setting psw mask (Hendrik Brueckner) [1114090 1113673] +* Mon Aug 11 2014 Phillip Lougher [3.10.0-123.8.1.el7] +- [scsi] fnic: fix broken FIP discovery by initializing multicast address (Chris Leech) [1119727 1100078] +- [scsi] libfcoe: Make fcoe_sysfs optional / fix fnic NULL exception (Chris Leech) [1119727 1100078] +- [fs] nfs: Don't mark the data cache as invalid if it has been flushed (Scott Mayhew) [1115817 1114054] +- [fs] nfs: Clear NFS_INO_REVAL_PAGECACHE when we update the file size (Scott Mayhew) [1115817 1114054] +- [fs] nfs: Fix cache_validity check in nfs_write_pageuptodate() (Scott Mayhew) [1115817 1114054] +- [mm] hugetlb: ensure hugepage access is denied if hugepages are not supported (David Gibson) [1122115 1081671] +- [kernel] hrtimer: Prevent all reprogramming if hang detected (Prarit Bhargava) [1113175 1094732] + +* Tue Aug 05 2014 Phillip Lougher [3.10.0-123.7.1.el7] +- [scsi] set DID_TIME_OUT correctly (Ewan Milne) [1122575 1103881] +- [scsi] fix invalid setting of host byte (Ewan Milne) [1122575 1103881] +- [scsi] More USB deadlock fixes (Ewan Milne) [1122575 1103881] +- [scsi] Fix USB deadlock caused by SCSI error handling (Ewan Milne) [1122575 1103881] +- [scsi] Fix command result state propagation (Ewan Milne) [1122575 1103881] +- [scsi] Fix spurious request sense in error handling (Ewan Milne) [1122575 1103881] +- [input] synaptics: fix resolution for manually provided min/max (Benjamin Tissoires) [1122559 1093449] +- [input] synaptics: change min/max quirk table to pnp-id matching (Benjamin Tissoires) [1122559 1093449] +- [input] synaptics: add a matches_pnp_id helper function (Benjamin Tissoires) [1122559 1093449] +- [input] synaptics: T540p - unify with other LEN0034 models (Benjamin Tissoires) [1122559 1093449] +- [input] synaptics: add min/max quirk for the ThinkPad W540 (Benjamin Tissoires) [1122559 1093449] +- [input] synaptics: add min/max quirk for ThinkPad Edge E431 (Benjamin Tissoires) [1122559 1093449] +- [input] synaptics: add min/max quirk for ThinkPad T431s, L440, L540, S1 Yoga and X1 (Benjamin Tissoires) [1122559 1093449] +- [input] synaptics: report INPUT_PROP_TOPBUTTONPAD property (Benjamin Tissoires) [1122559 1093449] +- [input] Add INPUT_PROP_TOPBUTTONPAD device property (Benjamin Tissoires) [1122559 1093449] +- [input] i8042: add firmware_id support (Benjamin Tissoires) [1122559 1093449] +- [input] serio: add firmware_id sysfs attribute (Benjamin Tissoires) [1122559 1093449] +- [input] synaptics: add manual min/max quirk for ThinkPad X240 (Benjamin Tissoires) [1122559 1093449] +- [input] synaptics: add manual min/max quirk (Benjamin Tissoires) [1122559 1093449] +- [input] synaptics: fix incorrect placement of __initconst (Benjamin Tissoires) [1122559 1093449] +- [ethernet] be2net: Fix invocation of be_close() after be_clear() (Ivan Vecera) [1122558 1066644] +- [ethernet] be2net: enable interrupts in EEH resume (Ivan Vecera) [1121712 1076682] +- [ethernet] sfc: PIO:Restrict to 64bit arch and use 64-bit writes (Nikolay Aleksandrov) [1119725 1089024] +- [kernel] ftrace: Hardcode ftrace_module_init() call into load_module() (Takahiro MUNEDA) [1119721 1061553] +- [kernel] trace: Make register/unregister_ftrace_command __init (Takahiro MUNEDA) [1119721 1061553] +- [block] nvme: Initialize device reference count earlier (David Milburn) [1119720 1081734] +- [ata] ahci: accommodate tag ordered controller (David Milburn) [1117154 1083746] +- [s390] af_iucv: recvmsg problem for SOCK_STREAM sockets (Hendrik Brueckner) [1115585 1109703] +- [s390] af_iucv: correct cleanup if listen backlog is full (Hendrik Brueckner) [1115584 1109033] +- [mm] Revert: vmscan: do not swap anon pages just because free+file is low (Johannes Weiner) [1114938 1102991] +- [drm] nouveau/bios: fix a bit shift error introduced by recent commit (Ulrich Obergfell) [1114869 1089936] +- [ethernet] bnx2x: Adapter not recovery from EEH error injection (Michal Schmidt) [1107722 1067154] +- [kernel] auditsc: audit_krule mask accesses need bounds checking (Denys Vlasenko) [1102708 1102710] {CVE-2014-3917} +- [block] mtip32xx: mtip_async_complete() bug fixes (Jeff Moyer) [1125776 1102281] +- [block] mtip32xx: Unmap the DMA segments before completing the IO request (Jeff Moyer) [1125776 1102281] +- [net] l2tp: don't fall back on UDP [get|set]sockopt (Petr Matousek) [1119465 1119466] {CVE-2014-4943} +- [s390] ptrace: correct insufficient sanitization when setting psw mask (Hendrik Brueckner) [1114090 1113673] {CVE-2014-3534} * Wed Jul 09 2014 Phillip Lougher [3.10.0-123.6.1.el7] - [x86] ptrace: force IRET path after a ptrace_stop() (Oleg Nesterov) [1115934 1115935] {CVE-2014-4699}