gentoo resync : 25.11.2020

4 files changed, 31 insertions, 64 deletions

diff --git a/app-crypt/tpm2-pkcs11/Manifest b/app-crypt/tpm2-pkcs11/Manifest
index 82a623ea012f..74dbe887b3d9 100644
--- a/app-crypt/tpm2-pkcs11/Manifest
+++ b/app-crypt/tpm2-pkcs11/Manifest
@@ -1,5 +1,4 @@
-DIST tpm2-pkcs11-1.3.2.tar.gz 1260000 BLAKE2B 219af608db4c72b9bd6c471af9499a4e78a4c9ba6afff72681830cd2f6ce174bc684b9b33c16d263bd6069f0f17f3c92afc56b03779aea38236f36232cd0e5ce SHA512 cca15ace5e6c576591c3432eabb0de98f276a334785b021aa28601c9a77686737c23702fd0ac384feeaf71c8966eccc0006ba428b400de58f811848538ffa978
-DIST tpm2-pkcs11-1.4.0.tar.gz 1334539 BLAKE2B 7f165fab37577903da98c5d3c134fe22e0f630e9494061fe8ced3293b96e2c830650090d8aa349c8ce57fea74c07774415279ef5fbde8db628c8607f2b3203cf SHA512 b271500c7aab256edf4b9e070e700bbc8162db070cd8dfe49289db60d8c4527b8e54c794beb8c97fda0d989e095ac6cb790898912993db1906b7139942c87ffb
-EBUILD tpm2-pkcs11-1.3.2.ebuild 1250 BLAKE2B 7216c963db4964e27323eb3c6eb88b186b7edf8bb72900ba91bc28e1753094c730dba75db09cc56478fa97e85f6ca04070865e59ca3a3c53b227347a9ea134d8 SHA512 c728ba486857889aef98f635f74420573689f04f7a8589127fda247110de7f224f750d363b3d95ca1b294d035a1dbdfb995cc4b21e3aed6e40004f05ee90232b
-EBUILD tpm2-pkcs11-1.4.0.ebuild 1346 BLAKE2B a2439527a123b86c3fec733224e3988ecebceca10ec1bf55dda86a63a7116dfef0716e6705457d2f98116972287d64ca2c2a14108d658b9774bb5f2c9cc5c66c SHA512 c579cb36906cdacd8bdc922564855ac6daf4182a0e00f4b3958c261400f232ec6863134b2d4078fdd833d58fdd76f539238add7f8739ad41b27798262393aeed
+AUX tpm2-pkcs11-1.3.2-Remove-WError.patch 356 BLAKE2B d3c124abbad2e3f8a818091293156840e22fca3aa59b59ff8af4f5e3ddd351e56e1619c647b89fd84df7e804bfccd608a1c9ea89d586ca84eb0326d3563ebf79 SHA512 4cd405ff046fd209bcc543c55514e5750007f76e2ed014bcf50975d62493feee0173c0649a06632d2aff2bcd39375be4ec5d341ba75558a257edf7a4ae03a63c
+DIST tpm2-pkcs11-1.5.0.tar.gz 1355121 BLAKE2B 9c00deb62bf30e22ef346bcdf951252913709f6c953f45e68df35cea434e55f79a960fea16aaa46794650c0cceaf979f4250af8cc835e48f34aca5b2306f2685 SHA512 999adf3ea031dfbb0eadefbd6b2c5457bff738bad231efa70218032f851fe5ba466e37bdf47b5bce380c378b97e88b2a76c9b59a264db5c5f380a9ba3cce58a0
+EBUILD tpm2-pkcs11-1.5.0.ebuild 1556 BLAKE2B f8c03e4058c93fe7866f24cbfe10c41e8cce5f1c7547f5db6877a008b8a5bce8d51f86cdc4f6ab855256af395befece75fdac581285b385ce6acd03b6f08ac89 SHA512 2fec1928477aeacaa54e1760b3669aec86213768ab5001cd2f88df1dc6d0e086b624bb2b9beee04086c978bfaf5a64429010c5883887b4588ba7560b172defa9
 MISC metadata.xml 439 BLAKE2B 6f2f3a6188973cfdc23515761b9ac0a1a67d644374de859c8f493874c79b8802a8cfdab9635ff6af3eb03cf925fc22214da23a26738b51d5dd3c0d5c9e78af72 SHA512 0d819fb83133364a6ff8fa22a868e4a88101ca1d72d2552e007e25be1f4ea7da9066556123879035962f36910dd5eaf2f5b5dc613c8e7807ab383084185bef41
diff --git a/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch b/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch
new file mode 100644
index 000000000000..7aae19c7c71f
--- /dev/null
+++ b/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index 3088817..d789ce9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -460,7 +460,6 @@ AS_IF([test x"$enable_hardening" != xno], [
+ 
+   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-pkcs11/tpm2-pkcs11-1.3.2.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.3.2.ebuild
deleted file mode 100644
index eacca8899f54..000000000000
--- a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.3.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A PKCS#11 interface for TPM2 hardware"
-HOMEPAGE="https://tpm2-software.github.io/"
-SRC_URI="https://github.com/tpm2-software/tpm2-pkcs11/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# Test requires the IBM TPM simulator that's not in portage
-RESTRICT="test"
-
-RDEPEND="app-crypt/p11-kit
-	app-crypt/tpm2-abrmd
-	app-crypt/tpm2-tools
-	app-crypt/tpm2-tss
-	dev-db/sqlite:3
-	dev-libs/openssl
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/autoconf-archive
-	virtual/pkgconfig"
-
-src_configure() {
-	default
-}
-
-src_compile() {
-	default
-	cd "${S}/tools" || die
-	BUILD_DIR="${S}/tools" python_foreach_impl distutils-r1_python_compile
-}
-
-src_install() {
-	default
-	cd "${S}/tools" || die
-	BUILD_DIR="${S}/tools" python_foreach_impl distutils-r1_python_install
-	dobin "${S}/tools/tpm2_ptool"
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.4.0.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.5.0.ebuild
index be28c64da7ec..37841aeebeb0 100644
--- a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.4.0.ebuild
+++ b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.5.0.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_REQ_USE="sqlite"
 
-inherit distutils-r1
+inherit autotools distutils-r1
 
 DESCRIPTION="A PKCS#11 interface for TPM2 hardware"
 HOMEPAGE="https://tpm2-software.github.io/"
@@ -19,25 +19,35 @@ KEYWORDS="~amd64"
 
 IUSE="fapi"
 
-# Test requires the IBM TPM simulator that's not in portage
+# python-pkcs11 is required but not in Portage. python-pkcs11 in turn requires
+# aenum which is ALSO not in portage. Futhermore, aenum has a dead homepage.
 RESTRICT="test"
 
 RDEPEND="app-crypt/p11-kit
 	app-crypt/tpm2-abrmd
 	app-crypt/tpm2-tools[fapi?]
 	!fapi? ( app-crypt/tpm2-tss )
-	fapi? ( >=app-crypt/tpm2-tss-3.0.0[fapi] )
+	fapi? ( >=app-crypt/tpm2-tss-3.0.1[fapi] )
 	dev-db/sqlite:3
-	dev-libs/openssl
+	dev-libs/openssl:=
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
+	dev-python/pyyaml[${PYTHON_USEDEP}] "
 
 DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/autoconf-archive
 	virtual/pkgconfig"
 
+PATCHES=(
+	"$FILESDIR/${PN}-1.3.2-Remove-WError.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable fapi)