[meta-security][PATCH 1/4] meta-tpm: rename recipes-tpm to recipes-tpm1

[meta-security][PATCH 1/4] meta-tpm: rename recipes-tpm to recipes-tpm1

[Armin Kuster]

a bit of re-org.

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-tpm/{recipes-tpm => recipes-tpm1}/hoth/libhoth_git.bb        | 0
 .../libtpm/files/Convert-another-vdprintf-to-dprintf.patch        | 0
 .../libtpm/files/Use-format-s-for-call-to-dprintf.patch           | 0
 .../libtpm/files/fix_signed_issue.patch                           | 0
 meta-tpm/{recipes-tpm => recipes-tpm1}/libtpm/libtpm_0.9.5.bb     | 0
 .../files/0001-create-tpm-key-support-well-known-key-option.patch | 0
 .../files/0002-libtpm-support-env-TPM_SRK_PW.patch                | 0
 ...003-tpm-openssl-tpm-engine-parse-an-encrypted-tpm-SRK-pa.patch | 0
 ...004-tpm-openssl-tpm-engine-change-variable-c-type-from-c.patch | 0
 .../openssl-tpm-engine/files/openssl11_build_fix.patch            | 0
 .../openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb                | 0
 .../pcr-extend/files/fix_openssl11_build.patch                    | 0
 .../{recipes-tpm => recipes-tpm1}/pcr-extend/pcr-extend_git.bb    | 0
 .../{recipes-tpm => recipes-tpm1}/swtpm/files/fix_fcntl_h.patch   | 0
 .../swtpm/files/fix_lib_search_path.patch                         | 0
 .../{recipes-tpm => recipes-tpm1}/swtpm/swtpm-wrappers-native.bb  | 0
 meta-tpm/{recipes-tpm => recipes-tpm1}/swtpm/swtpm_0.7.3.bb       | 0
 .../tpm-quote-tools/tpm-quote-tools_1.0.4.bb                      | 0
 .../tpm-tools/files/04-fix-FTBFS-clang.patch                      | 0
 .../tpm-tools/files/openssl1.1_fix.patch                          | 0
 .../tpm-tools/files/tpm-tools-extendpcr.patch                     | 0
 .../{recipes-tpm => recipes-tpm1}/tpm-tools/tpm-tools_1.3.9.2.bb  | 0
 ...001-build-don-t-override-localstatedir-mandir-sysconfdir.patch | 0
 .../get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch   | 0
 .../{recipes-tpm => recipes-tpm1}/trousers/files/tcsd.service     | 0
 .../trousers/files/trousers-udev.rules                            | 0
 .../{recipes-tpm => recipes-tpm1}/trousers/files/trousers.init.sh | 0
 meta-tpm/{recipes-tpm => recipes-tpm1}/trousers/trousers_git.bb   | 0
 28 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/hoth/libhoth_git.bb (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/libtpm/files/Convert-another-vdprintf-to-dprintf.patch (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/libtpm/files/Use-format-s-for-call-to-dprintf.patch (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/libtpm/files/fix_signed_issue.patch (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/libtpm/libtpm_0.9.5.bb (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/openssl-tpm-engine/files/0001-create-tpm-key-support-well-known-key-option.patch (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/openssl-tpm-engine/files/0002-libtpm-support-env-TPM_SRK_PW.patch (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/openssl-tpm-engine/files/0003-tpm-openssl-tpm-engine-parse-an-encrypted-tpm-SRK-pa.patch (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/openssl-tpm-engine/files/0004-tpm-openssl-tpm-engine-change-variable-c-type-from-c.patch (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/openssl-tpm-engine/files/openssl11_build_fix.patch (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/pcr-extend/files/fix_openssl11_build.patch (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/pcr-extend/pcr-extend_git.bb (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/swtpm/files/fix_fcntl_h.patch (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/swtpm/files/fix_lib_search_path.patch (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/swtpm/swtpm-wrappers-native.bb (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/swtpm/swtpm_0.7.3.bb (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/tpm-quote-tools/tpm-quote-tools_1.0.4.bb (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/tpm-tools/files/04-fix-FTBFS-clang.patch (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/tpm-tools/files/openssl1.1_fix.patch (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/tpm-tools/files/tpm-tools-extendpcr.patch (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/tpm-tools/tpm-tools_1.3.9.2.bb (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/trousers/files/0001-build-don-t-override-localstatedir-mandir-sysconfdir.patch (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/trousers/files/get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/trousers/files/tcsd.service (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/trousers/files/trousers-udev.rules (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/trousers/files/trousers.init.sh (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm1}/trousers/trousers_git.bb (100%)

diff --git a/meta-tpm/recipes-tpm/hoth/libhoth_git.bb b/meta-tpm/recipes-tpm1/hoth/libhoth_git.bb
similarity index 100%
rename from meta-tpm/recipes-tpm/hoth/libhoth_git.bb
rename to meta-tpm/recipes-tpm1/hoth/libhoth_git.bb
diff --git a/meta-tpm/recipes-tpm/libtpm/files/Convert-another-vdprintf-to-dprintf.patch b/meta-tpm/recipes-tpm1/libtpm/files/Convert-another-vdprintf-to-dprintf.patch
similarity index 100%
rename from meta-tpm/recipes-tpm/libtpm/files/Convert-another-vdprintf-to-dprintf.patch
rename to meta-tpm/recipes-tpm1/libtpm/files/Convert-another-vdprintf-to-dprintf.patch
diff --git a/meta-tpm/recipes-tpm/libtpm/files/Use-format-s-for-call-to-dprintf.patch b/meta-tpm/recipes-tpm1/libtpm/files/Use-format-s-for-call-to-dprintf.patch
similarity index 100%
rename from meta-tpm/recipes-tpm/libtpm/files/Use-format-s-for-call-to-dprintf.patch
rename to meta-tpm/recipes-tpm1/libtpm/files/Use-format-s-for-call-to-dprintf.patch
diff --git a/meta-tpm/recipes-tpm/libtpm/files/fix_signed_issue.patch b/meta-tpm/recipes-tpm1/libtpm/files/fix_signed_issue.patch
similarity index 100%
rename from meta-tpm/recipes-tpm/libtpm/files/fix_signed_issue.patch
rename to meta-tpm/recipes-tpm1/libtpm/files/fix_signed_issue.patch
diff --git a/meta-tpm/recipes-tpm/libtpm/libtpm_0.9.5.bb b/meta-tpm/recipes-tpm1/libtpm/libtpm_0.9.5.bb
similarity index 100%
rename from meta-tpm/recipes-tpm/libtpm/libtpm_0.9.5.bb
rename to meta-tpm/recipes-tpm1/libtpm/libtpm_0.9.5.bb
diff --git a/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0001-create-tpm-key-support-well-known-key-option.patch b/meta-tpm/recipes-tpm1/openssl-tpm-engine/files/0001-create-tpm-key-support-well-known-key-option.patch
similarity index 100%
rename from meta-tpm/recipes-tpm/openssl-tpm-engine/files/0001-create-tpm-key-support-well-known-key-option.patch
rename to meta-tpm/recipes-tpm1/openssl-tpm-engine/files/0001-create-tpm-key-support-well-known-key-option.patch
diff --git a/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0002-libtpm-support-env-TPM_SRK_PW.patch b/meta-tpm/recipes-tpm1/openssl-tpm-engine/files/0002-libtpm-support-env-TPM_SRK_PW.patch
similarity index 100%
rename from meta-tpm/recipes-tpm/openssl-tpm-engine/files/0002-libtpm-support-env-TPM_SRK_PW.patch
rename to meta-tpm/recipes-tpm1/openssl-tpm-engine/files/0002-libtpm-support-env-TPM_SRK_PW.patch
diff --git a/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0003-tpm-openssl-tpm-engine-parse-an-encrypted-tpm-SRK-pa.patch b/meta-tpm/recipes-tpm1/openssl-tpm-engine/files/0003-tpm-openssl-tpm-engine-parse-an-encrypted-tpm-SRK-pa.patch
similarity index 100%
rename from meta-tpm/recipes-tpm/openssl-tpm-engine/files/0003-tpm-openssl-tpm-engine-parse-an-encrypted-tpm-SRK-pa.patch
rename to meta-tpm/recipes-tpm1/openssl-tpm-engine/files/0003-tpm-openssl-tpm-engine-parse-an-encrypted-tpm-SRK-pa.patch
diff --git a/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0004-tpm-openssl-tpm-engine-change-variable-c-type-from-c.patch b/meta-tpm/recipes-tpm1/openssl-tpm-engine/files/0004-tpm-openssl-tpm-engine-change-variable-c-type-from-c.patch
similarity index 100%
rename from meta-tpm/recipes-tpm/openssl-tpm-engine/files/0004-tpm-openssl-tpm-engine-change-variable-c-type-from-c.patch
rename to meta-tpm/recipes-tpm1/openssl-tpm-engine/files/0004-tpm-openssl-tpm-engine-change-variable-c-type-from-c.patch
diff --git a/meta-tpm/recipes-tpm/openssl-tpm-engine/files/openssl11_build_fix.patch b/meta-tpm/recipes-tpm1/openssl-tpm-engine/files/openssl11_build_fix.patch
similarity index 100%
rename from meta-tpm/recipes-tpm/openssl-tpm-engine/files/openssl11_build_fix.patch
rename to meta-tpm/recipes-tpm1/openssl-tpm-engine/files/openssl11_build_fix.patch
diff --git a/meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb b/meta-tpm/recipes-tpm1/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb
similarity index 100%
rename from meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb
rename to meta-tpm/recipes-tpm1/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb
diff --git a/meta-tpm/recipes-tpm/pcr-extend/files/fix_openssl11_build.patch b/meta-tpm/recipes-tpm1/pcr-extend/files/fix_openssl11_build.patch
similarity index 100%
rename from meta-tpm/recipes-tpm/pcr-extend/files/fix_openssl11_build.patch
rename to meta-tpm/recipes-tpm1/pcr-extend/files/fix_openssl11_build.patch
diff --git a/meta-tpm/recipes-tpm/pcr-extend/pcr-extend_git.bb b/meta-tpm/recipes-tpm1/pcr-extend/pcr-extend_git.bb
similarity index 100%
rename from meta-tpm/recipes-tpm/pcr-extend/pcr-extend_git.bb
rename to meta-tpm/recipes-tpm1/pcr-extend/pcr-extend_git.bb
diff --git a/meta-tpm/recipes-tpm/swtpm/files/fix_fcntl_h.patch b/meta-tpm/recipes-tpm1/swtpm/files/fix_fcntl_h.patch
similarity index 100%
rename from meta-tpm/recipes-tpm/swtpm/files/fix_fcntl_h.patch
rename to meta-tpm/recipes-tpm1/swtpm/files/fix_fcntl_h.patch
diff --git a/meta-tpm/recipes-tpm/swtpm/files/fix_lib_search_path.patch b/meta-tpm/recipes-tpm1/swtpm/files/fix_lib_search_path.patch
similarity index 100%
rename from meta-tpm/recipes-tpm/swtpm/files/fix_lib_search_path.patch
rename to meta-tpm/recipes-tpm1/swtpm/files/fix_lib_search_path.patch
diff --git a/meta-tpm/recipes-tpm/swtpm/swtpm-wrappers-native.bb b/meta-tpm/recipes-tpm1/swtpm/swtpm-wrappers-native.bb
similarity index 100%
rename from meta-tpm/recipes-tpm/swtpm/swtpm-wrappers-native.bb
rename to meta-tpm/recipes-tpm1/swtpm/swtpm-wrappers-native.bb
diff --git a/meta-tpm/recipes-tpm/swtpm/swtpm_0.7.3.bb b/meta-tpm/recipes-tpm1/swtpm/swtpm_0.7.3.bb
similarity index 100%
rename from meta-tpm/recipes-tpm/swtpm/swtpm_0.7.3.bb
rename to meta-tpm/recipes-tpm1/swtpm/swtpm_0.7.3.bb
diff --git a/meta-tpm/recipes-tpm/tpm-quote-tools/tpm-quote-tools_1.0.4.bb b/meta-tpm/recipes-tpm1/tpm-quote-tools/tpm-quote-tools_1.0.4.bb
similarity index 100%
rename from meta-tpm/recipes-tpm/tpm-quote-tools/tpm-quote-tools_1.0.4.bb
rename to meta-tpm/recipes-tpm1/tpm-quote-tools/tpm-quote-tools_1.0.4.bb
diff --git a/meta-tpm/recipes-tpm/tpm-tools/files/04-fix-FTBFS-clang.patch b/meta-tpm/recipes-tpm1/tpm-tools/files/04-fix-FTBFS-clang.patch
similarity index 100%
rename from meta-tpm/recipes-tpm/tpm-tools/files/04-fix-FTBFS-clang.patch
rename to meta-tpm/recipes-tpm1/tpm-tools/files/04-fix-FTBFS-clang.patch
diff --git a/meta-tpm/recipes-tpm/tpm-tools/files/openssl1.1_fix.patch b/meta-tpm/recipes-tpm1/tpm-tools/files/openssl1.1_fix.patch
similarity index 100%
rename from meta-tpm/recipes-tpm/tpm-tools/files/openssl1.1_fix.patch
rename to meta-tpm/recipes-tpm1/tpm-tools/files/openssl1.1_fix.patch
diff --git a/meta-tpm/recipes-tpm/tpm-tools/files/tpm-tools-extendpcr.patch b/meta-tpm/recipes-tpm1/tpm-tools/files/tpm-tools-extendpcr.patch
similarity index 100%
rename from meta-tpm/recipes-tpm/tpm-tools/files/tpm-tools-extendpcr.patch
rename to meta-tpm/recipes-tpm1/tpm-tools/files/tpm-tools-extendpcr.patch
diff --git a/meta-tpm/recipes-tpm/tpm-tools/tpm-tools_1.3.9.2.bb b/meta-tpm/recipes-tpm1/tpm-tools/tpm-tools_1.3.9.2.bb
similarity index 100%
rename from meta-tpm/recipes-tpm/tpm-tools/tpm-tools_1.3.9.2.bb
rename to meta-tpm/recipes-tpm1/tpm-tools/tpm-tools_1.3.9.2.bb
diff --git a/meta-tpm/recipes-tpm/trousers/files/0001-build-don-t-override-localstatedir-mandir-sysconfdir.patch b/meta-tpm/recipes-tpm1/trousers/files/0001-build-don-t-override-localstatedir-mandir-sysconfdir.patch
similarity index 100%
rename from meta-tpm/recipes-tpm/trousers/files/0001-build-don-t-override-localstatedir-mandir-sysconfdir.patch
rename to meta-tpm/recipes-tpm1/trousers/files/0001-build-don-t-override-localstatedir-mandir-sysconfdir.patch
diff --git a/meta-tpm/recipes-tpm/trousers/files/get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch b/meta-tpm/recipes-tpm1/trousers/files/get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch
similarity index 100%
rename from meta-tpm/recipes-tpm/trousers/files/get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch
rename to meta-tpm/recipes-tpm1/trousers/files/get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch
diff --git a/meta-tpm/recipes-tpm/trousers/files/tcsd.service b/meta-tpm/recipes-tpm1/trousers/files/tcsd.service
similarity index 100%
rename from meta-tpm/recipes-tpm/trousers/files/tcsd.service
rename to meta-tpm/recipes-tpm1/trousers/files/tcsd.service
diff --git a/meta-tpm/recipes-tpm/trousers/files/trousers-udev.rules b/meta-tpm/recipes-tpm1/trousers/files/trousers-udev.rules
similarity index 100%
rename from meta-tpm/recipes-tpm/trousers/files/trousers-udev.rules
rename to meta-tpm/recipes-tpm1/trousers/files/trousers-udev.rules
diff --git a/meta-tpm/recipes-tpm/trousers/files/trousers.init.sh b/meta-tpm/recipes-tpm1/trousers/files/trousers.init.sh
similarity index 100%
rename from meta-tpm/recipes-tpm/trousers/files/trousers.init.sh
rename to meta-tpm/recipes-tpm1/trousers/files/trousers.init.sh
diff --git a/meta-tpm/recipes-tpm/trousers/trousers_git.bb b/meta-tpm/recipes-tpm1/trousers/trousers_git.bb
similarity index 100%
rename from meta-tpm/recipes-tpm/trousers/trousers_git.bb
rename to meta-tpm/recipes-tpm1/trousers/trousers_git.bb
-- 
2.25.1

[meta-security][PATCH 2/4] recipes-tpm: use this for common tpm recipes

[Armin Kuster]

a bit of re-org

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../libtpm/files/Convert-another-vdprintf-to-dprintf.patch        | 0
 .../libtpm/files/Use-format-s-for-call-to-dprintf.patch           | 0
 .../libtpm/files/fix_signed_issue.patch                           | 0
 meta-tpm/{recipes-tpm1 => recipes-tpm}/libtpm/libtpm_0.9.5.bb     | 0
 .../{recipes-tpm1 => recipes-tpm}/swtpm/files/fix_fcntl_h.patch   | 0
 .../swtpm/files/fix_lib_search_path.patch                         | 0
 .../{recipes-tpm1 => recipes-tpm}/swtpm/swtpm-wrappers-native.bb  | 0
 meta-tpm/{recipes-tpm1 => recipes-tpm}/swtpm/swtpm_0.7.3.bb       | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-tpm/{recipes-tpm1 => recipes-tpm}/libtpm/files/Convert-another-vdprintf-to-dprintf.patch (100%)
 rename meta-tpm/{recipes-tpm1 => recipes-tpm}/libtpm/files/Use-format-s-for-call-to-dprintf.patch (100%)
 rename meta-tpm/{recipes-tpm1 => recipes-tpm}/libtpm/files/fix_signed_issue.patch (100%)
 rename meta-tpm/{recipes-tpm1 => recipes-tpm}/libtpm/libtpm_0.9.5.bb (100%)
 rename meta-tpm/{recipes-tpm1 => recipes-tpm}/swtpm/files/fix_fcntl_h.patch (100%)
 rename meta-tpm/{recipes-tpm1 => recipes-tpm}/swtpm/files/fix_lib_search_path.patch (100%)
 rename meta-tpm/{recipes-tpm1 => recipes-tpm}/swtpm/swtpm-wrappers-native.bb (100%)
 rename meta-tpm/{recipes-tpm1 => recipes-tpm}/swtpm/swtpm_0.7.3.bb (100%)

diff --git a/meta-tpm/recipes-tpm1/libtpm/files/Convert-another-vdprintf-to-dprintf.patch b/meta-tpm/recipes-tpm/libtpm/files/Convert-another-vdprintf-to-dprintf.patch
similarity index 100%
rename from meta-tpm/recipes-tpm1/libtpm/files/Convert-another-vdprintf-to-dprintf.patch
rename to meta-tpm/recipes-tpm/libtpm/files/Convert-another-vdprintf-to-dprintf.patch
diff --git a/meta-tpm/recipes-tpm1/libtpm/files/Use-format-s-for-call-to-dprintf.patch b/meta-tpm/recipes-tpm/libtpm/files/Use-format-s-for-call-to-dprintf.patch
similarity index 100%
rename from meta-tpm/recipes-tpm1/libtpm/files/Use-format-s-for-call-to-dprintf.patch
rename to meta-tpm/recipes-tpm/libtpm/files/Use-format-s-for-call-to-dprintf.patch
diff --git a/meta-tpm/recipes-tpm1/libtpm/files/fix_signed_issue.patch b/meta-tpm/recipes-tpm/libtpm/files/fix_signed_issue.patch
similarity index 100%
rename from meta-tpm/recipes-tpm1/libtpm/files/fix_signed_issue.patch
rename to meta-tpm/recipes-tpm/libtpm/files/fix_signed_issue.patch
diff --git a/meta-tpm/recipes-tpm1/libtpm/libtpm_0.9.5.bb b/meta-tpm/recipes-tpm/libtpm/libtpm_0.9.5.bb
similarity index 100%
rename from meta-tpm/recipes-tpm1/libtpm/libtpm_0.9.5.bb
rename to meta-tpm/recipes-tpm/libtpm/libtpm_0.9.5.bb
diff --git a/meta-tpm/recipes-tpm1/swtpm/files/fix_fcntl_h.patch b/meta-tpm/recipes-tpm/swtpm/files/fix_fcntl_h.patch
similarity index 100%
rename from meta-tpm/recipes-tpm1/swtpm/files/fix_fcntl_h.patch
rename to meta-tpm/recipes-tpm/swtpm/files/fix_fcntl_h.patch
diff --git a/meta-tpm/recipes-tpm1/swtpm/files/fix_lib_search_path.patch b/meta-tpm/recipes-tpm/swtpm/files/fix_lib_search_path.patch
similarity index 100%
rename from meta-tpm/recipes-tpm1/swtpm/files/fix_lib_search_path.patch
rename to meta-tpm/recipes-tpm/swtpm/files/fix_lib_search_path.patch
diff --git a/meta-tpm/recipes-tpm1/swtpm/swtpm-wrappers-native.bb b/meta-tpm/recipes-tpm/swtpm/swtpm-wrappers-native.bb
similarity index 100%
rename from meta-tpm/recipes-tpm1/swtpm/swtpm-wrappers-native.bb
rename to meta-tpm/recipes-tpm/swtpm/swtpm-wrappers-native.bb
diff --git a/meta-tpm/recipes-tpm1/swtpm/swtpm_0.7.3.bb b/meta-tpm/recipes-tpm/swtpm/swtpm_0.7.3.bb
similarity index 100%
rename from meta-tpm/recipes-tpm1/swtpm/swtpm_0.7.3.bb
rename to meta-tpm/recipes-tpm/swtpm/swtpm_0.7.3.bb
-- 
2.25.1

[meta-security][PATCH 3/4] swtpm: update to 0.8.0

[Armin Kuster]

includes CVE-2022-23645

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-tpm/recipes-tpm/swtpm/{swtpm_0.7.3.bb => swtpm_0.8.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-tpm/recipes-tpm/swtpm/{swtpm_0.7.3.bb => swtpm_0.8.0.bb} (92%)

diff --git a/meta-tpm/recipes-tpm/swtpm/swtpm_0.7.3.bb b/meta-tpm/recipes-tpm/swtpm/swtpm_0.8.0.bb
similarity index 92%
rename from meta-tpm/recipes-tpm/swtpm/swtpm_0.7.3.bb
rename to meta-tpm/recipes-tpm/swtpm/swtpm_0.8.0.bb
index 55d83f9..614b07f 100644
--- a/meta-tpm/recipes-tpm/swtpm/swtpm_0.7.3.bb
+++ b/meta-tpm/recipes-tpm/swtpm/swtpm_0.8.0.bb
@@ -6,8 +6,8 @@ SECTION = "apps"
 # expect-native, socat-native, coreutils-native and net-tools-native are reportedly only required for the tests
 DEPENDS = "libtasn1 coreutils-native expect-native socat-native glib-2.0 net-tools-native libtpm json-glib"
 
-SRCREV = "f2268eebb0d1adf89bad83fa4cf91e37b4e3fa53"
-SRC_URI = "git://github.com/stefanberger/swtpm.git;branch=stable-0.7-next;protocol=https \
+SRCREV = "2ae7b019370760e17f4f2675195a91ca53950eda"
+SRC_URI = "git://github.com/stefanberger/swtpm.git;branch=master;protocol=https \
            "
 PE = "1"
 
-- 
2.25.1

[meta-security][PATCH 4/4] libtpm: update to 0.9.6

[Armin Kuster]

include: CVE-2023-1017 & CVE-2023-1018

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../recipes-tpm/libtpm/{libtpm_0.9.5.bb => libtpm_0.9.6.bb}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-tpm/recipes-tpm/libtpm/{libtpm_0.9.5.bb => libtpm_0.9.6.bb} (89%)

diff --git a/meta-tpm/recipes-tpm/libtpm/libtpm_0.9.5.bb b/meta-tpm/recipes-tpm/libtpm/libtpm_0.9.6.bb
similarity index 89%
rename from meta-tpm/recipes-tpm/libtpm/libtpm_0.9.5.bb
rename to meta-tpm/recipes-tpm/libtpm/libtpm_0.9.6.bb
index cf80064..a860319 100644
--- a/meta-tpm/recipes-tpm/libtpm/libtpm_0.9.5.bb
+++ b/meta-tpm/recipes-tpm/libtpm/libtpm_0.9.6.bb
@@ -2,7 +2,7 @@ SUMMARY = "LIBPM - Software TPM Library"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e73f0786a936da3814896df06ad225a9"
 
-SRCREV = "df1c3e98d697f3c1f09262d2ba161a7db784d6cc"
+SRCREV = "f8c2dc7e12a730dcca4220d7ac5ad86d13dfd630"
 SRC_URI = "git://github.com/stefanberger/libtpms.git;branch=stable-0.9;protocol=https"
 
 PE = "1"
-- 
2.25.1