diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /app-crypt/tpm2-tss | |
parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) |
gentoo resync : 15.06.2021
Diffstat (limited to 'app-crypt/tpm2-tss')
-rw-r--r-- | app-crypt/tpm2-tss/Manifest | 11 | ||||
-rw-r--r-- | app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch | 16 | ||||
-rw-r--r-- | app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch | 22 | ||||
-rw-r--r-- | app-crypt/tpm2-tss/files/tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch | 29 | ||||
-rw-r--r-- | app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild (renamed from app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild) | 5 | ||||
-rw-r--r-- | app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild (renamed from app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild) | 8 |
6 files changed, 41 insertions, 50 deletions
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest index 4b95ae830b46..1ede82d30eb8 100644 --- a/app-crypt/tpm2-tss/Manifest +++ b/app-crypt/tpm2-tss/Manifest @@ -1,11 +1,10 @@ AUX tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch 2073 BLAKE2B 09e64b791b75a6bb673402fe94bd4b4bac91f07f98e9053941470b0f44034d6892e6070aaa08326b25c1567018eef898b6508ded8bdbdfd0dd342ca22d0cdcc6 SHA512 d354f656481db5ead0d48ae0389954cc6735a037a6b09cda251360b937128b5807d4b3c5819dbceaa1767db2232ff8dea2f00af3998c182ee3533f97365aeda2 AUX tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch 452 BLAKE2B 8b05bcdbe62333226d89a0275de8cfaa6b4f87d508a5f5c7da260d713244f468e07fbcb5e5c071bd9f8679dd369120d4d41c3c2d9a6c6cf81e17498e1a8b397b SHA512 c8255213c3712cc9f0bdce0080c9f14644926bd45103c89e0dfdbd8dfb4d4c1168bd6c0582b4c671d4c65f6b965246eaefb86e9ae2f43d354a67584f97ef9745 -AUX tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch 478 BLAKE2B 0739aa873be6b3faa025fc38ab562da07afc0a7016856bc99f5b1fdd9202a24124d8f5789de0381ec136480cf24337754ae795f84252d8b38ead94dee1362317 SHA512 d94fab5dca4823a5839e54a1a284331dda449b7a76b01de390cf21535e88531b002b433ec0b4b8246c0f16417b2116ef4a6c63863c0aaf151f1885f0bab66945 -AUX tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch 990 BLAKE2B 275ce64a386e1d3a5e458b7914c9885e196d40f44d1af57bf2925f0c794946884ea9ebbf60e82ccd747986f9f8feaefa07f43742353a4da99f1fd13d17196975 SHA512 02c3c6f0cbb9f5a70988e7ba7c27d2b19b2ba74c024ca34f71f9803bdac4935b19bd0650bd9069b0c628e2a72449ed69710f59f576261aa68884777bf8f0d7f7 -DIST tpm2-tss-2.4.3.tar.gz 1439120 BLAKE2B 21acce29f96e8039124874c024b43eb8d2c4ffda27db58bb4f34446747c0fa6953c6ca390f8e87d22c1349123bada81051b119eaf7a28c7d1ad8a9195287c312 SHA512 4adaeb2724b720017e9d488f66de879ebdc0dbc2a4f7536493214913a49d2c631e302be26f710f0f45b0d514212cb036ca7ba9715ee13c29dda1d4a61595aa27 +AUX tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch 1214 BLAKE2B 40f1005626205d440fabda7f88444b0eef344df8f6ead5716807bcbaf490e7b24afc12580ae25c506fcc45dfb4bac0789d9b897dfcaae943c6ba9795b2f4f1d8 SHA512 adbff50c66a22659b563344c216d60bb80951016c3d7180c07c0498c285c9099a60e5573ed0ce29c7732de28d4c390b8eac16bf695c739d0c614dd344f1bfb46 DIST tpm2-tss-2.4.5.tar.gz 1439394 BLAKE2B 644d917f545e93dd81856611522329caf4ff038e4ddb04d761f03339cc7308095abc1c9b46a4d601cad67deea6f917ee5e4236c59f3d7042a7fdf2d33630dd3f SHA512 2c92af07ed1cc3665c19479c00ce5608883081f311192a264a4f7d9119c75ac582596c53b910534c4b66dbb60de2ffd3d6218169748332609c2e0fc89f519259 -DIST tpm2-tss-3.0.3.tar.gz 1489136 BLAKE2B 5bf24cf2c36e579388f62eea06ab3811eab1a89c0cd5d12f6f61cee7f6836487f25fefb864432ff8920931ff37327ca867d1d40fad89e0305d5e1edfb8f0e883 SHA512 54a926db55790250d69c81ac6e436556072057dd7c610d2718689030287dee69d533d4e04b3325dd73d9fc7635dad0bf0a7bfb082957bb51cb420efdb68efaf8 -EBUILD tpm2-tss-2.4.3.ebuild 1706 BLAKE2B 8093b404fa89ac49f22375f59b4f9e4f77e6f73fbb63841734f02413ce26d78c5f689630ee085419e3abb70e0b27d9bc341ca10ed329c5f0e676fdd65a760cbb SHA512 96e2af5daf4e0ad4ac2fa98afa35438383b56a61da704db591ffe502d35ae092c952674504d93758ddfdf7d39ee1bf91bd8a1b41f807188858a6314d6fc4a393 +DIST tpm2-tss-2.4.6.tar.gz 1472883 BLAKE2B e007de07c759e77e377f8569c0c5d94ab57597ea3cb452fb598a47c9b404714a7816c86221d4eacad962436fc7625066d4066f433cd957c37b92d51b0455e2a0 SHA512 f7f7f067605ea30661ac891e22095238689856e22e45f11a6b603cb36ed1ae0724ae52d36f0ee5dd72208da8520457667676ae08107647faa5441a0c9b642f7a +DIST tpm2-tss-3.1.0.tar.gz 1584690 BLAKE2B cee2807a030b8bab653045cb11dfc7a6a3f7b1e60c1ce4650ba5f0549f29f36ff307e7d53fb5ef9c950b4dae720bdaf35f7cd1e59ebc07b3f16740035e1d5738 SHA512 8967f172c92f1e3e5ba324dbe8afe07bf1bc7179dd755cef9812105f32634f312ee7cc7dfe8e13af69dc219432463f5dc9b93477743de47aba6af1d70b252405 EBUILD tpm2-tss-2.4.5.ebuild 1791 BLAKE2B 407b4c3f446647f0376fad070976c6906580f26aecde8a6075525908186984a4f5e1f79b4ca76de7fdecb7f82a33b3367326fdaa94ce003c0eff01f11a800a2f SHA512 fc261a84aebc8ac8b73a16d744d16b226c0c90dc79fd5cac4ab2d161acfa7daba7e8eccf5ac34a1fff849934b12324ac6ec827be687ba9010bd01bb46c2456b5 -EBUILD tpm2-tss-3.0.3.ebuild 1780 BLAKE2B 89aad07e3a6bf66825d898bb98001a42f0cdcac534723e8ea6a2d5506eeabed823eb2958f4a1d50d35e10f4ff3699eb506ec5dee9da04415a04f92815d4f1807 SHA512 222bb72f83518a459fd777773034a101f352a8cfe67f9d6b06e2b5f8658b6b25cf6be522c07f0a6008a32bb9dad73b0e5f6fcd064f0fe7dada7f56dbd245b37b +EBUILD tpm2-tss-2.4.6.ebuild 1796 BLAKE2B 2af3133443ba7319a9d6767301ac44be227bb6543bfc52b0a4e518b8aaef09b70c4430b4d58c1834428fe28b6a9959c1786ec52be612a8b3ad650f2ce3791da4 SHA512 450db75e492a38349541836c1cdc7921322315d11a61e0565b472130e78b7f212789c0449e3c20cd921df0148be9b1322d49fc6369fa093d925c808f5f396e65 +EBUILD tpm2-tss-3.1.0.ebuild 1728 BLAKE2B c8a8fa8b777d3531a1b2b21174c294596fa1380c5297350fe8e52ad779e8800983761908558001a22d4e0be8783edd8282c5384b044a879fffde85f457d3f8d9 SHA512 525c93c01032b8b3ec6210df68085eed811eecc7e0d854ce312be272d08e9509660823257ddb8b240bd6c69d79a0fffd01152861d742092911ca1cc647083aee MISC metadata.xml 826 BLAKE2B fcae1100a2beb1c195736a96e394f8f0ca99cfff199e0777e307fe6443acb85105c3d982f9dd55d7945422f8b319ee93d9456d2f953d70d7604ab6f4461dbd55 SHA512 584edb582987e9ea4ff0dc19920bde4f0129c638cc580d188f57364f07b73ab0d0e64172c616a9d0fabbbcbf989cedf59f6ee29243df827c370217f9f60fab0e diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch deleted file mode 100644 index fd1d462151fb..000000000000 --- a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index f2fa515a..7d2aca29 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -664,11 +664,6 @@ endif #FAPI - EXTRA_DIST += dist/tpm-udev.rules - - install-dirs: --if HOSTOS_LINUX -- (systemd-sysusers && systemd-tmpfiles --create) || \ -- ($(call make_tss_user_and_group) && $(call make_fapi_dirs) && ($call set_fapi_permissions)) || true -- $(call check_fapi_dirs) --endif - - install-data-hook: install-dirs - -if [ ! -z "$(udevrulesprefix)" ]; then \ diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch deleted file mode 100644 index a593716c97ea..000000000000 --- a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index ff59dd7c..3049032b 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -285,7 +285,7 @@ AC_ARG_ENABLE([integration], - [build and execute integration tests])],, - [enable_integration=no]) - AS_IF([test "x$enable_integration" = "xyes"], -- AS_IF([test "$HOSTOS" = "Linux"], -+ [AS_IF([test "$HOSTOS" = "Linux"], - [ERROR_IF_NO_PROG([ss])], - [ERROR_IF_NO_PROG([sockstat])]) - ERROR_IF_NO_PROG([echo]) -@@ -335,7 +335,7 @@ AS_IF([test "x$enable_integration" = "xyes"], - [AC_MSG_ERROR([No simulator executable found in PATH for testing TCTI.])]) - AC_SUBST([INTEGRATION_TCTI], [$integration_tcti]) - AC_SUBST([INTEGRATION_ARGS], [$integration_args]) -- AC_SUBST([ENABLE_INTEGRATION], [$enable_integration])) -+ AC_SUBST([ENABLE_INTEGRATION], [$enable_integration])]) - AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"]) - # - # sanitizer compiler flags diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch new file mode 100644 index 000000000000..b66b6e79c143 --- /dev/null +++ b/app-crypt/tpm2-tss/files/tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch @@ -0,0 +1,29 @@ +diff --git a/Makefile.am b/Makefile.am +index 183289f7..c791896c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -689,24 +689,6 @@ endif #FAPI + EXTRA_DIST += dist/tpm-udev.rules + + install-dirs: +-if HOSTOS_LINUX +-if SYSD_SYSUSERS +- @echo "systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf" +- @systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf || echo "WARNING Failed to create the tss user and group" +-else +- @echo "call make_tss_user_and_group" +- @$(call make_tss_user_and_group) || echo "WARNING Failed to create the tss user and group" +-endif +-if SYSD_TMPFILES +- @echo "systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf" +- @systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf|| echo "WARNING Failed to create the FAPI directories with the correct permissions" +-else +- @echo "(call make_fapi_dirs) && (call set_fapi_permissions)" +- @-$(call make_fapi_dirs) && $(call set_fapi_permissions) || echo "WARNING Failed to create the FAPI directories with the correct permissions" +-endif +- @echo "call check_fapi_dirs" +- @$(call check_fapi_dirs) +-endif + + install-data-hook: install-dirs + -if [ ! -z "$(udevrulesprefix)" ]; then \ diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild index 011fcaefd4a0..698ea26d5635 100644 --- a/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild +++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 arm arm64 x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="doc +fapi gcrypt +openssl static-libs test" RESTRICT="!test? ( test )" @@ -33,6 +33,7 @@ BDEPEND="virtual/pkgconfig doc? ( app-doc/doxygen )" PATCHES=( + "${FILESDIR}/${PN}-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch" "${FILESDIR}/${PN}-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch" ) diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild index a5458854763f..fa80dfb1ebcd 100644 --- a/app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild +++ b/app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -27,12 +27,12 @@ RDEPEND="acct-group/tss openssl? ( dev-libs/openssl:= )" DEPEND="${RDEPEND} test? ( dev-util/cmocka )" -BDEPEND="virtual/pkgconfig +BDEPEND="sys-apps/acl + virtual/pkgconfig doc? ( app-doc/doxygen )" PATCHES=( - "${FILESDIR}/${PN}-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch" - "${FILESDIR}/${PN}-3.0.1-Fix-underquoting-in-configure-ac.patch" + "${FILESDIR}/${PN}-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch" ) pkg_setup() { |