diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 7 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index eee8e65f..b343b87e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -shim (15.3-1) unstable; urgency=medium +shim (15.3-1~deb10u1) buster; urgency=medium - [ Steve McIntyre ] + * Rebuild the new upstream version for buster + * Switch to gcc-8 for building * Switch to much-newer release with many fixes + Particularly pulling in SBAT changes for better revocation support + Remove all our old patches, no longer needed: @@ -12,14 +13,13 @@ shim (15.3-1) unstable; urgency=medium + Now includes a vendor copy of gnu-efi with quite a few extra fixes needed. + Update copyright file to cover these changes - * Switch to using gcc-10 rather than gcc-9. Closes: #978521 * Add dbx entries for all our existing grub binaries + They're insecure, let's break the chainloading hole. * Add Debian SBAT data + Add a Debian SBAT template, and rules to use it + Adds a build-dep on dos2unix - -- Steve McIntyre <93sam@debian.org> Tue, 23 Mar 2021 23:39:48 +0000 + -- Steve McIntyre <93sam@debian.org> Wed, 24 Mar 2021 01:09:20 +0000 shim (15+1533136590.3beb971-10) unstable; urgency=medium diff --git a/debian/control b/debian/control index dae419ce..39deeff6 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,12 @@ Section: admin Priority: optional Maintainer: Debian EFI team <debian-efi@lists.debian.org> Uploaders: Steve Langasek <vorlon@debian.org>, Steve McIntyre <93sam@debian.org> -Standards-Version: 4.4.1 -Build-Depends: debhelper-compat (= 12), - gnu-efi (>= 3.0u), +Standards-Version: 4.3.0 +Build-Depends: debhelper-compat (= 9), sbsigntool, openssl, libelf-dev, - gcc-10, + gcc-8, dos2unix, pesign (>= 0.112-5) Vcs-Browser: https://salsa.debian.org/efi-team/shim diff --git a/debian/rules b/debian/rules index 58e7cb7b..9e029e2f 100755 --- a/debian/rules +++ b/debian/rules @@ -45,7 +45,7 @@ COMMON_OPTIONS += \ VENDOR_DBX_FILE=$(DBX_LIST) \ EFIDIR=$(distributor) \ CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- \ - CC=$(DEB_HOST_GNU_TYPE)-gcc-10 \ + CC=$(DEB_HOST_GNU_TYPE)-gcc-8 \ $(NULL) $(DBX_LIST): $(DBX_HASHES) |