diff --git a/.gitignore b/.gitignore
index b4b9901..9116531 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/linux-3.10.0-123.4.4.el7.tar.xz
+SOURCES/linux-3.10.0-123.6.3.el7.tar.xz
SOURCES/rheldup3.x509
SOURCES/rhelkpatch1.x509
diff --git a/.kernel.metadata b/.kernel.metadata
index a6a153a..775d220 100644
--- a/.kernel.metadata
+++ b/.kernel.metadata
@@ -1 +1,3 @@
-ea88307597ba3e603982b64c29e23f5f8bb513fe SOURCES/linux-3.10.0-123.4.4.el7.tar.xz
+651cb172983e94bd5c07d7f206aef8d748f5abbb SOURCES/linux-3.10.0-123.6.3.el7.tar.xz
+95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
+d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509
diff --git a/SOURCES/Makefile.common b/SOURCES/Makefile.common
index 03afd2c..d3b4294 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.4.4
+BUILD:=123.6.3
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/centos.cer b/SOURCES/centos.cer
deleted file mode 100644
index 00a5580..0000000
Binary files a/SOURCES/centos.cer 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 <jperrin@centos.org>
-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 <jperrin@centos.org>
-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 adfb65d..04ebea4 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.4.4.el7
+%define pkgrelease 123.6.3.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
@@ -366,11 +367,6 @@ Source72: kernel-%{version}-s390x-kdump.config
Source2000: cpupower.service
Source2001: cpupower.config
-# branding patches
-Patch1001: debrand-single-cpu.patch
-Patch1002: debrand-rh_taint.patch
-Patch1003: debrand-rh-i686-cpu.patch
-
# empty final patch to facilitate testing of kernel patches
Patch999999: linux-kernel-test.patch
@@ -525,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.
@@ -672,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.
@@ -829,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
@@ -1484,19 +1474,45 @@ fi
%kernel_variant_files %{with_kdump} kdump
%changelog
-* Thu Jul 24 2014 Johnny Hughes <johnny@centos.org> [3.10.0-123.4.4.el7]
-- Add in CentOS SecureBoot certs
-- Add in debranding changes
-- Add in CentOS kdump and driver update certs
-- Modifications to remove Red Hat branding from spec file
+* Wed Jul 16 2014 Phillip Lougher <plougher@redhat.com> [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 16 2014 Phillip Lougher <plougher@redhat.com> [3.10.0-123.4.4.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 <plougher@redhat.com> [3.10.0-123.6.2.el7]
+- [s390] ptrace: correct insufficient sanitization when setting psw mask (Hendrik Brueckner) [1114090 1113673]
-* Thu Jul 10 2014 Phillip Lougher <plougher@redhat.com> [3.10.0-123.4.3.el7]
+* Wed Jul 09 2014 Phillip Lougher <plougher@redhat.com> [3.10.0-123.6.1.el7]
- [x86] ptrace: force IRET path after a ptrace_stop() (Oleg Nesterov) [1115934 1115935] {CVE-2014-4699}
-* Thu Jun 05 2014 Phillip Lougher <plougher@redhat.com> [3.10.0-123.4.2.el7]
+* Wed Jul 02 2014 Phillip Lougher <plougher@redhat.com> [3.10.0-123.5.1.el7]
+- [net] ipv4/tunnels: fix an oops when using ipip/sit with IPsec (Jiri Pirko) [1114957 1108857]
+- [scsi] Add timeout to avoid infinite command retry (Ewan Milne) [1114468 1061871]
+- [net] filter: let bpf_tell_extensions return SKF_AD_MAX (Jiri Benc) [1114404 1079524]
+- [net] filter: introduce SO_BPF_EXTENSIONS (Jiri Benc) [1114404 1079524]
+- [net] sctp: Fix sk_ack_backlog wrap-around problem (Daniel Borkmann) [1113971 1112726] {CVE-2014-4667}
+- [tty] Set correct tty name in 'active' sysfs attribute (Denys Vlasenko) [1113467 1066403]
+- [powerpc] tm: Disable IRQ in tm_recheckpoint (Larry Woodman) [1113150 1088224]
+- [scsi] qla2xxx: Update version number to 8.06.00.08.07.0-k3 (Chad Dupuis) [1112389 1090378]
+- [scsi] qla2xxx: Reduce the time we wait for a command to complete during SCSI error handling (Chad Dupuis) [1112389 1090378]
+- [scsi] qla2xxx: Clear loop_id for ports that are marked lost during fabric scanning (Chad Dupuis) [1112389 1090378]
+- [scsi] qla2xxx: Avoid escalating the SCSI error handler if the command is not found in firmware (Chad Dupuis) [1112389 1090378]
+- [scsi] qla2xxx: Don't check for firmware hung during the reset context for ISP82XX (Chad Dupuis) [1112389 1090378]
+- [scsi] qla2xxx: Issue abort command for outstanding commands during cleanup when only firmware is alive (Chad Dupuis) [1112389 1090378]
+- [fs] nfs: Apply NFS_MOUNT_CMP_FLAGMASK to nfs_compare_remount_data() (Scott Mayhew) [1109407 1103805]
+- [ethernet] bnx2x: Fix kernel crash and data miscompare after EEH recovery (Michal Schmidt) [1107721 1101808]
+- [net] gro: restore frag0 optimization (and fix crash) (Michal Schmidt) [1099950 1069741]
+- [watchdog] hpwdt: display informative string (Nigel Croxon) [1096961 1074038]
+- [net] Use netlink_ns_capable to verify the permisions of netlink messages (Jiri Benc) [1094271 1094272] {CVE-2014-0181}
+- [net] netlink: Add variants of capable for use on netlink messages (Jiri Benc) [1094271 1094272] {CVE-2014-0181}
+- [net] diag: Move the permission check in sock_diag_put_filterinfo to packet_diag_dump (Jiri Benc) [1094271 1094272] {CVE-2014-0181}
+- [net] netlink: Rename netlink_capable netlink_allowed (Jiri Benc) [1094271 1094272] {CVE-2014-0181}
+- [net] diag: Fix ns_capable check in sock_diag_put_filterinfo (Jiri Benc) [1094271 1094272] {CVE-2014-0181}
+- [net] netlink: Fix permission check in netlink_connect() (Jiri Benc) [1094271 1094272] {CVE-2014-0181}
+- [kernel] cputime: Fix jiffies based cputime assumption on steal accounting (Frederic Weisbecker) [1090974 1047732]
+- [kernel] cputime: Bring cputime -> nsecs conversion (Frederic Weisbecker) [1090974 1047732]
+- [kernel] cputime: Default implementation of nsecs -> cputime conversion (Frederic Weisbecker) [1090974 1047732]
+- [net] mac80211: fix crash due to AP powersave TX vs. wakeup race (Jacob Tanenbaum) [1083533 1083534] {CVE-2014-2706}
+- [wireless] ath9k: tid->sched race in ath_tx_aggr_sleep() (Jacob Tanenbaum) [1083251 1083252] {CVE-2014-2672}
+- [powerpc] tm: Fix crash when forking inside a transaction (Radomir Vrbovsky) [1083214 1083215] {CVE-2014-2673}
- [fs] aio: fix plug memory disclosure and fix reqs_active accounting backport (Jeff Moyer) [1094604 1094605] {CVE-2014-0206}
- [fs] aio: plug memory disclosure and fix reqs_active accounting (Mateusz Guzik) [1094604 1094605] {CVE-2014-0206}