gentoo resync : 21.06.2020

6 files changed, 75 insertions, 45 deletions

diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 7aaf81605e69..6598580c2442 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,5 +1,5 @@
-AUX tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch 478 BLAKE2B 180ba38d8b383e12f822a490e648f1e7392bb72c587537b655f613d7200fa0812f367fb6fb9e8ec411e22168016f9db4b352804dc55de1d094c7e3f493ce3a2d SHA512 cfc9591034f8216b5b949058dd3444c2c5b0e860b2fe5cbea99f353d80425d051e90b1117cd5c66b96a5990f7514b575ccf7ee98cdf38b7a2060fe250b805982
-AUX tpm2-tss-2.4.0-fix-tmpfiles-path.patch 1145 BLAKE2B 2cb265a5ae605982765675b5911c111c76d433f5ed1803dedbe06766abf9a0e00abd6dd1e378e6d2e30e9f8acdaf2795595c6a83e7fc08b96377c3b125b62ffc SHA512 60a7af4e6aff18837bc6f97211f14af99799942dae197193daa81ceec9a5c889056321abbf3734ec45daf2d873cb978946b6a77f1f5fe4ec2c2df78d3c59c7dd
-DIST tpm2-tss-2.4.0.tar.gz 1446509 BLAKE2B bb078719fa85d9ea07b9710b5ac5d2f9c2b842700ed5b26a30ab2708a227b4bd599563c76e648d6f0b9dfe7785a25c049826f953baffdd39113bd62e7b4563df SHA512 763370381584f2124f751f0736e6a8b34428fd52134fd9966f3581e128f3b74b3f1261992f5d6162d7c866e47f7e5519ea80c1d1d39b80d5ed6e067eb2cd35a0
-EBUILD tpm2-tss-2.4.0.ebuild 1732 BLAKE2B 79aeca3a75ad2353e9097e04146076d007f4f9f577e43bc22e248ccfe768b2fe26cb11504fe252687c52734fa1cac741e92300400f2a19545888a5827e01546f SHA512 1322dfc40d4be8353b0b8ce64006160ab7717c615351e088e359e73f6e2fb1046db35a77bf9f5a80e5907edf3ed22a3016dbb93cbe3cceb783a83f8cc500e6ee
+AUX tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch 531 BLAKE2B 45a14e0d23b1dcba9eb92465fb6d6a57c3c97f1d574a987214475c40403c554066076a16432ee68ae1a58677c22c72612c08bf91e8cbfae98d941580c0a3598f SHA512 0840be27e1742d5999531cefbc20a661136e44d44728ee5b968d96a7d82baf1d14e5e4e671f8f34fdaf37a0214dc23bd5286c914f6f579e8f4d1dd959779a5a1
+AUX tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch 2073 BLAKE2B 09e64b791b75a6bb673402fe94bd4b4bac91f07f98e9053941470b0f44034d6892e6070aaa08326b25c1567018eef898b6508ded8bdbdfd0dd342ca22d0cdcc6 SHA512 d354f656481db5ead0d48ae0389954cc6735a037a6b09cda251360b937128b5807d4b3c5819dbceaa1767db2232ff8dea2f00af3998c182ee3533f97365aeda2
+DIST tpm2-tss-2.4.1.tar.gz 1445103 BLAKE2B c7be91b93d19b5afeddb6ec455db9ba06795f8dc76ee2a0c6cbabbd8f623930d7c9fdf6319497c70790445531d1e36fe3f904f4c1f4bc9254d833b6d19280f1f SHA512 51551d63fa404e23664aaad1b247bd4b1f93812ced1aed144c37f28cdb3adb4e696aa9e93a502c8fa0eb7e9b4376ac9377f0537eb4c717b68c0b014fee7a0643
+EBUILD tpm2-tss-2.4.1.ebuild 1769 BLAKE2B 7a738081fefc968dbe65457a27320b6aa8efc6890031934bb655dc714c780409900904d56ed5cad4b2f0da67bdf9904fcf0146e86d95058b8455d7b2bcf96902 SHA512 539af63e600cfa13daffe749de43ecc933601406e89390a32d1ceac2e0855d51da456924d2670270b6663f70ed1ac0421cc2a909c0f45259392fc179c08b116e
 MISC metadata.xml 713 BLAKE2B 2abdfb26f5f48d666fb73603855baca019806420a262855faa4d4b00c90cdb260f2d6db4fab0752b13ef67dcfcd0e6462889eed7797545b1893a8c6ed137d563 SHA512 d48e14b074bcaaf77b723671a49979f94b592812d55a1e42acbe9b609be4e799bab939fdd4db66a2f9e37b40a0c2a13b47ef48d0e6c30e0ba88110e28dfaa4d2
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch
deleted file mode 100644
index c916bbf0133c..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index c543a287..58187f7e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -558,10 +558,6 @@ uninstall-local:
- 	-rm $(DESTDIR)$(udevrulesdir)/$(udevrulesprefix)tpm-udev.rules
- endif
- 
--# Create tss user and FAPI directories directly after installation (vs. after a reboot)
--install-exec-hook:
--	systemd-sysusers && systemd-tmpfiles --create || true
--
- uninstall-hook:
- 	cd $(DESTDIR)$(man3dir) && \
- 		[ -L Tss2_TctiLdr_Initialize_Ex.3 ] && \
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch
deleted file mode 100644
index 93a1fed8a877..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/dist/fapi-config.json.in b/dist/fapi-config.json.in
-index e32a3c36..4aa636e2 100644
---- a/dist/fapi-config.json.in
-+++ b/dist/fapi-config.json.in
-@@ -2,7 +2,7 @@
-      "profile_name": "P_RSA2048SHA256",
-      "profile_dir": "@sysconfdir@/tpm2-tss/fapi-profiles/",
-      "user_dir": "~/@userstatedir@/tpm2-tss/user/keystore",
--     "system_dir": "@localstatedir@/lib/tpm2-tss/system/keystore",
-+     "system_dir": "@localstatedir@/tpm2-tss/system/keystore",
-      "tcti": "",
-      "system_pcrs" : [],
-      "log_dir" : "@runstatedir@/tpm2-tss/eventlog/"
-diff --git a/dist/tmpfiles.d/tpm2-tss-fapi.conf.in b/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
-index 1793c4d7..3f0c8380 100644
---- a/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
-+++ b/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
-@@ -1,3 +1,3 @@
- #Type   Path                                           Mode User Group Age         Argument
--d       @localstatedir@/lib/tpm2-tss/system/keystore   775  tss  tss   -           -
-+d       @localstatedir@/tpm2-tss/system/keystore       775  tss  tss   -           -
- d       @runstatedir@/tpm2-tss/eventlog                775  tss  tss   -           -
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch
new file mode 100644
index 000000000000..81c223df9576
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index 85683f9b..986d4c8d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -582,8 +582,6 @@ EXTRA_DIST += dist/tpm-udev.rules
+ 
+ install-data-hook:
+ 	-mv $(DESTDIR)$(udevrulesdir)/tpm-udev.rules $(DESTDIR)$(udevrulesdir)/$(udevrulesprefix)tpm-udev.rules
+-	(systemd-sysusers && systemd-tmpfiles --create) || \
+-	($(call make_tss_user_and_group) && $(call make_fapi_dirs) && ($call set_fapi_permissions)) || true
+ 
+ uninstall-local:
+ 	-rm $(DESTDIR)$(udevrulesdir)/$(udevrulesprefix)tpm-udev.rules
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch
new file mode 100644
index 000000000000..111c3d75c690
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch
@@ -0,0 +1,53 @@
+From 94cc338b0c5b97702e994ec628d684ee2c114547 Mon Sep 17 00:00:00 2001
+From: Tadeusz Struk <tadeusz.struk@intel.com>
+Date: Tue, 24 Mar 2020 16:42:14 -0700
+Subject: [PATCH] configure.ac: wrap PKG_CHECK_MODULES in braces
+
+PKG_CHECK_MODULES needs to be wrapped inside squere
+brackets when inside AS_IF, or it spit out errors:
+
+./configure: line 13054: JSONC_CFLAGS: command not found
+./configure: line 13055: C: command not found
+./configure: line 13056: JSONC_LIBS: command not found
+./configure: line 13155: CURL_CFLAGS: command not found
+./configure: line 13156: CURL_LIBS: command not found
+
+Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
+---
+ Makefile.am  | 2 +-
+ configure.ac | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 85683f9b..9144a5ad 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -467,7 +467,7 @@ src_tss2_fapi_libtss2_fapi_la_LIBADD  = $(libtss2_sys) $(libtss2_mu) $(libtss2_e
+ 
+ src_tss2_fapi_libtss2_fapi_la_SOURCES = $(TSS2_FAPI_SRC)
+ src_tss2_fapi_libtss2_fapi_la_CFLAGS  = $(AM_CFLAGS) -I$(srcdir)/src/tss2-fapi
+-src_tss2_fapi_libtss2_fapi_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LIBS) $(JSON_C_LIBS) $(CURL_LIBS)
++src_tss2_fapi_libtss2_fapi_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LIBS) $(JSONC_LIBS) $(CURL_LIBS)
+ if HAVE_LD_VERSION_SCRIPT
+ src_tss2_fapi_libtss2_fapi_la_LDFLAGS += -Wl,--version-script=$(srcdir)/lib/tss2-fapi.map
+ endif # HAVE_LD_VERSION_SCRIPT
+diff --git a/configure.ac b/configure.ac
+index a202d4a6..2edf609e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -165,10 +165,10 @@ AS_IF([test "x$enable_fapi" != xno -a "x$with_crypto" != "xossl"],
+     AC_MSG_ERROR([FAPI has to be compiled with OpenSSL]))
+ 
+ AS_IF([test "x$enable_fapi" = xyes ],
+-    PKG_CHECK_MODULES([JSON_C], [json-c]))
++      [PKG_CHECK_MODULES([JSONC], [json-c])])
+ 
+ AS_IF([test "x$enable_fapi" = xyes ],
+-    PKG_CHECK_MODULES([CURL], [libcurl]))
++      [PKG_CHECK_MODULES([CURL], [libcurl])])
+ 
+ AC_ARG_WITH([tctidefaultmodule],
+             [AS_HELP_STRING([--with-tctidefaultmodule],
+-- 
+2.26.2
+
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
index 9f3fd54be541..fd1198b631ab 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE="doc +fapi gcrypt +openssl static-libs test"
 
 RESTRICT="!test? ( test )"
@@ -33,9 +33,9 @@ BDEPEND="virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.4.0-fix-tmpfiles-path.patch"
-	"${FILESDIR}/${PN}-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch"
-	)
+	"${FILESDIR}/${P}-Dont-run-systemd-sysusers-in-Makefile.patch"
+	"${FILESDIR}/${P}-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch"
+)
 
 pkg_setup() {
 	local CONFIG_CHECK=" \
@@ -52,6 +52,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--localstatedir=/var \
 		$(use_enable doc doxygen-doc) \
 		$(use_enable fapi) \
 		$(use_enable static-libs static) \