Update to shim 15.8 in CentOS Stream 8
Resolves: RHEL-4391 Signed-off-by: Brian Stinson <bstinson@redhat.com>
This commit is contained in:
Brian Stinson
commit
dcebb53574
8
.gitignore
vendored
Normal file
8
.gitignore
vendored
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
*~
|
||||||
|
*.tar.*
|
||||||
|
*.rpm
|
||||||
|
.build*.log
|
||||||
|
.*.sw?
|
||||||
|
clog
|
||||||
|
rhtest.cer
|
||||||
|
shim-*/
|
||||||
1
sbat.centos.csv
Normal file
1
sbat.centos.csv
Normal file
@ -0,0 +1 @@
|
|||||||
|
shim.centos,3,The CentOS Project,shim,15.8,security@centos.org
|
||||||
|
BIN
secureboot-ca-x86_64.cer
Normal file
BIN
secureboot-ca-x86_64.cer
Normal file
Binary file not shown.
90
shim-find-debuginfo.sh
Executable file
90
shim-find-debuginfo.sh
Executable file
@ -0,0 +1,90 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
# shim-find-debuginfo.sh
|
||||||
|
# Copyright (C) 2017 Peter Jones <Peter Jones@random>
|
||||||
|
#
|
||||||
|
# Distributed under terms of the GPLv3 license.
|
||||||
|
#
|
||||||
|
set -e
|
||||||
|
set -u
|
||||||
|
|
||||||
|
mainarch=$1 && shift
|
||||||
|
if [ $# == 1 ]; then
|
||||||
|
altarch=$1 && shift
|
||||||
|
fi
|
||||||
|
if ! [ -v RPM_BUILD_ROOT ]; then
|
||||||
|
echo "RPM_BUILD_ROOT must be set" 1>&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
findsource()
|
||||||
|
{
|
||||||
|
(
|
||||||
|
cd ${RPM_BUILD_ROOT}
|
||||||
|
find usr/src/debug/ -type d | sed "s,^,%dir /,"
|
||||||
|
find usr/src/debug/ -type f | sed "s,^,/,"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
finddebug()
|
||||||
|
{
|
||||||
|
arch=$1 && shift
|
||||||
|
declare -a dirs=()
|
||||||
|
declare -a files=()
|
||||||
|
declare -a excludes=()
|
||||||
|
|
||||||
|
pushd ${RPM_BUILD_ROOT} >/dev/null 2>&1
|
||||||
|
for x in $(find usr/lib/debug/ -type f -iname *.efi.debug); do
|
||||||
|
if ! [ -e "${x}" ]; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
if [[ ${x} =~ ${arch}\.efi\.debug$ ]]; then
|
||||||
|
files[${#files[@]}]=${x}
|
||||||
|
else
|
||||||
|
excludes[${#excludes[@]}]=${x}
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
for x in usr/lib/debug/.build-id/*/*.debug ; do
|
||||||
|
if ! [ -e "${x}" ]; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
link=$(readlink "${x}")
|
||||||
|
if [[ ${link} =~ ${arch}\.efi\.debug$ ]]; then
|
||||||
|
files[${#files[@]}]=${x}
|
||||||
|
files[${#files[@]}]=${x%%.debug}
|
||||||
|
else
|
||||||
|
excludes[${#excludes[@]}]=${x}
|
||||||
|
excludes[${#excludes[@]}]=${x%%.debug}
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
for x in ${files[@]} ; do
|
||||||
|
declare name=$(dirname /${x})
|
||||||
|
while [ "${name}" != "/" ]; do
|
||||||
|
case "${name}" in
|
||||||
|
"/usr/lib/debug"|"/usr/lib"|"/usr")
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
dirs[${#dirs[@]}]=${name}
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
name=$(dirname ${name})
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
popd >/dev/null 2>&1
|
||||||
|
for x in ${dirs[@]} ; do
|
||||||
|
echo "%dir ${x}"
|
||||||
|
done | sort | uniq
|
||||||
|
for x in ${files[@]} ; do
|
||||||
|
echo "/${x}"
|
||||||
|
done | sort | uniq
|
||||||
|
for x in ${excludes[@]} ; do
|
||||||
|
echo "%exclude /${x}"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
findsource > build-${mainarch}/debugsource.list
|
||||||
|
finddebug ${mainarch} > build-${mainarch}/debugfiles.list
|
||||||
|
if [ -v altarch ]; then
|
||||||
|
finddebug ${altarch} > build-${altarch}/debugfiles.list
|
||||||
|
fi
|
||||||
260
shim-unsigned-x64.spec
Normal file
260
shim-unsigned-x64.spec
Normal file
@ -0,0 +1,260 @@
|
|||||||
|
%global pesign_vre 0.106-1
|
||||||
|
%global gnuefi_vre 1:3.0.5-6
|
||||||
|
%global openssl_vre 1.0.2j
|
||||||
|
|
||||||
|
%global debug_package %{nil}
|
||||||
|
%global __debug_package 1
|
||||||
|
%global _binaries_in_noarch_packages_terminate_build 0
|
||||||
|
%global __debug_install_post %{SOURCE100} x64 ia32
|
||||||
|
%undefine _debuginfo_subpackages
|
||||||
|
|
||||||
|
%global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/'))
|
||||||
|
%global shimrootdir %{_datadir}/shim/
|
||||||
|
%global shimversiondir %{shimrootdir}/%{version}-%{release}
|
||||||
|
%global efiarch x64
|
||||||
|
%global shimdir %{shimversiondir}/%{efiarch}
|
||||||
|
%global efialtarch ia32
|
||||||
|
%global shimaltdir %{shimversiondir}/%{efialtarch}
|
||||||
|
|
||||||
|
# currently here's what's in our dbx: nothing
|
||||||
|
%global dbxfile %{nil}
|
||||||
|
Name: shim-unsigned-%{efiarch}
|
||||||
|
Version: 15.8
|
||||||
|
Release: 1.el8.centos
|
||||||
|
Summary: First-stage UEFI bootloader
|
||||||
|
ExclusiveArch: x86_64
|
||||||
|
License: BSD
|
||||||
|
URL: https://github.com/rhboot/shim
|
||||||
|
Source0: https://github.com/rhboot/shim/releases/download/%{version}/shim-%{version}.tar.bz2
|
||||||
|
Source1: secureboot-ca-x86_64.cer
|
||||||
|
%if 0%{?dbxfile}
|
||||||
|
Source2: %{dbxfile}
|
||||||
|
%endif
|
||||||
|
Source3: sbat.centos.csv
|
||||||
|
Source4: shim.patches
|
||||||
|
|
||||||
|
Source100: shim-find-debuginfo.sh
|
||||||
|
|
||||||
|
%include %{SOURCE4}
|
||||||
|
|
||||||
|
BuildRequires: gcc make
|
||||||
|
BuildRequires: elfutils-libelf-devel
|
||||||
|
BuildRequires: git openssl-devel openssl
|
||||||
|
BuildRequires: pesign >= %{pesign_vre}
|
||||||
|
BuildRequires: dos2unix findutils
|
||||||
|
|
||||||
|
# Shim uses OpenSSL, but cannot use the system copy as the UEFI ABI is not
|
||||||
|
# compatible with SysV (there's no red zone under UEFI) and there isn't a
|
||||||
|
# POSIX-style C library.
|
||||||
|
# BuildRequires: OpenSSL
|
||||||
|
Provides: bundled(openssl) = %{openssl_vre}
|
||||||
|
|
||||||
|
%global desc \
|
||||||
|
Initial UEFI bootloader that handles chaining to a trusted full \
|
||||||
|
bootloader under secure boot environments.
|
||||||
|
%global debug_desc \
|
||||||
|
This package provides debug information for package %{expand:%%{name}} \
|
||||||
|
Debug information is useful when developing applications that \
|
||||||
|
use this package or when debugging this package.
|
||||||
|
|
||||||
|
%description
|
||||||
|
%desc
|
||||||
|
|
||||||
|
%package -n shim-unsigned-%{efialtarch}
|
||||||
|
Summary: First-stage UEFI bootloader (unsigned data)
|
||||||
|
Provides: bundled(openssl) = %{openssl_vre}
|
||||||
|
|
||||||
|
%description -n shim-unsigned-%{efialtarch}
|
||||||
|
%desc
|
||||||
|
|
||||||
|
%package debuginfo
|
||||||
|
Summary: Debug information for shim-unsigned-%{efiarch}
|
||||||
|
Requires: %{name}-debugsource = %{version}-%{release}
|
||||||
|
Group: Development/Debug
|
||||||
|
AutoReqProv: 0
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description debuginfo
|
||||||
|
%debug_desc
|
||||||
|
|
||||||
|
%package -n shim-unsigned-%{efialtarch}-debuginfo
|
||||||
|
Summary: Debug information for shim-unsigned-%{efialtarch}
|
||||||
|
Group: Development/Debug
|
||||||
|
Requires: %{name}-debugsource = %{version}-%{release}
|
||||||
|
AutoReqProv: 0
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description -n shim-unsigned-%{efialtarch}-debuginfo
|
||||||
|
%debug_desc
|
||||||
|
|
||||||
|
%package debugsource
|
||||||
|
Summary: Debug Source for shim-unsigned
|
||||||
|
Group: Development/Debug
|
||||||
|
AutoReqProv: 0
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description debugsource
|
||||||
|
%debug_desc
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup -S git_am -n shim-%{version}
|
||||||
|
git config --unset user.email
|
||||||
|
git config --unset user.name
|
||||||
|
mkdir build-%{efiarch}
|
||||||
|
mkdir build-%{efialtarch}
|
||||||
|
cp %{SOURCE3} data/
|
||||||
|
|
||||||
|
%build
|
||||||
|
COMMITID=$(cat commit)
|
||||||
|
MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMITID} "
|
||||||
|
MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} "
|
||||||
|
MAKEFLAGS+="ENABLE_SHIM_HASH=true "
|
||||||
|
MAKEFLAGS+="SBAT_AUTOMATIC_DATE=2023012900 "
|
||||||
|
MAKEFLAGS+="%{_smp_mflags}"
|
||||||
|
if [ -f "%{SOURCE1}" ]; then
|
||||||
|
MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1}"
|
||||||
|
fi
|
||||||
|
%if 0%{?dbxfile}
|
||||||
|
if [ -f "%{SOURCE2}" ]; then
|
||||||
|
MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2}"
|
||||||
|
fi
|
||||||
|
%endif
|
||||||
|
|
||||||
|
cd build-%{efiarch}
|
||||||
|
make ${MAKEFLAGS} \
|
||||||
|
DEFAULT_LOADER='\\\\grub%{efiarch}.efi' \
|
||||||
|
all
|
||||||
|
cd ..
|
||||||
|
|
||||||
|
cd build-%{efialtarch}
|
||||||
|
setarch linux32 -B make ${MAKEFLAGS} ARCH=%{efialtarch} \
|
||||||
|
DEFAULT_LOADER='\\\\grub%{efialtarch}.efi' \
|
||||||
|
all
|
||||||
|
cd ..
|
||||||
|
|
||||||
|
%install
|
||||||
|
COMMITID=$(cat commit)
|
||||||
|
MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMITID} "
|
||||||
|
MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} "
|
||||||
|
MAKEFLAGS+="ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true "
|
||||||
|
MAKEFLAGS+="SBAT_AUTOMATIC_DATE=2023012900 "
|
||||||
|
if [ -f "%{SOURCE1}" ]; then
|
||||||
|
MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1}"
|
||||||
|
fi
|
||||||
|
%if 0%{?dbxfile}
|
||||||
|
if [ -f "%{SOURCE2}" ]; then
|
||||||
|
MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2}"
|
||||||
|
fi
|
||||||
|
%endif
|
||||||
|
|
||||||
|
cd build-%{efiarch}
|
||||||
|
make ${MAKEFLAGS} \
|
||||||
|
DEFAULT_LOADER='\\\\grub%{efiarch}.efi' \
|
||||||
|
DESTDIR=${RPM_BUILD_ROOT} \
|
||||||
|
install-as-data install-debuginfo install-debugsource
|
||||||
|
cd ..
|
||||||
|
|
||||||
|
cd build-%{efialtarch}
|
||||||
|
setarch linux32 make ${MAKEFLAGS} ARCH=%{efialtarch} \
|
||||||
|
DEFAULT_LOADER='\\\\grub%{efialtarch}.efi' \
|
||||||
|
DESTDIR=${RPM_BUILD_ROOT} \
|
||||||
|
install-as-data install-debuginfo install-debugsource
|
||||||
|
cd ..
|
||||||
|
|
||||||
|
%files
|
||||||
|
%license COPYRIGHT
|
||||||
|
%dir %{shimrootdir}
|
||||||
|
%dir %{shimversiondir}
|
||||||
|
%dir %{shimdir}
|
||||||
|
%{shimdir}/*.CSV
|
||||||
|
%{shimdir}/*.efi
|
||||||
|
%{shimdir}/*.hash
|
||||||
|
|
||||||
|
%files -n shim-unsigned-%{efialtarch}
|
||||||
|
%license COPYRIGHT
|
||||||
|
%dir %{shimrootdir}
|
||||||
|
%dir %{shimversiondir}
|
||||||
|
%dir %{shimaltdir}
|
||||||
|
%{shimaltdir}/*.CSV
|
||||||
|
%{shimaltdir}/*.efi
|
||||||
|
%{shimaltdir}/*.hash
|
||||||
|
|
||||||
|
%files debuginfo -f build-%{efiarch}/debugfiles.list
|
||||||
|
|
||||||
|
%files -n shim-unsigned-%{efialtarch}-debuginfo -f build-%{efialtarch}/debugfiles.list
|
||||||
|
|
||||||
|
%files debugsource -f build-%{efiarch}/debugsource.list
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Thu Feb 08 2024 Brian Stinson <bstinson@redhat.com> - 15.8-1.el8.centos
|
||||||
|
- Update to shim-15.8
|
||||||
|
Resolves: RHEL-4391
|
||||||
|
|
||||||
|
* Wed Jun 01 2022 Peter Jones <pjones@redhat.com> - 15.6-1.el8
|
||||||
|
- Update to shim-15.6
|
||||||
|
Resolves: CVE-2022-28737
|
||||||
|
|
||||||
|
* Thu Sep 17 2020 Peter Jones <pjones@redhat.com> - 15-9.el8
|
||||||
|
- Fix an incorrect allocation size.
|
||||||
|
Related: rhbz#1877253
|
||||||
|
|
||||||
|
* Thu Jul 30 2020 Peter Jones <pjones@redhat.com> - 15-8
|
||||||
|
- Fix a load-address-dependent forever loop.
|
||||||
|
Resolves: rhbz#1861977
|
||||||
|
Related: CVE-2020-10713
|
||||||
|
Related: CVE-2020-14308
|
||||||
|
Related: CVE-2020-14309
|
||||||
|
Related: CVE-2020-14310
|
||||||
|
Related: CVE-2020-14311
|
||||||
|
Related: CVE-2020-15705
|
||||||
|
Related: CVE-2020-15706
|
||||||
|
Related: CVE-2020-15707
|
||||||
|
|
||||||
|
* Sat Jul 25 2020 Peter Jones <pjones@redhat.com> - 15-7
|
||||||
|
- Implement Lenny's workaround
|
||||||
|
Related: CVE-2020-10713
|
||||||
|
Related: CVE-2020-14308
|
||||||
|
Related: CVE-2020-14309
|
||||||
|
Related: CVE-2020-14310
|
||||||
|
Related: CVE-2020-14311
|
||||||
|
|
||||||
|
* Fri Jul 24 2020 Peter Jones <pjones@redhat.com> - 15-5
|
||||||
|
- Once more with the MokListRT config table patch added.
|
||||||
|
Related: CVE-2020-10713
|
||||||
|
Related: CVE-2020-14308
|
||||||
|
Related: CVE-2020-14309
|
||||||
|
Related: CVE-2020-14310
|
||||||
|
Related: CVE-2020-14311
|
||||||
|
|
||||||
|
* Thu Jul 23 2020 Peter Jones <pjones@redhat.com> - 15-4
|
||||||
|
- Rebuild for bug fixes and new signing keys
|
||||||
|
Related: CVE-2020-10713
|
||||||
|
Related: CVE-2020-14308
|
||||||
|
Related: CVE-2020-14309
|
||||||
|
Related: CVE-2020-14310
|
||||||
|
Related: CVE-2020-14311
|
||||||
|
|
||||||
|
* Wed Jun 05 2019 Javier Martinez Canillas <javierm@redhat.com> - 15-3
|
||||||
|
- Make EFI variable copying fatal only on secureboot enabled systems
|
||||||
|
Resolves: rhbz#1715878
|
||||||
|
- Fix booting shim from an EFI shell using a relative path
|
||||||
|
Resolves: rhbz#1717064
|
||||||
|
|
||||||
|
* Tue Feb 12 2019 Peter Jones <pjones@redhat.com> - 15-2
|
||||||
|
- Fix MoK mirroring issue which breaks kdump without intervention
|
||||||
|
Related: rhbz#1668966
|
||||||
|
|
||||||
|
* Fri Jul 20 2018 Peter Jones <pjones@redhat.com> - 15-1
|
||||||
|
- Update to shim 15
|
||||||
|
|
||||||
|
* Tue Sep 19 2017 Peter Jones <pjones@redhat.com> - 13-3
|
||||||
|
- Actually update to the *real* 13 final.
|
||||||
|
Related: rhbz#1489604
|
||||||
|
|
||||||
|
* Thu Aug 31 2017 Peter Jones <pjones@redhat.com> - 13-2
|
||||||
|
- Actually update to 13 final.
|
||||||
|
|
||||||
|
* Fri Aug 18 2017 Peter Jones <pjones@redhat.com> - 13-1
|
||||||
|
- Make a new shim-unsigned-x64 package like the shim-unsigned-aarch64 one.
|
||||||
|
- This will (eventually) supersede what's in the "shim" package so we can
|
||||||
|
make "shim" hold the signed one, which will confuse fewer people.
|
||||||
0
shim.patches
Normal file
0
shim.patches
Normal file
Loading…
Reference in New Issue
Block a user