Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c800da4e014f9b14b3162f630ef47637380cb84d
commit c800da4e014f9b14b3162f630ef47637380cb84d Author: DeX77 <[email protected]> Date: Sat Apr 22 20:40:43 2017 +0200 grub2-2.02-11-x86_64 * bump to rc2 diff --git a/source/base/grub2/0082-Measure-multiboot-images-and-modules.patch b/source/base/grub2/0082-Measure-multiboot-images-and-modules.patch deleted file mode 100644 index 9273ce0..0000000 --- a/source/base/grub2/0082-Measure-multiboot-images-and-modules.patch +++ /dev/null @@ -1,76 +0,0 @@ -From dbbb480855f86c3c47cd941de6511d1a1dfdeb31 Mon Sep 17 00:00:00 2001 -From: Matthew Garrett <[email protected]> -Date: Tue, 1 Sep 2015 16:02:55 -0700 -Subject: [PATCH 82/89] Measure multiboot images and modules - ---- - grub-core/loader/i386/multiboot_mbi.c | 3 +++ - grub-core/loader/multiboot.c | 2 ++ - grub-core/loader/multiboot_mbi2.c | 3 +++ - 3 files changed, 8 insertions(+) - -diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c -index f60b702..43a08e4 100644 ---- a/grub-core/loader/i386/multiboot_mbi.c -+++ b/grub-core/loader/i386/multiboot_mbi.c -@@ -36,6 +36,7 @@ - #include <grub/net.h> - #include <grub/i18n.h> - #include <grub/lib/cmdline.h> -+#include <grub/tpm.h> - - #ifdef GRUB_MACHINE_EFI - #include <grub/efi/efi.h> -@@ -164,6 +165,8 @@ grub_multiboot_load (grub_file_t file, const char *filename) - return grub_errno; - } - -+ grub_tpm_measure((unsigned char*)buffer, len, GRUB_KERNEL_PCR, filename); -+ - header = find_header (buffer, len); - - if (header == 0) -diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c -index 64a6513..58e6329 100644 ---- a/grub-core/loader/multiboot.c -+++ b/grub-core/loader/multiboot.c -@@ -43,6 +43,7 @@ - #include <grub/memory.h> - #include <grub/i18n.h> - #include <grub/efi/sb.h> -+#include <grub/tpm.h> - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -385,6 +386,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)), - } - - grub_file_close (file); -+ grub_tpm_measure (module, size, GRUB_KERNEL_PCR, argv[0]); - return GRUB_ERR_NONE; - } - -diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c -index f147d67..8f163ea 100644 ---- a/grub-core/loader/multiboot_mbi2.c -+++ b/grub-core/loader/multiboot_mbi2.c -@@ -36,6 +36,7 @@ - #include <grub/i18n.h> - #include <grub/net.h> - #include <grub/lib/cmdline.h> -+#include <grub/tpm.h> - - #if defined (GRUB_MACHINE_EFI) - #include <grub/efi/efi.h> -@@ -126,6 +127,8 @@ grub_multiboot_load (grub_file_t file, const char *filename) - - COMPILE_TIME_ASSERT (MULTIBOOT_HEADER_ALIGN % 4 == 0); - -+ grub_tpm_measure ((unsigned char *)buffer, len, GRUB_KERNEL_PCR, filename); -+ - header = find_header (buffer, len); - - if (header == 0) --- -2.5.5 - diff --git a/source/base/grub2/0088-Rework-TPM-measurements.patch b/source/base/grub2/0088-Rework-TPM-measurements.patch deleted file mode 100644 index d7b8f0c..0000000 --- a/source/base/grub2/0088-Rework-TPM-measurements.patch +++ /dev/null @@ -1,219 +0,0 @@ -From f4ed8103fcc767b5a39b0b051e72901b543bf8d5 Mon Sep 17 00:00:00 2001 -From: Matthew Garrett <[email protected]> -Date: Wed, 23 Mar 2016 17:03:43 -0700 -Subject: [PATCH 88/89] Rework TPM measurements - -Rework TPM measurements to use fewer PCRs. After discussion with upstream, -it's preferable to avoid using so many PCRs. Instead, measure into PCRs 8 -and 9 but use a prefix in the event log to indicate which subsystem carried -out the measurements. - -(cherry picked from commit bb3473d7c8741ad5ef7cf8aafbbcf094df08bfc9) ---- - grub-core/kern/dl.c | 2 +- - grub-core/kern/tpm.c | 10 ++++++++-- - grub-core/lib/cmdline.c | 4 ++-- - grub-core/loader/i386/efi/linux.c | 4 ++-- - grub-core/loader/i386/linux.c | 2 +- - grub-core/loader/i386/multiboot_mbi.c | 2 +- - grub-core/loader/i386/pc/linux.c | 2 +- - grub-core/loader/linux.c | 2 +- - grub-core/loader/multiboot.c | 2 +- - grub-core/loader/multiboot_mbi2.c | 2 +- - grub-core/script/execute.c | 4 ++-- - include/grub/tpm.h | 9 +++------ - 12 files changed, 24 insertions(+), 21 deletions(-) - -diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c -index 247cd0a..a023d3b 100644 ---- a/grub-core/kern/dl.c -+++ b/grub-core/kern/dl.c -@@ -734,7 +734,7 @@ grub_dl_load_file (const char *filename) - opens of the same device. */ - grub_file_close (file); - -- grub_tpm_measure(core, size, GRUB_TPM_PCR, filename); -+ grub_tpm_measure(core, size, GRUB_BINARY_PCR, "grub_module", filename); - - mod = grub_dl_load_core (core, size); - grub_free (core); -diff --git a/grub-core/kern/tpm.c b/grub-core/kern/tpm.c -index 1a99187..cb5a812 100644 ---- a/grub-core/kern/tpm.c -+++ b/grub-core/kern/tpm.c -@@ -7,7 +7,13 @@ - - grub_err_t - grub_tpm_measure (unsigned char *buf, grub_size_t size, grub_uint8_t pcr, -- const char *description) -+ const char *kind, const char *description) - { -- return grub_tpm_log_event(buf, size, pcr, description); -+ grub_err_t ret; -+ char *desc = grub_xasprintf("%s %s", kind, description); -+ if (!desc) -+ return GRUB_ERR_OUT_OF_MEMORY; -+ ret = grub_tpm_log_event(buf, size, pcr, description); -+ grub_free(desc); -+ return ret; - } -diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c -index 6b56304..178f738 100644 ---- a/grub-core/lib/cmdline.c -+++ b/grub-core/lib/cmdline.c -@@ -126,8 +126,8 @@ int grub_create_loader_cmdline (int argc, char *argv[], char *buf, - - *buf = 0; - -- grub_tpm_measure ((void *)orig, grub_strlen (orig), GRUB_CMDLINE_PCR, -- "Kernel Commandline"); -+ grub_tpm_measure ((void *)orig, grub_strlen (orig), GRUB_ASCII_PCR, -+ "grub_kernel_cmdline", orig); - - return i; - } -diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 4ee45e9..bd80be4 100644 ---- a/grub-core/loader/i386/efi/linux.c -+++ b/grub-core/loader/i386/efi/linux.c -@@ -130,7 +130,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), - argv[i]); - goto fail; - } -- grub_tpm_measure (ptr, cursize, GRUB_INITRD_PCR, "UEFI Linux initrd"); -+ grub_tpm_measure (ptr, cursize, GRUB_BINARY_PCR, "grub_linuxefi", "Initrd"); - ptr += cursize; - grub_memset (ptr, 0, ALIGN_UP_OVERHEAD (cursize, 4)); - ptr += ALIGN_UP_OVERHEAD (cursize, 4); -@@ -186,7 +186,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), - goto fail; - } - -- grub_tpm_measure (kernel, filelen, GRUB_KERNEL_PCR, "UEFI Linux kernel"); -+ grub_tpm_measure (kernel, filelen, GRUB_BINARY_PCR, "grub_linuxefi", "Kernel"); - - if (! grub_linuxefi_secure_validate (kernel, filelen)) - { -diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c -index 342c9fe..90d3392 100644 ---- a/grub-core/loader/i386/linux.c -+++ b/grub-core/loader/i386/linux.c -@@ -718,7 +718,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), - goto fail; - } - -- grub_tpm_measure (kernel, len, GRUB_KERNEL_PCR, "Linux Kernel"); -+ grub_tpm_measure (kernel, len, GRUB_BINARY_PCR, "grub_linux", "Kernel"); - - grub_memcpy (&lh, kernel, sizeof (lh)); - -diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c -index 43a08e4..efaa66c 100644 ---- a/grub-core/loader/i386/multiboot_mbi.c -+++ b/grub-core/loader/i386/multiboot_mbi.c -@@ -165,7 +165,7 @@ grub_multiboot_load (grub_file_t file, const char *filename) - return grub_errno; - } - -- grub_tpm_measure((unsigned char*)buffer, len, GRUB_KERNEL_PCR, filename); -+ grub_tpm_measure((unsigned char*)buffer, len, GRUB_BINARY_PCR, "grub_multiboot", filename); - - header = find_header (buffer, len); - -diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c -index 6b8f365..7edbc5e 100644 ---- a/grub-core/loader/i386/pc/linux.c -+++ b/grub-core/loader/i386/pc/linux.c -@@ -162,7 +162,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), - goto fail; - } - -- grub_tpm_measure (kernel, len, GRUB_KERNEL_PCR, "BIOS Linux Kernel"); -+ grub_tpm_measure (kernel, len, GRUB_BINARY_PCR, "grub_linux16", "Kernel"); - - grub_memcpy (&lh, kernel, sizeof (lh)); - kernel_offset = sizeof (lh); -diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c -index 3005c0d..78c41e3 100644 ---- a/grub-core/loader/linux.c -+++ b/grub-core/loader/linux.c -@@ -289,7 +289,7 @@ grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx, - grub_initrd_close (initrd_ctx); - return grub_errno; - } -- grub_tpm_measure (ptr, cursize, GRUB_INITRD_PCR, "Linux Initrd"); -+ grub_tpm_measure (ptr, cursize, GRUB_BINARY_PCR, "grub_initrd", "Initrd"); - ptr += cursize; - } - if (newc) -diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c -index 58e6329..234164b 100644 ---- a/grub-core/loader/multiboot.c -+++ b/grub-core/loader/multiboot.c -@@ -386,7 +386,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)), - } - - grub_file_close (file); -- grub_tpm_measure (module, size, GRUB_KERNEL_PCR, argv[0]); -+ grub_tpm_measure (module, size, GRUB_BINARY_PCR, "grub_multiboot", argv[0]); - return GRUB_ERR_NONE; - } - -diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c -index 8f163ea..3d1117b 100644 ---- a/grub-core/loader/multiboot_mbi2.c -+++ b/grub-core/loader/multiboot_mbi2.c -@@ -127,7 +127,7 @@ grub_multiboot_load (grub_file_t file, const char *filename) - - COMPILE_TIME_ASSERT (MULTIBOOT_HEADER_ALIGN % 4 == 0); - -- grub_tpm_measure ((unsigned char *)buffer, len, GRUB_KERNEL_PCR, filename); -+ grub_tpm_measure ((unsigned char *)buffer, len, GRUB_BINARY_PCR, "grub_multiboot", filename); - - header = find_header (buffer, len); - -diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c -index 9ae04a0..976643c 100644 ---- a/grub-core/script/execute.c -+++ b/grub-core/script/execute.c -@@ -995,8 +995,8 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd) - argv.args[i]); - } - cmdstring[cmdlen-1]= '\0'; -- grub_tpm_measure ((unsigned char *)cmdstring, cmdlen, GRUB_COMMAND_PCR, -- cmdstring); -+ grub_tpm_measure ((unsigned char *)cmdstring, cmdlen, GRUB_ASCII_PCR, -+ "grub_cmd", cmdstring); - grub_free(cmdstring); - invert = 0; - argc = argv.argc - 1; -diff --git a/include/grub/tpm.h b/include/grub/tpm.h -index 7fc9d77..ecb2d09 100644 ---- a/include/grub/tpm.h -+++ b/include/grub/tpm.h -@@ -26,11 +26,8 @@ - #define TPM_AUTHFAIL (TPM_BASE + 0x1) - #define TPM_BADINDEX (TPM_BASE + 0x2) - --#define GRUB_TPM_PCR 9 --#define GRUB_KERNEL_PCR 10 --#define GRUB_INITRD_PCR 11 --#define GRUB_CMDLINE_PCR 12 --#define GRUB_COMMAND_PCR 13 -+#define GRUB_ASCII_PCR 8 -+#define GRUB_BINARY_PCR 9 - - #define TPM_TAG_RQU_COMMAND 0x00C1 - #define TPM_ORD_Extend 0x14 -@@ -70,7 +67,7 @@ typedef struct { - } GRUB_PACKED ExtendOutgoing; - - grub_err_t EXPORT_FUNC(grub_tpm_measure) (unsigned char *buf, grub_size_t size, -- grub_uint8_t pcr, -+ grub_uint8_t pcr, const char *kind, - const char *description); - #if defined (GRUB_MACHINE_EFI) || defined (GRUB_MACHINE_PCBIOS) - grub_err_t grub_tpm_execute(PassThroughToTPM_InputParamBlock *inbuf, --- -2.5.5 - diff --git a/source/base/grub2/0089-Fix-event-log-prefix.patch b/source/base/grub2/0089-Fix-event-log-prefix.patch deleted file mode 100644 index 195948e..0000000 --- a/source/base/grub2/0089-Fix-event-log-prefix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c11f14d8b152ea83349670b029470d779e8b0ec7 Mon Sep 17 00:00:00 2001 -From: Matthew Garrett <[email protected]> -Date: Tue, 29 Mar 2016 15:36:49 -0700 -Subject: [PATCH 89/89] Fix event log prefix - -We're not passing the prefixed version of the description to the event log. -Fix that. - -(cherry picked from commit aab446306b8a78c741e229861c4988738cfc6426) ---- - grub-core/kern/tpm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/kern/tpm.c b/grub-core/kern/tpm.c -index cb5a812..e5e8fce 100644 ---- a/grub-core/kern/tpm.c -+++ b/grub-core/kern/tpm.c -@@ -13,7 +13,7 @@ grub_tpm_measure (unsigned char *buf, grub_size_t size, grub_uint8_t pcr, - char *desc = grub_xasprintf("%s %s", kind, description); - if (!desc) - return GRUB_ERR_OUT_OF_MEMORY; -- ret = grub_tpm_log_event(buf, size, pcr, description); -+ ret = grub_tpm_log_event(buf, size, pcr, desc); - grub_free(desc); - return ret; - } --- -2.5.5 - diff --git a/source/base/grub2/FrugalBuild b/source/base/grub2/FrugalBuild index 4b8c548..9156c8d 100644 --- a/source/base/grub2/FrugalBuild +++ b/source/base/grub2/FrugalBuild @@ -5,8 +5,8 @@ pkgname=grub2 _F_archive_name=grub pkgver=2.02 -pkgextraver=-beta3 -pkgrel=10 +pkgextraver=-rc2 +pkgrel=11 pkgdesc="The GNU GRand Unified Bootloader" url="http://www.gnu.org/software/grub/"; rodepends=('grub-theme-frugalware' 'scriptlet-core') @@ -19,7 +19,6 @@ groups=('base') archs=('x86_64') up2date="Flasttar http://git.savannah.gnu.org/cgit/grub.git"; _F_archive_ver="$pkgver${pkgextraver/-/\~}" -_F_archive_grepv="rc" replaces=('elilo') provides=("${replaces[@]}") @@ -100,17 +99,14 @@ source=(http://alpha.gnu.org/gnu/grub/grub-$pkgver${pkgextraver/-/\~}.tar.xz \ 0079-Measure-kernel-and-initrd-on-BIOS-systems.patch 0080-Measure-the-kernel-commandline.patch 0081-Measure-commands.patch - 0082-Measure-multiboot-images-and-modules.patch 0083-Make-grub-editenv-build-again.patch 0086-Handle-rssd-storage-devices.patch 0087-Fix-boot-when-there-s-no-TPM.patch - 0088-Rework-TPM-measurements.patch - 0089-Fix-event-log-prefix.patch uefi_firmware_setup.patch grub2-frugalware-config.patch grub2-frugalware-config2.patch) -sha1sums=('14a1f9239a9c974957e835dc706fc6a1e4819c83' \ +sha1sums=('4f6f3719fd7dbb0449a58547c1b08c9801337663' \ 'b070489950b87e4a9ca97d4e85db79879daae36a' \ '9de273e2fb3095694e82cf9969de61e994f2bce6' \ '0a5e537237d93b8ef222b72d39e74daf10e24f47' \ @@ -185,12 +181,9 @@ sha1sums=('14a1f9239a9c974957e835dc706fc6a1e4819c83' \ '36809777e82154ccb181f25fec38a057b6f178b7' \ 'a709a7b38a0d795d77fac928a527ecc12c6234e3' \ '3148003ba0a564c5e7cb28297954b53411d24e95' \ - 'c3653887114db6e914d022620798e03b2b33951c' \ 'bdd96db7a35af7094e8041769ab4f5ab43e6c688' \ 'f4cb59b77d91c15792a39f81e1516c25d17c4453' \ '9c9a1e45f8fe857a9cdc9cc79b0781e39b6d71c5' \ - '1c5a3756f2a5996cbd948f536e9d28b7291aa514' \ - 'a5f92d0b77999d720c0bdf0f22c49aa35019c365' \ '93199e15aa5f3adf7aaca91f1392e444bf25028c' \ 'af8f6a3114857e97e25b47273ac3b1c952586bbe' \ '8075e7d9b3e8c41a5d4b654c4d34ba3de209f161') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
