diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-29 11:38:31 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-29 11:38:31 +0100 |
commit | 90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch) | |
tree | 83fc5facb6b12be510a37bc3d241cc63e965b13a /app-crypt/trousers | |
parent | feb0daf81d888e9160f9f94502de09b66f2a63fd (diff) |
gentoo resync : 29.06.2020
Diffstat (limited to 'app-crypt/trousers')
-rw-r--r-- | app-crypt/trousers/Manifest | 4 | ||||
-rw-r--r-- | app-crypt/trousers/files/trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch | 25 | ||||
-rw-r--r-- | app-crypt/trousers/trousers-0.3.14-r1.ebuild | 104 | ||||
-rw-r--r-- | app-crypt/trousers/trousers-0.3.14-r2.ebuild | 1 |
4 files changed, 28 insertions, 106 deletions
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest index 2f480ea7efde..467f4cac1282 100644 --- a/app-crypt/trousers/Manifest +++ b/app-crypt/trousers/Manifest @@ -3,9 +3,9 @@ AUX tcsd.confd 372 BLAKE2B 535a5bb44cd18e4d0b7520a8ea840159d35e4ae0c557b63ec7892 AUX tcsd.initd 843 BLAKE2B 1c2190a10823130ed69c79761063656e55cdadafeca99053d12a86f110091936f44475f5ea6adaf90e7eb70f3871fcf6452c96c86b5bc88ae28a1a5144e2a95b SHA512 d43dac0f8a7b878fb7572df8e3314ef2e6c1b90ff794df2f41192e7e4f3c8849602dde49db359e6566f1e426b63fc214c6b9dea731fcb7f3c09623e3c27b2001 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-libressl.patch 877 BLAKE2B 6416ecf1cf99678299e4ac39756920de61e598ec9b9c91c17cf8eddfa10af145b813756e2fae3b39fef8682eeb2ee722b3979d52570f41b99708fb4ba2cebe2d SHA512 3aba9ec7554d4fdb941063f771b40c5700efefdbb6e5df186824e93a6b2c61801acb4be60cdbe71dcee9360c0f59229e5d17f1a18aa981132807b5e74efc2d59 DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21 -EBUILD trousers-0.3.14-r1.ebuild 3005 BLAKE2B 625aca034e7f6c85660c31f2ea2aeea18dc9b555213c8238c54d1e348a1a46db01f6e852ab2ae26ac42d396ba928a75bc0ba9d898bbd74b69b4c0b66310bb604 SHA512 bcbd7d7925f0ad42365c73a0419effe6c2e0b63904b1d2730305251b4ed6c95e5d36b6266a1409714075af714055b4500895399cf0b59ec8baa7bbaffb773502 -EBUILD trousers-0.3.14-r2.ebuild 1579 BLAKE2B 9798302ee9903fef84d39e836a69baa7c3c8fd92651e5245c9734c5979921fc50ebb19fc972b41cfd92d5883605f363afdc8f6588ba0d0db7db32d102fd9afa5 SHA512 9283242356516ef258ec8d42de3b571c24985152efc4441a3123ae2c50e00984ab83aaf61ab1c453311ed48edcf281528ce7e453172e18cf7eb4fb52efd1a2f0 +EBUILD trousers-0.3.14-r2.ebuild 1636 BLAKE2B a7d811322ebc0e5e61b7b4ae53d24a138e1e801782cc8f9b7a0ee3448163a422b92ee648f7df98d79d61ee143b012d85b74ab78e63c3a6251cd6e704bc8f46aa SHA512 2f99e83739a57b8e5114e87064e9975dd6d401842a03a08743ea115037c7847c80b5ed41f729947914304fa2a2c54db0a5b2613f449a45384503851aa5136feb MISC metadata.xml 507 BLAKE2B 1674e8c11713df517fd8d2aead0b5207a114de5b34559ed1b1a2527e73ee7e749a13d5a7e10330f940bc61c51ed9083e3ce423db428503f25295e1fd3b64d576 SHA512 f1c304734694001da4b95f1f18cb6891d3fc9df1db1013ad7155b2f60fd466f46947b3fa9e78d50c2a4a2fb1d0ca98b8ebb8017dde2bfcadd847e422df8885d7 diff --git a/app-crypt/trousers/files/trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch b/app-crypt/trousers/files/trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch new file mode 100644 index 000000000000..f777b629cebe --- /dev/null +++ b/app-crypt/trousers/files/trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch @@ -0,0 +1,25 @@ +From 5b1dbb5f8eada9002ec10f4ebc0bc418272e58b2 Mon Sep 17 00:00:00 2001 +From: Salah Coronya <salah.coronya@gmail.com> +Date: Sun, 7 Jun 2020 12:34:03 -0500 +Subject: [PATCH] src/tddl/Makefile.am: Mark tddl.a nodist + +This makes tddl.a nodist like the others, so it is not installed + +Signed-off-by: Salah Coronya <salah.coronya@gmail.com> +--- + src/tddl/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tddl/Makefile.am b/src/tddl/Makefile.am +index 607eb8e..2cd599b 100644 +--- a/src/tddl/Makefile.am ++++ b/src/tddl/Makefile.am +@@ -1,4 +1,4 @@ +-lib_LIBRARIES=libtddl.a ++noinst_LIBRARIES=libtddl.a + + libtddl_a_SOURCES=tddl.c + libtddl_a_CFLAGS=-DAPPID=\"TCSD\ TDDL\" -I${top_srcdir}/src/include -fPIE -DPIE +-- +2.26.2 + diff --git a/app-crypt/trousers/trousers-0.3.14-r1.ebuild b/app-crypt/trousers/trousers-0.3.14-r1.ebuild deleted file mode 100644 index b9fbfed67e72..000000000000 --- a/app-crypt/trousers/trousers-0.3.14-r1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools linux-info readme.gentoo-r1 systemd user 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 libressl selinux" # gtk - -# gtk support presently does NOT compile. -# gtk? ( >=x11-libs/gtk+-2 ) - -DEPEND=">=dev-libs/glib-2 - !libressl? ( >=dev-libs/openssl-0.9.7:0= ) - libressl? ( dev-libs/libressl:0= )" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-tcsd )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-0.3.13-nouseradd.patch" - "${FILESDIR}/${P}-libressl.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}" - -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 - - # New user/group for the daemon - enewgroup tss - enewuser tss -1 -1 /var/lib/tpm tss -} - -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.14-r2.ebuild b/app-crypt/trousers/trousers-0.3.14-r2.ebuild index b62a9eb93452..a36ff6830733 100644 --- a/app-crypt/trousers/trousers-0.3.14-r2.ebuild +++ b/app-crypt/trousers/trousers-0.3.14-r2.ebuild @@ -30,6 +30,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.3.13-nouseradd.patch" "${FILESDIR}/${P}-libressl.patch" "${FILESDIR}/${P}-fno-common.patch" + "${FILESDIR}/${P}-Makefile.am-Mark-tddl.a-nodist.patch" ) DOCS="AUTHORS ChangeLog NICETOHAVES README TODO" |