From 410c5392a10901271cf46df7f7860df695ad8cd4 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 21 Dec 2023 13:28:44 +0300 Subject: [PATCH] Revert EuroLinux modifications --- SPECS/kernel.spec | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 8547fa8..dffc937 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -622,15 +622,6 @@ Summary: The Linux kernel %define kernel_prereq coreutils, systemd >= 203-2, /usr/bin/kernel-install %define initrd_prereq dracut >= 027 -# EuroLinux override -# Normaly this should be done in rpmmacros, but because the packages must be rebuildable with beast -# we have to change this here - -%define with_doc 1 -%global signkernel 0 -%global signmodules 0 - -# End of EuroLinux override Name: kernel License: GPLv2 and Redistributable, no modification permitted @@ -1254,11 +1245,11 @@ Summary: gcov graph and source files for coverage data collection.\ %{nil} %package -n kernel-abi-stablelists -Summary: The EuroLinux kernel ABI symbol stablelists +Summary: The Red Hat Enterprise Linux kernel ABI symbol stablelists AutoReqProv: no %description -n kernel-abi-stablelists -The kABI package contains information pertaining to the EuroLinux -kernel ABI, including lists of kernel symbols that are needed by +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. %if %{with_kabidw_base} @@ -1267,8 +1258,8 @@ Summary: The baseline dataset for kABI verification using DWARF data Group: System Environment/Kernel AutoReqProv: no %description kernel-kabidw-base-internal -The package contains data describing the current ABI of the EuroLinux -kernel, suitable for the kabi-dw tool. +The package contains data describing the current ABI of the Red Hat Enterprise +Linux kernel, suitable for the kabi-dw tool. %endif # @@ -1799,7 +1790,7 @@ done # Adjust FIPS module name for RHEL %if 0%{?rhel} for i in *.config; do - sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME="EuroLinux %{rhel} - Kernel Cryptographic API"/' $i + sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME="Red Hat Enterprise Linux %{rhel} - Kernel Cryptographic API"/' $i done %endif @@ -3763,8 +3754,6 @@ fi # # %changelog -* Tue Dec 19 2023 EuroLinux Autopatch - * Fri Nov 24 2023 Jan Stancek [5.14.0-362.13.1.el9_3] - cifs: Fix UAF in cifs_demultiplex_thread() (Scott Mayhew) [RHEL-15169 RHEL-15173 RHEL-15170 RHEL-15174] {CVE-2023-1192} - iommu: Optimise PCI SAC address trick (Jerry Snitselaar) [RHEL-15381 RHEL-11705]