[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/trousers/, app-crypt/trousers/files/

[Quentin Retornaz]

commit:     5960523f36abf7dce001d7eda4f6599d8779310b
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue Jul  5 01:37:50 2022 +0000
Commit:     Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
CommitDate: Tue Jul  5 21:18:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=5960523f

app-crypt/trousers: Remove old version

Signed-off-by: orbea <orbea <AT> riseup.net>
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>

 app-crypt/trousers/Manifest                        |  1 -
 app-crypt/trousers/files/tcsd.confd                |  9 ---
 .../files/trousers-0.3.14-fno-common.patch         | 15 -----
 .../trousers/files/trousers-0.3.14-libressl.patch  | 28 ---------
 .../files/trousers-0.3.14-tcsd-fixes.patch         | 58 ------------------
 app-crypt/trousers/trousers-0.3.14-r3.ebuild       | 68 ----------------------
 6 files changed, 179 deletions(-)

diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 84891c9..4556d86 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -1,2 +1 @@
-DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
 DIST trousers-0.3.15.tar.gz 4699936 BLAKE2B 53c60498ed6a9d3d87295b00676e5d0d82452918c35af6b98c7979ffa2dc04dd817e7cd3f4a33ca17c30b90eab53d80b2bb25306fe9db7bda2125019edfed280 SHA512 769c7d891c6306c1b3252448f86e3043ee837e566c9431f5b4353512113e2907f6ce29c91e8044c420025b79c5f3ff2396ddce93f73b1eb2a15ea1de89ac0fdb

diff --git a/app-crypt/trousers/files/tcsd.confd b/app-crypt/trousers/files/tcsd.confd
deleted file mode 100644
index 78bedb9..0000000
--- 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/trousers-0.3.14-fno-common.patch b/app-crypt/trousers/files/trousers-0.3.14-fno-common.patch
deleted file mode 100644
index 5046bc7..0000000
--- 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-libressl.patch b/app-crypt/trousers/files/trousers-0.3.14-libressl.patch
deleted file mode 100644
index 9ee7c16..0000000
--- a/app-crypt/trousers/files/trousers-0.3.14-libressl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b8b1cda430270f03dc556cf9cf7d2fd478101525 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@×××××.com>
-Date: Wed, 7 Dec 2016 09:36:34 +0200
-Subject: [PATCH] tspi: support libressl
-
-Bug: https://sourceforge.net/p/trousers/bugs/222/
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com>
----
- src/trspi/crypto/openssl/rsa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/trspi/crypto/openssl/rsa.c b/src/trspi/crypto/openssl/rsa.c
-index 2b1205f..3e56015 100644
---- a/src/trspi/crypto/openssl/rsa.c
-+++ b/src/trspi/crypto/openssl/rsa.c
-@@ -38,7 +38,7 @@
- #define DEBUG_print_openssl_errors()
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100001L
-+#if OPENSSL_VERSION_NUMBER < 0x10100001L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- static int
- RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
- {
--- 
-2.7.3
-

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 10031e0..0000000
--- 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 d033079..0000000
--- 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}-libressl.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
-}