[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/trousers/
commit: 9ee0442620bf12fa1f7de6bc33649111228f06a3
Author: orbea riseup net>
AuthorDate: Wed May 10 19:00:32 2023 +
Commit: orbea riseup net>
CommitDate: Wed May 10 19:00:32 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=9ee04426
app-crypt/trousers: keyword 0.3.15-r1 for ~mips
Signed-off-by: orbea riseup.net>
app-crypt/trousers/trousers-0.3.15-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-crypt/trousers/trousers-0.3.15-r1.ebuild
b/app-crypt/trousers/trousers-0.3.15-r1.ebuild
index 7c56cab..5176e27 100644
--- a/app-crypt/trousers/trousers-0.3.15-r1.ebuild
+++ b/app-crypt/trousers/trousers-0.3.15-r1.ebuild
@@ -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 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 x86"
+KEYWORDS="amd64 arm arm64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 x86"
IUSE="doc selinux" # gtk
# gtk support presently does NOT compile.
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/trousers/files/, app-crypt/trousers/
commit: 42e6f7e828e0194f6d9931aa8d12d652ee62d889
Author: orbea riseup net>
AuthorDate: Thu Apr 13 20:28:48 2023 +
Commit: orbea riseup net>
CommitDate: Thu Apr 13 20:28:48 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=42e6f7e8
app-crypt/trousers: add 0.3.15-r1
Signed-off-by: orbea riseup.net>
...rs-0.3.15-tspi-drop-the-use-of-getpwent_r.patch | 69
app-crypt/trousers/trousers-0.3.15-r1.ebuild | 74 ++
2 files changed, 143 insertions(+)
diff --git
a/app-crypt/trousers/files/trousers-0.3.15-tspi-drop-the-use-of-getpwent_r.patch
b/app-crypt/trousers/files/trousers-0.3.15-tspi-drop-the-use-of-getpwent_r.patch
new file mode 100644
index 000..ab6ef76
--- /dev/null
+++
b/app-crypt/trousers/files/trousers-0.3.15-tspi-drop-the-use-of-getpwent_r.patch
@@ -0,0 +1,69 @@
+https://bugs.gentoo.org/713444
+
+From 2299eadf77ae7a7ec52148b6a8f4ea37e217eafa Mon Sep 17 00:00:00 2001
+From: Stijn Tintel
+Date: Thu, 2 Feb 2023 01:06:15 +0200
+Subject: [PATCH] tspi: drop the use of getpwent_r
+
+On systems with musl libc, libtspi.so is unusable due to the lack of
+getpwent_r. As there are multiple historical functions named getpwent_r
+that all behave differently, let's just play it safe and stop using it
+altogether.
+
+Signed-off-by: Stijn Tintel
+---
+ src/tspi/ps/tspps.c | 16
+ 1 file changed, 16 deletions(-)
+
+diff --git a/src/tspi/ps/tspps.c b/src/tspi/ps/tspps.c
+index b5e83d0..ae7b3df 100644
+--- a/src/tspi/ps/tspps.c
b/src/tspi/ps/tspps.c
+@@ -51,9 +51,7 @@
+
+ static int user_ps_fd = -1;
+ static MUTEX_DECLARE_INIT(user_ps_lock);
+-#if (defined (__FreeBSD__) || defined (__OpenBSD__))
+ static MUTEX_DECLARE_INIT(user_ps_path);
+-#endif
+ static struct flock fl;
+
+
+@@ -66,9 +64,6 @@ get_user_ps_path(char **file)
+ TSS_RESULT result;
+ char *file_name = NULL, *home_dir = NULL;
+ struct passwd *pwp;
+-#if (defined (__linux) || defined (linux) || defined(__GLIBC__))
+- struct passwd pw;
+-#endif
+ struct stat stat_buf;
+ char buf[PASSWD_BUFSIZE];
+ uid_t euid;
+@@ -96,16 +91,6 @@ get_user_ps_path(char **file)
+ #else
+ setpwent();
+ while (1) {
+-#if (defined (__linux) || defined (linux) || defined(__GLIBC__))
+- rc = getpwent_r(, buf, PASSWD_BUFSIZE, );
+- if (rc) {
+- LogDebugFn("USER PS: Error getting path to home
directory: getpwent_r: %s",
+- strerror(rc));
+- endpwent();
+- return TSPERR(TSS_E_INTERNAL_ERROR);
+- }
+-
+-#elif (defined (__FreeBSD__) || defined (__OpenBSD__))
+ if ((pwp = getpwent()) == NULL) {
+ LogDebugFn("USER PS: Error getting path to home
directory: getpwent: %s",
+strerror(rc));
+@@ -113,7 +98,6 @@ get_user_ps_path(char **file)
+ MUTEX_UNLOCK(user_ps_path);
+ return TSPERR(TSS_E_INTERNAL_ERROR);
+ }
+-#endif
+ if (euid == pwp->pw_uid) {
+ home_dir = strdup(pwp->pw_dir);
+ break;
+--
+2.39.1
+
diff --git a/app-crypt/trousers/trousers-0.3.15-r1.ebuild
b/app-crypt/trousers/trousers-0.3.15-r1.ebuild
new file mode 100644
index 000..7c56cab
--- /dev/null
+++ b/app-crypt/trousers/trousers-0.3.15-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 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 ~loong ~m68k ~ppc ppc64 ~riscv ~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}/${PN}-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch"
+ "${FILESDIR}/${P}-tspi-drop-the-use-of-getpwent_r.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
+"
+
+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'
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/trousers/
commit: 87b7084c3c1a8ecfc052197cc2f06e8329c93d5a
Author: orbea riseup net>
AuthorDate: Thu Apr 13 20:25:29 2023 +
Commit: orbea riseup net>
CommitDate: Thu Apr 13 20:25:29 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=87b7084c
app-crypt/trousers: keyword 0.3.15 for ~loong
Signed-off-by: orbea riseup.net>
app-crypt/trousers/trousers-0.3.15.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-crypt/trousers/trousers-0.3.15.ebuild
b/app-crypt/trousers/trousers-0.3.15.ebuild
index 6c046bc..cbf4494 100644
--- a/app-crypt/trousers/trousers-0.3.15.ebuild
+++ b/app-crypt/trousers/trousers-0.3.15.ebuild
@@ -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 ~riscv ~s390 x86"
+KEYWORDS="amd64 arm arm64 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 x86"
IUSE="doc selinux" # gtk
# gtk support presently does NOT compile.
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/trousers/, app-crypt/trousers/files/
commit: 5960523f36abf7dce001d7eda4f6599d8779310b
Author: orbea riseup net>
AuthorDate: Tue Jul 5 01:37:50 2022 +
Commit: Quentin Retornaz retornaz com>
CommitDate: Tue Jul 5 21:18:31 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=5960523f
app-crypt/trousers: Remove old version
Signed-off-by: orbea riseup.net>
Signed-off-by: Quentin Retornaz 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..000
--- 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..000
--- 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..000
--- 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
-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
- 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 < 0x1011L
-+#if OPENSSL_VERSION_NUMBER < 0x1011L || (defined(LIBRESSL_VERSION_NUMBER)
&& LIBRESSL_VERSION_NUMBER < 0x2070L)
- 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..000
--- 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:
[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/trousers/files/, app-crypt/trousers/
commit: 444f087022095af599ca2f9f8e4a8947b7daa3c5
Author: orbea riseup net>
AuthorDate: Tue Jul 5 01:34:36 2022 +
Commit: Quentin Retornaz retornaz com>
CommitDate: Tue Jul 5 21:18:27 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=444f0870
app-crypt/trousers: Merge changes from ::gentoo
Signed-off-by: orbea riseup.net>
Signed-off-by: Quentin Retornaz retornaz.com>
app-crypt/trousers/files/tcsd.initd | 31 ++-
app-crypt/trousers/metadata.xml | 8
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 @@
-http://www.gentoo.org/dtd/metadata.dtd;>
+https://www.gentoo.org/dtd/metadata.dtd;>
-
+
salah.coro...@gmail.com
- Salah Coronya
+ Christopher Byrne
-
+
proxy-ma...@gentoo.org
Proxy Maintainers
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
+}
