summaryrefslogtreecommitdiffstats
path: root/resources/grub/patch/grub.johnlane.ie
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2016-02-20 23:23:55 (EST)
committer Francis Rowe <info@gluglug.org.uk>2016-02-20 23:23:55 (EST)
commitd4f967a1a5aecf96518e32987a2a3e9ae3795ded (patch)
tree99d18dd6970155227cf731e7a32e19edad8f45dd /resources/grub/patch/grub.johnlane.ie
parent1d4ecda3f59df844d28c93cc756a447adb65ce16 (diff)
downloadlibreboot-d4f967a1a5aecf96518e32987a2a3e9ae3795ded.zip
libreboot-d4f967a1a5aecf96518e32987a2a3e9ae3795ded.tar.gz
libreboot-d4f967a1a5aecf96518e32987a2a3e9ae3795ded.tar.bz2
Update to latest GRUB
secfix directory removed (patches merged upstream)
Diffstat (limited to 'resources/grub/patch/grub.johnlane.ie')
-rw-r--r--resources/grub/patch/grub.johnlane.ie/0001-Cryptomount-support-LUKS-detached-header.patch4
-rw-r--r--resources/grub/patch/grub.johnlane.ie/0002-Cryptomount-support-key-files.patch4
-rw-r--r--resources/grub/patch/grub.johnlane.ie/0003-Cryptomount-luks-allow-multiple-passphrase-attempts.patch4
-rw-r--r--resources/grub/patch/grub.johnlane.ie/0004-Cryptomount-support-plain-dm-crypt.patch4
-rw-r--r--resources/grub/patch/grub.johnlane.ie/0005-Cryptomount-support-for-hyphens-in-UUID.patch4
-rw-r--r--resources/grub/patch/grub.johnlane.ie/0006-grub-core-disk-cryptodisk.c-Point-to-const-char.patch4
6 files changed, 12 insertions, 12 deletions
diff --git a/resources/grub/patch/grub.johnlane.ie/0001-Cryptomount-support-LUKS-detached-header.patch b/resources/grub/patch/grub.johnlane.ie/0001-Cryptomount-support-LUKS-detached-header.patch
index fa3c805..8fdb7b4 100644
--- a/resources/grub/patch/grub.johnlane.ie/0001-Cryptomount-support-LUKS-detached-header.patch
+++ b/resources/grub/patch/grub.johnlane.ie/0001-Cryptomount-support-LUKS-detached-header.patch
@@ -1,7 +1,7 @@
-From bc2a23386d123d37510c3cff1f7e607e7cf49cb1 Mon Sep 17 00:00:00 2001
+From f19bd8a206682a0d8c8c9650b2d4d171a67a9c1f Mon Sep 17 00:00:00 2001
From: John Lane <john@lane.uk.net>
Date: Tue, 23 Jun 2015 11:16:30 +0100
-Subject: [PATCH 1/6] Cryptomount support LUKS detached header
+Subject: [PATCH 02/11] Cryptomount support LUKS detached header
---
grub-core/disk/cryptodisk.c | 22 ++++++++++++++++++----
diff --git a/resources/grub/patch/grub.johnlane.ie/0002-Cryptomount-support-key-files.patch b/resources/grub/patch/grub.johnlane.ie/0002-Cryptomount-support-key-files.patch
index 1fe6ef3..ef6f1e2 100644
--- a/resources/grub/patch/grub.johnlane.ie/0002-Cryptomount-support-key-files.patch
+++ b/resources/grub/patch/grub.johnlane.ie/0002-Cryptomount-support-key-files.patch
@@ -1,7 +1,7 @@
-From 2883046688f91bd86cfc2d2c38ca53b65e201795 Mon Sep 17 00:00:00 2001
+From 641ff2b2aa380c0b9adbc025eb4af3a0217b577b Mon Sep 17 00:00:00 2001
From: John Lane <john@lane.uk.net>
Date: Fri, 26 Jun 2015 13:37:10 +0100
-Subject: [PATCH 2/6] Cryptomount support key files
+Subject: [PATCH 03/11] Cryptomount support key files
---
grub-core/disk/cryptodisk.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-
diff --git a/resources/grub/patch/grub.johnlane.ie/0003-Cryptomount-luks-allow-multiple-passphrase-attempts.patch b/resources/grub/patch/grub.johnlane.ie/0003-Cryptomount-luks-allow-multiple-passphrase-attempts.patch
index e68e5c6..252f76f 100644
--- a/resources/grub/patch/grub.johnlane.ie/0003-Cryptomount-luks-allow-multiple-passphrase-attempts.patch
+++ b/resources/grub/patch/grub.johnlane.ie/0003-Cryptomount-luks-allow-multiple-passphrase-attempts.patch
@@ -1,7 +1,7 @@
-From f32a31fd6279114af604a1b4cc33af8d377d2e29 Mon Sep 17 00:00:00 2001
+From b761dd8c48075a285f89ed439a0870879fde6c6e Mon Sep 17 00:00:00 2001
From: John Lane <john@lane.uk.net>
Date: Fri, 26 Jun 2015 13:49:58 +0100
-Subject: [PATCH 3/6] Cryptomount luks allow multiple passphrase attempts
+Subject: [PATCH 04/11] Cryptomount luks allow multiple passphrase attempts
---
grub-core/disk/luks.c | 278 ++++++++++++++++++++++++++------------------------
diff --git a/resources/grub/patch/grub.johnlane.ie/0004-Cryptomount-support-plain-dm-crypt.patch b/resources/grub/patch/grub.johnlane.ie/0004-Cryptomount-support-plain-dm-crypt.patch
index f35a393..77722ba 100644
--- a/resources/grub/patch/grub.johnlane.ie/0004-Cryptomount-support-plain-dm-crypt.patch
+++ b/resources/grub/patch/grub.johnlane.ie/0004-Cryptomount-support-plain-dm-crypt.patch
@@ -1,7 +1,7 @@
-From 590e1f484d0e9618882db07786251cdaf6669e9d Mon Sep 17 00:00:00 2001
+From a20258f8afbb3c9e1b3c6735126e7c720fa2459a Mon Sep 17 00:00:00 2001
From: John Lane <john@lane.uk.net>
Date: Fri, 26 Jun 2015 22:09:52 +0100
-Subject: [PATCH 4/6] Cryptomount support plain dm-crypt
+Subject: [PATCH 05/11] Cryptomount support plain dm-crypt
---
grub-core/disk/cryptodisk.c | 298 +++++++++++++++++++++++++++++++++++++++++++-
diff --git a/resources/grub/patch/grub.johnlane.ie/0005-Cryptomount-support-for-hyphens-in-UUID.patch b/resources/grub/patch/grub.johnlane.ie/0005-Cryptomount-support-for-hyphens-in-UUID.patch
index 8d49361..a6ccc07 100644
--- a/resources/grub/patch/grub.johnlane.ie/0005-Cryptomount-support-for-hyphens-in-UUID.patch
+++ b/resources/grub/patch/grub.johnlane.ie/0005-Cryptomount-support-for-hyphens-in-UUID.patch
@@ -1,7 +1,7 @@
-From ec936adca3370995a5ed5c6e5e99c6e8fa5c25ef Mon Sep 17 00:00:00 2001
+From 6d9ac49d116325c9d29633002ca204f56e8c57f5 Mon Sep 17 00:00:00 2001
From: John Lane <john@lane.uk.net>
Date: Fri, 26 Jun 2015 22:48:03 +0100
-Subject: [PATCH 5/6] Cryptomount support for hyphens in UUID
+Subject: [PATCH 06/11] Cryptomount support for hyphens in UUID
---
grub-core/disk/cryptodisk.c | 20 +++++++++++++++++---
diff --git a/resources/grub/patch/grub.johnlane.ie/0006-grub-core-disk-cryptodisk.c-Point-to-const-char.patch b/resources/grub/patch/grub.johnlane.ie/0006-grub-core-disk-cryptodisk.c-Point-to-const-char.patch
index 8b94ba4..4ff958c 100644
--- a/resources/grub/patch/grub.johnlane.ie/0006-grub-core-disk-cryptodisk.c-Point-to-const-char.patch
+++ b/resources/grub/patch/grub.johnlane.ie/0006-grub-core-disk-cryptodisk.c-Point-to-const-char.patch
@@ -1,7 +1,7 @@
-From 10d0f5aebea928cc42f6b65598c70343bb6899ca Mon Sep 17 00:00:00 2001
+From 1d3e995f587369b8de6c4a10fe3a7bb0d6ec6ee1 Mon Sep 17 00:00:00 2001
From: Klemens Nanni <contact@autoboot.org>
Date: Tue, 15 Sep 2015 16:00:03 +0200
-Subject: [PATCH 6/6] grub-core/disk/cryptodisk.c: Point to const char
+Subject: [PATCH 07/11] grub-core/disk/cryptodisk.c: Point to const char
---
grub-core/disk/cryptodisk.c | 2 +-