commit: 246fe63506169eec43814eb35489c026de134a76
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 15:25:35 2017 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 15:25:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=246fe635
app-crypt/trousers: cleanup
Bug: 609090
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-crypt/trousers/Manifest | 1 -
.../trousers/files/trousers-0.3.13-build.patch | 77 ---------------
.../trousers/files/trousers-0.3.5-nouseradd.patch | 11 ---
app-crypt/trousers/trousers-0.3.10-r1.ebuild | 104 ---------------------
4 files changed, 193 deletions(-)
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index b69a8eadcc..a2846309f3 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -1,2 +1 @@
-DIST trousers-0.3.10.tar.gz 1658652 SHA256
eb9569de5c66d9698f6c3303de03777b95ec72827f68b7744454bfa9227bc530 SHA512
1835246f846d20bc1b2731d68440a9ca45865fcd52ad847d95485e4b126fae8bec09feaad559c27d83e243d92b8adc3a67934bff2034b318df075842fe9df4f0
WHIRLPOOL
7a27ef57b0038178cbf384c9fdec2d2e3e58dbeb5e5bc1503d2a7058a8312df54fa72b87968554631e4b5e483ae5e8c5e0a2367346bf3ae001b523a507ceff40
DIST trousers-0.3.14.tar.gz 1378438 SHA256
ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47 SHA512
bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
WHIRLPOOL
1e1c51774fa796c706858d008651182673f7a88532cac35d010f4bd713fe50c1151e0a5a7ffb6975e8a050a1aab6edeb09d1672407025a776625c9b4f2912c88
diff --git a/app-crypt/trousers/files/trousers-0.3.13-build.patch
b/app-crypt/trousers/files/trousers-0.3.13-build.patch
deleted file mode 100644
index 4e0e60e977..0000000000
--- a/app-crypt/trousers/files/trousers-0.3.13-build.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/src/include/tcsps.h
-+++ b/src/include/tcsps.h
-@@ -23,13 +23,8 @@ int get_file();
- int put_file(int);
- void close_file(int);
- void ps_destroy();
--#ifdef SOLARIS
--TSS_RESULT read_data(int, void *, UINT32);
--TSS_RESULT write_data(int, void *, UINT32);
--#else
--inline TSS_RESULT read_data(int, void *, UINT32);
--inline TSS_RESULT write_data(int, void *, UINT32);
--#endif
-+TSS_RESULT read_data(int, void *, UINT32);
-+TSS_RESULT write_data(int, void *, UINT32);
- int write_key_init(int, UINT32, UINT32, UINT32);
- TSS_RESULT cache_key(UINT32, UINT16, TSS_UUID *, TSS_UUID *, UINT16,
UINT32, UINT32);
- TSS_RESULT UnloadBlob_KEY_PS(UINT16 *, BYTE *, TSS_KEY *);
---- a/src/include/tspps.h
-+++ b/src/include/tspps.h
-@@ -18,8 +18,8 @@
-
- TSS_RESULT get_file(int *);
- int put_file(int);
--inline TSS_RESULT read_data(int, void *, UINT32);
--inline TSS_RESULT write_data(int, void *, UINT32);
-+TSS_RESULT read_data(int, void *, UINT32);
-+TSS_RESULT write_data(int, void *, UINT32);
- UINT32 psfile_get_num_keys(int);
- TSS_RESULT psfile_get_parent_uuid_by_uuid(int, TSS_UUID *, TSS_UUID *);
- TSS_RESULT psfile_remove_key_by_uuid(int, TSS_UUID *);
---- a/src/tcs/ps/ps_utils.c
-+++ b/src/tcs/ps/ps_utils.c
-@@ -42,11 +42,7 @@
- struct key_disk_cache *key_disk_cache_head = NULL;
-
-
--#ifdef SOLARIS
- TSS_RESULT
--#else
--inline TSS_RESULT
--#endif
- read_data(int fd, void *data, UINT32 size)
- {
- int rc;
-@@ -64,11 +60,7 @@ read_data(int fd, void *data, UINT32 size)
- }
-
-
--#ifdef SOLARIS
- TSS_RESULT
--#else
--inline TSS_RESULT
--#endif
- write_data(int fd, void *data, UINT32 size)
- {
- int rc;
---- a/src/tspi/ps/ps_utils.c
-+++ b/src/tspi/ps/ps_utils.c
-@@ -22,7 +22,7 @@
- #include "tspps.h"
- #include "tsplog.h"
-
--inline TSS_RESULT
-+TSS_RESULT
- read_data(int fd, void *data, UINT32 size)
- {
- int rc;
-@@ -39,7 +39,7 @@ read_data(int fd, void *data, UINT32 size)
- return TSS_SUCCESS;
- }
-
--inline TSS_RESULT
-+TSS_RESULT
- write_data(int fd, void *data, UINT32 size)
- {
- int rc;
diff --git a/app-crypt/trousers/files/trousers-0.3.5-nouseradd.patch
b/app-crypt/trousers/files/trousers-0.3.5-nouseradd.patch
deleted file mode 100644
index 32114134da..0000000000
--- a/app-crypt/trousers/files/trousers-0.3.5-nouseradd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dist/Makefile.am
-+++ dist/Makefile.am
-@@ -6,8 +6,6 @@
- /bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf
-
- install-exec-hook:
-- /usr/sbin/groupadd tss || true
-- /usr/sbin/useradd -r tss -g tss || true
- /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir
-p ${DESTDIR}/@localstatedir@/lib/tpm; fi'
- /bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm || true
- /bin/chmod 0700 ${DESTDIR}/@localstatedir@/lib/tpm
diff --git a/app-crypt/trousers/trousers-0.3.10-r1.ebuild
b/app-crypt/trousers/trousers-0.3.10-r1.ebuild
deleted file mode 100644
index abb3964774..0000000000
--- a/app-crypt/trousers/trousers-0.3.10-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils linux-info readme.gentoo systemd user udev
-
-#MY_P="${PN}-${PV%.*}-${PV##*.}"
-
-DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
-HOMEPAGE="http://trousers.sf.net";
-SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
-
-LICENSE="CPL-1.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~m68k ~ppc ~ppc64 ~s390 ~sh x86"
-IUSE="doc selinux" # gtk
-
-# gtk support presently does NOT compile.
-# gtk? ( >=x11-libs/gtk+-2 )
-
-CDEPEND=">=dev-libs/glib-2
- >=dev-libs/openssl-0.9.7:0"
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-tcsd )"
-# S="${WORKDIR}/${P}git"
-
-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
-"
-
-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() {
- epatch "${FILESDIR}"/${PN}-0.3.5-nouseradd.patch
-
- sed -i -r \
- -e '/CFLAGS/s/ -(Werror|m64)//' \
- configure.in || die
- eautoreconf
-}
-
-src_configure() {
- # econf --with-gui=$(usex gtk gtk openssl)
- econf --with-gui=openssl
-}
-
-src_install() {
- keepdir /var/lib/tpm
- default
- 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
- prune_libtool_files
- readme.gentoo_create_doc
-}
