From 0528cf479035b0cdc42247052f52b5a625a1ed9f Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Wed, 12 Aug 2020 21:12:21 +0200 Subject: [PATCH] package/ima-evm-utils: bump version to 1.3.1 Dropped patches from this release. List of commits between 1.3 and 1.3.1: 97b912a7277747db1aca74c7d922e37d41b4f9a8 Release version 1.3.1 62534f212798c540c46e9f362e1d84845175d42e Rename "--validate" to "--ignore-violations" 5b58f475708a6a0c2e70a5d98bbe3f530217d1e1 Drop the ima_measurement "--verify" option 8e2738dd44c0aad2e11f995b802a4d6dcde6b505 extend ima_measurement --pcrs option to support per-bank pcr files 79ab82f55f14839d6b9ba6af78af3367370146bb Rename "Changelog" to "NEWS" 7f9a59c6c613ed8da2947b5e0078a8b75c4e7197 Fix missing {u,g}id_t typedef on musl 1f4e423e7c1d8d5ae85e12368065dec2dc4e87fb pcr_tss: Fix compilation for old compilers Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- ...ss-Fix-compilation-for-old-compilers.patch | 51 ------------------- ...Fix-missing-u-g-id_t-typedef-on-musl.patch | 29 ----------- package/ima-evm-utils/ima-evm-utils.hash | 4 +- package/ima-evm-utils/ima-evm-utils.mk | 2 +- 4 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 package/ima-evm-utils/0001-pcr_tss-Fix-compilation-for-old-compilers.patch delete mode 100644 package/ima-evm-utils/0002-Fix-missing-u-g-id_t-typedef-on-musl.patch diff --git a/package/ima-evm-utils/0001-pcr_tss-Fix-compilation-for-old-compilers.patch b/package/ima-evm-utils/0001-pcr_tss-Fix-compilation-for-old-compilers.patch deleted file mode 100644 index 079c4e0d22..0000000000 --- a/package/ima-evm-utils/0001-pcr_tss-Fix-compilation-for-old-compilers.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8e98b5bbf2127131f968a5d864f86e8443505639 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Wed, 22 Jul 2020 12:06:28 +0200 -Subject: [PATCH] pcr_tss: Fix compilation for old compilers - -pcr_tss.c: In function 'pcr_selections_match': -pcr_tss.c:73:2: error: 'for' loop initial declarations are only allowed in C99 mode - for (int i = 0; i < a->count; i++) { - ^ -pcr_tss.c:73:2: note: use option -std=c99 or -std=gnu99 to compile your code -pcr_tss.c:78:3: error: 'for' loop initial declarations are only allowed in C99 mode - for (int j = 0; j < a->pcrSelections[i].sizeofSelect; j++) { - ^ - -Fixes: 03f99ea ("ima-evm-utils: Add support for Intel TSS2 for PCR -reading") - -Signed-off-by: Petr Vorel -Signed-off-by: Petr Vorel -[ upstream status: 1f4e423 ("pcr_tss: Fix compilation for old compilers") ] ---- - src/pcr_tss.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/pcr_tss.c b/src/pcr_tss.c -index 11b247b..feb1ff7 100644 ---- a/src/pcr_tss.c -+++ b/src/pcr_tss.c -@@ -68,14 +68,17 @@ int tpm2_pcr_supported(void) - - static int pcr_selections_match(TPML_PCR_SELECTION *a, TPML_PCR_SELECTION *b) - { -+ int i, j; -+ - if (a->count != b->count) - return 0; -- for (int i = 0; i < a->count; i++) { -+ -+ for (i = 0; i < a->count; i++) { - if (a->pcrSelections[i].hash != b->pcrSelections[i].hash) - return 0; - if (a->pcrSelections[i].sizeofSelect != b->pcrSelections[i].sizeofSelect) - return 0; -- for (int j = 0; j < a->pcrSelections[i].sizeofSelect; j++) { -+ for (j = 0; j < a->pcrSelections[i].sizeofSelect; j++) { - if (a->pcrSelections[i].pcrSelect[j] != b->pcrSelections[i].pcrSelect[j]) - return 0; - } --- -2.27.0 - diff --git a/package/ima-evm-utils/0002-Fix-missing-u-g-id_t-typedef-on-musl.patch b/package/ima-evm-utils/0002-Fix-missing-u-g-id_t-typedef-on-musl.patch deleted file mode 100644 index 0596f68170..0000000000 --- a/package/ima-evm-utils/0002-Fix-missing-u-g-id_t-typedef-on-musl.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e74b1c8620ba81682dc6b62bd2783311b99f5bd0 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Wed, 22 Jul 2020 13:10:20 +0200 -Subject: [PATCH] Fix missing {u,g}id_t typedef on musl - -Fixes: 273701a ("evmctl - IMA/EVM control tool") - -Signed-off-by: Petr Vorel -[ upstream status: 7f9a59c ("Fix missing {u,g}id_t typedef on musl") ] ---- - src/imaevm.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/imaevm.h b/src/imaevm.h -index b881d92..923e2e6 100644 ---- a/src/imaevm.h -+++ b/src/imaevm.h -@@ -46,7 +46,7 @@ - #include - #include - #include -- -+#include - #include - - #ifdef USE_FPRINTF --- -2.27.0 - diff --git a/package/ima-evm-utils/ima-evm-utils.hash b/package/ima-evm-utils/ima-evm-utils.hash index 4fe1591f74..8d0eecfdb9 100644 --- a/package/ima-evm-utils/ima-evm-utils.hash +++ b/package/ima-evm-utils/ima-evm-utils.hash @@ -1,4 +1,4 @@ # sha1 from sourceforge, sha256 locally computed -sha1 8b81f83ddc0e7c863268e76049fa50ad89a04b11 ima-evm-utils-1.3.tar.gz -sha256 62e90e8dc6b131a4f34a356114cdcb5bef844f110abbdd5d8b53c449aecc609f ima-evm-utils-1.3.tar.gz +sha1 bb0c1c2de5f6c179d9a84909e5e6698b86a4aac2 ima-evm-utils-1.3.1.tar.gz +sha256 5304271f31a3601a2af5984942d9bd6c7532597c5a97250c9a4524074fc39925 ima-evm-utils-1.3.1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ima-evm-utils/ima-evm-utils.mk b/package/ima-evm-utils/ima-evm-utils.mk index 70295643a4..5c9aa2f7cd 100644 --- a/package/ima-evm-utils/ima-evm-utils.mk +++ b/package/ima-evm-utils/ima-evm-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMA_EVM_UTILS_VERSION = 1.3 +IMA_EVM_UTILS_VERSION = 1.3.1 IMA_EVM_UTILS_SITE = http://downloads.sourceforge.net/project/linux-ima/ima-evm-utils IMA_EVM_UTILS_LICENSE = GPL-2.0 IMA_EVM_UTILS_LICENSE_FILES = COPYING -- 2.30.2