From 275635d050052437cf8731f3dfb562f60ab0c189 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Aug 06 2014 17:08:20 +0000
Subject: roll in more branding changes


---

diff --git a/.gitignore b/.gitignore
index bbf80d2..d907264 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
 SOURCES/linux-3.10.0-123.6.3.el7.tar.xz
-SOURCES/rheldup3.x509
-SOURCES/rhelkpatch1.x509
 SOURCES/centos.cer
diff --git a/.kernel.metadata b/.kernel.metadata
index a910e26..b1295a8 100644
--- a/.kernel.metadata
+++ b/.kernel.metadata
@@ -1,4 +1,2 @@
 651cb172983e94bd5c07d7f206aef8d748f5abbb SOURCES/linux-3.10.0-123.6.3.el7.tar.xz
-95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
-d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509
 6e9105eb51e55a46761838f289a917611cad8091 SOURCES/centos.cer
diff --git a/SOURCES/centos-kpatch.x509 b/SOURCES/centos-kpatch.x509
new file mode 100644
index 0000000..ca57a43
Binary files /dev/null and b/SOURCES/centos-kpatch.x509 differ
diff --git a/SOURCES/centos-ldup.x509 b/SOURCES/centos-ldup.x509
new file mode 100644
index 0000000..9c65dd3
Binary files /dev/null and b/SOURCES/centos-ldup.x509 differ
diff --git a/SOURCES/secureboot.cer b/SOURCES/secureboot.cer
deleted file mode 100644
index 4ff8b79..0000000
Binary files a/SOURCES/secureboot.cer and /dev/null differ
diff --git a/SOURCES/securebootca.cer b/SOURCES/securebootca.cer
deleted file mode 100644
index b235400..0000000
Binary files a/SOURCES/securebootca.cer and /dev/null differ
diff --git a/SOURCES/x509.genkey b/SOURCES/x509.genkey
index b1bbe38..d98f8fe 100644
--- a/SOURCES/x509.genkey
+++ b/SOURCES/x509.genkey
@@ -5,9 +5,9 @@ prompt = no
 x509_extensions = myexts
 
 [ req_distinguished_name ]
-O = Red Hat
-CN = Red Hat Enterprise Linux kernel signing key
-emailAddress = secalert@redhat.com
+O = CentOS
+CN = CentOS Linux kernel signing key
+emailAddress = security@centos.org
 
 [ myexts ]
 basicConstraints=critical,CA:FALSE
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index cff1452..d738cca 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -339,9 +339,8 @@ Source10: sign-modules
 Source11: x509.genkey
 Source12: extra_certificates
 Source13: centos.cer
-Source14: secureboot.cer
-Source15: rheldup3.x509
-Source16: rhelkpatch1.x509
+Source15: centos-ldup.x509 
+Source16: centos-kpatch.x509
 
 Source18: check-kabi
 
@@ -369,8 +368,9 @@ Source2001: cpupower.config
 
 # empty final patch to facilitate testing of kernel patches
 Patch999999: linux-kernel-test.patch
-Patch1001:	debrand-rh_taint.patch
 Patch1000:	debrand-single-cpu.patch
+Patch1001:	debrand-rh_taint.patch
+Patch1002:	debrand-rh-i686-cpu.patch
 
 BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
 
@@ -523,11 +523,11 @@ This package provides debug information for package kernel-tools.
 %endif # with_tools
 
 %package -n kernel-abi-whitelists
-Summary: The Red Hat Enterprise Linux kernel ABI symbol whitelists
+Summary: The CentOS Linux kernel ABI symbol whitelists
 Group: System Environment/Kernel
 AutoReqProv: no
 %description -n kernel-abi-whitelists
-The kABI package contains information pertaining to the Red Hat Enterprise
+The kABI package contains information pertaining to the CentOS
 Linux kernel ABI, including lists of kernel symbols that are needed by
 external Linux kernel modules, and a yum plugin to aid enforcement.
 
@@ -673,6 +673,7 @@ 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
@@ -826,7 +827,7 @@ BuildKernel() {
     fi
 # EFI SecureBoot signing, x86_64-only
 %ifarch x86_64
-    %pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE13} -c %{SOURCE13} -n redhatsecureboot301
+    %pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE13} -c %{SOURCE13}
     mv $KernelImage.signed $KernelImage
 %endif
     $CopyKernel $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer
@@ -1481,8 +1482,8 @@ fi
 %kernel_variant_files %{with_kdump} kdump
 
 %changelog
-* Wed Aug 06 2014 CentOS Sources <bugs@centos.org> - 3.10.0-123.6.3.el7
-- Apply debranding changes
+* Wed Aug 06 2014 Johnny Hughes <johnny@centos.org> - 3.10.0-123.6.3.el7
+- Additional debranding changes
 
 * Wed Aug 06 2014 CentOS Sources <bugs@centos.org> - 3.10.0-123.6.3.el7
 - Apply debranding changes