From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C5085158009 for ; Tue, 27 Jun 2023 09:42:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04F0CE07F6; Tue, 27 Jun 2023 09:42:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D27E0E07F6 for ; Tue, 27 Jun 2023 09:42:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CE273340C33 for ; Tue, 27 Jun 2023 09:42:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 65417135 for ; Tue, 27 Jun 2023 09:42:30 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1687858944.e4ede124b4acd0e235ea0ad0087456851a10d845.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/, app-crypt/tpm2-tss/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Make-sysusers-and-tmpfiles-optional.patch app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild X-VCS-Directories: app-crypt/tpm2-tss/files/ app-crypt/tpm2-tss/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: e4ede124b4acd0e235ea0ad0087456851a10d845 X-VCS-Branch: master Date: Tue, 27 Jun 2023 09:42:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ac7f874d-9ba1-4c50-a84d-06a751ee1475 X-Archives-Hash: 5af70a5a9c511534f68bed1d22425124 commit: e4ede124b4acd0e235ea0ad0087456851a10d845 Author: Christopher Byrne gmail com> AuthorDate: Tue Jun 27 09:42:24 2023 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Jun 27 09:42:24 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4ede124 app-crypt/tpm2-tss: Fix leftover "imageno" directory Closes: https://github.com/gentoo/gentoo/pull/31444 Signed-off-by: Christopher Byrne gmail.com> Signed-off-by: David Seifert gentoo.org> ...4.0.1-Make-sysusers-and-tmpfiles-optional.patch | 50 ++++++++++++++++++++++ app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild | 1 + 2 files changed, 51 insertions(+) diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Make-sysusers-and-tmpfiles-optional.patch b/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Make-sysusers-and-tmpfiles-optional.patch new file mode 100644 index 000000000000..d93fcf9ef2d6 --- /dev/null +++ b/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Make-sysusers-and-tmpfiles-optional.patch @@ -0,0 +1,50 @@ +From 75f53cf7eab591870ce735203995d01d2f577187 Mon Sep 17 00:00:00 2001 +From: Christopher Byrne +Date: Tue, 13 Jun 2023 21:40:56 -0500 +Subject: [PATCH] configure.ac: Make sysusers and tmpfiles optional + +Signed-off-by: Christopher Byrne +--- + Makefile.am | 6 +++++- + configure.ac | 4 ++-- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 2c81cfa9..98965fa7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -563,10 +563,14 @@ fapi-config.json: dist/fapi-config.json.in + -e 's|[@]sysmeasurements@|$(sysmeasurements)|g' \ + < "$<" > "$@" + ++if SYSD_SYSUSERS + sysusers_DATA = dist/sysusers.d/tpm2-tss.conf +-tmpfiles_DATA = tpm2-tss-fapi.conf ++endif + ++if SYSD_TMPFILES ++tmpfiles_DATA = tpm2-tss-fapi.conf + CLEANFILES += tpm2-tss-fapi.conf ++endif + + # We have to do this ourselves, in order to get absolute paths + tpm2-tss-fapi.conf: dist/tmpfiles.d/tpm2-tss-fapi.conf.in +diff --git a/configure.ac b/configure.ac +index b6550278..2d478147 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -550,9 +550,9 @@ AS_IF([test "x$enable_integration" = "xyes" && test "x$enable_self_generated_cer + + # Check for systemd helper tools used by make install + AC_CHECK_PROG(systemd_sysusers, systemd-sysusers, yes) +-AM_CONDITIONAL(SYSD_SYSUSERS, test "x$systemd_sysusers" = "xyes") ++AM_CONDITIONAL([SYSD_SYSUSERS], [test "x$systemd_sysusers" = "xyes" && test "x$sysusersdir" != "xno"]) + AC_CHECK_PROG(systemd_tmpfiles, systemd-tmpfiles, yes) +-AM_CONDITIONAL(SYSD_TMPFILES, test "x$systemd_tmpfiles" = "xyes") ++AM_CONDITIONAL([SYSD_TMPFILES], [test "x$systemd_tmpfiles" = "xyes" && test "x$tmpfilesdir" != "xno"]) + + # Check all tools used by make install + AS_IF([test "$HOSTOS" = "Linux" && test "x$systemd_sysusers" != "xyes"], +-- +2.39.3 + diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild index a9dd55409584..3e27adc524f7 100644 --- a/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild +++ b/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild @@ -39,6 +39,7 @@ BDEPEND="sys-apps/acl PATCHES=( "${FILESDIR}/${PN}-4.0.0-Dont-install-files-into-run.patch" + "${FILESDIR}/${PN}-4.0.1-Make-sysusers-and-tmpfiles-optional.patch" ) pkg_setup() {