From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- app-crypt/trousers/Manifest | 9 +-- app-crypt/trousers/files/tcsd.confd | 9 --- app-crypt/trousers/files/tcsd.initd | 31 ++-------- .../files/trousers-0.3.14-fno-common.patch | 15 ----- .../files/trousers-0.3.14-tcsd-fixes.patch | 58 ------------------ app-crypt/trousers/trousers-0.3.14-r3.ebuild | 68 ---------------------- app-crypt/trousers/trousers-0.3.15.ebuild | 4 +- 7 files changed, 10 insertions(+), 184 deletions(-) delete mode 100644 app-crypt/trousers/files/tcsd.confd delete mode 100644 app-crypt/trousers/files/trousers-0.3.14-fno-common.patch delete mode 100644 app-crypt/trousers/files/trousers-0.3.14-tcsd-fixes.patch delete mode 100644 app-crypt/trousers/trousers-0.3.14-r3.ebuild (limited to 'app-crypt/trousers') diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest index 6c6bbd37f01b..0db63504c83a 100644 --- a/app-crypt/trousers/Manifest +++ b/app-crypt/trousers/Manifest @@ -1,13 +1,8 @@ AUX 61-trousers.rules 96 BLAKE2B ba66e3652f5a82f4b86fb45f556322046b06b2aacbd4b0b8e118f86dd612eea9ad0c67dbd037fd738ef48f74dea3d8699acefd224d33350e54db94238b4fd479 SHA512 83fa5b8666bcb0111f69456e6b9ea73eca2e1933e44bf7b705ff4d3c7b63a63ae4d0a1c30b0a00ebe6a8b4206ed7df80abca8503ace1c795119213f3546e9307 -AUX tcsd.confd 372 BLAKE2B 535a5bb44cd18e4d0b7520a8ea840159d35e4ae0c557b63ec7892b7827bfb8d4924e4d226baa25d5d6b1c7c68d552da916d7e507339c2af4138441f66d165683 SHA512 1e33f521156d55ff450907e01a7c60750e2880520700de1e8fb42ed03d5a16a20332f6f437f2cc7ed155f65b9306bf2d670f46c4b7055d4c9248beaeb06f8a75 -AUX tcsd.initd 843 BLAKE2B 1c2190a10823130ed69c79761063656e55cdadafeca99053d12a86f110091936f44475f5ea6adaf90e7eb70f3871fcf6452c96c86b5bc88ae28a1a5144e2a95b SHA512 d43dac0f8a7b878fb7572df8e3314ef2e6c1b90ff794df2f41192e7e4f3c8849602dde49db359e6566f1e426b63fc214c6b9dea731fcb7f3c09623e3c27b2001 +AUX tcsd.initd 363 BLAKE2B c8142c8939fe92ce902cd225910af4098cae15d7a47f858c9384e03f51964355d62144f0f736957530cfe0dd6b698b54c857035f6529d5013ce5c66b4a7b5d20 SHA512 156395199cc58c0f1a9febf60e5d5bc21a1e09f2e02862134530eb65431e7a3a1db466862f307ff797841f4c806f5893aadfb9eda3bb7c7a95b6327155378674 AUX tcsd.service 131 BLAKE2B db7995ca078c6008daba2bee50b892d5ae0fceb184c966f67578185dbdd81b8a3a55000029215d28d99e8e3ccd73f64b85b66cc4f4a337f28ee9d9ade4222067 SHA512 e516bde8ce45fe4ad687aaaabae475da9c20a9fbd8ebee736d09ceb6efa597efb6f3bb99840a4c0d2c9eb77c2824df6ee45985b46dc8cf924b4eed67eeec1468 AUX trousers-0.3.13-nouseradd.patch 606 BLAKE2B 7e4a479fe1bdc75f743263c1321f2d99cfe99d04d8196b57a158bd2ce75335526b2001c2af8aa0f8b17ddfefa304685e237385be0bc4113d5ca366dd464fa85d SHA512 a6c9074e535429f09ce5e850d943378348b54bed479b7fef0fff7bb18ab2547421407900aa35533749a764275a241ddbd083c4e2f3d6a9ad6f9b1d40d090f783 AUX trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch 746 BLAKE2B 91dec77a329a4931487cdff54ab8c77ae302af6bc741da3db61bc34b416d29615808799c8a4c5b39a293021dc1cc16642461037fcb367507ceadcc4456565715 SHA512 704a87fd4b5e50356ac6a0ad68aec04eebb2030d9818c9e23a40f2e621d6e2d5e5660b81997b459e67a8059a0d88a254a41baa833806ce99268ee24b1190ae0b -AUX trousers-0.3.14-fno-common.patch 385 BLAKE2B 7ed20c894c4687275804adf8d820227e5b246f02880d38b29dc6a17d12a4932059f237913f8d1841d56ee32c652cf732c01e77cd1235255b8e2fc28bc9a78027 SHA512 cf771b065d972b9974c93ec67a471a8ed3da737178a14b2d14537ee7948544bcbf071201d42d6e2b1333a3c30e8104cd1dbb344327a424597e5046e50137a692 -AUX trousers-0.3.14-tcsd-fixes.patch 2203 BLAKE2B 8085cfd36817e35d54d39a012037945440fcae6e5040f7a7fd35a3c814df93264382a87eb06758b6042b64bef851ab3d5f5e424c2b946c0d1eaa92ebb97a733f SHA512 cc2827ed501cc29dcadd00537161804a62918c9dc703b2a773227aaf74a695d026b44c70848819a78b01cc785831117ae9dfa1d4c30133241b97dd32e8e838ba -DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21 DIST trousers-0.3.15.tar.gz 4699936 BLAKE2B 53c60498ed6a9d3d87295b00676e5d0d82452918c35af6b98c7979ffa2dc04dd817e7cd3f4a33ca17c30b90eab53d80b2bb25306fe9db7bda2125019edfed280 SHA512 769c7d891c6306c1b3252448f86e3043ee837e566c9431f5b4353512113e2907f6ce29c91e8044c420025b79c5f3ff2396ddce93f73b1eb2a15ea1de89ac0fdb -EBUILD trousers-0.3.14-r3.ebuild 1580 BLAKE2B 7dcebd1140aee67cc63e4665afd2bb030bc44339ada7dcc6f9f5dbc2bd1f010c3eef573ae3ca35e8fbcf1450ce6e2a3539bc13479c3f5dbffcd81f96f774e107 SHA512 c62b0f19be4be398c94220be992c933595ed4c6182bf135458d8090695ed831be1f219ec778edf524dae7383e0b83f731bd829b57c7007f0535e0cba273fd827 -EBUILD trousers-0.3.15.ebuild 1506 BLAKE2B 12fdc774facfc1060ca3e9b3a4eb969e099c20bb5d78557d0e4198e3655f3bcc34d1c759aebe9f59a1c9a5f1938dc4990b566b099e662874b734702853f19901 SHA512 7bea49dd5974fa79fc5b8f0bebed1e7f5add0a1ea223dc24f94b6f94c4a24cd8017d47e529c9b1602402a4354d381105950cbdf07294985c28f77f6c79ea48e0 +EBUILD trousers-0.3.15.ebuild 1479 BLAKE2B 0279e032e55f9c24e914411dd990ef129beafccf1dd50200e0ec5121cca6eb49e6f527104b1a4811e7bf8b87f03e8c97b8dcc7afccb0e6ae36588f2b91f02bc4 SHA512 f5e96759b0cb25949678abd69df160c02ef81fbbc45d33bf605143a38b6cd2a7769a2fa5c82f429e213f31f0dec4ce22fb084ad9ba5dd239776aadfe0ab97739 MISC metadata.xml 542 BLAKE2B 07459ff82ec6f21116e860820a212a751bd07fcad1b175417d8d3b12709c870c523776e228c19aa7f824ac13d304afb533c697c22551ef977b3b9c687d2f6b00 SHA512 c980dfc26aaf0c6718fb9088d91296760db245807f0293a6c7abe412774e9bc297c401153df71ebeeddbc28e92441e3e1e78a5e16c5fca8d3445fe0558faadb1 diff --git a/app-crypt/trousers/files/tcsd.confd b/app-crypt/trousers/files/tcsd.confd deleted file mode 100644 index 78bedb9fda30..000000000000 --- a/app-crypt/trousers/files/tcsd.confd +++ /dev/null @@ -1,9 +0,0 @@ -# /etc/conf.d/tscd - -# Configuration file for the TrouSerS' TCS daemon (tcsd) init script -# Have a look on /etc/tcsd.conf too, there is more to configure there. - -# TPM_MODULES: name of the module(s) that should be loaded. You only need to -# set this if your driver is not compiled in kernel and is not already loaded -# on boot. (default: unset) -#TPM_MODULES="tpm_atmel" diff --git a/app-crypt/trousers/files/tcsd.initd b/app-crypt/trousers/files/tcsd.initd index c9c050cb06d9..9b18c48e1ee3 100644 --- a/app-crypt/trousers/files/tcsd.initd +++ b/app-crypt/trousers/files/tcsd.initd @@ -1,38 +1,19 @@ #!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation +# 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/files/trousers-0.3.14-fno-common.patch b/app-crypt/trousers/files/trousers-0.3.14-fno-common.patch deleted file mode 100644 index 5046bc70883b..000000000000 --- a/app-crypt/trousers/files/trousers-0.3.14-fno-common.patch +++ /dev/null @@ -1,15 +0,0 @@ -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/files/trousers-0.3.14-tcsd-fixes.patch b/app-crypt/trousers/files/trousers-0.3.14-tcsd-fixes.patch deleted file mode 100644 index 10031e088293..000000000000 --- a/app-crypt/trousers/files/trousers-0.3.14-tcsd-fixes.patch +++ /dev/null @@ -1,58 +0,0 @@ -Index: trousers-0.3.14/src/tcs/ps/tcsps.c -=================================================================== ---- trousers-0.3.14.orig/src/tcs/ps/tcsps.c -+++ trousers-0.3.14/src/tcs/ps/tcsps.c -@@ -72,7 +72,7 @@ get_file() - } - - /* open and lock the file */ -- system_ps_fd = open(tcsd_options.system_ps_file, O_CREAT|O_RDWR, 0600); -+ system_ps_fd = open(tcsd_options.system_ps_file, O_CREAT|O_RDWR|O_NOFOLLOW, 0600); - if (system_ps_fd < 0) { - LogError("system PS: open() of %s failed: %s", - tcsd_options.system_ps_file, strerror(errno)); -Index: trousers-0.3.14/src/tcsd/svrside.c -=================================================================== ---- trousers-0.3.14.orig/src/tcsd/svrside.c -+++ trousers-0.3.14/src/tcsd/svrside.c -@@ -473,6 +473,7 @@ main(int argc, char **argv) - } - return TCSERR(TSS_E_INTERNAL_ERROR); - } -+ setgid(pwd->pw_gid); - setuid(pwd->pw_uid); - #endif - #endif -Index: trousers-0.3.14/src/tcsd/tcsd_conf.c -=================================================================== ---- trousers-0.3.14.orig/src/tcsd/tcsd_conf.c -+++ trousers-0.3.14/src/tcsd/tcsd_conf.c -@@ -743,7 +743,7 @@ conf_file_init(struct tcsd_config *conf) - #ifndef SOLARIS - struct group *grp; - struct passwd *pw; -- mode_t mode = (S_IRUSR|S_IWUSR); -+ mode_t mode = (S_IRUSR|S_IWUSR|S_IRGRP); - #endif /* SOLARIS */ - TSS_RESULT result; - -@@ -798,15 +798,15 @@ conf_file_init(struct tcsd_config *conf) - } - - /* make sure user/group TSS owns the conf file */ -- if (pw->pw_uid != stat_buf.st_uid || grp->gr_gid != stat_buf.st_gid) { -+ if (stat_buf.st_uid != 0 || grp->gr_gid != stat_buf.st_gid) { - LogError("TCSD config file (%s) must be user/group %s/%s", tcsd_config_file, -- TSS_USER_NAME, TSS_GROUP_NAME); -+ "root", TSS_GROUP_NAME); - return TCSERR(TSS_E_INTERNAL_ERROR); - } - -- /* make sure only the tss user can manipulate the config file */ -+ /* make sure only the tss user can read (but not manipulate) the config file */ - if (((stat_buf.st_mode & 0777) ^ mode) != 0) { -- LogError("TCSD config file (%s) must be mode 0600", tcsd_config_file); -+ LogError("TCSD config file (%s) must be mode 0640", tcsd_config_file); - return TCSERR(TSS_E_INTERNAL_ERROR); - } - #endif /* SOLARIS */ diff --git a/app-crypt/trousers/trousers-0.3.14-r3.ebuild b/app-crypt/trousers/trousers-0.3.14-r3.ebuild deleted file mode 100644 index 72418a365fc0..000000000000 --- a/app-crypt/trousers/trousers-0.3.14-r3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools linux-info readme.gentoo-r1 systemd udev - -DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation" -HOMEPAGE="http://trousers.sf.net" -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" -IUSE="doc selinux" # gtk - -# gtk support presently does NOT compile. -# gtk? ( >=x11-libs/gtk+-2 ) - -DEPEND="acct-group/tss - acct-user/tss - >=dev-libs/glib-2 - >=dev-libs/openssl-0.9.7:0= - " -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-tcsd )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-0.3.13-nouseradd.patch" - "${FILESDIR}/${P}-fno-common.patch" - "${FILESDIR}/${P}-Makefile.am-Mark-tddl.a-nodist.patch" - "${FILESDIR}/${P}-tcsd-fixes.patch" -) - -DOCS="AUTHORS ChangeLog NICETOHAVES README TODO" - -DOC_CONTENTS=" - If you have problems starting tcsd, please check permissions and - ownership on /dev/tpm* and ~tss/system.data -" -S="${WORKDIR}" - -CONFIG_CHECK="~TCG_TPM" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # econf --with-gui=$(usex gtk gtk openssl) - econf --with-gui=openssl -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die - - 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 -} diff --git a/app-crypt/trousers/trousers-0.3.15.ebuild b/app-crypt/trousers/trousers-0.3.15.ebuild index b3b23fa8f5c2..b25a3dfb4c72 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 @@ -57,9 +57,9 @@ 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 + udev_reload } -- cgit v1.2.3