Compare commits
4 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
50ea135003 | ||
|
|
93b532e80b | ||
|
|
b3ee67bad0 | ||
|
|
7683e147ff |
11 changed files with 63 additions and 196 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,5 +1,4 @@
|
|||
*~
|
||||
*.sh
|
||||
*.tar.*
|
||||
*.rpm
|
||||
.build*.log
|
||||
|
|
|
|||
BIN
dbx.esl
Normal file
BIN
dbx.esl
Normal file
Binary file not shown.
Binary file not shown.
BIN
fedora-ca.cer
Normal file
BIN
fedora-ca.cer
Normal file
Binary file not shown.
|
|
@ -1,41 +0,0 @@
|
|||
# rpminspect configuration
|
||||
|
||||
---
|
||||
common:
|
||||
workdir: /var/tmp/rpminspect
|
||||
profiledir: /usr/share/rpminspect/profiles/fedora
|
||||
koji:
|
||||
hub: https://koji.fedoraproject.org/kojihub
|
||||
download_ursine: https://kojipkgs.fedoraproject.org
|
||||
download_mbs: https://kojipkgs.fedoraproject.org
|
||||
commands:
|
||||
msgunfmt: msgunfmt
|
||||
desktop-file-validate: desktop-file-validate
|
||||
abidiff: abidiff
|
||||
kmidiff: kmidiff
|
||||
annocheck: annocheck
|
||||
udevadm: udevadm
|
||||
vendor:
|
||||
vendor_data_dir: /usr/share/rpminspect
|
||||
licensedb:
|
||||
- /usr/share/fedora-license-data/licenses/fedora-licenses.json
|
||||
favor_release: newest
|
||||
inspections:
|
||||
abidiff: off
|
||||
disttag: off
|
||||
manpage: off
|
||||
javabytecode: off
|
||||
metadata:
|
||||
# Required Vendor string. This is part of the RPM header and is
|
||||
# the value expected in packages checked by rpminspect.
|
||||
vendor: Fedora Project
|
||||
|
||||
# Allowed build host subdomain. The RPM header contains information about
|
||||
# where the package was built. rpminspect verifies the hostnames are in
|
||||
# the expected subdomain listed below.
|
||||
#
|
||||
# This is an array of allowed subdomains.
|
||||
buildhost_subdomain:
|
||||
- .fedoraproject.org
|
||||
- .bos.redhat.com
|
||||
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
shim.rh,3,The Fedora Project,shim,15.8,https://src.fedoraproject.org/rpms/shim-unsigned-x64
|
||||
shim.redhat,3,The Fedora Project,shim,15.8,https://src.fedoraproject.org/rpms/shim-unsigned-x64
|
||||
shim.fedora,3,The Fedora Project,shim,15.8,https://src.fedoraproject.org/rpms/shim-unsigned-x64
|
||||
|
|
|
@ -20,9 +20,9 @@ fi
|
|||
findsource()
|
||||
{
|
||||
(
|
||||
cd "${RPM_BUILD_ROOT}"
|
||||
find usr/src/debug/ -type d | sed -e "s,^,%dir /," | sort -u | tac
|
||||
find usr/src/debug/ -type f | sed -e "s,^,/," | sort -u | tac
|
||||
cd ${RPM_BUILD_ROOT}
|
||||
find usr/src/debug/ -type d | sed "s,^,%dir /,"
|
||||
find usr/src/debug/ -type f | sed "s,^,/,"
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -32,12 +32,9 @@ finddebug()
|
|||
declare -a dirs=()
|
||||
declare -a files=()
|
||||
declare -a excludes=()
|
||||
declare -a tmp=()
|
||||
|
||||
pushd "${RPM_BUILD_ROOT}" >/dev/null 2>&1
|
||||
|
||||
mapfile -t tmp < <(find usr/lib/debug/ -type f -iname "*.efi.debug")
|
||||
for x in "${tmp[@]}" ; do
|
||||
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
|
||||
|
|
@ -60,10 +57,8 @@ finddebug()
|
|||
excludes[${#excludes[@]}]=${x%%.debug}
|
||||
fi
|
||||
done
|
||||
for x in "${files[@]}" ; do
|
||||
declare name
|
||||
|
||||
name=$(dirname "/${x}")
|
||||
for x in ${files[@]} ; do
|
||||
declare name=$(dirname /${x})
|
||||
while [ "${name}" != "/" ]; do
|
||||
case "${name}" in
|
||||
"/usr/lib/debug"|"/usr/lib"|"/usr")
|
||||
|
|
@ -72,24 +67,24 @@ finddebug()
|
|||
dirs[${#dirs[@]}]=${name}
|
||||
;;
|
||||
esac
|
||||
name=$(dirname "${name}")
|
||||
name=$(dirname ${name})
|
||||
done
|
||||
done
|
||||
|
||||
popd >/dev/null 2>&1
|
||||
for x in "${dirs[@]}" ; do
|
||||
for x in ${dirs[@]} ; do
|
||||
echo "%dir ${x}"
|
||||
done | sort | uniq
|
||||
for x in "${files[@]}" ; do
|
||||
for x in ${files[@]} ; do
|
||||
echo "/${x}"
|
||||
done | sort | uniq
|
||||
for x in "${excludes[@]}" ; do
|
||||
for x in ${excludes[@]} ; do
|
||||
echo "%exclude /${x}"
|
||||
done
|
||||
}
|
||||
|
||||
findsource > "build-${mainarch}/debugsource.list"
|
||||
finddebug "${mainarch}" > "build-${mainarch}/debugfiles.list"
|
||||
findsource > build-${mainarch}/debugsource.list
|
||||
finddebug ${mainarch} > build-${mainarch}/debugfiles.list
|
||||
if [ -v altarch ]; then
|
||||
finddebug "${altarch}" > "build-${altarch}/debugfiles.list"
|
||||
finddebug ${altarch} > build-${altarch}/debugfiles.list
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
%global pesign_vre 0.106-1
|
||||
%global gnuefi_vre 1:3.0.5-6
|
||||
%global openssl_vre 1.0.2j
|
||||
|
||||
# For prereleases, % global prerelease rc2, and downpatch Makefile
|
||||
%if %{defined prerelease}
|
||||
%global dashpre -%{prerelease}
|
||||
%global dotpre .%{prerelease}
|
||||
%global tildepre ~%{prerelease}
|
||||
%global zdpd 0%{dotpre}.
|
||||
%endif
|
||||
%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/
|
||||
|
|
@ -17,39 +16,32 @@
|
|||
%global efialtarch ia32
|
||||
%global shimaltdir %{shimversiondir}/%{efialtarch}
|
||||
|
||||
%global debug_package %{nil}
|
||||
%global __debug_package 1
|
||||
%global _binaries_in_noarch_packages_terminate_build 0
|
||||
%global __debug_install_post %{SOURCE100} %{efiarch} %{efialtarch}
|
||||
%undefine _debuginfo_subpackages
|
||||
|
||||
# currently here's what's in our dbx: nothing
|
||||
%global dbxfile %{nil}
|
||||
|
||||
Name: shim-unsigned-%{efiarch}
|
||||
Version: 15.8
|
||||
Release: 2
|
||||
Version: 13
|
||||
Release: 3%{?dist}
|
||||
Summary: First-stage UEFI bootloader
|
||||
ExclusiveArch: x86_64
|
||||
License: BSD-2-Clause AND OpenSSL
|
||||
License: BSD
|
||||
URL: https://github.com/rhboot/shim
|
||||
Source0: https://github.com/rhboot/shim/releases/download/%{version}%{?dashpre}/shim-%{version}%{?dotpre}.tar.bz2
|
||||
Source1: fedora-ca-20200709.cer
|
||||
%if 0%{?dbxfile}
|
||||
Source2: %{dbxfile}
|
||||
%endif
|
||||
Source3: sbat.redhat.csv
|
||||
Source4: shim.patches
|
||||
Source0: https://github.com/rhboot/shim/releases/download/%{version}/shim-%{version}.tar.bz2
|
||||
Source1: fedora-ca.cer
|
||||
# currently here's what's in our dbx:
|
||||
# grub2-efi-2.00-11.fc18.x86_64:
|
||||
# grubx64.efi 6ac839881e73504047c06a1aac0c4763408ecb3642783c8acf77a2d393ea5cd7
|
||||
# gcdx64.efi 065cd63bab696ad2f4732af9634d66f2c0d48f8a3134b8808750d378550be151
|
||||
# grub2-efi-2.00-11.fc19.x86_64:
|
||||
# grubx64.efi 49ece9a10a9403b32c8e0c892fd9afe24a974323c96f2cc3dd63608754bf9b45
|
||||
# gcdx64.efi 99fcaa957786c155a92b40be9c981c4e4685b8c62b408cb0f6cb2df9c30b9978
|
||||
# woops.
|
||||
Source2: dbx.esl
|
||||
|
||||
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
|
||||
BuildRequires: gnu-efi >= %{gnuefi_vre}
|
||||
BuildRequires: gnu-efi-devel >= %{gnuefi_vre}
|
||||
|
||||
# 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
|
||||
|
|
@ -77,6 +69,8 @@ Provides: bundled(openssl) = %{openssl_vre}
|
|||
|
||||
%package debuginfo
|
||||
Summary: Debug information for shim-unsigned-%{efiarch}
|
||||
Requires: %{name}-debugsource = %{version}-%{release}
|
||||
Group: Development/Debug
|
||||
AutoReqProv: 0
|
||||
BuildArch: noarch
|
||||
|
||||
|
|
@ -85,6 +79,8 @@ BuildArch: noarch
|
|||
|
||||
%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
|
||||
|
||||
|
|
@ -93,6 +89,7 @@ BuildArch: noarch
|
|||
|
||||
%package debugsource
|
||||
Summary: Debug Source for shim-unsigned
|
||||
Group: Development/Debug
|
||||
AutoReqProv: 0
|
||||
BuildArch: noarch
|
||||
|
||||
|
|
@ -100,70 +97,57 @@ BuildArch: noarch
|
|||
%debug_desc
|
||||
|
||||
%prep
|
||||
%autosetup -S git_am -n shim-%{version}
|
||||
%autosetup -S git -n shim-%{version}
|
||||
git config --unset user.email
|
||||
git config --unset user.name
|
||||
mkdir build-%{efiarch}
|
||||
mkdir build-%{efialtarch}
|
||||
cp %{SOURCE3} data/
|
||||
|
||||
%build
|
||||
COMMIT_ID=5914984a1ffeab841f482c791426d7ca9935a5e6
|
||||
MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMIT_ID=${COMMIT_ID} "
|
||||
COMMITID=$(cat commit)
|
||||
MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMITID} "
|
||||
MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} "
|
||||
MAKEFLAGS+="ENABLE_SHIM_HASH=true "
|
||||
MAKEFLAGS+=" %{_smp_mflags} "
|
||||
MAKEFLAGS+="ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true "
|
||||
MAKEFLAGS+="%{_smp_mflags}"
|
||||
if [ -f "%{SOURCE1}" ]; then
|
||||
MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1} "
|
||||
MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1}"
|
||||
fi
|
||||
%if 0%{?dbxfile}
|
||||
if [ -f "%{SOURCE2}" ]; then
|
||||
MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2} "
|
||||
MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2}"
|
||||
fi
|
||||
%endif
|
||||
|
||||
cd build-%{efiarch}
|
||||
make ${MAKEFLAGS} \
|
||||
DEFAULT_LOADER='\\\\grub%{efiarch}.efi' \
|
||||
all
|
||||
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
|
||||
setarch linux32 -B make ${MAKEFLAGS} ARCH=%{efialtarch} DEFAULT_LOADER='\\\\grub%{efialtarch}.efi' all
|
||||
cd ..
|
||||
|
||||
%install
|
||||
COMMIT_ID=5914984a1ffeab841f482c791426d7ca9935a5e6
|
||||
MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMIT_ID=${COMMIT_ID} "
|
||||
COMMITID=$(cat commit)
|
||||
MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMITID} "
|
||||
MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} "
|
||||
MAKEFLAGS+="ENABLE_SHIM_HASH=true "
|
||||
MAKEFLAGS+="ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true "
|
||||
if [ -f "%{SOURCE1}" ]; then
|
||||
MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1} "
|
||||
MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1}"
|
||||
fi
|
||||
%if 0%{?dbxfile}
|
||||
if [ -f "%{SOURCE2}" ]; then
|
||||
MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2} "
|
||||
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
|
||||
install -m 0644 BOOT*.CSV "${RPM_BUILD_ROOT}/%{shimdir}/"
|
||||
cd ..
|
||||
|
||||
cd build-%{efialtarch}
|
||||
setarch linux32 make ${MAKEFLAGS} \
|
||||
ARCH=%{efialtarch} \
|
||||
setarch linux32 make ${MAKEFLAGS} ARCH=%{efialtarch} \
|
||||
DEFAULT_LOADER='\\\\grub%{efialtarch}.efi' \
|
||||
DESTDIR=${RPM_BUILD_ROOT} \
|
||||
install-as-data install-debuginfo install-debugsource
|
||||
install -m 0644 BOOT*.CSV "${RPM_BUILD_ROOT}/%{shimaltdir}/"
|
||||
cd ..
|
||||
|
||||
%files
|
||||
|
|
@ -173,7 +157,6 @@ cd ..
|
|||
%dir %{shimdir}
|
||||
%{shimdir}/*.efi
|
||||
%{shimdir}/*.hash
|
||||
%{shimdir}/*.CSV
|
||||
|
||||
%files -n shim-unsigned-%{efialtarch}
|
||||
%license COPYRIGHT
|
||||
|
|
@ -182,7 +165,6 @@ cd ..
|
|||
%dir %{shimaltdir}
|
||||
%{shimaltdir}/*.efi
|
||||
%{shimaltdir}/*.hash
|
||||
%{shimaltdir}/*.CSV
|
||||
|
||||
%files debuginfo -f build-%{efiarch}/debugfiles.list
|
||||
|
||||
|
|
@ -191,79 +173,14 @@ cd ..
|
|||
%files debugsource -f build-%{efiarch}/debugsource.list
|
||||
|
||||
%changelog
|
||||
* Fri Mar 22 2024 Nicolas Frayer <nfrayer@redhat.com>
|
||||
- Migrate to SPDX license
|
||||
- Please refer to https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2
|
||||
* Tue Sep 19 2017 Peter Jones <pjones@redhat.com> - 13-3
|
||||
- Actually update to the *real* 13 final.
|
||||
Related: rhbz#1489604
|
||||
|
||||
* Tue Feb 20 2024 Peter Jones <pjones@redhat.com> - 15.8-2
|
||||
- Fix some minor problems caught in review.
|
||||
* Thu Aug 31 2017 Peter Jones <pjones@redhat.com> - 13-2
|
||||
- Actually update to 13 final.
|
||||
|
||||
* Mon Dec 11 2023 Peter Jones <pjones@redhat.com> - 15.8-1
|
||||
- Update to shim-15.8
|
||||
Resolves: CVE-2023-40546
|
||||
Resolves: CVE-2023-40547
|
||||
Resolves: CVE-2023-40548
|
||||
Resolves: CVE-2023-40549
|
||||
Resolves: CVE-2023-40550
|
||||
Resolves: CVE-2023-40551
|
||||
Resolves: rhbz#2113005
|
||||
Resolves: rhbz#2189197
|
||||
Resolves: rhbz#2238884
|
||||
|
||||
* Tue Jun 07 2022 Peter Jones <pjones@redhat.com> - 15.6-1
|
||||
- Update to shim-15.6
|
||||
Resolves: CVE-2022-28737
|
||||
|
||||
* Thu Mar 10 2022 Peter Jones <pjones@redhat.com> - 15.5-1
|
||||
- Update to shim 15.5
|
||||
- lots of minor fixes
|
||||
|
||||
* Tue Mar 30 2021 Peter Jones <pjones@redhat.com> - 15.4-1
|
||||
- Update to shim 15.4
|
||||
- Support for revocations via the ".sbat" section and SBAT EFI variable
|
||||
- A new unit test framework and a bunch of unit tests
|
||||
- No external gnu-efi dependency
|
||||
- Better CI
|
||||
Resolves: CVE-2020-14372
|
||||
Resolves: CVE-2020-25632
|
||||
Resolves: CVE-2020-25647
|
||||
Resolves: CVE-2020-27749
|
||||
Resolves: CVE-2020-27779
|
||||
Resolves: CVE-2021-20225
|
||||
Resolves: CVE-2021-20233
|
||||
|
||||
* Wed Mar 24 2021 Peter Jones <pjones@redhat.com> - 15.3-0~1
|
||||
- Update to shim 15.3
|
||||
- Support for revocations via the ".sbat" section and SBAT EFI variable
|
||||
- A new unit test framework and a bunch of unit tests
|
||||
- No external gnu-efi dependency
|
||||
- Better CI
|
||||
Resolves: CVE-2020-14372
|
||||
Resolves: CVE-2020-25632
|
||||
Resolves: CVE-2020-25647
|
||||
Resolves: CVE-2020-27749
|
||||
Resolves: CVE-2020-27779
|
||||
Resolves: CVE-2021-20225
|
||||
Resolves: CVE-2021-20233
|
||||
|
||||
* Thu Apr 05 2018 Peter Jones <pjones@redhat.com> - 15-1
|
||||
- Update to shim 15
|
||||
- better checking for bad linker output
|
||||
- flicker-free console if there's no error output
|
||||
- improved http boot support
|
||||
- better protocol re-installation
|
||||
- dhcp proxy support
|
||||
- tpm measurement even when verification is disabled
|
||||
- REQUIRE_TPM build flag
|
||||
- more reproducable builds
|
||||
- measurement of everything verified through shim_verify()
|
||||
- coverity and scan-build checker make targets
|
||||
- misc cleanups
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 13-0.2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Fri Aug 18 2017 Peter Jones <pjones@redhat.com> - 13-0.1
|
||||
* 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.
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (shim-15.8.tar.bz2) = 30b3390ae935121ea6fe728d8f59d37ded7b918ad81bea06e213464298b4bdabbca881b30817965bd397facc596db1ad0b8462a84c87896ce6c1204b19371cd1
|
||||
SHA512 (shim-13.tar.bz2) = fc2ebd769b985a285df6eb89915796327dd49c8b7de416342b0f08097e4f94b5e14b90be9ff30351040c4c3e94b3f854d5ddb14824cf4dfa9681806a43e19d8d
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue