diff options
| author |   orbea <orbea@riseup.net> | 2022-07-04 18:34:36 -0700 |
|---|---|---|
| committer |   Quentin Retornaz <gentoo@retornaz.com> | 2022-07-05 23:18:27 +0200 |
| commit | 444f087022095af599ca2f9f8e4a8947b7daa3c5 (patch) | |
| tree | d3d0c55e9a3278efb28be9489f3a44901c6669e5 /app-crypt | |
| parent | dev-libs/efl: Add package (diff) | |
| download | libressl-444f087022095af599ca2f9f8e4a8947b7daa3c5.tar.gz libressl-444f087022095af599ca2f9f8e4a8947b7daa3c5.tar.bz2 libressl-444f087022095af599ca2f9f8e4a8947b7daa3c5.zip | |
app-crypt/trousers: Merge changes from ::gentoo
Signed-off-by: orbea <orbea@riseup.net>
Signed-off-by: Quentin Retornaz <gentoo@retornaz.com>
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/trousers/files/tcsd.initd | 31 | ||||
| -rw-r--r-- | app-crypt/trousers/metadata.xml | 8 | ||||
| -rw-r--r-- | app-crypt/trousers/trousers-0.3.15.ebuild | 16 |
3 files changed, 22 insertions, 33 deletions
diff --git a/app-crypt/trousers/files/tcsd.initd b/app-crypt/trousers/files/tcsd.initd index 3740403..9b18c48 100644 --- a/app-crypt/trousers/files/tcsd.initd +++ b/app-crypt/trousers/files/tcsd.initd @@ -1,38 +1,19 @@ #!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +command=/usr/sbin/tcsd +description="TrouSerS' TCS daemon (tcsd)" +command_user="tss:tss" + depend() { use logger need net } -checkconfig() { - local mod - if [ -n "${TPM_MODULES}" ] ; then - for mod in ${TPM_MODULES} ; do - lsmod | grep -q "^${mod}\b" \ - || modprobe ${mod} &>/dev/null \ - || ewarn "Failed to load module ${mod}" - done - # Should we sleep or something to wait for device creation? - fi +start_pre() { if [ ! -c /dev/tpm ] && [ ! -c /dev/tpm0 ] ; then eerror "No TPM device found!" return 1 fi - return 0 -} - -start() { - ebegin "Starting TrouSerS' TCS daemon (tcsd)" - checkconfig || eend $? - start-stop-daemon --start --user tss --exec /usr/sbin/tcsd - eend $? -} - -stop() { - ebegin "Stopping TrouSerS' TCS daemon (tcsd)" - start-stop-daemon --stop --quiet --exec /usr/sbin/tcsd --user tss - eend $? } diff --git a/app-crypt/trousers/metadata.xml b/app-crypt/trousers/metadata.xml index 643c6bf..2eceffb 100644 --- a/app-crypt/trousers/metadata.xml +++ b/app-crypt/trousers/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>salah.coronya@gmail.com</email> - <name>Salah Coronya</name> + <name>Christopher Byrne</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/app-crypt/trousers/trousers-0.3.15.ebuild b/app-crypt/trousers/trousers-0.3.15.ebuild index 3a31ad3..6c046bc 100644 --- a/app-crypt/trousers/trousers-0.3.15.ebuild +++ b/app-crypt/trousers/trousers-0.3.15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz" LICENSE="CPL-1.0 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~x86" +KEYWORDS="amd64 arm arm64 ~m68k ~ppc ppc64 ~riscv ~s390 x86" IUSE="doc selinux" # gtk # gtk support presently does NOT compile. @@ -20,7 +20,8 @@ IUSE="doc selinux" # gtk DEPEND="acct-group/tss acct-user/tss >=dev-libs/glib-2 - >=dev-libs/openssl-0.9.7:0=" + >=dev-libs/openssl-0.9.7:0= + " RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-tcsd )" BDEPEND="virtual/pkgconfig" @@ -57,9 +58,16 @@ src_install() { keepdir /var/lib/tpm use doc && dodoc doc/* newinitd "${FILESDIR}"/tcsd.initd tcsd - newconfd "${FILESDIR}"/tcsd.confd tcsd systemd_dounit "${FILESDIR}"/tcsd.service udev_dorules "${FILESDIR}"/61-trousers.rules fowners tss:tss /var/lib/tpm readme.gentoo_create_doc } + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} |