From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/trousers/files/, app-crypt/trousers/
Date: Tue, 28 Apr 2020 07:44:32 +0000 (UTC) [thread overview]
Message-ID: <1588059846.31454f0e773a3d17201258e778b5e29ea9cd7217.juippis@gentoo> (raw)
commit: 31454f0e773a3d17201258e778b5e29ea9cd7217
Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Sat Apr 25 04:03:52 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Apr 28 07:44:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31454f0e
app-crypt/trousers: Fix -fno-common/gcc10 compile error
Closes: https://bugs.gentoo.org/707244
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15509
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/trousers-0.3.14-fno-common.patch | 15 +++++++++
app-crypt/trousers/trousers-0.3.14-r2.ebuild | 39 ++--------------------
2 files changed, 17 insertions(+), 37 deletions(-)
diff --git a/app-crypt/trousers/files/trousers-0.3.14-fno-common.patch b/app-crypt/trousers/files/trousers-0.3.14-fno-common.patch
new file mode 100644
index 00000000000..5046bc70883
--- /dev/null
+++ b/app-crypt/trousers/files/trousers-0.3.14-fno-common.patch
@@ -0,0 +1,15 @@
+diff --git a/src/include/tcsd.h b/src/include/tcsd.h
+index 5b9462b..05bae97 100644
+--- a/src/include/tcsd.h
++++ b/src/include/tcsd.h
+@@ -166,8 +166,8 @@ void thread_signal_init();
+
+ /* signal handling */
+ #ifndef __APPLE__
+-struct sigaction tcsd_sa_int;
+-struct sigaction tcsd_sa_chld;
++extern struct sigaction tcsd_sa_int;
++extern struct sigaction tcsd_sa_chld;
+ #endif
+
+ #endif
diff --git a/app-crypt/trousers/trousers-0.3.14-r2.ebuild b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
index 98591153d56..b94cc955e2d 100644
--- a/app-crypt/trousers/trousers-0.3.14-r2.ebuild
+++ b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
@@ -29,6 +29,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
"${FILESDIR}/${P}-libressl.patch"
+ "${FILESDIR}/${P}-fno-common.patch"
)
DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
@@ -37,45 +38,9 @@ DOC_CONTENTS="
If you have problems starting tcsd, please check permissions and
ownership on /dev/tpm* and ~tss/system.data
"
-
S="${WORKDIR}"
-pkg_setup() {
- # Check for driver (not sure it can be an rdep, because ot depends on the
- # version of virtual/linux-sources... Is that supported by portage?)
- linux-info_pkg_setup
- local tpm_kernel_version tpm_kernel_present tpm_module
- kernel_is ge 2 6 12 && tpm_kernel_version="yes"
- if linux_config_exists; then
- linux_chkconfig_present TCG_TPM && tpm_kernel_present="yes"
- else
- ewarn "No kernel configuration could be found."
- fi
- has_version app-crypt/tpm-emulator && tpm_module="yes"
- if [[ -n "${tpm_kernel_present}" ]]; then
- einfo "Good, you seem to have in-kernel TPM support."
- elif [[ -n "${tpm_module}" ]]; then
- einfo "Good, you seem to have TPM support with the external module."
- if [[ -n "${tpm_kernel_version}" ]]; then
- elog
- elog "Note that since you have a >=2.6.12 kernel, you could use"
- elog "the in-kernel driver instead of (CONFIG_TCG_TPM)."
- fi
- elif [[ -n "${tpm_kernel_version}" ]]; then
- eerror
- eerror "To use this package, you will have to activate TPM support"
- eerror "in your kernel configuration. That's at least CONFIG_TCG_TPM,"
- eerror "plus probably a chip specific driver (like CONFIG_TCG_ATMEL)."
- eerror
- else
- eerror
- eerror "To use this package, you should install a TPM driver."
- eerror "You can have the following options:"
- eerror " - install app-crypt/tpm-emulator"
- eerror " - switch to a >=2.6.12 kernel and compile the kernel module"
- eerror
- fi
-}
+CONFIG_CHECK="~TCG_TPM"
src_prepare() {
default
next reply other threads:[~2020-04-28 7:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 7:44 Joonas Niilola [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-04-19 6:41 [gentoo-commits] repo/gentoo:master commit in: app-crypt/trousers/files/, app-crypt/trousers/ Joonas Niilola
2022-04-19 6:41 Joonas Niilola
2020-11-24 10:39 Stefan Strogin
2020-08-15 0:57 Sam James
2018-09-27 23:55 Alon Bar-Lev
2017-02-25 6:03 Alon Bar-Lev
2016-12-07 16:33 Alon Bar-Lev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1588059846.31454f0e773a3d17201258e778b5e29ea9cd7217.juippis@gentoo \
--to=juippis@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox