From 1bc9c3b9d5a8c51b67f6ea2f57bdd76ff5073097 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Sep 2022 03:11:19 +0100 Subject: gentoo auto-resync : 28:09:2022 - 03:11:19 --- app-crypt/Manifest.gz | Bin 23969 -> 23969 bytes app-crypt/tpm2-abrmd/Manifest | 2 +- app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1-r1.ebuild | 4 +- app-crypt/tpm2-tools/Manifest | 4 +- app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild | 4 +- app-crypt/tpm2-tools/tpm2-tools-5.3.ebuild | 54 ++++++++ app-crypt/tpm2-tss/Manifest | 5 +- ...st-fix-usage-of-FILE-in-unit-test-fapi-io.patch | 146 +++++++++++++++++++++ app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild | 5 +- app-crypt/tpm2-tss/tpm2-tss-3.2.0-r4.ebuild | 6 +- 10 files changed, 222 insertions(+), 8 deletions(-) create mode 100644 app-crypt/tpm2-tools/tpm2-tools-5.3.ebuild create mode 100644 app-crypt/tpm2-tss/files/tpm2-tss-3.2.0-test-fix-usage-of-FILE-in-unit-test-fapi-io.patch (limited to 'app-crypt') diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz index e78e548b87ea..2acef31b20e2 100644 Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest index c436499351d4..7728775c7ab7 100644 --- a/app-crypt/tpm2-abrmd/Manifest +++ b/app-crypt/tpm2-abrmd/Manifest @@ -1,5 +1,5 @@ AUX tpm2-abrmd.confd 17 BLAKE2B f3b6301cb29f0f741c26025bded10af8948eb7f16faca051828b063f4fdab823309fac085e69e281600f77646f3e2bd91c1a5079bd675569aef8db762fdbe991 SHA512 ca7c4782ccc3ee7592bb4b24a6a81c624d22969cf9b9e1c3e22d45e85d3720836b1f22735ccf2ba51258c6eb0b30c4d88d7bed893f58b1aac7423fb7013529f9 AUX tpm2-abrmd.initd 390 BLAKE2B 5dbaccf073eba208e13c24f92127e41c4c71fe62dd9bf2062301efbcc16daa1559ffba127399a189d6466e21a8cf9b85ac0e09d34f495be58430eb3cfe0886ef SHA512 aef622face110e22831dddab8a6474b4d003e6d50da9d334653a88ef0a7fca88377379a56fef9c404af5222c8c2fb97090eca913aa7d96183c4e14d7ab470044 DIST tpm2-abrmd-2.4.1.tar.gz 577259 BLAKE2B 7d97e1069a171f3693fb11b8e2ce0243993f4352aae9fd691bfbf1b8fcef8615b79957f8f662ac00fe59bf7e3830d8abb79c67790f7be1cd3140fd1c7b1ed560 SHA512 0335285678cfceca4f185981ded90d213ff796cadddc9b5d6dbf2db533f81023a0f1089bbd8a8017bccb95190889be23b24d38a176d3368d221479aff4ff7d6c -EBUILD tpm2-abrmd-2.4.1-r1.ebuild 1507 BLAKE2B cfe372476300d93b9325cad246fe51d4a42e9976eee0fbde2598111c7cf6d1f32b2274fb96dc5f1161722c5ee02b3aa8b4d3c8b3c818faea3a44371cd9b80223 SHA512 37542ba391d7fc93890623cc7b69b8b5932a8de1c82ff5dec8b5afa0fb87df378d0e5a9a7ed5b3148b45729047f54422d5d0adb3d8edb03fcec5bed9a9fc9c7f +EBUILD tpm2-abrmd-2.4.1-r1.ebuild 1580 BLAKE2B 9598e8a6d2b1dd25cffd6bc23c2fe6c68369dbba39a584101a8b65a743eae09e3ac6aee930517e8c6fedd4f83f451f531ac254fb132687210d074159aa5169f9 SHA512 b46319faf9d9b8b5e626afcbdc30fbdc88a1f0660fc11f38eb9cc4ed3ac8e7d2e835318d732463de6580765effb0bd2faf48c5c91662b21b7bc1582fb3366722 MISC metadata.xml 493 BLAKE2B fd3fd8c23a18d535957ac767d6f1a8cc49a91ad362d02b3df87e14040d856c7f01341561fed23090b6776937d9cb11e7015d869fc5399620e9047f1644591e9d SHA512 2f72ada33f64c867a9b0a453919d0dbd444ba072abe3212fd6a3c2fb5bd337fb38b6ff0b8474345e6843160822d6c065261881799a9598de3a57045f09208667 diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1-r1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1-r1.ebuild index ed4032c44ca0..cda953bf6908 100644 --- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1-r1.ebuild +++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit autotools systemd +inherit autotools flag-o-matic systemd DESCRIPTION="TPM2 Access Broker & Resource Manager" HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd" @@ -36,6 +36,8 @@ src_prepare() { } src_configure() { + # tests fail with LTO enabbled. See bug 865275 + filter-lto econf \ $(use_enable static-libs static) \ $(use_enable test unit) \ diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest index aaaff03b666c..90bc6231050f 100644 --- a/app-crypt/tpm2-tools/Manifest +++ b/app-crypt/tpm2-tools/Manifest @@ -1,5 +1,7 @@ AUX tpm2-tools-5.1.1-no-efivar-automagic.patch 1083 BLAKE2B 10a8299a28ee54339ac73692dc54475da3044d3afcfe570d6c72f5d8ace2bbf3faf5242002be02c4a765ba9b9c37ba9777d9b4b8bac416e6721d9b8660d19bf2 SHA512 4622e235ef5202cc3448fbc67f362ce36396ca04892c340f275f67c93d5bb2857a14094329ec499c4f7215ac10002b70d18cfc2bdef1474d93f556c5759383ae AUX tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch 1380 BLAKE2B ffbbe59cbfd4a411544ef7f03ed04c73afc774edebaa2da8deb11e7fe4f321b88b686d3138fd5524b2279407518dda32de0e1cb96a5517ba87f8cc8c9ddb2be5 SHA512 557ad07048e288a9611222b920e8c82fab9852dde04da2b57981cb04ce3bb9d4ea40c57ba24fb2b3dc09cacc16ef731d11428d0603d757f7f7adc2023c5ca779 DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2 SHA512 9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b -EBUILD tpm2-tools-5.2-r1.ebuild 1518 BLAKE2B 94b0832fd9339490452191f81f3f36d7f269e3b2752e33dda6fb1713106e0243ce505b71d5730823add71d9f120d04ca1c890ccbd178d5e434a58688847ece41 SHA512 6c09c045c687f42ad9ae71f03e121610ccfd1767a201fae243b76576b014851c29391ac4a121861076f1b0444b799c2d0de943226986577505e3542d97f2514d +DIST tpm2-tools-5.3.tar.gz 1118934 BLAKE2B 7efb43180c23cee30ea860fb697049d5c4444594bff66404d0fe805ef1783b70859c04563ed946fe38bac329fe0c849ba30fe0dff9fc10f0d6942210862d96d6 SHA512 224a5ea3448a877362abb35ac06b115c559c09b44b30d74c8326211be66d24e0e130c285b1e285be1842e7203ab488629b0f4e451cbd782c83ed72023d146675 +EBUILD tpm2-tools-5.2-r1.ebuild 1602 BLAKE2B a70c4a29b5c4c04bbf59d4c399d535af4160183fb490be2e806525d0892f03b40d92015f1b036b9d433d78d305247ef4cf9d45c6f181fe8b61231dc7f04cc9b5 SHA512 b59f2a4fcb40458ac40e2ad43dd7f0881063dec4ccbb940ae60acab51ca4df1d1dcd63e71fddd9dff76ad12b19b273c555a2665a3a7036a75fe969a96993ebc2 +EBUILD tpm2-tools-5.3.ebuild 1273 BLAKE2B 31032f0d1019313421dc2b0f23da5bbfbee608120348edccec66d108daf0f343b56fba50701316a9c35e5b656d03b9aa386f1a76603bcd0832466612cdb9576b SHA512 29d356973c46b75cc7922d05a5927d14550374cfef69e1b16b8993461c4d3065983a7be772e7335f44049332bae23898d368ccbe250ba91ca59d77582ecf1a6d MISC metadata.xml 560 BLAKE2B fe8daaba2a7586247537f8ed7b92769676b20f2c1377f7bb582dff49e06cf3f9beba4f79e28f10ea76d67d089eb152b060b091414dd9b47c5694ca153211421f SHA512 a744fcc50c7e44b1939190150404aee9054eab8e921e6f63cafa58dc80be5f20692632509de85399b6a9633701da72fd951e8bcfbe9e5177f315fa1dcbcc9ee5 diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild index 22e76e0b6bd7..2da3dc2b0eba 100644 --- a/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild +++ b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -inherit autotools bash-completion-r1 python-any-r1 +inherit autotools bash-completion-r1 flag-o-matic python-any-r1 DESCRIPTION="Tools for the TPM 2.0 TSS" HOMEPAGE="https://github.com/tpm2-software/tpm2-tools" @@ -51,6 +51,8 @@ src_prepare() { } src_configure() { + # tests fail with LTO enabbled. See bug 865275 and 865277 + filter-lto econf \ $(use_enable fapi) \ $(use_enable test unit) \ diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.3.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.3.ebuild new file mode 100644 index 000000000000..27316e08d750 --- /dev/null +++ b/app-crypt/tpm2-tools/tpm2-tools-5.3.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit autotools bash-completion-r1 flag-o-matic python-any-r1 + +DESCRIPTION="Tools for the TPM 2.0 TSS" +HOMEPAGE="https://github.com/tpm2-software/tpm2-tools" +SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="+fapi test" + +RESTRICT="!test? ( test )" + +RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?] + dev-libs/openssl:= + net-misc/curl + sys-libs/efivar:=" +DEPEND="${RDEPEND} + test? ( + app-crypt/swtpm + app-crypt/tpm2-abrmd + dev-util/cmocka + )" +BDEPEND="virtual/pkgconfig + sys-devel/autoconf-archive + test? ( + app-editors/vim-core + dev-tcltk/expect + $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + ) + ${PYTHON_DEPS}" + +src_configure() { + # tests fail with LTO enabbled. See bug 865275 and 865277 + filter-lto + econf \ + $(use_enable fapi) \ + $(use_enable test unit) \ + --with-bashcompdir=$(get_bashcompdir) \ + --enable-hardening +} + +src_install() { + default + mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die + local utils=( "${ED}"/usr/bin/tpm2_* ) + bashcomp_alias tpm2 "${utils[@]##*/}" +} diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest index cd81b1cf2a86..ae3705f938dd 100644 --- a/app-crypt/tpm2-tss/Manifest +++ b/app-crypt/tpm2-tss/Manifest @@ -1,7 +1,8 @@ AUX tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch 1214 BLAKE2B 40f1005626205d440fabda7f88444b0eef344df8f6ead5716807bcbaf490e7b24afc12580ae25c506fcc45dfb4bac0789d9b897dfcaae943c6ba9795b2f4f1d8 SHA512 adbff50c66a22659b563344c216d60bb80951016c3d7180c07c0498c285c9099a60e5573ed0ce29c7732de28d4c390b8eac16bf695c739d0c614dd344f1bfb46 AUX tpm2-tss-3.2.0-Dont-run-systemd-sysusers-in-Makefile.patch 2556 BLAKE2B ea8799561378e718019ed2e3885a91f5b5a270f65eb22f11f952e4346fe066f40fc8ae21230d77c53f4a2ebee3d508342777f34e7e7aa6aa81fcd48fb766984e SHA512 ba555d93affd142c213cc023ddccdfbdfabc9aa05528005cca5bd51751f729c6b44111054443f7ed69c1316cf2986b1f84d5c470e918a1ac34f9c4760eb2e596 AUX tpm2-tss-3.2.0-slibtool.patch 3603 BLAKE2B f0a0047b316396dfa5800702b793bf5247d62be75704be42968b7719a87a25200b6870e14f87ccb45876b53600052b6716386493ddcbead87857093188608621 SHA512 8c20df4be8857dfcf030770e74f27dc14c31f4a5b6eb1a90c9dca6f0dd01987a7983478c0dfe9774669b9f8fc9ddace66d5d51f991582ba3689bcdcea64a1b86 +AUX tpm2-tss-3.2.0-test-fix-usage-of-FILE-in-unit-test-fapi-io.patch 4895 BLAKE2B cb6e4d4544bb78e4fb768b4943dc0ebd381e2a480528d824634f486343955ea29370a731f5bbec222f653a3194615b4cbf13749fa089b58e2ded29e6bcaf06b8 SHA512 1fae2396bcf7bf1af55d4a8e6aa522e8a86344252a3b642c16f84158a3e3eb98dd2d0e2e41c2f13fa25af9452dd1a252bed4af91896aa2efa23029aa0ed1bf2f DIST tpm2-tss-3.2.0.tar.gz 1629211 BLAKE2B a89aa4d89a50bdfb5a9652874d30e2138747bd022049f2be2d0b56e296329d0c41254033ec3a062dbd64fde54a62e952f54446c551e5788231827cd53fae045a SHA512 cabb411f074dfa94919ba914849aac77a0ac2f50622e28a1406cf575369148774748e0e2b7a7c566ec83561a96d4b883bac5a3b1763f4cf48668a0c5d68c0a23 -EBUILD tpm2-tss-3.2.0-r3.ebuild 2550 BLAKE2B 2a1ebf581d6dae840e235afd19131164bcad8a6103a9ab8420fa67e69bab676c7b210b2966a8fda0458ed369ee99deb7da5d7871dc85057daa3e3a3d197f6370 SHA512 a1df8e66d2ba7de7ce000c17c8e59a2c9449fecce5d4feade69f0b3f7f9bee4bf68f518784b574cb636d386a2690698cfc8620410eab3916c8f17315fb315e1c -EBUILD tpm2-tss-3.2.0-r4.ebuild 2606 BLAKE2B c95d09e279e467b40ce4df3fa024e3db1a5064132dad6930036a498ba3a25e84ee3e4070c39eb84cc15641137d66a64ad9d31e77bd836ea14063ec2e8ef63041 SHA512 14b29ef752b3e57652b7e61d58e0919709b46831590f9b5e196240eaa472a00e262fa54f9525700943c5beb569e1ea782036c5dac9ab716d3601321c2390084b +EBUILD tpm2-tss-3.2.0-r3.ebuild 2635 BLAKE2B 53e6ce0e7a7766c54246af2352209a55fd898a412a87ab086ac8f1eb1374eccc9b2ecbe2fc8db644706f734f783cb7982aecb8b3539dd02797cbc26474c8cd3d SHA512 f305ac53b44085835f5a437d556fa889bacf4ab0cff1962a9c7d37807fc8c88dcd2f6d4976dd8bd8c4c04673b1f146f390189c0a6035a4eb6c8d394c69fd1bb6 +EBUILD tpm2-tss-3.2.0-r4.ebuild 2768 BLAKE2B 161aa01998cbe9a96d0f0bad1d013dabbdb0205e73356982109efc51619a7d542ae0a7f83f89dacec0eed238c0002cdc766fabd14a4a57a3402e463149b6fe3a SHA512 3fcfd7ef31011174de12991a1efc16e5f9f3dbd9a525e11224bd691e0591eddf699d9c92399b96199dcc93dc529d7d68cc36f92d65c5342376fa696e7a4ac86d MISC metadata.xml 747 BLAKE2B 0462c5942012c444e13bf094be03e0cc142b3b5e3e613570506f84be45bb3019876f3f44454b078668c7e3cbd4a60819cd2ea57c588cab34bfe82f76f222bcf8 SHA512 dab6f379190e40b0321597f0c5fa03ee5731eb77e91dc5d82d2f57c896cf40a074598ba1dedd1575e4e23e1fc5ed306f83cb50992fca6cc2bc1a1db822765a7a diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.2.0-test-fix-usage-of-FILE-in-unit-test-fapi-io.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.2.0-test-fix-usage-of-FILE-in-unit-test-fapi-io.patch new file mode 100644 index 000000000000..aff792a28263 --- /dev/null +++ b/app-crypt/tpm2-tss/files/tpm2-tss-3.2.0-test-fix-usage-of-FILE-in-unit-test-fapi-io.patch @@ -0,0 +1,146 @@ +https://github.com/tpm2-software/tpm2-tss/commit/bda22252507124bb8e466ac2f0c61d5ebed9027d +https://github.com/tpm2-software/tpm2-tss/pull/2423 +https://bugs.gentoo.org/833530 + +From bda22252507124bb8e466ac2f0c61d5ebed9027d Mon Sep 17 00:00:00 2001 +From: William Roberts +Date: Mon, 26 Sep 2022 15:16:15 -0500 +Subject: [PATCH] test: fix usage of FILE in unit test fapi-io + +The unit test had a static FILE structure used to pass to stdio FILE * +routines as a dummy value to indicate to use the __real_xxx variant of +the mocked function. This doesn't work when FILE is opaque as the +compiler cannot figure out how much storage space is needed for a FILE +struct. + +Fix this by passing a dummy pointer to a data type the compiler knows +about and casting it to FILE pointer. + +Fixes: #2419 + +Signed-off-by: William Roberts +--- + test/unit/fapi-io.c | 30 ++++++++++++++++-------------- + 1 file changed, 16 insertions(+), 14 deletions(-) + +diff --git a/test/unit/fapi-io.c b/test/unit/fapi-io.c +index dbadcb47..8a883a43 100644 +--- a/test/unit/fapi-io.c ++++ b/test/unit/fapi-io.c +@@ -38,7 +38,9 @@ + bool wrap_fcntl_test = false; + bool wrap_malloc_test = false; + bool wrap_read_test = false; +-FILE mock_stream; /**< stream will be used to activate wrapper.*/ ++char _mock_stream; /**< stream will be used to activate wrapper.*/ ++ ++#define MOCK_STREAM ((FILE *)(&_mock_stream)) + + /* + * Wrapper functions for file system io. +@@ -74,7 +76,7 @@ __real_fclose(FILE *stream, ...); + int + __wrap_fclose(FILE *stream, ...) + { +- if (stream != &mock_stream) { ++ if (stream != MOCK_STREAM) { + return __real_fclose(stream); + } + return mock_type(int); +@@ -86,7 +88,7 @@ __real_fseek(FILE *stream, long offset, int whence, ...); + int + __wrap_fseek(FILE *stream, long offset, int whence, ...) + { +- if (stream != &mock_stream) { ++ if (stream != MOCK_STREAM) { + return __real_fseek(stream, offset, whence); + } + return mock_type(int); +@@ -98,7 +100,7 @@ __real_ftell(FILE *stream, ...); + long + __wrap_ftell(FILE *stream, ...) + { +- if (stream != &mock_stream) { ++ if (stream != MOCK_STREAM) { + return __real_ftell(stream); + } + return mock_type(int); +@@ -135,7 +137,7 @@ __real_fileno(FILE *stream, ...); + int + __wrap_fileno(FILE *stream, ...) + { +- if (stream != &mock_stream) { ++ if (stream != MOCK_STREAM) { + return __real_fileno(stream); + } + return 1; +@@ -179,7 +181,7 @@ check_io_read_async(void **state) { + assert_int_equal(r, TSS2_FAPI_RC_IO_ERROR); + + wrap_fcntl_test = true; +- will_return(__wrap_fopen, &mock_stream); ++ will_return(__wrap_fopen, MOCK_STREAM); + will_return(__wrap_fcntl, -1); + will_return_always(__wrap_fclose, 0); + errno = EAGAIN; +@@ -187,8 +189,8 @@ check_io_read_async(void **state) { + r = ifapi_io_read_async(&io, "tss_unit_dummyf"); + assert_int_equal(r, TSS2_FAPI_RC_IO_ERROR); + +- will_return(__wrap_fopen, &mock_stream); +- will_return(__wrap_fopen, &mock_stream); ++ will_return(__wrap_fopen, MOCK_STREAM); ++ will_return(__wrap_fopen, MOCK_STREAM); + will_return(__wrap_fcntl, 0); + will_return(__wrap_fseek, 0); + will_return(__wrap_ftell, 1); +@@ -202,8 +204,8 @@ check_io_read_async(void **state) { + + wrap_malloc_test = false; + +- will_return(__wrap_fopen, &mock_stream); +- will_return(__wrap_fopen, &mock_stream); ++ will_return(__wrap_fopen, MOCK_STREAM); ++ will_return(__wrap_fopen, MOCK_STREAM); + will_return(__wrap_fcntl, 0); + will_return(__wrap_fseek, 0); + will_return(__wrap_ftell, 1); +@@ -236,7 +238,7 @@ check_io_read_finish(void **state) { + will_return_always(__wrap_fclose, 0); + io.char_buffer = &io_char_buffer[0]; + io.buffer_length = 10; +- io.stream = &mock_stream; ++ io.stream = MOCK_STREAM; + errno = EAGAIN; + r = ifapi_io_read_finish(&io, &buffer[0], &count); + assert_int_equal(r, TSS2_FAPI_RC_TRY_AGAIN); +@@ -298,7 +300,7 @@ check_io_write_async(void **state) { + assert_int_equal(r, TSS2_FAPI_RC_IO_ERROR); + + wrap_fcntl_test = true; +- will_return(__wrap_fopen, &mock_stream); ++ will_return(__wrap_fopen, MOCK_STREAM); + will_return(__wrap_fcntl, -1); + + errno = EAGAIN; +@@ -306,7 +308,7 @@ check_io_write_async(void **state) { + assert_int_equal(r, TSS2_FAPI_RC_IO_ERROR); + + io.char_rbuffer = NULL; +- will_return(__wrap_fopen, &mock_stream); ++ will_return(__wrap_fopen, MOCK_STREAM); + will_return(__wrap_fcntl, 0); + will_return(__wrap_fcntl, 0); + will_return(__wrap_fcntl, -1); +@@ -345,7 +347,7 @@ check_io_write_finish(void **state) { + will_return_always(__wrap_fclose, 0); + + wrap_write_test = true; +- io.stream = &mock_stream; ++ io.stream = MOCK_STREAM; + will_return(__wrap_write, -1); + errno = EAGAIN; + r = ifapi_io_write_finish(&io); +-- +2.35.1 + diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild index 4de62a88379e..6b9f088e71d1 100644 --- a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild +++ b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools linux-info multilib-minimal tmpfiles udev +inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack" HOMEPAGE="https://github.com/tpm2-software/tpm2-tss" @@ -59,6 +59,9 @@ src_prepare() { } multilib_src_configure() { + # tests fail with LTO enabbled. See bug 865275 and 865279 + filter-lto + ECONF_SOURCE=${S} econf \ --localstatedir=/var \ $(multilib_native_use_enable doc doxygen-doc) \ diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r4.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r4.ebuild index ff68e249a0e9..1e76e7ee9d5f 100644 --- a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r4.ebuild +++ b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools linux-info multilib-minimal tmpfiles udev +inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack" HOMEPAGE="https://github.com/tpm2-software/tpm2-tss" @@ -38,6 +38,7 @@ BDEPEND="sys-apps/acl PATCHES=( "${FILESDIR}/${PN}-3.2.0-Dont-run-systemd-sysusers-in-Makefile.patch" "${FILESDIR}/${PN}-3.2.0-slibtool.patch" # 858674 + "${FILESDIR}/${PN}-3.2.0-test-fix-usage-of-FILE-in-unit-test-fapi-io.patch" ) pkg_setup() { @@ -60,6 +61,9 @@ src_prepare() { } multilib_src_configure() { + # tests fail with LTO enabbled. See bug 865275 and 865279 + filter-lto + ECONF_SOURCE=${S} econf \ --localstatedir=/var \ $(multilib_native_use_enable doc doxygen-doc) \ -- cgit v1.2.3