Accepting request 1132038 from home:gary_lin:branches:Base:System

- Update to 0.5.4
  - Improve systemd-boot support
  - Add --boot-entry for systemd-boot
  - Manpage fixes
  - Fix PCR index in JSON file
  - Fix GrubPcrSnapshot parsing
- Drop upstreamed patches: boot_entry.patch and fix_pcr_index.patch

OBS-URL: https://build.opensuse.org/request/show/1132038
OBS-URL: https://build.opensuse.org/package/show/Base:System/pcr-oracle?expand=0&rev=19
This commit is contained in:
Alberto Planas 2023-12-11 10:15:33 +00:00 committed by Git OBS Bridge
parent 07fa94a1ef
commit 3d40a4e426
7 changed files with 16 additions and 2134 deletions

View File

@ -7,7 +7,7 @@
<param name="url">https://github.com/okirch/pcr-oracle.git</param>
<param name="filename">pcr-oracle</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="revision">refs/tags/0.5.3</param>
<param name="revision">refs/tags/0.5.4</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">pcr-oracle*.tar</param>

File diff suppressed because it is too large Load Diff

View File

@ -1,32 +0,0 @@
From 152f97b1b49ca12d1de1df67c892b1c35140c056 Mon Sep 17 00:00:00 2001
From: Alberto Planas <aplanas@suse.com>
Date: Thu, 30 Nov 2023 13:20:54 +0100
Subject: [PATCH 1/3] Remove old systemd parameter
Signed-off-by: Alberto Planas <aplanas@suse.com>
---
man/pcr-oracle.8.in | 1 -
1 file changed, 1 deletion(-)
Index: pcr-oracle-0.5.3/src/sd-boot.c
===================================================================
--- pcr-oracle-0.5.3.orig/src/sd-boot.c
+++ pcr-oracle-0.5.3/src/sd-boot.c
@@ -233,7 +233,7 @@ sdb_policy_entry_set_pcr_mask(struct jso
pcrs = json_object_new_array();
json_object_object_add(entry, "pcrs", pcrs);
- for (pcr_index = 1; pcr_mask; pcr_index++, pcr_mask >>= 1) {
+ for (pcr_index = 0; pcr_mask; pcr_index++, pcr_mask >>= 1) {
if (pcr_mask & 1)
json_object_array_add(pcrs, json_object_new_int(pcr_index));
}
@@ -315,7 +315,7 @@ sdb_policy_file_add_entry(const char *fi
goto out;
sdb_policy_entry_set_pcr_mask(entry, pcr_mask);
- json_object_object_add(entry, "pfkp",
+ json_object_object_add(entry, "pkfp",
json_object_new_string(print_hex_string(fingerprint, fingerprint_len)));
json_object_object_add(entry, "sig",
json_object_new_string(print_base64_value(signature, signature_len)));

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bc53ad505c90d59675f87bd00769d7be8a6c9a3fbfa30c8013dc26d2f9a96bf7
size 80368

3
pcr-oracle-0.5.4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:130085dbd77b8e4001356cbe9411829228eb29cdd6f14931aea5ecb57c75a2e6
size 81828

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Dec 8 07:17:35 UTC 2023 - Gary Ching-Pang Lin <glin@suse.com>
- Update to 0.5.4
- Improve systemd-boot support
- Add --boot-entry for systemd-boot
- Manpage fixes
- Fix PCR index in JSON file
- Fix GrubPcrSnapshot parsing
- Drop upstreamed patches: boot_entry.patch and fix_pcr_index.patch
-------------------------------------------------------------------
Wed Nov 29 15:56:39 UTC 2023 - Alberto Planas Dominguez <aplanas@suse.com>

View File

@ -18,17 +18,13 @@
Name: pcr-oracle
Version: 0.5.3
Version: 0.5.4
Release: 0
Summary: Predict TPM PCR values
License: GPL-2.0-only
Group: System/Boot
URL: https://github.com/okirch/pcr-oracle
Source: %{name}-%{version}.tar.xz
# PATCH-FEATURE-UPSTREAM boot_entry.patch gh#okirch/pcr-oracle#40
Patch1: boot_entry.patch
# PATCH-FEATURE-UPSTREAM boot_entry.patch gh#okirch/pcr-oracle#44
Patch2: fix_pcr_index.patch
BuildRequires: libopenssl-devel >= 0.9.8
BuildRequires: tpm2-0-tss-devel >= 2.4.0
Requires: libtss2-tcti-device0