gentoo (leap year) resync : 29.02.2020

5 files changed, 24 insertions, 58 deletions

diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest
index 82cb84fa6960..9ce542e4cf92 100644
--- a/app-crypt/tpm2-tss-engine/Manifest
+++ b/app-crypt/tpm2-tss-engine/Manifest
@@ -1,5 +1,4 @@
-AUX tpm2-tss-engine-1.0.0-build.patch 2362 BLAKE2B d1e28ef019da77a9f857b90d9bce7d03a55504e0b74b7aafa2e56e417cc528b55ea8284ca9e2e30b35dd357a829b0329f26e595f9c421315c6b08ec8ac2aba80 SHA512 6a5fa163ccf8e0b24c9f1641b1c29be55d437d2e026343d9f33872fe2f2914a440884c705ec0c679130533ffa67d8ee33d475385568c57ed5d738d84b598c49d
-AUX tpm2-tss-engine-1.0.0-libressl.patch 1054 BLAKE2B 42f666eb44e61659e941758ab48bcf76c5be94be5944d7437db0671b286f038d8cee3e8754ca84fdbb0957b7e964445e798d2c494354c6ca9eff576ce45d7f6d SHA512 9b7c769d6a65ec67a522d78abb56da8c8560074a6bc1efcb300669308bfeeb39340da7c049a4c5d0a446f9e0d4e9fc03ee80ad0db52395c4a81013e11d27796d
-DIST tpm2-tss-engine-1.0.0.tar.gz 382277 BLAKE2B 6580eb83f4e9391a12df2fb9cb86ace385a9e29004a64f6ca9378d9b8f60572a7761f4f486e1010d435487fed28858737d2bb71b08e400e9551a7b83c198bbe7 SHA512 b06722c82c9cefd5184125b26fb46bd7b20d62631c21c51a028348833c4786b41ff64f2c1cb7d53f749a6cf35b8fae02ae02285fc43d1d044e2d2b6e2e7048a3
-EBUILD tpm2-tss-engine-1.0.0.ebuild 821 BLAKE2B 986550cef0aeefccb1e0b123d7bbcecfdefa6c5b41bbc9b2e9afe411578a3ac7192294fb6cda7f54a6d6640a288e24b7b25f211ae11bd08c0bae15203bcb41a5 SHA512 26fd09212feab98c4bf353b37400692d3595fcf1229fc2c19715b07cf84b0dfec5019d300bd2aa3e74017992f2a347cfb32590865dc583f5ca44f453335a3751
-MISC metadata.xml 261 BLAKE2B 1f28a367c89055b59f6e03dba69b5f2ca8305effc0475795410a035eea72b2586a0e18b62bcb56fab8b387cb1bf86598cb206ac57a8bc68007371b1543a3f443 SHA512 c30b7dd0d2a8e605cd0d2b33a22e3da2fc8f7592d5b4b5292f3a8c59d872ee342bcfc3b9b3971f69a2a4bacc319f3be53b64d495815d608198e77b68203cba4d
+AUX tpm2-tss-engine-1.0.1-build-add-disable-defaultflags.patch 2205 BLAKE2B 59d04d10159899a453204a4812d768d78cba86b2ca649692d105107790a157fb6bf32fe202ede43a4c57437f87ee7d8c5917d6493386841e9c8574b86db93882 SHA512 d1e97ec52a459da7de3e53797cfac118230da90988a8112d7118c084a85cd04f6f3b8053d2fcae9bf3b819f4ab5ac3cd04d74cd4c8a7c7c725c0547436bfb045
+DIST tpm2-tss-engine-1.0.1.tar.gz 382715 BLAKE2B b33b91bf892509f8ed88bea1ba9611f06c9342726932baebbe918fcd4208f6c4b07710db666261b7676b90feb796746552804553e79ef817c02587504d266f44 SHA512 106fc6aadf0b4b27c3b38be596356aa59b4b76ec1602e8c5564aec6b4be7e2b5d6077006ee13d41e58402255b879aadaa966c758b5b326ae32742007ce2ef238
+EBUILD tpm2-tss-engine-1.0.1.ebuild 750 BLAKE2B 76b054f7a11d9ab8093d5a119a55a6822b92ed2108713dfb23193df1fa8d17ba196e39b1c97bd8f77f9bfee4485fb0c867b3b91a7cce18d0c530dea36c2a5e05 SHA512 49a0b8e9661ebe6af52f093ad80e9f92cac5d9b5a0dbeaae8a62723dbe3b2a60a4f9d2cda4de0d8e7432bfbb48f924e0c9842f2f19ac5f1d588a91797971711d
+MISC metadata.xml 463 BLAKE2B 7e0574fa7ade812b4a7176f30d0218a70e0396f2c76ccaedac3cc50ffd0aca7581f7b6075ee98828634d7f3b6b7af63059bfed2eab84b52fce418ee787e237be SHA512 b6d0746d2806d1e1f2a741b5ccd97abfc74e6fd8562796175a900ebf28244d8b3a8a1d9cc4bcd70cf51abd66eb180594f972e03c68deed57fa0023d726b6227b
diff --git a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-libressl.patch b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-libressl.patch
deleted file mode 100644
index 66bb68e76940..000000000000
--- a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-libressl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From deb2b6697babf99aaf3f64b342ce414b48638ea3 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 31 May 2019 20:36:47 +0300
-Subject: [PATCH] build: libressl fix incomplete type
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-src/tpm2-tss-engine-rand.c:90:1: error: variable ‘rand_methods’ has initializer but incomplete type
-   90 | static RAND_METHOD rand_methods = {
-      | ^~~~~~
-src/tpm2-tss-engine-rand.c:91:5: warning: excess elements in struct initializer
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- src/tpm2-tss-engine-rand.c | 1 +
- 1 file changed, 1 insertion(+)
-
-https://github.com/tpm2-software/tpm2-tss-engine/pull/120
-
-diff --git a/src/tpm2-tss-engine-rand.c b/src/tpm2-tss-engine-rand.c
-index 50d5661..86980a5 100644
---- a/src/tpm2-tss-engine-rand.c
-+++ b/src/tpm2-tss-engine-rand.c
-@@ -32,6 +32,7 @@
- #include <string.h>
- 
- #include <openssl/engine.h>
-+#include <openssl/rand.h>
- 
- #include <tss2/tss2_mu.h>
- #include <tss2/tss2_esys.h>
--- 
-2.21.0
-
diff --git a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-build.patch b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-build-add-disable-defaultflags.patch
index aa2b2e4e4fd3..7556a80600da 100644
--- a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-build.patch
+++ b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-build-add-disable-defaultflags.patch
@@ -1,22 +1,20 @@
-From 92aee12fbd246461a22925dd054c4d6394c4fdf5 Mon Sep 17 00:00:00 2001
+From 56cc4110e1ef0667ff248a689c50803c2ec4312b Mon Sep 17 00:00:00 2001
 From: Alon Bar-Lev <alon.barlev@gmail.com>
 Date: Fri, 31 May 2019 02:30:37 +0300
-Subject: [PATCH] build: add --disable-defaultflags
+Subject: [PATCH 2/3] build: add --disable-defaultflags
 
 Align with tpm2-tss to allow downstream to provide flags.
 
 Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
 ---
- configure.ac | 42 +++++++++++++++++++++++++-----------------
- 1 file changed, 25 insertions(+), 17 deletions(-)
-
-https://github.com/tpm2-software/tpm2-tss-engine/pull/117
+ configure.ac | 41 ++++++++++++++++++++++++-----------------
+ 1 file changed, 24 insertions(+), 17 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index f3a399c..f59cfaf 100644
+index d14c4d7..3ee45c5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -80,23 +80,31 @@ AS_IF([test "x$enable_tctienvvar" = xyes], [AC_DEFINE([ENABLE_TCTIENVVAR], [1])]
+@@ -84,23 +84,30 @@ AC_ARG_ENABLE([tctienvvar],
  
  AC_CONFIG_FILES([Makefile])
  
@@ -39,8 +37,7 @@ index f3a399c..f59cfaf 100644
 -AX_ADD_LINK_FLAG([-Wl,-z,relro])
 +AC_ARG_ENABLE([defaultflags],
 +              [AS_HELP_STRING([--disable-defaultflags],
-+                              [Disable default preprocessor, compiler, and linker flags.])],
-+              [enable_defaultflags=$enableval],
++                              [Disable default preprocessor, compiler, and linker flags.])],,
 +              [enable_defaultflags=yes])
 +AS_IF([test "x$enable_defaultflags" = "xyes"],
 +      [
@@ -66,5 +63,5 @@ index f3a399c..f59cfaf 100644
  AX_CODE_COVERAGE
  m4_ifdef([_AX_CODE_COVERAGE_RULES],
 -- 
-2.21.0
+2.24.1
 
diff --git a/app-crypt/tpm2-tss-engine/metadata.xml b/app-crypt/tpm2-tss-engine/metadata.xml
index 8a310e85c09b..3625c1b74945 100644
--- a/app-crypt/tpm2-tss-engine/metadata.xml
+++ b/app-crypt/tpm2-tss-engine/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>salah.coronya@gmail.com</email>
+		<name>Salah Coronya</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tpm2-software/tpm2-tss-engine</remote-id>
 	</upstream>
diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.0.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.1.ebuild
index 45bd390504e9..8bdced04657f 100644
--- a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.0.ebuild
+++ b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,19 +12,17 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.ta
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libressl test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-crypt/tpm2-tss-2.2.2:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0"
 DEPEND="${RDEPEND}
 	test? ( dev-util/cmocka )"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-libressl.patch"
+	"${FILESDIR}/${P}-build-add-disable-defaultflags.patch"
 )
 
 src_prepare() {