subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-crypt\/tpm2\-tools\/"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2024-05-07 Thread Sam James

commit: bb50eeae1aa5f05f41ed4fd8cefbdb0c062c51f8
Author: Sam James  gentoo  org>
AuthorDate: Tue May  7 10:29:01 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  7 10:29:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb50eeae

app-crypt/tpm2-tools: Stabilize 5.6.1 arm64, #931272

Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
index 0a6170ebbdb8..132c29286d83 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/tpm2-tools-5.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2024-05-07 Thread Sam James

commit: 4a4b1c938172b65f3fdb5ecc9b5801555dcb23ce
Author: Sam James  gentoo  org>
AuthorDate: Tue May  7 10:29:03 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  7 10:29:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a4b1c93

app-crypt/tpm2-tools: Stabilize 5.6.1 arm, #931272

Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
index 132c29286d83..f8ad3a1b74c9 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/tpm2-tools-5.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2024-05-06 Thread Joonas Niilola

commit: be044dfa163e4362e89183b7574116e9f2cadfc6
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue May  7 05:52:35 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May  7 05:52:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be044dfa

app-crypt/tpm2-tools: Stabilize 5.6.1 x86, #931272

Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
index 923ae66847d9..0bc61dcfd857 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/tpm2-tools-5.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2024-05-06 Thread Joonas Niilola

commit: bb6bbb54e1a1e8aaefdbf84a83791fface9593ef
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue May  7 05:53:04 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May  7 05:53:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb6bbb54

app-crypt/tpm2-tools: Stabilize 5.6.1 amd64, #931272

Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
index 0bc61dcfd857..0a6170ebbdb8 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/tpm2-tools-5.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2024-05-05 Thread Sam James

commit: ebff9657edadc8779ed9fde8e2b2debd7bfcac53
Author: Christopher Byrne  gmail  com>
AuthorDate: Fri Apr 26 16:52:01 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May  5 11:36:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebff9657

app-crypt/tpm2-tools: add 5.6.1

Bug: https://bugs.gentoo.org/931056

Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/Manifest|  1 +
 app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild | 87 
 2 files changed, 88 insertions(+)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index f9a3d2cb3763..39a89e4cd553 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,3 +1,4 @@
 DIST tpm2-tools-5.5.tar.gz 1241390 BLAKE2B 
2225f9e0835988351f84ed06f914616e25fd65bacaa93b51d0bb04185314efb9a6f60eb3539b250f54b2c2ba590f1b76594df3e625e45c8d37e38d13371bea26
 SHA512 
24f72a3e9840d531d900e96771a863baae1c71a76fcad0fda8020dff06acd8e3b65b86401ace21f034766403caf9ae97ce710ff6013bb7ed25657a6ecf325470
 DIST 
tpm2-tools-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch.xz 
47916 BLAKE2B 
1bbc84f58ad46507417c89be1b4ce2450fb33cf3abe8f080c23890d96be85379f135ef1dbf4b580e1a386fa6d5ebc4fbaab351b5238bbf1011bb97b0f49a847b
 SHA512 
3db0daa39a8dc756d7cb25e3673149dc3eeafd7410f2c6537464431b501e3704a886d9b7a9acd71440d6d419649dd471fd6f9247d593c89a30b05774a8d1b3de
+DIST tpm2-tools-5.6.1.tar.gz 1255474 BLAKE2B 
7fda0084283bbd592c3323605f598ebb77ba267ebb900e62b2eff2742257378d95f99b48aab090f80438a6c86f168e1863f9350c18571a23e17eea90a1b9bdd9
 SHA512 
7a5903db0578a1364c44ca8ac3672c3cae745e2b0ab66ddf6a91fdb75146441af32dfe4ccad6825bea343fea74bed97f9e45bf752594ee56f32e4cb7be2bed33
 DIST tpm2-tools-5.6.tar.gz 1266731 BLAKE2B 
fe88722c26d62128cd6dfbdd8ef2568656a75fe27b1443fed28387d0db1f50b7d0651819d34dfa98acde785b4cfb4e7c11420b110bb5333ed2bb6b67cdd4fc70
 SHA512 
14216f29ed3ecca5fbe356ed3744c8b6b25a62ff11b2aed596d11101328c8bfd29a02f6ca5a218f9a4477a5e9648c50f0ae96e71de0b4ff5ea1f98ebeeb73cd7

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
new file mode 100644
index ..923ae66847d9
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+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;
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/tpm2-tools-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch.xz;
+
+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
+   dev-build/autoconf-archive
+   test? (
+   app-editors/vim-core
+   dev-tcltk/expect
+   $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+   )
+   ${PYTHON_DEPS}"
+
+PATCHES=(
+   
"${FILESDIR}/${PN}-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch"
+   
"${WORKDIR}/${PN}-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch"
+   "${FILESDIR}/${PN}-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch"
+   "${FILESDIR}/${PN}-5.6-test-eventlog.sh-Fix-accidental-deletions.patch"
+)
+
+python_check_deps() {
+   python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+   use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+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_* )
+   utils=("${utils[@]##*/}")
+   # these utiltites don't have bash completions
+   local nobashcomp=( tpm2_encodeobject tpm2_getpolicydigest\
+  tpm2_sessionconfig tpm2_tr_encode)
+   mapfile -d $'\0' -t utils < <(printf '%s\0' "${utils[@]}" | grep -Ezvw 
"${nobashcomp[@]/#/-e}")
+   bashcomp_alias tpm2 "${utils[@]}"
+}
+
+src_test() {
+# This hook doesn't

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2024-05-05 Thread Sam James

commit: c27dcfa2208e23d6f91f6dce31e8a2f93fb9367b
Author: Christopher Byrne  gmail  com>
AuthorDate: Fri Apr 26 18:27:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May  5 11:36:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c27dcfa2

app-crypt/tpm2-tools: add 5.7

Signed-off-by: Christopher Byrne  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36507
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/Manifest  |  1 +
 app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild | 83 ++
 2 files changed, 84 insertions(+)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 39a89e4cd553..de6dabd7afff 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -2,3 +2,4 @@ DIST tpm2-tools-5.5.tar.gz 1241390 BLAKE2B 
2225f9e0835988351f84ed06f914616e25fd6
 DIST 
tpm2-tools-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch.xz 
47916 BLAKE2B 
1bbc84f58ad46507417c89be1b4ce2450fb33cf3abe8f080c23890d96be85379f135ef1dbf4b580e1a386fa6d5ebc4fbaab351b5238bbf1011bb97b0f49a847b
 SHA512 
3db0daa39a8dc756d7cb25e3673149dc3eeafd7410f2c6537464431b501e3704a886d9b7a9acd71440d6d419649dd471fd6f9247d593c89a30b05774a8d1b3de
 DIST tpm2-tools-5.6.1.tar.gz 1255474 BLAKE2B 
7fda0084283bbd592c3323605f598ebb77ba267ebb900e62b2eff2742257378d95f99b48aab090f80438a6c86f168e1863f9350c18571a23e17eea90a1b9bdd9
 SHA512 
7a5903db0578a1364c44ca8ac3672c3cae745e2b0ab66ddf6a91fdb75146441af32dfe4ccad6825bea343fea74bed97f9e45bf752594ee56f32e4cb7be2bed33
 DIST tpm2-tools-5.6.tar.gz 1266731 BLAKE2B 
fe88722c26d62128cd6dfbdd8ef2568656a75fe27b1443fed28387d0db1f50b7d0651819d34dfa98acde785b4cfb4e7c11420b110bb5333ed2bb6b67cdd4fc70
 SHA512 
14216f29ed3ecca5fbe356ed3744c8b6b25a62ff11b2aed596d11101328c8bfd29a02f6ca5a218f9a4477a5e9648c50f0ae96e71de0b4ff5ea1f98ebeeb73cd7
+DIST tpm2-tools-5.7.tar.gz 1339035 BLAKE2B 
3984f25176e0b092793a33a0b40b396bc650de989e0b600989d11439cccdf7bc410535c01e1a0e985ab67b36b63eb02d392342aa1746b86727ba22d67d522389
 SHA512 
629b0b1826815877f452935285f7b3fe0f32bd24fe9130eb169a2dc9b7b254a737797043af9eea68be706b87c32ab2b7189151360c9c00bc5c31dce62a799670

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild
new file mode 100644
index ..f0c382e9893b
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+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
+   dev-build/autoconf-archive
+   test? (
+   app-editors/vim-core
+   dev-tcltk/expect
+   $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+   )
+   ${PYTHON_DEPS}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch"
+)
+
+python_check_deps() {
+   python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+   use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+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_* )
+   utils=("${utils[@]##*/}")
+   # these utiltites don't have bash completions
+   local nobashcomp=( tpm2_encodeobject tpm2_getpolicydigest\
+  tpm2_sessionconfig tpm2_tr_encode)
+   mapfile -d $'\0' -t utils < <(printf '%s\0' "${utils[@]}" | grep -Ezvw 
"${nobashcomp[@]/#/-e}")
+   bashcomp_alias tpm2 "${utils[@]}"
+}
+
+src_test() {
+# This hook doesn't get invoked consisently, so call it manually
+# else one of the tests will fail
+   emake prepare-check
+   default
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/files/, app-crypt/tpm2-tools/

2024-04-15 Thread Sam James

commit: 6012458803eaa9f9ae7617d26297b3f006c8dfae
Author: Christopher Byrne  gmail  com>
AuthorDate: Tue Apr 16 00:46:48 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 16 02:27:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60124588

app-crypt/tpm2-tools: Fix eventlog test

Closes: https://bugs.gentoo.org/930008
Signed-off-by: Christopher Byrne  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35660
Signed-off-by: Sam James  gentoo.org>

 ...test-eventlog.sh-Fix-accidental-deletions.patch | 68 ++
 app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild  |  1 +
 2 files changed, 69 insertions(+)

diff --git 
a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog.sh-Fix-accidental-deletions.patch
 
b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog.sh-Fix-accidental-deletions.patch
new file mode 100644
index ..7274ee40827a
--- /dev/null
+++ 
b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog.sh-Fix-accidental-deletions.patch
@@ -0,0 +1,68 @@
+From 4dec5295361d753c3466bc9e8b0ae3a3cc58dff5 Mon Sep 17 00:00:00 2001
+From: Juergen Repp 
+Date: Thu, 4 Apr 2024 09:42:51 +0200
+Subject: [PATCH] test eventlog.sh Fix accidental deletions.
+
+* Accidental deletions made in commit 196e3d439407e81040ced054a8ed302489348a9d
+  are undone.
+* python3 is used as default instead of python.
+
+Signed-off-by: Juergen Repp 
+---
+ test/integration/tests/eventlog.sh | 33 --
+ 1 file changed, 31 insertions(+), 2 deletions(-)
+
+diff --git a/test/integration/tests/eventlog.sh 
b/test/integration/tests/eventlog.sh
+index 9d5290f0..e7c13706 100755
+--- a/test/integration/tests/eventlog.sh
 b/test/integration/tests/eventlog.sh
+@@ -3,7 +3,7 @@
+ set -E
+ shopt -s expand_aliases
+ 
+-alias python=${PYTHON-python}
++alias python=${PYTHON-python3}
+ 
+ yaml_validate() {
+ cmd=$1
+@@ -88,7 +88,36 @@ expect_pass() {
+ expect_fail
+ expect_fail foo
+ expect_fail foo bar
+-expect_fail ${srcdir}/test/integration/fix
++expect_fail ${srcdir}/test/integration/fixtures/event-bad.bin
++
++expect_pass ${srcdir}/test/integration/fixtures/specid-vendordata.bin
++expect_pass ${srcdir}/test/integration/fixtures/event.bin
++expect_pass ${srcdir}/test/integration/fixtures/event-uefivar.bin
++expect_pass ${srcdir}/test/integration/fixtures/event-uefiaction.bin
++expect_pass ${srcdir}/test/integration/fixtures/event-uefiservices.bin
++expect_pass ${srcdir}/test/integration/fixtures/event-uefi-sha1-log.bin
++expect_pass ${srcdir}/test/integration/fixtures/event-bootorder.bin
++expect_pass ${srcdir}/test/integration/fixtures/event-postcode.bin
++
++# Make sure that --eventlog-version=2 works on complete TPM2 logs
++expect_pass ${srcdir}/test/integration/fixtures/event-arch-linux.bin 
--eventlog-version=2
++expect_pass ${srcdir}/test/integration/fixtures/event-gce-ubuntu-2104-log.bin 
--eventlog-version=2
++expect_pass ${srcdir}/test/integration/fixtures/event-sd-boot-fedora37.bin 
--eventlog-version=2
++expect_pass ${srcdir}/test/integration/fixtures/event-moklisttrusted.bin 
--eventlog-version=2
++
++# Pick an event with leading whitespace and validate we have
++# preserved it correctly after parsing the YAML
++event=$(yaml_validate "print(y['events'][80]['Event']['String'])" < 
${srcdir}/test/integration/fixtures/event-moklisttrusted.bin.yaml | tr -d '\0')
++expect=$(echo -e "grub_cmd: menuentry UEFI Firmware Settings --id 
uefi-firmware {\n\t\tfwsetup\n\t}")
++if test "$event" != "$expect"
++then
++echo "Got $event"
++echo "Want $expect"
++exit 1
++fi
++
++# Compare strings generated by tpm2_eventlog with binary data of the 
corresponding
++# events.
+ hex_file="${srcdir}/test/integration/fixtures/event-moklisttrusted-hex.yaml"
+ tool_file="${srcdir}/test/integration/fixtures/event-moklisttrusted.bin.yaml"
+ 
+-- 
+2.43.2
+

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
index 216cca435e9d..ab59eed9520d 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
@@ -42,6 +42,7 @@ PATCHES=(

"${WORKDIR}/${PN}-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch"
"${FILESDIR}/${PN}-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch"
"${FILESDIR}/${PN}-5.6-bashism.patch"
+   "${FILESDIR}/${PN}-5.6-test-eventlog.sh-Fix-accidental-deletions.patch"
 )
 
 python_check_deps() {

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2024-04-15 Thread Sam James

commit: 6f08de91f6e8ba84835173b53fbd33720a302a1b
Author: Christopher Byrne  gmail  com>
AuthorDate: Fri Mar  8 01:57:51 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 16 02:27:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f08de91

app-crypt/tpm2-tools: Exclude bash completion for tpm2_tr_encode

Closes: https://bugs.gentoo.org/925860
Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
index 04fb5536f1f5..216cca435e9d 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
@@ -73,7 +73,8 @@ src_install() {
local utils=( "${ED}"/usr/bin/tpm2_* )
utils=("${utils[@]##*/}")
# these utiltites don't have bash completions
-   local nobashcomp=( tpm2_encodeobject tpm2_getpolicydigest 
tpm2_sessionconfig )
+   local nobashcomp=( tpm2_encodeobject tpm2_getpolicydigest\
+  tpm2_sessionconfig tpm2_tr_encode)
mapfile -d $'\0' -t utils < <(printf '%s\0' "${utils[@]}" | grep -Ezvw 
"${nobashcomp[@]/#/-e}")
bashcomp_alias tpm2 "${utils[@]}"
 }

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/

2024-01-21 Thread Sam James

commit: 2cff69fec866f90fb9743ebfbae0dec140553e2b
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 21 08:11:52 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 21 08:12:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cff69fe

app-crypt/tpm2-tools: fix bashism in configure

Closes: https://bugs.gentoo.org/922592
Signed-off-by: Sam James  gentoo.org>

 .../tpm2-tools/files/tpm2-tools-5.6-bashism.patch  | 47 ++
 ...2-tools-5.6.ebuild => tpm2-tools-5.6-r1.ebuild} |  1 +
 2 files changed, 48 insertions(+)

diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-bashism.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-bashism.patch
new file mode 100644
index ..01ce4301d4e3
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-bashism.patch
@@ -0,0 +1,47 @@
+https://github.com/tpm2-software/tpm2-tools/pull/3339
+
+From 9f244c3f74747b7f79c8c6813657b2f2f8a1c844 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sun, 21 Jan 2024 08:08:28 +
+Subject: [PATCH] configure.ac: fix bashisms
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Fixes configure warnings/errors like:
+```
+checking for libcurl... yes
+./configure: 15201: test: xauto: unexpected operator
+./configure: 15286: test: xauto: unexpected operator
+checking for efivar/efivar.h... yes
+```
+
+This fixes a build error later on too:
+```
+/usr/lib/gcc/x86_64-pc-linux-gnu/14/../../../../x86_64-pc-linux-gnu/bin/ld: 
lib/libcommon.a(libcommon_a-tpm2_eventlog_yaml.o): in function 
`yaml_devicepath':
+tpm2_eventlog_yaml.c:(.text.yaml_devicepath+0x2f): undefined reference to 
`efidp_format_device_path'
+/usr/lib/gcc/x86_64-pc-linux-gnu/14/../../../../x86_64-pc-linux-gnu/bin/ld: 
tpm2_eventlog_yaml.c:(.text.yaml_devicepath+0x61): undefined reference to 
`efidp_format_device_path'
+```
+
+Bug: https://bugs.gentoo.org/922592
+Signed-off-by: Sam James 
+--- a/configure.ac
 b/configure.ac
+@@ -94,9 +94,9 @@ AC_ARG_WITH([efivar],
+ )
+ 
+ # use the true program to avoid failing hard
+-AS_IF([test "x$with_efivar" == "xauto"],
++AS_IF([test "x$with_efivar" = "xauto"],
+   [PKG_CHECK_MODULES([EFIVAR], [efivar], [AC_CHECK_HEADERS([efivar/efivar.h], 
, [true])], [true])],
+-  [test "x$with_efivar" == "xyes"],
++  [test "x$with_efivar" = "xyes"],
+   [PKG_CHECK_MODULES([EFIVAR], [efivar], 
[AC_CHECK_HEADERS([efivar/efivar.h])])],
+ )
+ 
+

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.6.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
similarity index 98%
rename from app-crypt/tpm2-tools/tpm2-tools-5.6.ebuild
rename to app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
index 3eb1badf0637..04fb5536f1f5 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.6.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
@@ -41,6 +41,7 @@ PATCHES=(

"${FILESDIR}/${PN}-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch"

"${WORKDIR}/${PN}-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch"
"${FILESDIR}/${PN}-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch"
+   "${FILESDIR}/${PN}-5.6-bashism.patch"
 )
 
 python_check_deps() {

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2024-01-20 Thread Sam James

commit: e5077c13bc7e14e6744c73e71a9b7e9054b190ca
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 20 13:28:34 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 20 13:28:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5077c13

app-crypt/tpm2-tools: update for autoconf-archive move

Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.6.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.6.ebuild
index a324ea94a31b..3eb1badf0637 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.6.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
dev-util/cmocka
)"
 BDEPEND="virtual/pkgconfig
-   sys-devel/autoconf-archive
+   dev-build/autoconf-archive
test? (
app-editors/vim-core
dev-tcltk/expect

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/

2024-01-20 Thread Sam James

commit: 8f5a21555823773364e1c2df95151652b6627dba
Author: Christopher Byrne  gmail  com>
AuthorDate: Mon Nov 13 16:06:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 20 13:27:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f5a2155

app-crypt/tpm2-tools: add 5.6

Signed-off-by: Christopher Byrne  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33930
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/Manifest  |   2 +
 ...Makefile-am-Dont-require-pandoc-for-tests.patch |  15 +++
 ...og-fix-check-eventlog.sh-if-efivar.h-exis.patch | 123 +
 app-crypt/tpm2-tools/tpm2-tools-5.6.ebuild |  78 +
 4 files changed, 218 insertions(+)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index efbfb742fe01..f9a3d2cb3763 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1 +1,3 @@
 DIST tpm2-tools-5.5.tar.gz 1241390 BLAKE2B 
2225f9e0835988351f84ed06f914616e25fd65bacaa93b51d0bb04185314efb9a6f60eb3539b250f54b2c2ba590f1b76594df3e625e45c8d37e38d13371bea26
 SHA512 
24f72a3e9840d531d900e96771a863baae1c71a76fcad0fda8020dff06acd8e3b65b86401ace21f034766403caf9ae97ce710ff6013bb7ed25657a6ecf325470
+DIST 
tpm2-tools-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch.xz 
47916 BLAKE2B 
1bbc84f58ad46507417c89be1b4ce2450fb33cf3abe8f080c23890d96be85379f135ef1dbf4b580e1a386fa6d5ebc4fbaab351b5238bbf1011bb97b0f49a847b
 SHA512 
3db0daa39a8dc756d7cb25e3673149dc3eeafd7410f2c6537464431b501e3704a886d9b7a9acd71440d6d419649dd471fd6f9247d593c89a30b05774a8d1b3de
+DIST tpm2-tools-5.6.tar.gz 1266731 BLAKE2B 
fe88722c26d62128cd6dfbdd8ef2568656a75fe27b1443fed28387d0db1f50b7d0651819d34dfa98acde785b4cfb4e7c11420b110bb5333ed2bb6b67cdd4fc70
 SHA512 
14216f29ed3ecca5fbe356ed3744c8b6b25a62ff11b2aed596d11101328c8bfd29a02f6ca5a218f9a4477a5e9648c50f0ae96e71de0b4ff5ea1f98ebeeb73cd7

diff --git 
a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch
 
b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch
new file mode 100644
index ..7b6fc8821940
--- /dev/null
+++ 
b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile.am b/Makefile.am
+index 627983ca..d32f109c 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -659,10 +659,3 @@ else
+ endif
+ 
+ check: prepare-check
+-
+-if !HAVE_PANDOC
+-# If pandoc is not enabled, we want to complain that you need pandoc for make 
dist,
+-# so hook the target and complain.
+-  @(>&2 echo "You do not have pandoc, a requirement for the distribution 
of manpages")
+-  @exit 1
+-endif

diff --git 
a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch
 
b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch
new file mode 100644
index ..f24cf50aff5c
--- /dev/null
+++ 
b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch
@@ -0,0 +1,123 @@
+From 9cd74df24dbeee81b408e12ac10a98a088008d07 Mon Sep 17 00:00:00 2001
+From: Juergen Repp 
+Date: Mon, 20 Nov 2023 13:55:36 +0100
+Subject: [PATCH] test eventlog: fix check eventlog.sh if efivar.h exists
+
+If efivar.h exist a pretty print function for the DevicePath
+is executed. Therefore two yaml test files are needed for
+the bin test file uefiservices.
+Fixes #3302.
+
+Signed-off-by: Juergen Repp 
+---
+ Makefile.am   | 13 ++
+ configure.ac  |  3 ++
+ .../event-uefiservices.bin.yaml.pretty| 45 +++
+ ...n.yaml => event-uefiservices.bin.yaml.raw} |  0
+ 4 files changed, 61 insertions(+)
+ create mode 100644 
test/integration/fixtures/event-uefiservices.bin.yaml.pretty
+ rename test/integration/fixtures/{event-uefiservices.bin.yaml => 
event-uefiservices.bin.yaml.raw} (100%)
+
+diff --git a/Makefile.am b/Makefile.am
+index 413345cd..ef76dca8 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -352,6 +352,7 @@ TEST_EXTENSIONS = .sh
+ 
+ check-hook:
+   rm -rf .lock_file
++  rm -f  
$(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml
+ 
+ EXTRA_DIST_IGNORE = \
+ .gitignore \
+@@ -647,6 +648,18 @@ dist-hook:
+   for f in $(EXTRA_DIST_IGNORE); do \
+   rm -rf `find $(distdir) -name $$f`; \
+   done;
++
++prepare-check:
++if HAVE_EFIVAR_H
++  cp  
$(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml.pretty \
++  
$(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml
++else
++  cp  
$(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml.raw \
++  
$(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml
++endif
++
++check: prepare-check
++
+ if

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2023-09-09 Thread David Seifert

commit: 56e65936310cbf23ce10740decefcc321060ca31
Author: David Seifert  gentoo  org>
AuthorDate: Sat Sep  9 13:16:43 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Sep  9 13:16:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56e65936

app-crypt/tpm2-tools: enable py3.12

Signed-off-by: David Seifert  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
index 98c2668e4ddd..3369665b5b11 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit bash-completion-r1 flag-o-matic python-any-r1
 
 DESCRIPTION="Tools for the TPM 2.0 TSS"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/files/, app-crypt/tpm2-tools/

2023-09-09 Thread David Seifert

commit: f0b2505f7e70aa8f90043383ca568d510130ef20
Author: David Seifert  gentoo  org>
AuthorDate: Sat Sep  9 13:16:42 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Sep  9 13:16:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b2505f

app-crypt/tpm2-tools: drop 5.2-r1, 5.4

Signed-off-by: David Seifert  gentoo.org>

 app-crypt/tpm2-tools/Manifest  |  2 -
 .../tpm2-tools-5.1.1-no-efivar-automagic.patch | 34 --
 ...testparms-fix-condition-for-negative-test.patch | 33 --
 app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild  | 76 --
 app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild | 62 --
 5 files changed, 207 deletions(-)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index f9743f210370..efbfb742fe01 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,3 +1 @@
-DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 
27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2
 SHA512 
9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b
-DIST tpm2-tools-5.4.tar.gz 1241132 BLAKE2B 
21406ec61de19db49f1dd1ff9648e1b0a9ae2647df2ce290acca40c2fc54464e3c8a744afdbc9314ca731869ac974a7863e2bea3c70df844a972501a5b7973f2
 SHA512 
8d7802b85bd26b6efa0ed6be73b917b907bb7b424ff7d07e46e5574dfdd9d46ea2d7727904ebaba4651c8d1249cd52a7dc6dff8e9635666c8d97ca7c337a0396
 DIST tpm2-tools-5.5.tar.gz 1241390 BLAKE2B 
2225f9e0835988351f84ed06f914616e25fd65bacaa93b51d0bb04185314efb9a6f60eb3539b250f54b2c2ba590f1b76594df3e625e45c8d37e38d13371bea26
 SHA512 
24f72a3e9840d531d900e96771a863baae1c71a76fcad0fda8020dff06acd8e3b65b86401ace21f034766403caf9ae97ce710ff6013bb7ed25657a6ecf325470

diff --git 
a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch
deleted file mode 100644
index 25f3ef43fe3d..
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.gentoo.org/812047
-
-From 0cea7f0f78f1a9e8dca789eb5f2ece052e026bed Mon Sep 17 00:00:00 2001
-From: Christopher Byrne 
-Date: Tue, 7 Sep 2021 20:22:27 -0500
-Subject: [PATCH] configure.ac: Fix automagic depency on libefivar
-
-Signed-off-by: Christopher Byrne 

- configure.ac | 8 ++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f1c17116..bdb4abda 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -62,8 +62,12 @@ PKG_CHECK_MODULES([CRYPTO], [libcrypto >= 1.1.0])
- PKG_CHECK_MODULES([CURL], [libcurl])
- 
- # pretty print of devicepath if efivar library is present
--PKG_CHECK_MODULES([EFIVAR], [efivar],,[true])
--AC_CHECK_HEADERS([efivar/efivar.h])
-+AC_ARG_WITH([efivar], AS_HELP_STRING([--without-efivar], [Build without 
efivar library (default: test)]))
-+
-+AS_IF([test "x$with_efivar" != "xno"], [
-+  PKG_CHECK_MODULES([EFIVAR], [efivar])
-+  AC_CHECK_HEADERS([efivar/efivar.h])
-+])
- 
- # backwards compat with older pkg-config
- # - pull in AC_DEFUN from pkg.m4
--- 
-2.32.0
-

diff --git 
a/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch
 
b/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch
deleted file mode 100644
index e1094647bdfd..
--- 
a/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 3d80fad66694ad14a58dd89204a25e9248c4ab0c Mon Sep 17 00:00:00 2001
-From: Jonas Witschel 
-Date: Wed, 29 Sep 2021 17:08:07 +0200
-Subject: [PATCH] testparms: fix condition for negative test
-
-Commit e858dec76686bb4c42e74e0984b433231e530f93 ("testparms: ensure curve not
-supported before negative test") is supposed to ensure that the negative test
-is run only if ecc521 is *not* supported, but instead it runs the negative test
-if ecc521 is *available*. This worked anyway for libtpms < 0.9.0 because 
camellia
-was not supported, but since libtpms 0.9.0 added support for this algorithm, 
the
-test suite fails now with swtpm.
-
-Signed-off-by: Jonas Witschel 

- test/integration/tests/testparms.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/integration/tests/testparms.sh 
b/test/integration/tests/testparms.sh
-index 8c3548e5..a587a60a 100644
 a/test/integration/tests/testparms.sh
-+++ b/test/integration/tests/testparms.sh
-@@ -63,7 +63,7 @@ else
- fi
- 
- # Attempt to specify a suite that is not supported (error from TPM)
--if tpm2 getcap ecc-curves | grep -q TPM2_ECC_NIST_P521; then
-+if ! tpm2 getcap ecc-curves | grep -q TPM2_ECC_NIST_P521; then
- if tpm2 testparms "ecc521:ecdsa:camellia" &>/dev/null; then
- echo "tpm2 testparms

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2023-04-05 Thread Sam James

commit: 996b932faf902e5b7e5baee114407d47eff8a47c
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr  5 20:15:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr  5 20:15:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=996b932f

app-crypt/tpm2-tools: Stabilize 5.5 ppc64, #903874

Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
index 504eb52c03c8..2565483dc9ab 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ppc64 ~x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2023-04-05 Thread Sam James

commit: e3d5e8047f5aa795f3a5cbfcc26c80efd2a12d9b
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr  5 20:15:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr  5 20:15:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d5e804

app-crypt/tpm2-tools: Stabilize 5.5 amd64, #903874

Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
index 020a9fbac3cb..98c2668e4ddd 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2023-04-05 Thread Sam James

commit: 5dfbf7da4df4f927f23f8de338fdeb11c8221b57
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr  5 20:15:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr  5 20:15:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dfbf7da

app-crypt/tpm2-tools: Stabilize 5.5 x86, #903874

Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
index 2565483dc9ab..020a9fbac3cb 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ppc64 x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2023-04-05 Thread Sam James

commit: 1011ad7d3aadadc20aa84537ee3a3b7960cf6867
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr  5 20:03:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr  5 20:03:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1011ad7d

app-crypt/tpm2-tools: Stabilize 5.5 arm, #903874

Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
index af0b624512e4..504eb52c03c8 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc64 ~x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2023-04-05 Thread Sam James

commit: 1bd03e17851105c05c424da8c7bf080b2ca22518
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr  5 20:03:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr  5 20:03:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd03e17

app-crypt/tpm2-tools: Stabilize 5.5 arm64, #903874

Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
index e463582021ec..af0b624512e4 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2023-03-15 Thread Arthur Zamarin

commit: 0a7ca70a6b03b80a28e328956ce149fc14c3f772
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Mar 15 17:06:57 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Mar 15 17:06:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a7ca70a

app-crypt/tpm2-tools: Stabilize 5.4 arm64, #894966

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
index d7144f53e27e..585635d1d7e3 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2023-03-15 Thread Arthur Zamarin

commit: 22448184c6c6d9bc53d5722f18d516c62de963b2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Mar 15 17:07:00 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Mar 15 17:07:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22448184

app-crypt/tpm2-tools: Stabilize 5.4 x86, #894966

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
index 585635d1d7e3..c6a8bf53eeb0 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2023-03-15 Thread Arthur Zamarin

commit: a7661b8ef91fcc20f410ba760723e7cf8360d8d9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Mar 15 17:05:24 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Mar 15 17:05:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7661b8e

app-crypt/tpm2-tools: Stabilize 5.4 ppc64, #894966

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
index e1a19dd0f21b..d7144f53e27e 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc64 ~x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2023-02-20 Thread Sam James

commit: 79e46df04b3c1db30b3c37e215e47718bf0c1f43
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 20 13:49:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 20 13:49:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79e46df0

app-crypt/tpm2-tools: Stabilize 5.4 arm, #894966

Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
index 9a0ccfad1d4a..035295aaba16 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2023-02-20 Thread Sam James

commit: 145572307a47952a5df38e9b93e38f212077cb94
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 20 13:49:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 20 13:49:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14557230

app-crypt/tpm2-tools: Stabilize 5.4 amd64, #894966

Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
index 035295aaba16..e1a19dd0f21b 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 ~x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2023-02-15 Thread Sam James

commit: 567e519290427e4e983ecce2961b71f0409cdc36
Author: Christopher Byrne  gmail  com>
AuthorDate: Thu Feb 16 04:48:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 16 05:08:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=567e5192

app-crypt/tpm2-tools: add 5.5

Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/Manifest  |  1 +
 app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild | 66 ++
 2 files changed, 67 insertions(+)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index e89942029277..5342e514aa97 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,3 +1,4 @@
 DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 
27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2
 SHA512 
9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b
 DIST tpm2-tools-5.3.tar.gz 1118934 BLAKE2B 
7efb43180c23cee30ea860fb697049d5c594bff66404d0fe805ef1783b70859c04563ed946fe38bac329fe0c849ba30fe0dff9fc10f0d6942210862d96d6
 SHA512 
224a5ea3448a877362abb35ac06b115c559c09b44b30d74c8326211be66d24e0e130c285b1e285be1842e7203ab488629b0f4e451cbd782c83ed72023d146675
 DIST tpm2-tools-5.4.tar.gz 1241132 BLAKE2B 
21406ec61de19db49f1dd1ff9648e1b0a9ae2647df2ce290acca40c2fc54464e3c8a744afdbc9314ca731869ac974a7863e2bea3c70df844a972501a5b7973f2
 SHA512 
8d7802b85bd26b6efa0ed6be73b917b907bb7b424ff7d07e46e5574dfdd9d46ea2d7727904ebaba4651c8d1249cd52a7dc6dff8e9635666c8d97ca7c337a0396
+DIST tpm2-tools-5.5.tar.gz 1241390 BLAKE2B 
2225f9e0835988351f84ed06f914616e25fd65bacaa93b51d0bb04185314efb9a6f60eb3539b250f54b2c2ba590f1b76594df3e625e45c8d37e38d13371bea26
 SHA512 
24f72a3e9840d531d900e96771a863baae1c71a76fcad0fda8020dff06acd8e3b65b86401ace21f034766403caf9ae97ce710ff6013bb7ed25657a6ecf325470

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
new file mode 100644
index ..e463582021ec
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit 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}"
+
+python_check_deps() {
+   python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+   use test && python-any-r1_pkg_setup
+}
+
+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_* )
+   utils=("${utils[@]##*/}")
+   # these utiltites don't have bash completions
+   local nobashcomp=( tpm2_encodeobject tpm2_getpolicydigest 
tpm2_sessionconfig )
+   mapfile -d $'\0' -t utils < <(printf '%s\0' "${utils[@]}" | grep -Ezvw 
"${nobashcomp[@]/#/-e}")
+   bashcomp_alias tpm2 "${utils[@]}"
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2023-02-15 Thread Sam James

commit: 1635e78753ae661e1893d1559b05114a72a224de
Author: Christopher Byrne  gmail  com>
AuthorDate: Tue Feb 14 22:35:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 16 05:08:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1635e787

app-crypt/tpm2-tools: Add missing python_check_deps

Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
index 6b996f725753..9a0ccfad1d4a 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,6 +36,14 @@ BDEPEND="virtual/pkgconfig
)
${PYTHON_DEPS}"
 
+python_check_deps() {
+   python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+use test && python-any-r1_pkg_setup
+}
+
 src_configure() {
# tests fail with LTO enabbled. See bug 865275 and 865277
filter-lto

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2023-02-15 Thread Sam James

commit: f81848d8c5d801a82ce57eeac8da83a0fbfb606f
Author: Christopher Byrne  gmail  com>
AuthorDate: Tue Feb 14 22:36:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 16 05:08:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f81848d8

app-crypt/tpm2-tools: drop 5.3

Signed-off-by: Christopher Byrne  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29586
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/Manifest  |  1 -
 app-crypt/tpm2-tools/tpm2-tools-5.3.ebuild | 54 --
 2 files changed, 55 deletions(-)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 5342e514aa97..f9743f210370 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,4 +1,3 @@
 DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 
27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2
 SHA512 
9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b
-DIST tpm2-tools-5.3.tar.gz 1118934 BLAKE2B 
7efb43180c23cee30ea860fb697049d5c594bff66404d0fe805ef1783b70859c04563ed946fe38bac329fe0c849ba30fe0dff9fc10f0d6942210862d96d6
 SHA512 
224a5ea3448a877362abb35ac06b115c559c09b44b30d74c8326211be66d24e0e130c285b1e285be1842e7203ab488629b0f4e451cbd782c83ed72023d146675
 DIST tpm2-tools-5.4.tar.gz 1241132 BLAKE2B 
21406ec61de19db49f1dd1ff9648e1b0a9ae2647df2ce290acca40c2fc54464e3c8a744afdbc9314ca731869ac974a7863e2bea3c70df844a972501a5b7973f2
 SHA512 
8d7802b85bd26b6efa0ed6be73b917b907bb7b424ff7d07e46e5574dfdd9d46ea2d7727904ebaba4651c8d1249cd52a7dc6dff8e9635666c8d97ca7c337a0396
 DIST tpm2-tools-5.5.tar.gz 1241390 BLAKE2B 
2225f9e0835988351f84ed06f914616e25fd65bacaa93b51d0bb04185314efb9a6f60eb3539b250f54b2c2ba590f1b76594df3e625e45c8d37e38d13371bea26
 SHA512 
24f72a3e9840d531d900e96771a863baae1c71a76fcad0fda8020dff06acd8e3b65b86401ace21f034766403caf9ae97ce710ff6013bb7ed25657a6ecf325470

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.3.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.3.ebuild
deleted file mode 100644
index b2293c046c2c..
--- a/app-crypt/tpm2-tools/tpm2-tools-5.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..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[@]##*/}"
-}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2023-02-15 Thread Sam James

commit: d412c9753c1e2c701f46d84c61cecfb2917f2be8
Author: Christopher Byrne  gmail  com>
AuthorDate: Tue Feb 14 22:30:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 16 05:08:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d412c975

app-crypt/tpm2-tools: add missing python_check_deps and enable py3.11

Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 3ab7ad1a2fbe..b51e5b4b83e0 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit autotools bash-completion-r1 flag-o-matic python-any-r1
 
 DESCRIPTION="Tools for the TPM 2.0 TSS"
@@ -41,6 +41,14 @@ PATCHES=(
"${FILESDIR}/${PN}-5.2-testparms-fix-condition-for-negative-test.patch"
 )
 
+python_check_deps() {
+   python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+   use test && python-any-r1_pkg_setup
+}
+
 src_prepare() {
default
sed -i \

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2022-12-21 Thread Sam James

commit: 3ab52c3eb810835726bbc87d616b00d8b87a965b
Author: Christopher Byrne  gmail  com>
AuthorDate: Thu Dec  8 23:18:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 21 23:35:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab52c3e

app-crypt/tpm2-tools: add 5.4

Signed-off-by: Christopher Byrne  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28614
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/Manifest  |  1 +
 app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild | 54 ++
 2 files changed, 55 insertions(+)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index a0813d8bd6cc..e89942029277 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,2 +1,3 @@
 DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 
27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2
 SHA512 
9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b
 DIST tpm2-tools-5.3.tar.gz 1118934 BLAKE2B 
7efb43180c23cee30ea860fb697049d5c594bff66404d0fe805ef1783b70859c04563ed946fe38bac329fe0c849ba30fe0dff9fc10f0d6942210862d96d6
 SHA512 
224a5ea3448a877362abb35ac06b115c559c09b44b30d74c8326211be66d24e0e130c285b1e285be1842e7203ab488629b0f4e451cbd782c83ed72023d146675
+DIST tpm2-tools-5.4.tar.gz 1241132 BLAKE2B 
21406ec61de19db49f1dd1ff9648e1b0a9ae2647df2ce290acca40c2fc54464e3c8a744afdbc9314ca731869ac974a7863e2bea3c70df844a972501a5b7973f2
 SHA512 
8d7802b85bd26b6efa0ed6be73b917b907bb7b424ff7d07e46e5574dfdd9d46ea2d7727904ebaba4651c8d1249cd52a7dc6dff8e9635666c8d97ca7c337a0396

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
new file mode 100644
index ..6b996f725753
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.4.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_{9..11} )
+inherit 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[@]##*/}"
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2022-09-27 Thread Sam James

commit: d4de7bc2e59145263ffe055879c0969785a8e850
Author: Christopher Byrne  gmail  com>
AuthorDate: Tue Sep 27 17:24:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 28 00:06:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4de7bc2

app-crypt/tpm2-tools: add 5.3

Signed-off-by: Christopher Byrne  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27499
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/Manifest  |  1 +
 app-crypt/tpm2-tools/tpm2-tools-5.3.ebuild | 54 ++
 2 files changed, 55 insertions(+)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index e7303ed6665d..a0813d8bd6cc 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1 +1,2 @@
 DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 
27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2
 SHA512 
9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b
+DIST tpm2-tools-5.3.tar.gz 1118934 BLAKE2B 
7efb43180c23cee30ea860fb697049d5c594bff66404d0fe805ef1783b70859c04563ed946fe38bac329fe0c849ba30fe0dff9fc10f0d6942210862d96d6
 SHA512 
224a5ea3448a877362abb35ac06b115c559c09b44b30d74c8326211be66d24e0e130c285b1e285be1842e7203ab488629b0f4e451cbd782c83ed72023d146675

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 ..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[@]##*/}"
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2022-09-27 Thread Sam James

commit: cd1574236dd9457377d45d53470816828e364a8a
Author: Christopher Byrne  gmail  com>
AuthorDate: Mon Sep 26 21:22:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 27 21:42:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd157423

app-crypt/tpm2-tools: Filter out LTO flags due test failures

Closes: https://bugs.gentoo.org/865277
Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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) \

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2022-07-14 Thread Joonas Niilola

commit: 6500d76449978134d6bf45da2ca93bb302e5dc35
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Jul 15 05:34:05 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jul 15 05:39:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6500d764

app-crypt/tpm2-tools: Stabilize 5.2-r1 amd64, #856865

Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 7bb66768f35b..22e76e0b6bd7 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2022-07-14 Thread Arthur Zamarin

commit: e3714570ca259bfeef0eef73fad837a90b147d0e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Jul 14 19:37:29 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Jul 14 19:37:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3714570

app-crypt/tpm2-tools: Stabilize 5.2-r1 arm64, #856865

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 e8f9113bb672..1da149d89cc3 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc64 ~x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2022-07-14 Thread Arthur Zamarin

commit: 0053b3d1f7b9ac5f07bf71e865fde407b46d788b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Jul 14 19:37:35 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Jul 14 19:37:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0053b3d1

app-crypt/tpm2-tools: Stabilize 5.2-r1 x86, #856865

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 fff56e0b0ef6..7bb66768f35b 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ppc64 x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2022-07-14 Thread Arthur Zamarin

commit: 44e7b343bed4a3829282aff7b4ff1f2982bbedc6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Jul 14 19:37:23 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Jul 14 19:37:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44e7b343

app-crypt/tpm2-tools: Stabilize 5.2-r1 arm, #856865

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8438c854a1ce..e8f9113bb672 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2022-07-14 Thread Arthur Zamarin

commit: acdb2d6eeddf10d778547acd60100bbcf9ec57c4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Jul 14 19:37:33 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Jul 14 19:37:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acdb2d6e

app-crypt/tpm2-tools: Stabilize 5.2-r1 ppc64, #856865

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 1da149d89cc3..fff56e0b0ef6 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ppc64 ~x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/files/

2022-04-25 Thread Conrad Kostecki

commit: 2d873558e87b56979247b45be401aab18f19e60c
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Apr 25 17:46:50 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon Apr 25 21:45:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d873558

app-crypt/tpm2-tools: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch| 12 
 1 file changed, 12 deletions(-)

diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch
deleted file mode 100644
index caa3fac23bf4..
--- a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 7b5c2196..d07d5433 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -210,7 +210,6 @@ AS_IF([test x"$enable_hardening" != x"no"], [
- 
-   add_hardened_c_flag([-Wall])
-   add_hardened_c_flag([-Wextra])
--  add_hardened_c_flag([-Werror])
- 
-   add_hardened_c_flag([-Wformat])
-   add_hardened_c_flag([-Wformat-security])

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2022-04-23 Thread Sam James

commit: d6962f615db989a07281c89bae51c7e2a07e6a2f
Author: Christopher Byrne  gmail  com>
AuthorDate: Sat Apr 23 19:34:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 23 21:32:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6962f61

app-crypt/tpm2-tools: Move to python-any-r1

Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

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 5b29e8bbade6..8438c854a1ce 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-single-r1
+inherit autotools bash-completion-r1 python-any-r1
 
 DESCRIPTION="Tools for the TPM 2.0 TSS"
 HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
@@ -16,13 +16,11 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
dev-libs/openssl:=
net-misc/curl
-   sys-libs/efivar:=
-   ${PYTHON_DEPS}"
+   sys-libs/efivar:="
 DEPEND="${RDEPEND}
test? (
app-crypt/swtpm
@@ -34,7 +32,7 @@ BDEPEND="virtual/pkgconfig
test? (
app-editors/vim-core
dev-tcltk/expect
-   $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+   $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
)
${PYTHON_DEPS}"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2022-04-23 Thread Sam James

commit: f74ea242bd2da1ffd5edfd01730528547b0422fd
Author: Christopher Byrne  gmail  com>
AuthorDate: Sat Apr 23 19:34:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 23 21:32:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f74ea242

app-crypt/tpm2-tools: Add sublot operator to app-crypt/tpm2-tss dep

Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../tpm2-tools/{tpm2-tools-5.2.ebuild => tpm2-tools-5.2-r1.ebuild}| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
similarity index 94%
rename from app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
rename to app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
index 9b7629c2cc9a..5b29e8bbade6 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ IUSE="+fapi test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1[fapi?]
+RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
dev-libs/openssl:=
net-misc/curl
sys-libs/efivar:=

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2022-04-23 Thread Sam James

commit: 56fefdd448a88d54c8963fb77508b960e16a7314
Author: Christopher Byrne  gmail  com>
AuthorDate: Sat Apr 23 19:34:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 23 21:30:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56fefdd4

app-crypt/tpm2-tools: drop 4.3.2

Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/Manifest|  1 -
 app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild | 44 
 2 files changed, 45 deletions(-)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index d710f2982f60..e7303ed6665d 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,2 +1 @@
-DIST tpm2-tools-4.3.2.tar.gz 887708 BLAKE2B 
ee6fe3d0566138d6289d1a91252ccb106d36ff80d55f2d6f9ee30c8e16338d706e80085ac5f4f56a79bcb339e5dcb240efcf71d4003bcffdad366f3cd7a1165b
 SHA512 
1aa47c62c3d2a83195ec649e50c0be2c8be39f926806d8d7cb96edc499c385d527661813e02024e98f83ae9ebcb22d7dadc507ddfab48be9bbe428d9439d7ee1
 DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 
27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2
 SHA512 
9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b

diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
deleted file mode 100644
index fc76619d1790..
--- a/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+fapi"
-
-# Integration test are now run as part of the testing suite, which will fail
-# because none of the supported TPM emulators are in Portage. In a future
-# version of tpm2-tools, swtpm will be supported and the tests can be run.
-RESTRICT="test"
-
-RDEPEND="net-misc/curl:=
-   >=app-crypt/tpm2-tss-2.4.0:=[fapi?]
-   dev-libs/openssl:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-   sys-devel/autoconf-archive"
-PATCHES=(
-   "${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
-)
-
-src_prepare() {
-   sed -i \
-   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
-   "${S}/configure.ac" || die
-   default
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable fapi) \
-   --enable-hardening
-}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-12-13 Thread Arthur Zamarin

commit: f5edada175b355757469245df20c12d57da59544
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Dec 13 18:27:51 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Dec 13 18:28:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5edada1

app-crypt/tpm2-tools: Keyword 5.2 ppc64, #810862

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
index c0cdeb5b9236..9b7629c2cc9a 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-12-12 Thread Sam James

commit: 3ada12a999895fe3e8121d2a6a1677a65abbe2cf
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 13 00:05:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 13 00:05:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ada12a9

app-crypt/tpm2-tools: Keyword 5.2 arm64, #810862

Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
index f5db2002958f..8e2e65002a56 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-12-12 Thread Sam James

commit: b6030a2fb32592256185c6dd589d406c36c7714f
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 13 00:06:02 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 13 00:06:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6030a2f

app-crypt/tpm2-tools: Keyword 5.2 arm, #810862

Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
index 8e2e65002a56..c0cdeb5b9236 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/files/, app-crypt/tpm2-tools/

2021-10-06 Thread Ionen Wolkens

commit: 90e9e0dc896c27dde200b18d51d0fff7656258d4
Author: Christopher Byrne  gmail  com>
AuthorDate: Tue Oct  5 01:27:44 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Oct  6 10:56:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90e9e0dc

app-crypt/tpm2-tools: Fix broken test exposed in libtpms-0.9.0

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Ionen Wolkens  gentoo.org>

 ...testparms-fix-condition-for-negative-test.patch | 33 ++
 app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild |  1 +
 2 files changed, 34 insertions(+)

diff --git 
a/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch
 
b/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch
new file mode 100644
index 000..e1094647bdf
--- /dev/null
+++ 
b/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch
@@ -0,0 +1,33 @@
+From 3d80fad66694ad14a58dd89204a25e9248c4ab0c Mon Sep 17 00:00:00 2001
+From: Jonas Witschel 
+Date: Wed, 29 Sep 2021 17:08:07 +0200
+Subject: [PATCH] testparms: fix condition for negative test
+
+Commit e858dec76686bb4c42e74e0984b433231e530f93 ("testparms: ensure curve not
+supported before negative test") is supposed to ensure that the negative test
+is run only if ecc521 is *not* supported, but instead it runs the negative test
+if ecc521 is *available*. This worked anyway for libtpms < 0.9.0 because 
camellia
+was not supported, but since libtpms 0.9.0 added support for this algorithm, 
the
+test suite fails now with swtpm.
+
+Signed-off-by: Jonas Witschel 
+---
+ test/integration/tests/testparms.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/integration/tests/testparms.sh 
b/test/integration/tests/testparms.sh
+index 8c3548e5..a587a60a 100644
+--- a/test/integration/tests/testparms.sh
 b/test/integration/tests/testparms.sh
+@@ -63,7 +63,7 @@ else
+ fi
+ 
+ # Attempt to specify a suite that is not supported (error from TPM)
+-if tpm2 getcap ecc-curves | grep -q TPM2_ECC_NIST_P521; then
++if ! tpm2 getcap ecc-curves | grep -q TPM2_ECC_NIST_P521; then
+ if tpm2 testparms "ecc521:ecdsa:camellia" &>/dev/null; then
+ echo "tpm2 testparms succeeded while it shouldn't or TPM failed"
+ exit 1
+-- 
+2.32.0
+

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
index 87c3b2f5697..f5db2002958 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
@@ -40,6 +40,7 @@ BDEPEND="virtual/pkgconfig
 
 PATCHES=(
"${FILESDIR}/${PN}-5.1.1-no-efivar-automagic.patch"
+   "${FILESDIR}/${PN}-5.2-testparms-fix-condition-for-negative-test.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-10-04 Thread Ionen Wolkens

commit: 5ce37c8ef4f0c1429d3e1a423bd6a7c4897b38d0
Author: Christopher Byrne  gmail  com>
AuthorDate: Tue Sep 28 19:43:23 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Oct  4 14:23:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ce37c8e

app-crypt/tpm2-tools: Bump to 5.2

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-crypt/tpm2-tools/Manifest  |  1 +
 app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild | 67 ++
 2 files changed, 68 insertions(+)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index ec36aa46f00..158898da959 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,2 +1,3 @@
 DIST tpm2-tools-4.3.2.tar.gz 887708 BLAKE2B 
ee6fe3d0566138d6289d1a91252ccb106d36ff80d55f2d6f9ee30c8e16338d706e80085ac5f4f56a79bcb339e5dcb240efcf71d4003bcffdad366f3cd7a1165b
 SHA512 
1aa47c62c3d2a83195ec649e50c0be2c8be39f926806d8d7cb96edc499c385d527661813e02024e98f83ae9ebcb22d7dadc507ddfab48be9bbe428d9439d7ee1
 DIST tpm2-tools-5.1.1.tar.gz 1044427 BLAKE2B 
885ff61ad971c95d067bf8f9339de289f082f3103d1c382f45ac3ffbd4d5effc343ddc3c2c74b97b9d31f3f823d264991d1726c1f9c21d5c9b82ac1cdf714d3f
 SHA512 
4e094dcffb66103773d85e866ab9ba8db5d0f205ff9658e08fe14e8e41250570a7f7274b4048934adf256ea41650fa498fc3d6da2786adc241a4bf2e8f7bf78e
+DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 
27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2
 SHA512 
9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
new file mode 100644
index 000..87c3b2f5697
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 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 python-single-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 ~x86"
+IUSE="+fapi test"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-crypt/tpm2-tss-3.0.1[fapi?]
+   dev-libs/openssl:=
+   net-misc/curl
+   sys-libs/efivar:=
+   ${PYTHON_DEPS}"
+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_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+   )
+   ${PYTHON_DEPS}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-5.1.1-no-efivar-automagic.patch"
+)
+
+src_prepare() {
+   default
+   sed -i \
+   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
+   "configure.ac" || die
+   "./scripts/utils/man_to_bashcompletion.sh" || die
+   eautoreconf
+}
+
+src_configure() {
+   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[@]##*/}"
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/files/, app-crypt/tpm2-tools/

2021-10-04 Thread Ionen Wolkens

commit: 22efe441fa7828eeec91ce9d69a7a2c3062fa67a
Author: Christopher Byrne  gmail  com>
AuthorDate: Tue Sep 28 19:54:42 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Oct  4 14:23:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22efe441

app-crypt/tpm2-tools: Remove old

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Christopher Byrne  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22434
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-crypt/tpm2-tools/Manifest  |  1 -
 .../tpm2-tools-5.1.1-fix-tpm-checkquote.patch  | 34 --
 app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild| 72 --
 3 files changed, 107 deletions(-)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 158898da959..d710f2982f6 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,3 +1,2 @@
 DIST tpm2-tools-4.3.2.tar.gz 887708 BLAKE2B 
ee6fe3d0566138d6289d1a91252ccb106d36ff80d55f2d6f9ee30c8e16338d706e80085ac5f4f56a79bcb339e5dcb240efcf71d4003bcffdad366f3cd7a1165b
 SHA512 
1aa47c62c3d2a83195ec649e50c0be2c8be39f926806d8d7cb96edc499c385d527661813e02024e98f83ae9ebcb22d7dadc507ddfab48be9bbe428d9439d7ee1
-DIST tpm2-tools-5.1.1.tar.gz 1044427 BLAKE2B 
885ff61ad971c95d067bf8f9339de289f082f3103d1c382f45ac3ffbd4d5effc343ddc3c2c74b97b9d31f3f823d264991d1726c1f9c21d5c9b82ac1cdf714d3f
 SHA512 
4e094dcffb66103773d85e866ab9ba8db5d0f205ff9658e08fe14e8e41250570a7f7274b4048934adf256ea41650fa498fc3d6da2786adc241a4bf2e8f7bf78e
 DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 
27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2
 SHA512 
9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b

diff --git 
a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch
deleted file mode 100644
index 73fb0e3f487..000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3d7edb1c70cba6c34c71c9b856c07b8adcebb15c Mon Sep 17 00:00:00 2001
-From: Alberto Planas 
-Date: Thu, 17 Jun 2021 11:07:25 +0200
-Subject: [PATCH] tpm2_checkquote: fix uninitialized variable
-
-The variable `temp_pcrs` is uninitialized, and later partially
-uninitialized when reading the selection data from file.
-
-When activating lto optimizations, this bug presents itself showing an
-error during the read of the quote:
-
-ERROR: Malformed PCR file, pcr count cannot be greater than 32, got: ...
-
-Fixes: #2767
-
-Co-authored-by: Martin Liska 
-Signed-off-by: Alberto Planas 

- tools/misc/tpm2_checkquote.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/misc/tpm2_checkquote.c b/tools/misc/tpm2_checkquote.c
-index 531508579..8d780f111 100644
 a/tools/misc/tpm2_checkquote.c
-+++ b/tools/misc/tpm2_checkquote.c
-@@ -376,7 +376,7 @@ static tool_rc init(void) {
- TPM2B_ATTEST *msg = NULL;
- TPML_PCR_SELECTION pcr_select;
- tpm2_pcrs *pcrs;
--tpm2_pcrs temp_pcrs;
-+tpm2_pcrs temp_pcrs = {};
- tool_rc return_value = tool_rc_general_error;
- 
- msg = message_from_file(ctx.msg_file_path);

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild
deleted file mode 100644
index 6ede7d5e055..000
--- a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit autotools bash-completion-r1 python-single-r1
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fapi test"
-
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1[fapi?]
-   dev-libs/openssl:=
-   net-misc/curl
-   sys-libs/efivar:=
-   ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-   test? (
-   app-crypt/swtpm
-   app-crypt/tpm2-abrmd
-   app-editors/vim-core
-   dev-tcltk/expect
-   dev-util/cmocka
-   dev-python/pyyaml
-   )"
-BDEPEND="virtual/pkgconfig
-   sys-devel/autoconf-archive"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE=" ${PYTHON_REQUIRED_USE} "
-
-# One of the tests fails without this patch. See
-# https://github.com/tpm2-software/tpm2-tools/issues/2767
-PATCHES=(
-   "${FILESDIR}/${PN}-5.1.1-fix-tpm-checkquote.patch"
-   "${FILESDIR}/${PN}-5.1.1-no-efivar-automagic.patch"
-)
-
-src_prepare() {
-   sed -i \
-   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
-

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-09-24 Thread Joonas Niilola

commit: f2d5edcdfd350543326cb5f1020281731884f813
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Sep 24 07:43:14 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Sep 24 07:46:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d5edcd

app-crypt/tpm2-tools: keyword 5.1.1-r2 for ~x86

Bug: https://bugs.gentoo.org/810862
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild
index 6fe96e4e93f..f261ad301a2 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="+fapi test"
 
 RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-09-24 Thread Joonas Niilola

commit: 2c10f95386b2383112ee4c275bc7942bacd71145
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Sep 24 07:44:32 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Sep 24 07:46:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c10f953

app-crypt/tpm2-tools: remove non-existent subslot binders from 5.1.1

Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild
index f261ad301a2..6ede7d5e055 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild
@@ -15,9 +15,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+fapi test"
 
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
+RDEPEND=">=app-crypt/tpm2-tss-3.0.1[fapi?]
dev-libs/openssl:=
-   net-misc/curl:=
+   net-misc/curl
sys-libs/efivar:=
${PYTHON_DEPS}"
 DEPEND="${RDEPEND}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-09-08 Thread Sam James

commit: 0534e0b79048e8fa7a6c697549c2b6b8b1b3a0c5
Author: Christopher Byrne  gmail  com>
AuthorDate: Wed Sep  8 03:01:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep  8 06:46:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0534e0b7

app-crypt/tpm2-tools: Call default before eautoreconf in src_prepare

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
index 01663f80cd5..fc76619d179 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
@@ -33,8 +33,8 @@ src_prepare() {
sed -i \
"s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
"${S}/configure.ac" || die
-   eautoreconf
default
+   eautoreconf
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/files/, app-crypt/tpm2-tools/

2021-09-08 Thread Sam James

commit: bafea1d5f8c2e86f310eb3e227577156e2a2cfd8
Author: Christopher Byrne  gmail  com>
AuthorDate: Wed Sep  8 02:53:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep  8 06:46:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bafea1d5

app-crypt/tpm2-tools: Fix automagic dependency on sys-libs/efivar

Closes: https://bugs.gentoo.org/812047
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../tpm2-tools-5.1.1-no-efivar-automagic.patch | 34 ++
 app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild| 72 ++
 2 files changed, 106 insertions(+)

diff --git 
a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch
new file mode 100644
index 000..25f3ef43fe3
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/812047
+
+From 0cea7f0f78f1a9e8dca789eb5f2ece052e026bed Mon Sep 17 00:00:00 2001
+From: Christopher Byrne 
+Date: Tue, 7 Sep 2021 20:22:27 -0500
+Subject: [PATCH] configure.ac: Fix automagic depency on libefivar
+
+Signed-off-by: Christopher Byrne 
+---
+ configure.ac | 8 ++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f1c17116..bdb4abda 100644
+--- a/configure.ac
 b/configure.ac
+@@ -62,8 +62,12 @@ PKG_CHECK_MODULES([CRYPTO], [libcrypto >= 1.1.0])
+ PKG_CHECK_MODULES([CURL], [libcurl])
+ 
+ # pretty print of devicepath if efivar library is present
+-PKG_CHECK_MODULES([EFIVAR], [efivar],,[true])
+-AC_CHECK_HEADERS([efivar/efivar.h])
++AC_ARG_WITH([efivar], AS_HELP_STRING([--without-efivar], [Build without 
efivar library (default: test)]))
++
++AS_IF([test "x$with_efivar" != "xno"], [
++  PKG_CHECK_MODULES([EFIVAR], [efivar])
++  AC_CHECK_HEADERS([efivar/efivar.h])
++])
+ 
+ # backwards compat with older pkg-config
+ # - pull in AC_DEFUN from pkg.m4
+-- 
+2.32.0
+

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild
new file mode 100644
index 000..6fe96e4e93f
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit autotools bash-completion-r1 python-single-r1
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+fapi test"
+
+RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
+   dev-libs/openssl:=
+   net-misc/curl:=
+   sys-libs/efivar:=
+   ${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+   test? (
+   app-crypt/swtpm
+   app-crypt/tpm2-abrmd
+   app-editors/vim-core
+   dev-tcltk/expect
+   dev-util/cmocka
+   dev-python/pyyaml
+   )"
+BDEPEND="virtual/pkgconfig
+   sys-devel/autoconf-archive"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE=" ${PYTHON_REQUIRED_USE} "
+
+# One of the tests fails without this patch. See
+# https://github.com/tpm2-software/tpm2-tools/issues/2767
+PATCHES=(
+   "${FILESDIR}/${PN}-5.1.1-fix-tpm-checkquote.patch"
+   "${FILESDIR}/${PN}-5.1.1-no-efivar-automagic.patch"
+)
+
+src_prepare() {
+   sed -i \
+   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
+   "${S}/configure.ac" || die
+   "${S}/scripts/utils/man_to_bashcompletion.sh"
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable fapi) \
+   $(use_enable test unit) \
+   --with-bashcompdir=$(get_bashcompdir) \
+   --enable-hardening
+}
+
+src_install() {
+   default
+
+   mv "${D}/$(get_bashcompdir)/tpm2_completion.bash" \
+  "${D}/$(get_bashcompdir)/tpm2" || die
+   for B in "${D}"/usr/bin/tpm2_*
+   do
+   TPM2_UTILS="${TPM2_UTILS} $(basename ${B})"
+   done
+   bashcomp_alias tpm2 ${TPM2_UTILS}
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-09-08 Thread Sam James

commit: 181bde925ebf9d87ffa07d4fe3e055b112882b2c
Author: Christopher Byrne  gmail  com>
AuthorDate: Wed Sep  8 03:01:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep  8 06:46:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=181bde92

app-crypt/tpm2-tools: Remove old

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Christopher Byrne  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22241
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild | 70 -
 1 file changed, 70 deletions(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild
deleted file mode 100644
index fb7168bfb2f..000
--- a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit autotools bash-completion-r1 python-single-r1
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+fapi test"
-
-RDEPEND="net-misc/curl:=
-   >=app-crypt/tpm2-tss-3.0.1:=[fapi?]
-   dev-libs/openssl:=
-   ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-   test? (
-   app-crypt/swtpm
-   app-crypt/tpm2-abrmd
-   app-editors/vim-core
-   dev-tcltk/expect
-   dev-util/cmocka
-   dev-python/pyyaml
-   )"
-BDEPEND="virtual/pkgconfig
-   sys-devel/autoconf-archive"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE=" ${PYTHON_REQUIRED_USE} "
-
-# One of the tests fails without this patch. See
-# https://github.com/tpm2-software/tpm2-tools/issues/2767
-PATCHES=(
-   "${FILESDIR}/${PN}-5.1.1-fix-tpm-checkquote.patch"
-)
-
-src_prepare() {
-   sed -i \
-   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
-   "${S}/configure.ac" || die
-   "${S}/scripts/utils/man_to_bashcompletion.sh"
-   eautoreconf
-   default
-}
-
-src_configure() {
-   econf \
-   $(use_enable fapi) \
-   $(use_enable test unit) \
-   --with-bashcompdir=$(get_bashcompdir) \
-   --enable-hardening
-}
-
-src_install() {
-   default
-
-   mv "${D}/$(get_bashcompdir)/tpm2_completion.bash" \
-  "${D}/$(get_bashcompdir)/tpm2" || die
-   for B in "${D}"/usr/bin/tpm2_*
-   do
-   TPM2_UTILS="${TPM2_UTILS} $(basename ${B})"
-   done
-   bashcomp_alias tpm2 ${TPM2_UTILS}
-}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-07-14 Thread Ionen Wolkens

commit: 5588bb3da1bc7b74068b7a3d3416e23ae871eb79
Author: Christopher Byrne  gmail  com>
AuthorDate: Wed Jul 14 15:23:57 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jul 15 01:48:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5588bb3d

app-crypt/tpm2-tools: Add missing test dependency

Closes: https://bugs.gentoo.org/802120
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Christopher Byrne  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21644
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild
index 9dde2c97d8e..fb7168bfb2f 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
app-crypt/swtpm
app-crypt/tpm2-abrmd
app-editors/vim-core
+   dev-tcltk/expect
dev-util/cmocka
dev-python/pyyaml
)"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/

2021-07-14 Thread Joonas Niilola

commit: eabdf05da8ad3080e931873efc6833f58d0eed47
Author: Christopher Byrne  gmail  com>
AuthorDate: Sat Jul  3 04:02:04 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jul 14 06:25:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eabdf05d

app-crypt/tpm2-tools: Enable tests & fix bash completions

Closes: https://bugs.gentoo.org/797685
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 .../tpm2-tools-5.1.1-fix-tpm-checkquote.patch  | 34 +++
 app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild| 69 ++
 2 files changed, 103 insertions(+)

diff --git 
a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch
new file mode 100644
index 000..73fb0e3f487
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch
@@ -0,0 +1,34 @@
+From 3d7edb1c70cba6c34c71c9b856c07b8adcebb15c Mon Sep 17 00:00:00 2001
+From: Alberto Planas 
+Date: Thu, 17 Jun 2021 11:07:25 +0200
+Subject: [PATCH] tpm2_checkquote: fix uninitialized variable
+
+The variable `temp_pcrs` is uninitialized, and later partially
+uninitialized when reading the selection data from file.
+
+When activating lto optimizations, this bug presents itself showing an
+error during the read of the quote:
+
+ERROR: Malformed PCR file, pcr count cannot be greater than 32, got: ...
+
+Fixes: #2767
+
+Co-authored-by: Martin Liska 
+Signed-off-by: Alberto Planas 
+---
+ tools/misc/tpm2_checkquote.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/misc/tpm2_checkquote.c b/tools/misc/tpm2_checkquote.c
+index 531508579..8d780f111 100644
+--- a/tools/misc/tpm2_checkquote.c
 b/tools/misc/tpm2_checkquote.c
+@@ -376,7 +376,7 @@ static tool_rc init(void) {
+ TPM2B_ATTEST *msg = NULL;
+ TPML_PCR_SELECTION pcr_select;
+ tpm2_pcrs *pcrs;
+-tpm2_pcrs temp_pcrs;
++tpm2_pcrs temp_pcrs = {};
+ tool_rc return_value = tool_rc_general_error;
+ 
+ msg = message_from_file(ctx.msg_file_path);

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild
new file mode 100644
index 000..9dde2c97d8e
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit autotools bash-completion-r1 python-single-r1
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+fapi test"
+
+RDEPEND="net-misc/curl:=
+   >=app-crypt/tpm2-tss-3.0.1:=[fapi?]
+   dev-libs/openssl:=
+   ${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+   test? (
+   app-crypt/swtpm
+   app-crypt/tpm2-abrmd
+   app-editors/vim-core
+   dev-util/cmocka
+   dev-python/pyyaml
+   )"
+BDEPEND="virtual/pkgconfig
+   sys-devel/autoconf-archive"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE=" ${PYTHON_REQUIRED_USE} "
+
+# One of the tests fails without this patch. See
+# https://github.com/tpm2-software/tpm2-tools/issues/2767
+PATCHES=(
+   "${FILESDIR}/${PN}-5.1.1-fix-tpm-checkquote.patch"
+)
+
+src_prepare() {
+   sed -i \
+   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
+   "${S}/configure.ac" || die
+   "${S}/scripts/utils/man_to_bashcompletion.sh"
+   eautoreconf
+   default
+}
+
+src_configure() {
+   econf \
+   $(use_enable fapi) \
+   $(use_enable test unit) \
+   --with-bashcompdir=$(get_bashcompdir) \
+   --enable-hardening
+}
+
+src_install() {
+   default
+
+   mv "${D}/$(get_bashcompdir)/tpm2_completion.bash" \
+  "${D}/$(get_bashcompdir)/tpm2" || die
+   for B in "${D}"/usr/bin/tpm2_*
+   do
+   TPM2_UTILS="${TPM2_UTILS} $(basename ${B})"
+   done
+   bashcomp_alias tpm2 ${TPM2_UTILS}
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-07-14 Thread Joonas Niilola

commit: 6debaa4fee036b0be00e737c72313bd93f298af0
Author: Christopher Byrne  gmail  com>
AuthorDate: Sat Jul  3 04:02:35 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jul 14 06:25:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6debaa4f

app-crypt/tpm2-tools: Remove old

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Christopher Byrne  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21509
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.1.1.ebuild | 41 
 1 file changed, 41 deletions(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.1.1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.1.1.ebuild
deleted file mode 100644
index da8ba7b3847..000
--- a/app-crypt/tpm2-tools/tpm2-tools-5.1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+fapi"
-
-# Integration test are now run as part of the testing suite, which will fail
-# because none of the supported TPM emulators are in Portage. In a future
-# version of tpm2-tools, swtpm will be supported and the tests can be run.
-RESTRICT="test"
-
-RDEPEND="net-misc/curl:=
-   >=app-crypt/tpm2-tss-3.0.1:=[fapi?]
-   dev-libs/openssl:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-   sys-devel/autoconf-archive"
-
-src_prepare() {
-   sed -i \
-   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
-   "${S}/configure.ac" || die
-   eautoreconf
-   default
-}
-
-src_configure() {
-   econf \
-   $(use_enable fapi) \
-   --enable-hardening
-}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-06-21 Thread Sam James

commit: 848547251ea0f10ad40220b7c8e661e31fb2c469
Author: Christopher Byrne  gmail  com>
AuthorDate: Mon Jun 21 17:13:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 21 22:44:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84854725

app-crypt/tpm2-tools: Bump to 5.1.1

Bug: https://bugs.gentoo.org/793764
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/Manifest|  1 +
 app-crypt/tpm2-tools/tpm2-tools-5.1.1.ebuild | 41 
 2 files changed, 42 insertions(+)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 76c86194481..5ca8318994d 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,3 +1,4 @@
 DIST tpm2-tools-4.3.1.tar.gz 891993 BLAKE2B 
d145fd542952ebbf59bb82640b9ac41cc777dcd8f526683447e3a3fd22fd4c46ab59899418ae52382d88e05418b772afd7f10093c5e0ef4cba685470cf7a7c8e
 SHA512 
0104b6bca9e56ee30c033f3ddb2ab75b683b07ff917b800ff8fde49ce5cdc6d42e5fff63ed3ee9700f656dbf34bca76cee7408c256f1e30d92148c506b0032f2
 DIST tpm2-tools-4.3.2.tar.gz 887708 BLAKE2B 
ee6fe3d0566138d6289d1a91252ccb106d36ff80d55f2d6f9ee30c8e16338d706e80085ac5f4f56a79bcb339e5dcb240efcf71d4003bcffdad366f3cd7a1165b
 SHA512 
1aa47c62c3d2a83195ec649e50c0be2c8be39f926806d8d7cb96edc499c385d527661813e02024e98f83ae9ebcb22d7dadc507ddfab48be9bbe428d9439d7ee1
 DIST tpm2-tools-5.0.tar.gz 990855 BLAKE2B 
5d39bbef0bc6f0d84f37c64c697260343a9f9e134bce015a6b529176195adb907672f35b85382b0a4785e40e368030ac347083086c3799bdfe86dced1ac69848
 SHA512 
ea57a28a61e28b78cae7067ff58facd8754fafab7a2689fd93f8b3374073b6ac30301a75f8ff5c654800ab469ee6604d0b8a86c310631b9545b816ecaa05968e
+DIST tpm2-tools-5.1.1.tar.gz 1044427 BLAKE2B 
885ff61ad971c95d067bf8f9339de289f082f3103d1c382f45ac3ffbd4d5effc343ddc3c2c74b97b9d31f3f823d264991d1726c1f9c21d5c9b82ac1cdf714d3f
 SHA512 
4e094dcffb66103773d85e866ab9ba8db5d0f205ff9658e08fe14e8e41250570a7f7274b4048934adf256ea41650fa498fc3d6da2786adc241a4bf2e8f7bf78e

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.1.1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.1.1.ebuild
new file mode 100644
index 000..da8ba7b3847
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+fapi"
+
+# Integration test are now run as part of the testing suite, which will fail
+# because none of the supported TPM emulators are in Portage. In a future
+# version of tpm2-tools, swtpm will be supported and the tests can be run.
+RESTRICT="test"
+
+RDEPEND="net-misc/curl:=
+   >=app-crypt/tpm2-tss-3.0.1:=[fapi?]
+   dev-libs/openssl:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+   sys-devel/autoconf-archive"
+
+src_prepare() {
+   sed -i \
+   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
+   "${S}/configure.ac" || die
+   eautoreconf
+   default
+}
+
+src_configure() {
+   econf \
+   $(use_enable fapi) \
+   --enable-hardening
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-06-21 Thread Sam James

commit: 8578a68b4ad71976a93a013423771b485739e1fa
Author: Christopher Byrne  gmail  com>
AuthorDate: Mon Jun 21 17:14:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 21 22:44:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8578a68b

app-crypt/tpm2-tools: Remove old

Bug: https://bugs.gentoo.org/793764
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Christopher Byrne  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21363
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/Manifest |  1 -
 app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild | 44 ---
 2 files changed, 45 deletions(-)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 46ead7ebabd..ec36aa46f00 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,3 +1,2 @@
 DIST tpm2-tools-4.3.2.tar.gz 887708 BLAKE2B 
ee6fe3d0566138d6289d1a91252ccb106d36ff80d55f2d6f9ee30c8e16338d706e80085ac5f4f56a79bcb339e5dcb240efcf71d4003bcffdad366f3cd7a1165b
 SHA512 
1aa47c62c3d2a83195ec649e50c0be2c8be39f926806d8d7cb96edc499c385d527661813e02024e98f83ae9ebcb22d7dadc507ddfab48be9bbe428d9439d7ee1
-DIST tpm2-tools-5.0.tar.gz 990855 BLAKE2B 
5d39bbef0bc6f0d84f37c64c697260343a9f9e134bce015a6b529176195adb907672f35b85382b0a4785e40e368030ac347083086c3799bdfe86dced1ac69848
 SHA512 
ea57a28a61e28b78cae7067ff58facd8754fafab7a2689fd93f8b3374073b6ac30301a75f8ff5c654800ab469ee6604d0b8a86c310631b9545b816ecaa05968e
 DIST tpm2-tools-5.1.1.tar.gz 1044427 BLAKE2B 
885ff61ad971c95d067bf8f9339de289f082f3103d1c382f45ac3ffbd4d5effc343ddc3c2c74b97b9d31f3f823d264991d1726c1f9c21d5c9b82ac1cdf714d3f
 SHA512 
4e094dcffb66103773d85e866ab9ba8db5d0f205ff9658e08fe14e8e41250570a7f7274b4048934adf256ea41650fa498fc3d6da2786adc241a4bf2e8f7bf78e

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
deleted file mode 100644
index 344be726c38..000
--- a/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+fapi"
-
-# Integration test are now run as part of the testing suite, which will fail
-# because none of the supported TPM emulators are in Portage. In a future
-# version of tpm2-tools, swtpm will be supported and the tests can be run.
-RESTRICT="test"
-
-RDEPEND="net-misc/curl:=
-   >=app-crypt/tpm2-tss-3.0.1:=[fapi?]
-   dev-libs/openssl:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-   sys-devel/autoconf-archive"
-PATCHES=(
-   "${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
-)
-
-src_prepare() {
-   sed -i \
-   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
-   "${S}/configure.ac" || die
-   eautoreconf
-   default
-}
-
-src_configure() {
-   econf \
-   $(use_enable fapi) \
-   --enable-hardening
-}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-06-21 Thread Sam James

commit: c32180a825c18a528b3fc9552cbfa261462eb971
Author: Christopher Byrne  gmail  com>
AuthorDate: Mon Jun 21 17:13:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 21 22:44:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c32180a8

app-crypt/tpm2-tools: Remove old

Bug: https://bugs.gentoo.org/793764
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/Manifest|  1 -
 app-crypt/tpm2-tools/tpm2-tools-4.3.1.ebuild | 44 
 2 files changed, 45 deletions(-)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 5ca8318994d..46ead7ebabd 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,4 +1,3 @@
-DIST tpm2-tools-4.3.1.tar.gz 891993 BLAKE2B 
d145fd542952ebbf59bb82640b9ac41cc777dcd8f526683447e3a3fd22fd4c46ab59899418ae52382d88e05418b772afd7f10093c5e0ef4cba685470cf7a7c8e
 SHA512 
0104b6bca9e56ee30c033f3ddb2ab75b683b07ff917b800ff8fde49ce5cdc6d42e5fff63ed3ee9700f656dbf34bca76cee7408c256f1e30d92148c506b0032f2
 DIST tpm2-tools-4.3.2.tar.gz 887708 BLAKE2B 
ee6fe3d0566138d6289d1a91252ccb106d36ff80d55f2d6f9ee30c8e16338d706e80085ac5f4f56a79bcb339e5dcb240efcf71d4003bcffdad366f3cd7a1165b
 SHA512 
1aa47c62c3d2a83195ec649e50c0be2c8be39f926806d8d7cb96edc499c385d527661813e02024e98f83ae9ebcb22d7dadc507ddfab48be9bbe428d9439d7ee1
 DIST tpm2-tools-5.0.tar.gz 990855 BLAKE2B 
5d39bbef0bc6f0d84f37c64c697260343a9f9e134bce015a6b529176195adb907672f35b85382b0a4785e40e368030ac347083086c3799bdfe86dced1ac69848
 SHA512 
ea57a28a61e28b78cae7067ff58facd8754fafab7a2689fd93f8b3374073b6ac30301a75f8ff5c654800ab469ee6604d0b8a86c310631b9545b816ecaa05968e
 DIST tpm2-tools-5.1.1.tar.gz 1044427 BLAKE2B 
885ff61ad971c95d067bf8f9339de289f082f3103d1c382f45ac3ffbd4d5effc343ddc3c2c74b97b9d31f3f823d264991d1726c1f9c21d5c9b82ac1cdf714d3f
 SHA512 
4e094dcffb66103773d85e866ab9ba8db5d0f205ff9658e08fe14e8e41250570a7f7274b4048934adf256ea41650fa498fc3d6da2786adc241a4bf2e8f7bf78e

diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-4.3.1.ebuild
deleted file mode 100644
index 01663f80cd5..000
--- a/app-crypt/tpm2-tools/tpm2-tools-4.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+fapi"
-
-# Integration test are now run as part of the testing suite, which will fail
-# because none of the supported TPM emulators are in Portage. In a future
-# version of tpm2-tools, swtpm will be supported and the tests can be run.
-RESTRICT="test"
-
-RDEPEND="net-misc/curl:=
-   >=app-crypt/tpm2-tss-2.4.0:=[fapi?]
-   dev-libs/openssl:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-   sys-devel/autoconf-archive"
-PATCHES=(
-   "${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
-)
-
-src_prepare() {
-   sed -i \
-   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
-   "${S}/configure.ac" || die
-   eautoreconf
-   default
-}
-
-src_configure() {
-   econf \
-   $(use_enable fapi) \
-   --enable-hardening
-}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-06-21 Thread Sam James

commit: ee71fdfe9cc9631baacab3bcb5fa47ae2ef13247
Author: Christopher Byrne  gmail  com>
AuthorDate: Mon Jun 21 15:13:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 21 22:44:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee71fdfe

app-crypt/tpm2-tools: Bump to 4.3.2

Bug: https://bugs.gentoo.org/793764
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm2-tools/Manifest|  1 +
 app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild | 44 
 2 files changed, 45 insertions(+)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 68a29fc9545..76c86194481 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,2 +1,3 @@
 DIST tpm2-tools-4.3.1.tar.gz 891993 BLAKE2B 
d145fd542952ebbf59bb82640b9ac41cc777dcd8f526683447e3a3fd22fd4c46ab59899418ae52382d88e05418b772afd7f10093c5e0ef4cba685470cf7a7c8e
 SHA512 
0104b6bca9e56ee30c033f3ddb2ab75b683b07ff917b800ff8fde49ce5cdc6d42e5fff63ed3ee9700f656dbf34bca76cee7408c256f1e30d92148c506b0032f2
+DIST tpm2-tools-4.3.2.tar.gz 887708 BLAKE2B 
ee6fe3d0566138d6289d1a91252ccb106d36ff80d55f2d6f9ee30c8e16338d706e80085ac5f4f56a79bcb339e5dcb240efcf71d4003bcffdad366f3cd7a1165b
 SHA512 
1aa47c62c3d2a83195ec649e50c0be2c8be39f926806d8d7cb96edc499c385d527661813e02024e98f83ae9ebcb22d7dadc507ddfab48be9bbe428d9439d7ee1
 DIST tpm2-tools-5.0.tar.gz 990855 BLAKE2B 
5d39bbef0bc6f0d84f37c64c697260343a9f9e134bce015a6b529176195adb907672f35b85382b0a4785e40e368030ac347083086c3799bdfe86dced1ac69848
 SHA512 
ea57a28a61e28b78cae7067ff58facd8754fafab7a2689fd93f8b3374073b6ac30301a75f8ff5c654800ab469ee6604d0b8a86c310631b9545b816ecaa05968e

diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
new file mode 100644
index 000..01663f80cd5
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+fapi"
+
+# Integration test are now run as part of the testing suite, which will fail
+# because none of the supported TPM emulators are in Portage. In a future
+# version of tpm2-tools, swtpm will be supported and the tests can be run.
+RESTRICT="test"
+
+RDEPEND="net-misc/curl:=
+   >=app-crypt/tpm2-tss-2.4.0:=[fapi?]
+   dev-libs/openssl:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+   sys-devel/autoconf-archive"
+PATCHES=(
+   "${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
+)
+
+src_prepare() {
+   sed -i \
+   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
+   "${S}/configure.ac" || die
+   eautoreconf
+   default
+}
+
+src_configure() {
+   econf \
+   $(use_enable fapi) \
+   --enable-hardening
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-06-09 Thread Joonas Niilola

commit: 3987cf30969dab7d8052b88e8b19afed8f5952f2
Author: Christopher Byrne  gmail  com>
AuthorDate: Thu May 20 01:56:52 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jun  9 06:08:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3987cf30

app-crypt/tpm2-tools: Bump to 4.3.1

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/Manifest|  1 +
 app-crypt/tpm2-tools/tpm2-tools-4.3.1.ebuild | 44 
 2 files changed, 45 insertions(+)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 23b297edef5..8981e58caac 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,2 +1,3 @@
 DIST tpm2-tools-4.3.0.tar.gz 881544 BLAKE2B 
0415f30845658e84e97a964abebc3082e45fb880c10bec405cd89c7bfa373ace10b669c4af78e7e47f2d2bb62fc7cc34b2e54e392a95c8f9b8956b8c92af6aee
 SHA512 
4e622bbc8642ba7fd93a7343900560fe3779cba03e363d16f391fc8929724a11913d238e3986de06982cbced27c3c2ca8c7e73d75796407b8646c101ccf393a8
+DIST tpm2-tools-4.3.1.tar.gz 891993 BLAKE2B 
d145fd542952ebbf59bb82640b9ac41cc777dcd8f526683447e3a3fd22fd4c46ab59899418ae52382d88e05418b772afd7f10093c5e0ef4cba685470cf7a7c8e
 SHA512 
0104b6bca9e56ee30c033f3ddb2ab75b683b07ff917b800ff8fde49ce5cdc6d42e5fff63ed3ee9700f656dbf34bca76cee7408c256f1e30d92148c506b0032f2
 DIST tpm2-tools-5.0.tar.gz 990855 BLAKE2B 
5d39bbef0bc6f0d84f37c64c697260343a9f9e134bce015a6b529176195adb907672f35b85382b0a4785e40e368030ac347083086c3799bdfe86dced1ac69848
 SHA512 
ea57a28a61e28b78cae7067ff58facd8754fafab7a2689fd93f8b3374073b6ac30301a75f8ff5c654800ab469ee6604d0b8a86c310631b9545b816ecaa05968e

diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-4.3.1.ebuild
new file mode 100644
index 000..01663f80cd5
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.3.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+fapi"
+
+# Integration test are now run as part of the testing suite, which will fail
+# because none of the supported TPM emulators are in Portage. In a future
+# version of tpm2-tools, swtpm will be supported and the tests can be run.
+RESTRICT="test"
+
+RDEPEND="net-misc/curl:=
+   >=app-crypt/tpm2-tss-2.4.0:=[fapi?]
+   dev-libs/openssl:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+   sys-devel/autoconf-archive"
+PATCHES=(
+   "${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
+)
+
+src_prepare() {
+   sed -i \
+   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
+   "${S}/configure.ac" || die
+   eautoreconf
+   default
+}
+
+src_configure() {
+   econf \
+   $(use_enable fapi) \
+   --enable-hardening
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-06-09 Thread Joonas Niilola

commit: 0ce85ce04f6462675f3b8713a6039f435c27fb48
Author: Christopher Byrne  gmail  com>
AuthorDate: Thu May 20 01:57:38 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jun  9 06:08:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ce85ce0

app-crypt/tpm2-tools: Remove old

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Christopher Byrne  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20892
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/Manifest   |  1 -
 app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild | 44 -
 2 files changed, 45 deletions(-)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 8981e58caac..68a29fc9545 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,3 +1,2 @@
-DIST tpm2-tools-4.3.0.tar.gz 881544 BLAKE2B 
0415f30845658e84e97a964abebc3082e45fb880c10bec405cd89c7bfa373ace10b669c4af78e7e47f2d2bb62fc7cc34b2e54e392a95c8f9b8956b8c92af6aee
 SHA512 
4e622bbc8642ba7fd93a7343900560fe3779cba03e363d16f391fc8929724a11913d238e3986de06982cbced27c3c2ca8c7e73d75796407b8646c101ccf393a8
 DIST tpm2-tools-4.3.1.tar.gz 891993 BLAKE2B 
d145fd542952ebbf59bb82640b9ac41cc777dcd8f526683447e3a3fd22fd4c46ab59899418ae52382d88e05418b772afd7f10093c5e0ef4cba685470cf7a7c8e
 SHA512 
0104b6bca9e56ee30c033f3ddb2ab75b683b07ff917b800ff8fde49ce5cdc6d42e5fff63ed3ee9700f656dbf34bca76cee7408c256f1e30d92148c506b0032f2
 DIST tpm2-tools-5.0.tar.gz 990855 BLAKE2B 
5d39bbef0bc6f0d84f37c64c697260343a9f9e134bce015a6b529176195adb907672f35b85382b0a4785e40e368030ac347083086c3799bdfe86dced1ac69848
 SHA512 
ea57a28a61e28b78cae7067ff58facd8754fafab7a2689fd93f8b3374073b6ac30301a75f8ff5c654800ab469ee6604d0b8a86c310631b9545b816ecaa05968e

diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild
deleted file mode 100644
index 01663f80cd5..000
--- a/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+fapi"
-
-# Integration test are now run as part of the testing suite, which will fail
-# because none of the supported TPM emulators are in Portage. In a future
-# version of tpm2-tools, swtpm will be supported and the tests can be run.
-RESTRICT="test"
-
-RDEPEND="net-misc/curl:=
-   >=app-crypt/tpm2-tss-2.4.0:=[fapi?]
-   dev-libs/openssl:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-   sys-devel/autoconf-archive"
-PATCHES=(
-   "${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
-)
-
-src_prepare() {
-   sed -i \
-   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
-   "${S}/configure.ac" || die
-   eautoreconf
-   default
-}
-
-src_configure() {
-   econf \
-   $(use_enable fapi) \
-   --enable-hardening
-}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/files/

2021-05-03 Thread Sam James

commit: 70eb828dffade884a4617f44f799b809b2e82c6f
Author: Sam James  gentoo  org>
AuthorDate: Mon May  3 18:34:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  3 18:45:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70eb828d

app-crypt/tpm2-tools: drop obsolete LibreSSL patch

Signed-off-by: Sam James  gentoo.org>

 .../files/tpm2-tools-4.3.0-libressl.patch  | 26 ---
 .../tpm2-tools/files/tpm2-tools-5.0-libressl.patch | 39 --
 2 files changed, 65 deletions(-)

diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-libressl.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-libressl.patch
deleted file mode 100644
index 88948546353..000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-libressl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/lib/tpm2_identity_util.c b/lib/tpm2_identity_util.c
-index a3b0e387..9519ca7b 100644
 a/lib/tpm2_identity_util.c
-+++ b/lib/tpm2_identity_util.c
-@@ -17,7 +17,7 @@
- 
- // Identity-related functionality that the TPM normally does, but using 
OpenSSL
- 
--#if defined(LIBRESSL_VERSION_NUMBER)
-+#if 0
- static int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
- const unsigned char *from, int flen, const unsigned char *param, int 
plen,
- const EVP_MD *md, const EVP_MD *mgf1md) {
-diff --git a/lib/tpm2_openssl.c b/lib/tpm2_openssl.c
-index 6d29c0d4..bd375ce3 100644
 a/lib/tpm2_openssl.c
-+++ b/lib/tpm2_openssl.c
-@@ -14,7 +14,7 @@
- #include "tpm2_openssl.h"
- 
- /* compatibility function for OpenSSL versions < 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- static int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) {
- int r;
- int topad;

diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.0-libressl.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-5.0-libressl.patch
deleted file mode 100644
index b41c9f50e27..000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.0-libressl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/lib/tpm2_identity_util.c b/lib/tpm2_identity_util.c
-index a3b0e387..9519ca7b 100644
 a/lib/tpm2_identity_util.c
-+++ b/lib/tpm2_identity_util.c
-@@ -17,7 +17,7 @@
- 
- // Identity-related functionality that the TPM normally does, but using 
OpenSSL
- 
--#if defined(LIBRESSL_VERSION_NUMBER)
-+#if 0
- static int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
- const unsigned char *from, int flen, const unsigned char *param, int 
plen,
- const EVP_MD *md, const EVP_MD *mgf1md) {
-diff --git a/lib/tpm2_openssl.c b/lib/tpm2_openssl.c
-index e769d6df..54f124c9 100644
 a/lib/tpm2_openssl.c
-+++ b/lib/tpm2_openssl.c
-@@ -15,7 +15,7 @@
- #include "tpm2_systemdeps.h"
- 
- /* compatibility function for OpenSSL versions < 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- static int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) {
- int r;
- int topad;
-diff --git a/lib/tpm2_openssl.h b/lib/tpm2_openssl.h
-index 46c8f9c0..71206309 100644
 a/lib/tpm2_openssl.h
-+++ b/lib/tpm2_openssl.h
-@@ -17,7 +17,7 @@
- #define LIB_TPM2_OPENSSL_OPENSSL_PRE11
- #endif
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) && 
!defined(LIBRESSL_VERSION_NUMBER)
- #define EC_POINT_set_affine_coordinates_tss(group, tpm_pub_key, bn_x, bn_y, 
dmy) \
- EC_POINT_set_affine_coordinates(group, tpm_pub_key, bn_x, bn_y, dmy)
-

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-05-02 Thread Mikle Kolyada

commit: 67d70633119f9edce686d0233fded6db1423e8d5
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  2 16:32:07 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  2 16:40:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67d70633

app-crypt/tpm2-tools: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild | 8 +++-
 app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild   | 8 +++-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild
index f9edff247c5..01663f80cd5 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+fapi libressl"
+IUSE="+fapi"
 
 # Integration test are now run as part of the testing suite, which will fail
 # because none of the supported TPM emulators are in Portage. In a future
@@ -21,13 +21,11 @@ RESTRICT="test"
 
 RDEPEND="net-misc/curl:=
>=app-crypt/tpm2-tss-2.4.0:=[fapi?]
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )"
+   dev-libs/openssl:0="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
sys-devel/autoconf-archive"
 PATCHES=(
-   "${FILESDIR}/${PN}-4.3.0-libressl.patch"
"${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
 )
 
@@ -42,5 +40,5 @@ src_prepare() {
 src_configure() {
econf \
$(use_enable fapi) \
-   $(use_enable !libressl hardening)
+   --enable-hardening
 }

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
index 375c04e216e..344be726c38 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+fapi libressl"
+IUSE="+fapi"
 
 # Integration test are now run as part of the testing suite, which will fail
 # because none of the supported TPM emulators are in Portage. In a future
@@ -21,13 +21,11 @@ RESTRICT="test"
 
 RDEPEND="net-misc/curl:=
>=app-crypt/tpm2-tss-3.0.1:=[fapi?]
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )"
+   dev-libs/openssl:0="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
sys-devel/autoconf-archive"
 PATCHES=(
-   "${FILESDIR}/${PN}-5.0-libressl.patch"
"${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
 )
 
@@ -42,5 +40,5 @@ src_prepare() {
 src_configure() {
econf \
$(use_enable fapi) \
-   $(use_enable !libressl hardening)
+   --enable-hardening
 }

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-04-25 Thread Michał Górny

commit: fce77092e59167643202c11740e6ff2807031f64
Author: Christopher Byrne  gmail  com>
AuthorDate: Sun Apr 25 07:12:28 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Apr 25 07:59:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fce77092

app-crypt/tpm2-tools: Update maintainer name

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Michał Górny  gentoo.org>

 app-crypt/tpm2-tools/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/metadata.xml 
b/app-crypt/tpm2-tools/metadata.xml
index f5730a08362..801a27835a5 100644
--- a/app-crypt/tpm2-tools/metadata.xml
+++ b/app-crypt/tpm2-tools/metadata.xml
@@ -3,7 +3,7 @@
 

salah.coro...@gmail.com
-   Salah Coronya
+   Christopher Byrne


proxy-ma...@gentoo.org

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-01-20 Thread Joonas Niilola

commit: 7f2b10bf493381a3a4ab5d8ac9a8c7681e88950a
Author: Salah Coronya  gmail  com>
AuthorDate: Sat Dec 19 02:57:06 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jan 20 14:13:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f2b10bf

app-crypt/tpm2-tools: Remove old

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Salah Coronya  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18721
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.0.ebuild | 42 --
 1 file changed, 42 deletions(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.0.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.0.ebuild
deleted file mode 100644
index 3252b0db14e..000
--- a/app-crypt/tpm2-tools/tpm2-tools-5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+fapi libressl"
-
-# Integration test are now run as part of the testing suite, which will fail
-# because none of the supported TPM emulators are in Portage. In a future
-# version of tpm2-tools, swtpm will be supported and the tests can be run.
-RESTRICT="test"
-
-RDEPEND="net-misc/curl:=
-   >=app-crypt/tpm2-tss-3.0.1:=[fapi?]
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-PATCHES=(
-   "${FILESDIR}/${PN}-4.2.1-libressl.patch"
-   "${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
-)
-
-src_prepare() {
-   eautoreconf
-   default
-}
-
-src_configure() {
-   econf \
-   $(use_enable fapi) \
-   $(use_enable !libressl hardening)
-}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-01-20 Thread Joonas Niilola

commit: 285ff66c5ae45705faa8d171a24afa4c8fba06e2
Author: Salah Coronya  gmail  com>
AuthorDate: Sat Dec 19 02:56:00 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jan 20 14:13:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=285ff66c

app-crypt/tpm2-tools: Don't let configure run git, add missing dep

Closes: https://bugs.gentoo.org/760567
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Salah Coronya  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild | 46 +++
 1 file changed, 46 insertions(+)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
new file mode 100644
index 000..c03f468e395
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+fapi libressl"
+
+# Integration test are now run as part of the testing suite, which will fail
+# because none of the supported TPM emulators are in Portage. In a future
+# version of tpm2-tools, swtpm will be supported and the tests can be run.
+RESTRICT="test"
+
+RDEPEND="net-misc/curl:=
+   >=app-crypt/tpm2-tss-3.0.1:=[fapi?]
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+   sys-devel/autoconf-archive"
+PATCHES=(
+   "${FILESDIR}/${PN}-4.2.1-libressl.patch"
+   "${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
+)
+
+src_prepare() {
+   sed -i \
+   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
+   "${S}/configure.ac" || die
+   eautoreconf
+   default
+}
+
+src_configure() {
+   econf \
+   $(use_enable fapi) \
+   $(use_enable !libressl hardening)
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-01-20 Thread Joonas Niilola

commit: b5ec8281ec77b01416c4a85d3bf7a56e22d71803
Author: Salah Coronya  gmail  com>
AuthorDate: Sat Dec 19 02:50:12 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jan 20 14:13:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5ec8281

app-crypt/tpm2-tools: Don't let configure run git, add missing dep

Closes: https://bugs.gentoo.org/760567
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Salah Coronya  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild | 46 +
 1 file changed, 46 insertions(+)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild
new file mode 100644
index 000..a3d0239561c
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+fapi libressl"
+
+# Integration test are now run as part of the testing suite, which will fail
+# because none of the supported TPM emulators are in Portage. In a future
+# version of tpm2-tools, swtpm will be supported and the tests can be run.
+RESTRICT="test"
+
+RDEPEND="net-misc/curl:=
+   >=app-crypt/tpm2-tss-2.4.0:=[fapi?]
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+   sys-devel/autoconf-archive"
+PATCHES=(
+   "${FILESDIR}/${PN}-4.2.1-libressl.patch"
+   "${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
+)
+
+src_prepare() {
+   sed -i \
+   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
+   "${S}/configure.ac" || die
+   eautoreconf
+   default
+}
+
+src_configure() {
+   econf \
+   $(use_enable fapi) \
+   $(use_enable !libressl hardening)
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2021-01-20 Thread Joonas Niilola

commit: 96d68b403f28f9a040f745bcc17e8a3553b19df3
Author: Salah Coronya  gmail  com>
AuthorDate: Sat Dec 19 02:56:36 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jan 20 14:13:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96d68b40

app-crypt/tpm2-tools: Remove old

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Salah Coronya  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/tpm2-tools-4.3.0.ebuild | 42 
 1 file changed, 42 deletions(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.0.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-4.3.0.ebuild
deleted file mode 100644
index 7ccea9899c4..000
--- a/app-crypt/tpm2-tools/tpm2-tools-4.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+fapi libressl"
-
-# Integration test are now run as part of the testing suite, which will fail
-# because none of the supported TPM emulators are in Portage. In a future
-# version of tpm2-tools, swtpm will be supported and the tests can be run.
-RESTRICT="test"
-
-RDEPEND="net-misc/curl:=
-   >=app-crypt/tpm2-tss-2.4.0:=[fapi?]
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-PATCHES=(
-   "${FILESDIR}/${PN}-4.2.1-libressl.patch"
-   "${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
-)
-
-src_prepare() {
-   eautoreconf
-   default
-}
-
-src_configure() {
-   econf \
-   $(use_enable fapi) \
-   $(use_enable !libressl hardening)
-}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/files/, app-crypt/tpm2-tools/

2021-01-20 Thread Joonas Niilola

commit: 2c12e051f16f72eba50104d04527567e7a541591
Author: Salah Coronya  gmail  com>
AuthorDate: Wed Dec 30 22:26:43 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jan 20 14:13:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c12e051

app-crypt/tpm2-tools: Fix libressl support

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Salah Coronya  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 .../files/tpm2-tools-4.2.1-libressl.patch  | 26 --
 .../files/tpm2-tools-4.3.0-libressl.patch  | 26 ++
 app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild|  2 +-
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.2.1-libressl.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-4.2.1-libressl.patch
deleted file mode 100644
index 2f39db3283c..000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-4.2.1-libressl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a1ac2ee0c6592e6f730458c03a2abd1532c66046 Mon Sep 17 00:00:00 2001
-From: Salah Coronya 
-Date: Sun, 12 Jan 2020 19:17:48 -0600
-Subject: [PATCH] lib/tpm2_openssl.c: Fix build for libressl
-
-Signed-off-by: Salah Coronya 

- lib/tpm2_openssl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/tpm2_openssl.c b/lib/tpm2_openssl.c
-index 505dd7a0..fd3861d9 100644
 a/lib/tpm2_openssl.c
-+++ b/lib/tpm2_openssl.c
-@@ -14,7 +14,7 @@
- #include "tpm2_openssl.h"
- 
- /* compatibility function for OpenSSL versions < 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- static int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) {
- int r;
- int topad;
--- 
-2.24.1
-

diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-libressl.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-libressl.patch
new file mode 100644
index 000..88948546353
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-libressl.patch
@@ -0,0 +1,26 @@
+diff --git a/lib/tpm2_identity_util.c b/lib/tpm2_identity_util.c
+index a3b0e387..9519ca7b 100644
+--- a/lib/tpm2_identity_util.c
 b/lib/tpm2_identity_util.c
+@@ -17,7 +17,7 @@
+ 
+ // Identity-related functionality that the TPM normally does, but using 
OpenSSL
+ 
+-#if defined(LIBRESSL_VERSION_NUMBER)
++#if 0
+ static int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
+ const unsigned char *from, int flen, const unsigned char *param, int 
plen,
+ const EVP_MD *md, const EVP_MD *mgf1md) {
+diff --git a/lib/tpm2_openssl.c b/lib/tpm2_openssl.c
+index 6d29c0d4..bd375ce3 100644
+--- a/lib/tpm2_openssl.c
 b/lib/tpm2_openssl.c
+@@ -14,7 +14,7 @@
+ #include "tpm2_openssl.h"
+ 
+ /* compatibility function for OpenSSL versions < 1.1.0 */
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ static int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) {
+ int r;
+ int topad;

diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild
index a3d0239561c..f9edff247c5 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
sys-devel/autoconf-archive"
 PATCHES=(
-   "${FILESDIR}/${PN}-4.2.1-libressl.patch"
+   "${FILESDIR}/${PN}-4.3.0-libressl.patch"
"${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
 )

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/files/, app-crypt/tpm2-tools/

2021-01-20 Thread Joonas Niilola

commit: c03f24ee12d3d31273e6bd5501402032c4e75328
Author: Salah Coronya  gmail  com>
AuthorDate: Wed Dec 30 22:29:41 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jan 20 14:13:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c03f24ee

app-crypt/tpm2-tools: Fix libressl support

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Salah Coronya  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 .../tpm2-tools/files/tpm2-tools-5.0-libressl.patch | 39 ++
 app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild  |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.0-libressl.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-5.0-libressl.patch
new file mode 100644
index 000..b41c9f50e27
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-5.0-libressl.patch
@@ -0,0 +1,39 @@
+diff --git a/lib/tpm2_identity_util.c b/lib/tpm2_identity_util.c
+index a3b0e387..9519ca7b 100644
+--- a/lib/tpm2_identity_util.c
 b/lib/tpm2_identity_util.c
+@@ -17,7 +17,7 @@
+ 
+ // Identity-related functionality that the TPM normally does, but using 
OpenSSL
+ 
+-#if defined(LIBRESSL_VERSION_NUMBER)
++#if 0
+ static int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
+ const unsigned char *from, int flen, const unsigned char *param, int 
plen,
+ const EVP_MD *md, const EVP_MD *mgf1md) {
+diff --git a/lib/tpm2_openssl.c b/lib/tpm2_openssl.c
+index e769d6df..54f124c9 100644
+--- a/lib/tpm2_openssl.c
 b/lib/tpm2_openssl.c
+@@ -15,7 +15,7 @@
+ #include "tpm2_systemdeps.h"
+ 
+ /* compatibility function for OpenSSL versions < 1.1.0 */
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ static int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) {
+ int r;
+ int topad;
+diff --git a/lib/tpm2_openssl.h b/lib/tpm2_openssl.h
+index 46c8f9c0..71206309 100644
+--- a/lib/tpm2_openssl.h
 b/lib/tpm2_openssl.h
+@@ -17,7 +17,7 @@
+ #define LIB_TPM2_OPENSSL_OPENSSL_PRE11
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) && 
!defined(LIBRESSL_VERSION_NUMBER)
+ #define EC_POINT_set_affine_coordinates_tss(group, tpm_pub_key, bn_x, bn_y, 
dmy) \
+ EC_POINT_set_affine_coordinates(group, tpm_pub_key, bn_x, bn_y, dmy)
+ 

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
index c03f468e395..375c04e216e 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
sys-devel/autoconf-archive"
 PATCHES=(
-   "${FILESDIR}/${PN}-4.2.1-libressl.patch"
+   "${FILESDIR}/${PN}-5.0-libressl.patch"
"${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
 )

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2020-11-20 Thread Joonas Niilola

commit: 910fedcc6c356faf46225df8b01b93f2c4fb65d0
Author: Salah Coronya  gmail  com>
AuthorDate: Mon Nov 16 23:11:29 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov 20 11:40:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=910fedcc

app-crypt/tpm2-tools: Bump to 5.0

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Salah Coronya  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18291
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/Manifest  |  1 +
 app-crypt/tpm2-tools/tpm2-tools-5.0.ebuild | 42 ++
 2 files changed, 43 insertions(+)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 9f9afbc73bf..23b297edef5 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1 +1,2 @@
 DIST tpm2-tools-4.3.0.tar.gz 881544 BLAKE2B 
0415f30845658e84e97a964abebc3082e45fb880c10bec405cd89c7bfa373ace10b669c4af78e7e47f2d2bb62fc7cc34b2e54e392a95c8f9b8956b8c92af6aee
 SHA512 
4e622bbc8642ba7fd93a7343900560fe3779cba03e363d16f391fc8929724a11913d238e3986de06982cbced27c3c2ca8c7e73d75796407b8646c101ccf393a8
+DIST tpm2-tools-5.0.tar.gz 990855 BLAKE2B 
5d39bbef0bc6f0d84f37c64c697260343a9f9e134bce015a6b529176195adb907672f35b85382b0a4785e40e368030ac347083086c3799bdfe86dced1ac69848
 SHA512 
ea57a28a61e28b78cae7067ff58facd8754fafab7a2689fd93f8b3374073b6ac30301a75f8ff5c654800ab469ee6604d0b8a86c310631b9545b816ecaa05968e

diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.0.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-5.0.ebuild
new file mode 100644
index 000..3252b0db14e
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+fapi libressl"
+
+# Integration test are now run as part of the testing suite, which will fail
+# because none of the supported TPM emulators are in Portage. In a future
+# version of tpm2-tools, swtpm will be supported and the tests can be run.
+RESTRICT="test"
+
+RDEPEND="net-misc/curl:=
+   >=app-crypt/tpm2-tss-3.0.1:=[fapi?]
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+PATCHES=(
+   "${FILESDIR}/${PN}-4.2.1-libressl.patch"
+   "${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
+)
+
+src_prepare() {
+   eautoreconf
+   default
+}
+
+src_configure() {
+   econf \
+   $(use_enable fapi) \
+   $(use_enable !libressl hardening)
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2020-10-08 Thread Joonas Niilola

commit: bed18d9eafc44451e3824fa50fdaa8ca487de9b3
Author: Salah Coronya  gmail  com>
AuthorDate: Wed Sep  9 22:23:41 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Oct  8 06:43:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bed18d9e

app-crypt/tpm2-tools: Remove old

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Salah Coronya  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17488
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/Manifest   |  1 -
 app-crypt/tpm2-tools/tpm2-tools-4.2.1-r1.ebuild | 34 -
 2 files changed, 35 deletions(-)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 78b6b400522..9f9afbc73bf 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,2 +1 @@
-DIST tpm2-tools-4.2.1.tar.gz 879294 BLAKE2B 
7619f72f0fe39360f111822b4ec7a0bb90156f295977115c4612efac33059dd786abfa5d5f46a8fcc134fce11d099b03cb7f9ee01aa3addf5a3bb2455e1eb2d4
 SHA512 
4da103e70880d72a9aa402dea39ea439a0657729af22f08ac7275022c475ab46cb3dd6123d6846669d9b7f8f9af7b3e3df7c3b1d33cd0149b649b7941c84c339
 DIST tpm2-tools-4.3.0.tar.gz 881544 BLAKE2B 
0415f30845658e84e97a964abebc3082e45fb880c10bec405cd89c7bfa373ace10b669c4af78e7e47f2d2bb62fc7cc34b2e54e392a95c8f9b8956b8c92af6aee
 SHA512 
4e622bbc8642ba7fd93a7343900560fe3779cba03e363d16f391fc8929724a11913d238e3986de06982cbced27c3c2ca8c7e73d75796407b8646c101ccf393a8

diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.2.1-r1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-4.2.1-r1.ebuild
deleted file mode 100644
index ea91b076cb6..000
--- a/app-crypt/tpm2-tools/tpm2-tools-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+fapi libressl"
-
-# Integration test are now run as part of the testing suite, which will fail
-# because none of the supported TPM emulators are in Portage. In a future
-# version of tpm2-tools, swtpm will be supported and the tests can be run.
-RESTRICT="test"
-
-RDEPEND="net-misc/curl:=
-   >=app-crypt/tpm2-tss-2.4.0:=[fapi?]
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-PATCHES=(
-   "${FILESDIR}/${P}-libressl.patch"
-)
-
-src_configure() {
-   econf \
-   $(use_enable fapi) \
-   $(use_enable !libressl hardening)
-}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/

2020-10-08 Thread Joonas Niilola

commit: 9eb6f4ebf5710b1979b864e81c8d191b7f113ffd
Author: Salah Coronya  gmail  com>
AuthorDate: Wed Sep  9 22:22:52 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Oct  8 06:43:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eb6f4eb

app-crypt/tpm2-tools: Bump to 4.3.0

Closes: https://bugs.gentoo.org/744436
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Salah Coronya  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/Manifest  |  1 +
 .../files/tpm2-tools-4.3.0-Remove-WError.patch | 12 +++
 app-crypt/tpm2-tools/tpm2-tools-4.3.0.ebuild   | 42 ++
 3 files changed, 55 insertions(+)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index bb9cff37586..78b6b400522 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1 +1,2 @@
 DIST tpm2-tools-4.2.1.tar.gz 879294 BLAKE2B 
7619f72f0fe39360f111822b4ec7a0bb90156f295977115c4612efac33059dd786abfa5d5f46a8fcc134fce11d099b03cb7f9ee01aa3addf5a3bb2455e1eb2d4
 SHA512 
4da103e70880d72a9aa402dea39ea439a0657729af22f08ac7275022c475ab46cb3dd6123d6846669d9b7f8f9af7b3e3df7c3b1d33cd0149b649b7941c84c339
+DIST tpm2-tools-4.3.0.tar.gz 881544 BLAKE2B 
0415f30845658e84e97a964abebc3082e45fb880c10bec405cd89c7bfa373ace10b669c4af78e7e47f2d2bb62fc7cc34b2e54e392a95c8f9b8956b8c92af6aee
 SHA512 
4e622bbc8642ba7fd93a7343900560fe3779cba03e363d16f391fc8929724a11913d238e3986de06982cbced27c3c2ca8c7e73d75796407b8646c101ccf393a8

diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch
new file mode 100644
index 000..caa3fac23bf
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index 7b5c2196..d07d5433 100644
+--- a/configure.ac
 b/configure.ac
+@@ -210,7 +210,6 @@ AS_IF([test x"$enable_hardening" != x"no"], [
+ 
+   add_hardened_c_flag([-Wall])
+   add_hardened_c_flag([-Wextra])
+-  add_hardened_c_flag([-Werror])
+ 
+   add_hardened_c_flag([-Wformat])
+   add_hardened_c_flag([-Wformat-security])

diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.0.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-4.3.0.ebuild
new file mode 100644
index 000..7ccea9899c4
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+fapi libressl"
+
+# Integration test are now run as part of the testing suite, which will fail
+# because none of the supported TPM emulators are in Portage. In a future
+# version of tpm2-tools, swtpm will be supported and the tests can be run.
+RESTRICT="test"
+
+RDEPEND="net-misc/curl:=
+   >=app-crypt/tpm2-tss-2.4.0:=[fapi?]
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+PATCHES=(
+   "${FILESDIR}/${PN}-4.2.1-libressl.patch"
+   "${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
+)
+
+src_prepare() {
+   eautoreconf
+   default
+}
+
+src_configure() {
+   econf \
+   $(use_enable fapi) \
+   $(use_enable !libressl hardening)
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2020-08-23 Thread David Seifert

commit: 4690e6d51439851d567281be7cca353604b401ae
Author: Salah Coronya  gmail  com>
AuthorDate: Fri Aug 21 15:25:00 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Aug 23 11:48:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4690e6d5

app-crypt/tpm2-tools: Fix build for non-FAPI users

Closes: https://bugs.gentoo.org/738406
Closes: https://github.com/gentoo/gentoo/pull/17205
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Salah Coronya  gmail.com>
Signed-off-by: David Seifert  gentoo.org>

 .../tpm2-tools/{tpm2-tools-4.2.1.ebuild => tpm2-tools-4.2.1-r1.ebuild}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.2.1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-4.2.1-r1.ebuild
similarity index 94%
rename from app-crypt/tpm2-tools/tpm2-tools-4.2.1.ebuild
rename to app-crypt/tpm2-tools/tpm2-tools-4.2.1-r1.ebuild
index f791854a95a..ea91b076cb6 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-4.2.1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.2.1-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="+fapi libressl"
 RESTRICT="test"
 
 RDEPEND="net-misc/curl:=
-   fapi? ( >=app-crypt/tpm2-tss-2.4.0:=[fapi?] )
+   >=app-crypt/tpm2-tss-2.4.0:=[fapi?]
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/files/, app-crypt/tpm2-tools/

2020-06-24 Thread Joonas Niilola

commit: ded55f1b692c28ae442e9c9ff69bdb5a64aa33ac
Author: Salah Coronya  gmail  com>
AuthorDate: Wed May 27 01:26:31 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jun 24 14:29:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ded55f1b

app-crypt/tpm2-tools: Bump to 4.2.1

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Salah Coronya  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/Manifest  |  1 +
 .../files/tpm2-tools-4.2.1-libressl.patch  | 26 +
 app-crypt/tpm2-tools/tpm2-tools-4.2.1.ebuild   | 34 ++
 3 files changed, 61 insertions(+)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index eb3869a2746..038baa1317b 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1 +1,2 @@
+DIST tpm2-tools-4.2.1.tar.gz 879294 BLAKE2B 
7619f72f0fe39360f111822b4ec7a0bb90156f295977115c4612efac33059dd786abfa5d5f46a8fcc134fce11d099b03cb7f9ee01aa3addf5a3bb2455e1eb2d4
 SHA512 
4da103e70880d72a9aa402dea39ea439a0657729af22f08ac7275022c475ab46cb3dd6123d6846669d9b7f8f9af7b3e3df7c3b1d33cd0149b649b7941c84c339
 DIST tpm2-tools-4.2.tar.gz 889062 BLAKE2B 
434b88e90f953785e57a9e9f18d717c8b6632206dabfc7478ae866e245eadf032ec4f26bb9597d04ea887bc23a8096d7e6fc2748b0e96806cb2989fd7edf9071
 SHA512 
7aaf549dd77307e5ad93d4b34737d684c8a7384996143124f10b188f5e99860940902cee83538e6957997859420dd430d6d27979b223beae515aab94ac8fb235

diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.2.1-libressl.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-4.2.1-libressl.patch
new file mode 100644
index 000..2f39db3283c
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-4.2.1-libressl.patch
@@ -0,0 +1,26 @@
+From a1ac2ee0c6592e6f730458c03a2abd1532c66046 Mon Sep 17 00:00:00 2001
+From: Salah Coronya 
+Date: Sun, 12 Jan 2020 19:17:48 -0600
+Subject: [PATCH] lib/tpm2_openssl.c: Fix build for libressl
+
+Signed-off-by: Salah Coronya 
+---
+ lib/tpm2_openssl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/tpm2_openssl.c b/lib/tpm2_openssl.c
+index 505dd7a0..fd3861d9 100644
+--- a/lib/tpm2_openssl.c
 b/lib/tpm2_openssl.c
+@@ -14,7 +14,7 @@
+ #include "tpm2_openssl.h"
+ 
+ /* compatibility function for OpenSSL versions < 1.1.0 */
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ static int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) {
+ int r;
+ int topad;
+-- 
+2.24.1
+

diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.2.1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-4.2.1.ebuild
new file mode 100644
index 000..f791854a95a
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.2.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+fapi libressl"
+
+# Integration test are now run as part of the testing suite, which will fail
+# because none of the supported TPM emulators are in Portage. In a future
+# version of tpm2-tools, swtpm will be supported and the tests can be run.
+RESTRICT="test"
+
+RDEPEND="net-misc/curl:=
+   fapi? ( >=app-crypt/tpm2-tss-2.4.0:=[fapi?] )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+PATCHES=(
+   "${FILESDIR}/${P}-libressl.patch"
+)
+
+src_configure() {
+   econf \
+   $(use_enable fapi) \
+   $(use_enable !libressl hardening)
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/files/, app-crypt/tpm2-tools/

2020-06-24 Thread Joonas Niilola

commit: c465e822c23591a68373eef10917be283dfde026
Author: Salah Coronya  gmail  com>
AuthorDate: Wed May 27 01:28:07 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jun 24 14:29:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c465e822

app-crypt/tpm2-tools: Remove old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Salah Coronya  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15981
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/Manifest  |  1 -
 .../tpm2-tools/files/tpm2-tools-4.2-libressl.patch | 26 -
 app-crypt/tpm2-tools/tpm2-tools-4.2.ebuild | 34 --
 3 files changed, 61 deletions(-)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 038baa1317b..bb9cff37586 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,2 +1 @@
 DIST tpm2-tools-4.2.1.tar.gz 879294 BLAKE2B 
7619f72f0fe39360f111822b4ec7a0bb90156f295977115c4612efac33059dd786abfa5d5f46a8fcc134fce11d099b03cb7f9ee01aa3addf5a3bb2455e1eb2d4
 SHA512 
4da103e70880d72a9aa402dea39ea439a0657729af22f08ac7275022c475ab46cb3dd6123d6846669d9b7f8f9af7b3e3df7c3b1d33cd0149b649b7941c84c339
-DIST tpm2-tools-4.2.tar.gz 889062 BLAKE2B 
434b88e90f953785e57a9e9f18d717c8b6632206dabfc7478ae866e245eadf032ec4f26bb9597d04ea887bc23a8096d7e6fc2748b0e96806cb2989fd7edf9071
 SHA512 
7aaf549dd77307e5ad93d4b34737d684c8a7384996143124f10b188f5e99860940902cee83538e6957997859420dd430d6d27979b223beae515aab94ac8fb235

diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.2-libressl.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-4.2-libressl.patch
deleted file mode 100644
index 2f39db3283c..000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-4.2-libressl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a1ac2ee0c6592e6f730458c03a2abd1532c66046 Mon Sep 17 00:00:00 2001
-From: Salah Coronya 
-Date: Sun, 12 Jan 2020 19:17:48 -0600
-Subject: [PATCH] lib/tpm2_openssl.c: Fix build for libressl
-
-Signed-off-by: Salah Coronya 

- lib/tpm2_openssl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/tpm2_openssl.c b/lib/tpm2_openssl.c
-index 505dd7a0..fd3861d9 100644
 a/lib/tpm2_openssl.c
-+++ b/lib/tpm2_openssl.c
-@@ -14,7 +14,7 @@
- #include "tpm2_openssl.h"
- 
- /* compatibility function for OpenSSL versions < 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- static int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) {
- int r;
- int topad;
--- 
-2.24.1
-

diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.2.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-4.2.ebuild
deleted file mode 100644
index f791854a95a..000
--- a/app-crypt/tpm2-tools/tpm2-tools-4.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+fapi libressl"
-
-# Integration test are now run as part of the testing suite, which will fail
-# because none of the supported TPM emulators are in Portage. In a future
-# version of tpm2-tools, swtpm will be supported and the tests can be run.
-RESTRICT="test"
-
-RDEPEND="net-misc/curl:=
-   fapi? ( >=app-crypt/tpm2-tss-2.4.0:=[fapi?] )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-PATCHES=(
-   "${FILESDIR}/${P}-libressl.patch"
-)
-
-src_configure() {
-   econf \
-   $(use_enable fapi) \
-   $(use_enable !libressl hardening)
-}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/

2020-05-13 Thread Joonas Niilola

commit: 3ea12f993b67f45c05a4fb35db9c0d5f0387ea76
Author: Salah Coronya  gmail  com>
AuthorDate: Sat Apr 11 04:25:42 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed May 13 13:16:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ea12f99

app-crypt/tpm2-tools: Remove old

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Salah Coronya  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15311
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/Manifest  |  2 -
 .../files/tpm2-tools-3.1.3-libressl.patch  | 81 --
 .../files/tpm2-tools-4.1.1-libressl.patch  | 26 ---
 app-crypt/tpm2-tools/tpm2-tools-3.1.4.ebuild   | 32 -
 app-crypt/tpm2-tools/tpm2-tools-4.1.1.ebuild   | 32 -
 5 files changed, 173 deletions(-)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 27bb8e1ebee..eb3869a2746 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,3 +1 @@
-DIST tpm2-tools-3.1.4.tar.gz 589388 BLAKE2B 
9a0158d0658dc2db4734b18ea1d49bd6c0aef84c4f1236f3134245165dccdb0bada69d92f0e5a59ecb1f2973e5cd25924d2b9c4cad2891d9e4f9fb94a84b
 SHA512 
c5e1be4ffab305ee42a8b4a9c9aa4373158259a58844e273465f97a74f913fb12098b9fd81127148be95ecba7378f6a45b96af256dde3101a237e5e33e8e8ccb
-DIST tpm2-tools-4.1.1.tar.gz 779914 BLAKE2B 
5b347b00508183cbde407e01454df0a7eb3a8080cb5b8f73d153c4972b38b98ac7c04b54aeedef03b9bfd97b3cff482dbc44d5f11215af9c3c7754380d75
 SHA512 
25952cf947f0acd16b1a8dbd3ac8573bce85ff970a7e24c290c4f9cd29418e77a3e48ac82c932fbd250887a9303ab301ff92db594c2fffaba47b873382444d26
 DIST tpm2-tools-4.2.tar.gz 889062 BLAKE2B 
434b88e90f953785e57a9e9f18d717c8b6632206dabfc7478ae866e245eadf032ec4f26bb9597d04ea887bc23a8096d7e6fc2748b0e96806cb2989fd7edf9071
 SHA512 
7aaf549dd77307e5ad93d4b34737d684c8a7384996143124f10b188f5e99860940902cee83538e6957997859420dd430d6d27979b223beae515aab94ac8fb235

diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-3.1.3-libressl.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-3.1.3-libressl.patch
deleted file mode 100644
index 7c26d6e14f8..000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-3.1.3-libressl.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From a3447989483e09638e6ebeab7eabe6273aa5f3db Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev 
-Date: Fri, 4 Jan 2019 10:33:15 +0200
-Subject: [PATCH] build: fixup libressl support and add libressl-2.7
-
-Signed-off-by: Alon Bar-Lev 
-Backport: 5d4cc4ee

- lib/conversion.c |  6 +-
- lib/tpm_kdfa.c   | 10 +++---
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/lib/conversion.c b/lib/conversion.c
-index ce0f5b3..f55af6f 100644
 a/lib/conversion.c
-+++ b/lib/conversion.c
-@@ -45,6 +45,10 @@
- #include "tpm2_alg_util.h"
- #include "tpm2_util.h"
- 
-+#if (OPENSSL_VERSION_NUMBER < 0x101fL && 
!defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && 
LIBRESSL_VERSION_NUMBER < 0x2070L) /* OpenSSL 1.1.0 */
-+#define LIB_TPM2_OPENSSL_OPENSSL_PRE11
-+#endif
-+
- static bool tpm2_convert_pubkey_ssl(TPMT_PUBLIC *public, pubkey_format 
format, const char *path);
- 
- pubkey_format tpm2_parse_pubkey_format(const char *label) {
-@@ -134,7 +138,7 @@ static bool tpm2_convert_pubkey_ssl(TPMT_PUBLIC *public, 
pubkey_format format, c
- goto error;
- }
- 
--#if OPENSSL_VERSION_NUMBER < 0x101fL /* OpenSSL 1.1.0 */
-+#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
- ssl_rsa_key->e = e;
- ssl_rsa_key->n = n;
- #else
-diff --git a/lib/tpm_kdfa.c b/lib/tpm_kdfa.c
-index 3d1ed50..fc03af8 100644
 a/lib/tpm_kdfa.c
-+++ b/lib/tpm_kdfa.c
-@@ -34,6 +34,10 @@
- #include "log.h"
- #include "tpm2_util.h"
- 
-+#if (OPENSSL_VERSION_NUMBER < 0x101fL && 
!defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && 
LIBRESSL_VERSION_NUMBER < 0x2070L) /* OpenSSL 1.1.0 */
-+#define LIB_TPM2_OPENSSL_OPENSSL_PRE11
-+#endif
-+
- static const EVP_MD *tpm_algorithm_to_openssl_digest(TPMI_ALG_HASH algorithm) 
{
- 
- switch(algorithm) {
-@@ -54,7 +58,7 @@ static const EVP_MD 
*tpm_algorithm_to_openssl_digest(TPMI_ALG_HASH algorithm) {
- static HMAC_CTX *hmac_alloc()
- {
- HMAC_CTX *ctx;
--#if OPENSSL_VERSION_NUMBER < 0x101fL /* OpenSSL 1.1.0 */
-+#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
- ctx = malloc(sizeof(*ctx));
- #else
- ctx = HMAC_CTX_new();
-@@ -62,7 +66,7 @@ static HMAC_CTX *hmac_alloc()
- if (!ctx)
- return NULL;
- 
--#if OPENSSL_VERSION_NUMBER < 0x101fL
-+#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
- HMAC_CTX_init(ctx);
- #endif
- 
-@@ -71,7 +75,7 @@ static HMAC_CTX *hmac_alloc()
- 
- static void hmac_del(HMAC_CTX *ctx)
- {
--#if OPENSSL_VERSION_NUMBER < 0x101fL
-+#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
- HMAC_CTX_cleanup(ctx);
- free(ctx);
- #else
--- 
-2.19.2
-

diff --git

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/

2020-05-13 Thread Joonas Niilola

commit: f1b23e789dfc6359d1967a199f48eb44ca2f33ef
Author: Salah Coronya  gmail  com>
AuthorDate: Sat Apr 11 00:43:55 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed May 13 13:16:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1b23e78

app-crypt/tpm2-tools: Bump to 4.2

Closes: https://bugs.gentoo.org/722018
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Salah Coronya  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/Manifest  |  1 +
 .../tpm2-tools/files/tpm2-tools-4.2-libressl.patch | 26 +
 app-crypt/tpm2-tools/metadata.xml  |  3 ++
 app-crypt/tpm2-tools/tpm2-tools-4.2.ebuild | 34 ++
 4 files changed, 64 insertions(+)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 5c398b78b3c..27bb8e1ebee 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,2 +1,3 @@
 DIST tpm2-tools-3.1.4.tar.gz 589388 BLAKE2B 
9a0158d0658dc2db4734b18ea1d49bd6c0aef84c4f1236f3134245165dccdb0bada69d92f0e5a59ecb1f2973e5cd25924d2b9c4cad2891d9e4f9fb94a84b
 SHA512 
c5e1be4ffab305ee42a8b4a9c9aa4373158259a58844e273465f97a74f913fb12098b9fd81127148be95ecba7378f6a45b96af256dde3101a237e5e33e8e8ccb
 DIST tpm2-tools-4.1.1.tar.gz 779914 BLAKE2B 
5b347b00508183cbde407e01454df0a7eb3a8080cb5b8f73d153c4972b38b98ac7c04b54aeedef03b9bfd97b3cff482dbc44d5f11215af9c3c7754380d75
 SHA512 
25952cf947f0acd16b1a8dbd3ac8573bce85ff970a7e24c290c4f9cd29418e77a3e48ac82c932fbd250887a9303ab301ff92db594c2fffaba47b873382444d26
+DIST tpm2-tools-4.2.tar.gz 889062 BLAKE2B 
434b88e90f953785e57a9e9f18d717c8b6632206dabfc7478ae866e245eadf032ec4f26bb9597d04ea887bc23a8096d7e6fc2748b0e96806cb2989fd7edf9071
 SHA512 
7aaf549dd77307e5ad93d4b34737d684c8a7384996143124f10b188f5e99860940902cee83538e6957997859420dd430d6d27979b223beae515aab94ac8fb235

diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.2-libressl.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-4.2-libressl.patch
new file mode 100644
index 000..2f39db3283c
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-4.2-libressl.patch
@@ -0,0 +1,26 @@
+From a1ac2ee0c6592e6f730458c03a2abd1532c66046 Mon Sep 17 00:00:00 2001
+From: Salah Coronya 
+Date: Sun, 12 Jan 2020 19:17:48 -0600
+Subject: [PATCH] lib/tpm2_openssl.c: Fix build for libressl
+
+Signed-off-by: Salah Coronya 
+---
+ lib/tpm2_openssl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/tpm2_openssl.c b/lib/tpm2_openssl.c
+index 505dd7a0..fd3861d9 100644
+--- a/lib/tpm2_openssl.c
 b/lib/tpm2_openssl.c
+@@ -14,7 +14,7 @@
+ #include "tpm2_openssl.h"
+ 
+ /* compatibility function for OpenSSL versions < 1.1.0 */
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ static int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) {
+ int r;
+ int topad;
+-- 
+2.24.1
+

diff --git a/app-crypt/tpm2-tools/metadata.xml 
b/app-crypt/tpm2-tools/metadata.xml
index b28056e8794..26b4dcbaf51 100644
--- a/app-crypt/tpm2-tools/metadata.xml
+++ b/app-crypt/tpm2-tools/metadata.xml
@@ -9,6 +9,9 @@
proxy-ma...@gentoo.org
Proxy Maintainers

+   
+   Enable feature API tools
+   

tpm2-software/tpm2-tools


diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.2.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-4.2.ebuild
new file mode 100644
index 000..f791854a95a
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+fapi libressl"
+
+# Integration test are now run as part of the testing suite, which will fail
+# because none of the supported TPM emulators are in Portage. In a future
+# version of tpm2-tools, swtpm will be supported and the tests can be run.
+RESTRICT="test"
+
+RDEPEND="net-misc/curl:=
+   fapi? ( >=app-crypt/tpm2-tss-2.4.0:=[fapi?] )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+PATCHES=(
+   "${FILESDIR}/${P}-libressl.patch"
+)
+
+src_configure() {
+   econf \
+   $(use_enable fapi) \
+   $(use_enable !libressl hardening)
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/

2020-02-26 Thread Joonas Niilola

commit: e3f888a442e6edcc605f7c02f4ffb09c41e23f46
Author: Salah Coronya  gmail  com>
AuthorDate: Thu Feb 20 02:06:06 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Feb 26 16:17:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3f888a4

app-crypt/tpm2-tools: Bump version to 4.1.1

Closes: https://bugs.gentoo.org/694988
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Salah Coronya  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/Manifest  |  1 +
 .../files/tpm2-tools-4.1.1-libressl.patch  | 26 ++
 app-crypt/tpm2-tools/tpm2-tools-4.1.1.ebuild   | 32 ++
 3 files changed, 59 insertions(+)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index fe23dab9fc3..5c398b78b3c 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1 +1,2 @@
 DIST tpm2-tools-3.1.4.tar.gz 589388 BLAKE2B 
9a0158d0658dc2db4734b18ea1d49bd6c0aef84c4f1236f3134245165dccdb0bada69d92f0e5a59ecb1f2973e5cd25924d2b9c4cad2891d9e4f9fb94a84b
 SHA512 
c5e1be4ffab305ee42a8b4a9c9aa4373158259a58844e273465f97a74f913fb12098b9fd81127148be95ecba7378f6a45b96af256dde3101a237e5e33e8e8ccb
+DIST tpm2-tools-4.1.1.tar.gz 779914 BLAKE2B 
5b347b00508183cbde407e01454df0a7eb3a8080cb5b8f73d153c4972b38b98ac7c04b54aeedef03b9bfd97b3cff482dbc44d5f11215af9c3c7754380d75
 SHA512 
25952cf947f0acd16b1a8dbd3ac8573bce85ff970a7e24c290c4f9cd29418e77a3e48ac82c932fbd250887a9303ab301ff92db594c2fffaba47b873382444d26

diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.1.1-libressl.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-4.1.1-libressl.patch
new file mode 100644
index 000..2f39db3283c
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-4.1.1-libressl.patch
@@ -0,0 +1,26 @@
+From a1ac2ee0c6592e6f730458c03a2abd1532c66046 Mon Sep 17 00:00:00 2001
+From: Salah Coronya 
+Date: Sun, 12 Jan 2020 19:17:48 -0600
+Subject: [PATCH] lib/tpm2_openssl.c: Fix build for libressl
+
+Signed-off-by: Salah Coronya 
+---
+ lib/tpm2_openssl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/tpm2_openssl.c b/lib/tpm2_openssl.c
+index 505dd7a0..fd3861d9 100644
+--- a/lib/tpm2_openssl.c
 b/lib/tpm2_openssl.c
+@@ -14,7 +14,7 @@
+ #include "tpm2_openssl.h"
+ 
+ /* compatibility function for OpenSSL versions < 1.1.0 */
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ static int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) {
+ int r;
+ int topad;
+-- 
+2.24.1
+

diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.1.1.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-4.1.1.ebuild
new file mode 100644
index 000..a2ad7f1f2dc
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libressl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-crypt/tpm2-tss-2.3.1:=
+   net-misc/curl:=
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+   test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}/${P}-libressl.patch"
+)
+
+src_configure() {
+   econf \
+   $(use_enable !libressl hardening) \
+   $(use_enable test unit)
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2020-02-26 Thread Joonas Niilola

commit: 41ceffb996c22d610922fa9996ad3da5c3f4eaf0
Author: Salah Coronya  gmail  com>
AuthorDate: Thu Feb 20 02:06:06 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Feb 26 16:17:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41ceffb9

app-crypt/tpm2-tools: Add salah.coronya  gmail.com as proxy maintainer

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Salah Coronya  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm2-tools/metadata.xml | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/metadata.xml 
b/app-crypt/tpm2-tools/metadata.xml
index 42a8d7b7aea..b28056e8794 100644
--- a/app-crypt/tpm2-tools/metadata.xml
+++ b/app-crypt/tpm2-tools/metadata.xml
@@ -1,7 +1,14 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   salah.coro...@gmail.com
+   Salah Coronya
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

tpm2-software/tpm2-tools

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2019-05-30 Thread Alon Bar-Lev

commit: 060e20d6da4ac0d03a991ad2f4e2f2ada752c52b
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Thu May 30 21:30:55 2019 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Thu May 30 23:46:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=060e20d6

app-crypt/tpm2-tools: version bump

Signed-off-by: Alon Bar-Lev  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 app-crypt/tpm2-tools/Manifest   | 2 +-
 .../tpm2-tools/{tpm2-tools-3.1.3.ebuild => tpm2-tools-3.1.4.ebuild} | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 7b96fcbbc30..fe23dab9fc3 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1 +1 @@
-DIST tpm2-tools-3.1.3.tar.gz 544098 BLAKE2B 
4c22ae98ed444b7d5b5f99e6a7d4cc37fcf9d46979669a2225b6f2abf8ccaaff203ccc8c816169be215c6160ce2480e4c9a0197040764013ab362dd060c29bec
 SHA512 
37edf59e47168c42ffc66e948722753334ae3e00f3e258d9e801dffd259a763a1bf4f63b3feecf7728b4dade69ca5da15d631e1a606f68e10f7d314a1a757bdc
+DIST tpm2-tools-3.1.4.tar.gz 589388 BLAKE2B 
9a0158d0658dc2db4734b18ea1d49bd6c0aef84c4f1236f3134245165dccdb0bada69d92f0e5a59ecb1f2973e5cd25924d2b9c4cad2891d9e4f9fb94a84b
 SHA512 
c5e1be4ffab305ee42a8b4a9c9aa4373158259a58844e273465f97a74f913fb12098b9fd81127148be95ecba7378f6a45b96af256dde3101a237e5e33e8e8ccb

diff --git a/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-3.1.4.ebuild
similarity index 86%
rename from app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild
rename to app-crypt/tpm2-tools/tpm2-tools-3.1.4.ebuild
index df27445aa2b..c9391925f76 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-3.1.4.ebuild
@@ -12,8 +12,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="libressl test"
 
-RDEPEND=">=app-crypt/tpm2-tss-2.0
-   net-misc/curl
+RDEPEND=">=app-crypt/tpm2-tss-2.0:=
+   net-misc/curl:=
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
@@ -21,7 +21,7 @@ DEPEND="${RDEPEND}
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-   "${FILESDIR}/${P}-libressl.patch"
+   "${FILESDIR}/${PN}-3.1.3-libressl.patch"
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/

2019-01-04 Thread Alon Bar-Lev

commit: a66b106e25440d56b008371c60cb347c6fc62fe7
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Fri Jan  4 08:36:03 2019 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Fri Jan  4 08:37:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a66b106e

app-crypt/tpm2-tools: fix libressl support

Closes: https://bugs.gentoo.org/show_bug.cgi?id=674158
Thanks: Toralf Förster
Signed-off-by: Alon Bar-Lev  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../files/tpm2-tools-3.1.3-libressl.patch  | 81 ++
 app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild   |  6 +-
 2 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-3.1.3-libressl.patch 
b/app-crypt/tpm2-tools/files/tpm2-tools-3.1.3-libressl.patch
new file mode 100644
index 000..7c26d6e14f8
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-3.1.3-libressl.patch
@@ -0,0 +1,81 @@
+From a3447989483e09638e6ebeab7eabe6273aa5f3db Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev 
+Date: Fri, 4 Jan 2019 10:33:15 +0200
+Subject: [PATCH] build: fixup libressl support and add libressl-2.7
+
+Signed-off-by: Alon Bar-Lev 
+Backport: 5d4cc4ee
+---
+ lib/conversion.c |  6 +-
+ lib/tpm_kdfa.c   | 10 +++---
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/lib/conversion.c b/lib/conversion.c
+index ce0f5b3..f55af6f 100644
+--- a/lib/conversion.c
 b/lib/conversion.c
+@@ -45,6 +45,10 @@
+ #include "tpm2_alg_util.h"
+ #include "tpm2_util.h"
+ 
++#if (OPENSSL_VERSION_NUMBER < 0x101fL && 
!defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && 
LIBRESSL_VERSION_NUMBER < 0x2070L) /* OpenSSL 1.1.0 */
++#define LIB_TPM2_OPENSSL_OPENSSL_PRE11
++#endif
++
+ static bool tpm2_convert_pubkey_ssl(TPMT_PUBLIC *public, pubkey_format 
format, const char *path);
+ 
+ pubkey_format tpm2_parse_pubkey_format(const char *label) {
+@@ -134,7 +138,7 @@ static bool tpm2_convert_pubkey_ssl(TPMT_PUBLIC *public, 
pubkey_format format, c
+ goto error;
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x101fL /* OpenSSL 1.1.0 */
++#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
+ ssl_rsa_key->e = e;
+ ssl_rsa_key->n = n;
+ #else
+diff --git a/lib/tpm_kdfa.c b/lib/tpm_kdfa.c
+index 3d1ed50..fc03af8 100644
+--- a/lib/tpm_kdfa.c
 b/lib/tpm_kdfa.c
+@@ -34,6 +34,10 @@
+ #include "log.h"
+ #include "tpm2_util.h"
+ 
++#if (OPENSSL_VERSION_NUMBER < 0x101fL && 
!defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && 
LIBRESSL_VERSION_NUMBER < 0x2070L) /* OpenSSL 1.1.0 */
++#define LIB_TPM2_OPENSSL_OPENSSL_PRE11
++#endif
++
+ static const EVP_MD *tpm_algorithm_to_openssl_digest(TPMI_ALG_HASH algorithm) 
{
+ 
+ switch(algorithm) {
+@@ -54,7 +58,7 @@ static const EVP_MD 
*tpm_algorithm_to_openssl_digest(TPMI_ALG_HASH algorithm) {
+ static HMAC_CTX *hmac_alloc()
+ {
+ HMAC_CTX *ctx;
+-#if OPENSSL_VERSION_NUMBER < 0x101fL /* OpenSSL 1.1.0 */
++#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
+ ctx = malloc(sizeof(*ctx));
+ #else
+ ctx = HMAC_CTX_new();
+@@ -62,7 +66,7 @@ static HMAC_CTX *hmac_alloc()
+ if (!ctx)
+ return NULL;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x101fL
++#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
+ HMAC_CTX_init(ctx);
+ #endif
+ 
+@@ -71,7 +75,7 @@ static HMAC_CTX *hmac_alloc()
+ 
+ static void hmac_del(HMAC_CTX *ctx)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x101fL
++#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
+ HMAC_CTX_cleanup(ctx);
+ free(ctx);
+ #else
+-- 
+2.19.2
+

diff --git a/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild
index a23c0b4d9a6..df27445aa2b 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,10 @@ DEPEND="${RDEPEND}
test? ( dev-util/cmocka )"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+   "${FILESDIR}/${P}-libressl.patch"
+)
+
 src_configure() {
econf \
--disable-hardening \

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/

2018-12-30 Thread Alon Bar-Lev

commit: 3cd3fa3e139cf893ec5037398b851a519337bcbb
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Sun Dec 30 20:51:10 2018 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Sun Dec 30 20:58:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cd3fa3e

app-crypt/tpm2-tools: initial add

Closes: https://bugs.gentoo.org/show_bug.cgi?id=634304
Thanks: Alex Guzman
Thanks: Sebastian Hamann
Signed-off-by: Alon Bar-Lev  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-crypt/tpm2-tools/Manifest|  1 +
 app-crypt/tpm2-tools/metadata.xml| 11 +++
 app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild | 27 +++
 3 files changed, 39 insertions(+)

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
new file mode 100644
index 000..7b96fcbbc30
--- /dev/null
+++ b/app-crypt/tpm2-tools/Manifest
@@ -0,0 +1 @@
+DIST tpm2-tools-3.1.3.tar.gz 544098 BLAKE2B 
4c22ae98ed444b7d5b5f99e6a7d4cc37fcf9d46979669a2225b6f2abf8ccaaff203ccc8c816169be215c6160ce2480e4c9a0197040764013ab362dd060c29bec
 SHA512 
37edf59e47168c42ffc66e948722753334ae3e00f3e258d9e801dffd259a763a1bf4f63b3feecf7728b4dade69ca5da15d631e1a606f68e10f7d314a1a757bdc

diff --git a/app-crypt/tpm2-tools/metadata.xml 
b/app-crypt/tpm2-tools/metadata.xml
new file mode 100644
index 000..a1035736860
--- /dev/null
+++ b/app-crypt/tpm2-tools/metadata.xml
@@ -0,0 +1,11 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   cry...@gentoo.org
+   Crypto
+   
+   
+   tpm2-software/tpm2-tools
+   
+

diff --git a/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild 
b/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild
new file mode 100644
index 000..a23c0b4d9a6
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools;
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libressl test"
+
+RDEPEND=">=app-crypt/tpm2-tss-2.0
+   net-misc/curl
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+   test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+   econf \
+   --disable-hardening \
+   $(use_enable test unit)
+}

81 matches

Mail list logo