summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve McIntyre <steve@einval.com>2021-03-23 23:43:27 +0000
committerSteve McIntyre <steve@einval.com>2021-03-23 23:43:27 +0000
commit85b409232ce89b34626df9d72abedf5d4f5ccef6 (patch)
tree137c8cbdc86156c467c72a19e21cb2ba7133d060
parentf43e9abcc596c1b2934e7f43bddf173f74f3866c (diff)
downloadefi-boot-shim-85b409232ce89b34626df9d72abedf5d4f5ccef6.tar.gz
efi-boot-shim-85b409232ce89b34626df9d72abedf5d4f5ccef6.zip
Switch to using the 15.3 release from upstream
-rw-r--r--debian/changelog13
-rwxr-xr-xdebian/rules2
2 files changed, 7 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index a99f4985..2183be3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-shim (15+1613861442.888f5b5-1) unstable; urgency=medium
+shim (15.3-1) unstable; urgency=medium
[ Steve McIntyre ]
- * Switch to much-newer upstream code point with many fixes
+ * 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:
- avoid_null_vsprint.patch
@@ -9,10 +9,9 @@ shim (15+1613861442.888f5b5-1) unstable; urgency=medium
- fixup_git.patch
- uname.patch
- use_compare_mem_gcc9.patch
- + Includes a vendor copy of gnu-efi for now, packaged as an extra
- tarball.
- - Added an extra rule to generate the extra tarball. Thanks to
- Dmitri John Ledkov for help.
+ + 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.
@@ -20,7 +19,7 @@ shim (15+1613861442.888f5b5-1) unstable; urgency=medium
+ Add a Debian SBAT template, and rules to use it
+ Adds a build-dep on dos2unix
- -- Steve McIntyre <93sam@debian.org> Sun, 21 Feb 2021 13:50:16 +0100
+ -- Steve McIntyre <93sam@debian.org> Tue, 23 Mar 2021 23:39:48 +0000
shim (15+1533136590.3beb971-10) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 9ca9bc2f..58e7cb7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ endif
COMMON_OPTIONS += \
RELEASE=15.3 \
- COMMIT_ID=39b96c01bfd4547f38c9e573ff5d551057ea272c \
+ COMMIT_ID=XXXX \
MAKELEVEL=0 \
ENABLE_HTTPBOOT=true \
VENDOR_CERT_FILE=$(cert) \