[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/, app-crypt/tpm-tools/files/

2023-09-09 Thread David Seifert 
commit: fe1f8a4c5316ad6357f25592263eaac63e1bd297
Author: David Seifert  gentoo  org>
AuthorDate: Sat Sep  9 13:16:47 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Sep  9 13:16:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe1f8a4c

app-crypt/tpm-tools: drop 1.3.9.1-r1, 1.3.9.2

Signed-off-by: David Seifert  gentoo.org>

 app-crypt/tpm-tools/Manifest   |   1 -
 .../files/tpm-tools-1.3.9.1-openssl-1.1.patch  | 238 -
 app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild|  50 -
 app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild   |  52 -
 4 files changed, 341 deletions(-)

diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index 81566e78b41a..aad28331f0da 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1,2 +1 @@
-DIST tpm-tools-1.3.9.1.tar.gz 482859 BLAKE2B 
ee915679e23bead04672bf719ce59bb6f20b550be39855b5304caeff554bf54d3cfe9104d464af7762388995e51d2bed0f9bedad83e42146cb7457382d09f4b2
 SHA512 
63a9c0e761cd890cc0a218de79a9c0169e151aba7824c19bf6b7ec894cf41c4950de1f63bd849aa93a4bdff36cf0fe557bc17113912b6d77f57f2bf1190b6a08
 DIST tpm-tools-1.3.9.2.tar.gz 431930 BLAKE2B 
bbea3848765d9907c6faa1b5f4a60002e94243040985ce503f392bc8d7392bea41b54317b15fd227b5d73d589cf2c330729532448751d4375484375725310dfa
 SHA512 
b684716c71702140591d89eb03d3724ed5b448e7ba2881bc44de9d44ffc23a9f7dfcf4351eec24e5438cc883f49a7dafee82bb19f90800610cf764ce74e60ccb

diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch 
b/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch
deleted file mode 100644
index ae31af025851..
--- a/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-From 31d9cebc43833de939a0e13be0110ed830b66cbd Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev 
-Date: Sat, 8 Dec 2018 23:28:54 +0200
-Subject: [PATCH] data_import.c: support openssl-1.1
-
-Signed-off-by: Alon Bar-Lev 
-Bug: https://sourceforge.net/p/trousers/bugs/227/

- src/data_mgmt/data_import.c | 159 +---
- 1 file changed, 112 insertions(+), 47 deletions(-)
-
-diff --git a/src/data_mgmt/data_import.c b/src/data_mgmt/data_import.c
-index f534717..33c76e7 100644
 a/src/data_mgmt/data_import.c
-+++ b/src/data_mgmt/data_import.c
-@@ -39,6 +39,30 @@
- #include 
- #include 
- 
-+#if OPENSSL_VERSION_NUMBER < 0x1010L
-+static void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, 
const BIGNUM **d) {
-+  if ( n )
-+  *n = r->n;
-+  if ( e )
-+  *e = r->e;
-+  if ( d )
-+  *d = r->d;
-+}
-+static void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM 
**q) {
-+  if ( p )
-+  *p = r->p;
-+  if ( q )
-+  *q = r->q;
-+}
-+static void RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const 
BIGNUM **dmq1, const BIGNUM **iqmp) {
-+  if ( dmp1 )
-+  *dmp1 = r->dmp1;
-+  if ( dmq1 )
-+  *dmq1 = r->dmq1;
-+  if ( iqmp )
-+  *iqmp = r->iqmp;
-+}
-+#endif
- 
- /*
-  * Global variables
-@@ -372,7 +396,7 @@ readX509Cert( const char  *a_pszFile,
-   goto out;
-   }
- 
--  if ( EVP_PKEY_type( pKey->type ) != EVP_PKEY_RSA ) {
-+  if ( EVP_PKEY_base_id( pKey ) != EVP_PKEY_RSA ) {
-   logError( TOKEN_RSA_KEY_ERROR );
- 
-   X509_free( pX509 );
-@@ -691,17 +715,35 @@ createRsaPubKeyObject( RSA   *a_pRsa,
- 
-   int  rc = -1;
- 
--  int  nLen = BN_num_bytes( a_pRsa->n );
--  int  eLen = BN_num_bytes( a_pRsa->e );
-+  const BIGNUM *bn;
-+  const BIGNUM *be;
-+  int  nLen;
-+  int  eLen;
-+  CK_BYTE *n = NULL;
-+  CK_BYTE *e = NULL;
-+
-+  RSA_get0_key( a_pRsa, , , NULL );
-+
-+  nLen = BN_num_bytes( bn );
-+  eLen = BN_num_bytes( be );
-+  n = malloc( nLen );
-+  e = malloc( eLen );
-+
-+  if ( !n || !e ) {
-+  logError( TOKEN_MEMORY_ERROR );
-+  goto out;
-+  }
-+
-+  // Get binary representations of the RSA key information
-+  BN_bn2bin( bn, n );
-+  BN_bn2bin( be, e );
- 
-+  {
-   CK_RV  rv;
- 
-   CK_BBOOL  bTrue  = TRUE;
-   CK_BBOOL  bFalse = FALSE;
- 
--  CK_BYTE *n = malloc( nLen );
--  CK_BYTE *e = malloc( eLen );
--
-   CK_OBJECT_CLASS  clPubClass  = CKO_PUBLIC_KEY;
-   CK_KEY_TYPE  tKeyType= CKK_RSA;
-   CK_BBOOL bPrivate= ( !g_bPublic ) ? TRUE : FALSE;
-@@ -726,21 +768,13 @@ createRsaPubKeyObject( RSA   *a_pRsa,
- 
-   *a_hObject = 0;
- 
--  if ( !n || !e ) {
--  logError( TOKEN_MEMORY_ERROR );
--  goto out;
--  }
--
--  // Get binary representations of the RSA key information
--  BN_bn2bin( a_pRsa->n, n );
--  BN_bn2bin( a_pRsa->e, e );
--
-   // Create the RSA public

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2023-03-17 Thread Arthur Zamarin 
commit: bf91824c07cfcd87d7634b22207b0129b2f17d13
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 17 14:20:43 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 17 14:20:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf91824c

app-crypt/tpm-tools: Stabilize 1.3.9.2-r1 arm64, #901723

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild
index d355492f173b..eff74ea8520a 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~m68k ~s390 x86"
+KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 x86"
 IUSE="nls pkcs11 debug"
 
 DEPEND=">=app-crypt/trousers-0.3.15-r1

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2023-03-17 Thread Sam James 
commit: 6efd81a361facddaae41917b8a8636ccbf77a4bb
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 17 14:10:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 17 14:10:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6efd81a3

app-crypt/tpm-tools: Stabilize 1.3.9.2-r1 x86, #901723

Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild
index 68163a060786..8b2566b27e8b 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 x86"
 IUSE="nls pkcs11 debug"
 
 DEPEND=">=app-crypt/trousers-0.3.15-r1

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2023-03-17 Thread Sam James 
commit: 18118c11a2eff3e2a5819c985548868d485eab60
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 17 14:10:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 17 14:10:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18118c11

app-crypt/tpm-tools: Stabilize 1.3.9.2-r1 amd64, #901723

Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild
index 8b2566b27e8b..d355492f173b 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~m68k ~s390 x86"
 IUSE="nls pkcs11 debug"
 
 DEPEND=">=app-crypt/trousers-0.3.15-r1

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2023-02-13 Thread Sam James 
commit: 37ecf6b971e037cf7413136835e5575a5553d985
Author: Stijn Tintel  linux-ipv6  be>
AuthorDate: Wed Feb  1 23:18:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 14 03:13:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37ecf6b9

app-crypt/tpm-tools: revbump to depend on app-crypt/trousers-0.3.15-r1

Closes: https://bugs.gentoo.org/713444
Signed-off-by: Stijn Tintel  linux-ipv6.be>
Closes: https://github.com/gentoo/gentoo/pull/29384
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild | 52 +
 1 file changed, 52 insertions(+)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild
new file mode 100644
index ..68163a060786
--- /dev/null
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
+HOMEPAGE="http://trousers.sourceforge.net;
+SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~x86"
+IUSE="nls pkcs11 debug"
+
+DEPEND=">=app-crypt/trousers-0.3.15-r1
+   dev-libs/openssl:0=
+   pkcs11? ( dev-libs/opencryptoki )"
+RDEPEND="${DEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+   default
+
+# upstream didn't generate the tarball correctly so we must bootstrap
+# ouselves
+   mkdir -p po || die
+   mkdir -p m4 || die
+   cp -R po_/* po/ || die
+   touch po/Makefile.in.in || die
+   touch m4/Makefile.am || die
+
+   sed -i -r \
+   -e '/CFLAGS/s/ -m64//' \
+   configure.ac || die
+
+   eautoreconf
+}
+
+src_configure() {
+   append-cppflags $(usex debug -DDEBUG -DNDEBUG)
+
+   econf \
+   $(use_enable nls) \
+   $(use pkcs11 || echo --disable-pkcs11-support)
+}
+
+src_install() {
+   default
+   find "${D}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/files/

2022-07-11 Thread Sam James 
commit: 55e1c6ff631293f6d5167659f58b6a0d8afd6bb3
Author: orbea  riseup  net>
AuthorDate: Mon Jul 11 00:11:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 12 02:45:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e1c6ff

app-crypt/tpm-tools: Remove libressl support

This removes outdated libressl checks from the openssl-1.1.patch which
are no longer required for the libressl overlay.

Signed-off-by: orbea  riseup.net>
Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch 
b/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch
index a5747dbca709..ae31af025851 100644
--- a/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch
+++ b/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch
@@ -17,7 +17,7 @@ index f534717..33c76e7 100644
  #include 
  #include 
  
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || (defined(LIBRESSL_VERSION_NUMBER) 
&& LIBRESSL_VERSION_NUMBER < 0x2070L)
++#if OPENSSL_VERSION_NUMBER < 0x1010L
 +static void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, 
const BIGNUM **d) {
 +  if ( n )
 +  *n = r->n;
@@ -236,6 +236,3 @@ index f534717..33c76e7 100644
  
rc = 0;
  
--- 
-2.19.2
-

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2021-12-09 Thread Sam James 
commit: c4dc37eb72f4651cb1c0b6f2c3b82c4ab6d7d947
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  9 21:25:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  9 21:25:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4dc37eb

app-crypt/tpm-tools: Stabilize 1.3.9.2 arm64, #828322

Signed-off-by: Sam James  gentoo.org>

 app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
index 1f7603f6acb0..4bfe4151f59a 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~m68k ~s390 x86"
+KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 x86"
 IUSE="nls pkcs11 debug"
 
 DEPEND=">=app-crypt/trousers-0.3.0

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2021-12-06 Thread Agostino Sarubbo 
commit: 55b447b69e61a2030c6bd0ce82a8bdde988112ff
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Dec  7 06:24:47 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Dec  7 06:24:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55b447b6

app-crypt/tpm-tools: x86 stable wrt bug #828322

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
index 39c9ad1724ca..1f7603f6acb0 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~m68k ~s390 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~m68k ~s390 x86"
 IUSE="nls pkcs11 debug"
 
 DEPEND=">=app-crypt/trousers-0.3.0

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2021-12-06 Thread Agostino Sarubbo 
commit: 202108c5b441b93b58c032b3de3bd985f942e33d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Dec  6 11:26:31 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Dec  6 11:26:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=202108c5

app-crypt/tpm-tools: amd64 stable wrt bug #828322

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
index 5c3f6dd63c64..39c9ad1724ca 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~m68k ~s390 ~x86"
 IUSE="nls pkcs11 debug"
 
 DEPEND=">=app-crypt/trousers-0.3.0

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2021-05-02 Thread Mikle Kolyada 
commit: 35ea68e94a1be621219267dfce62812f5359bbf7
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  2 16:33:27 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  2 16:40:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ea68e9

app-crypt/tpm-tools: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild | 7 +++
 app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild| 7 +++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
index 90690f25648..2f87a05d545 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,11 +12,10 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 x86"
-IUSE="libressl nls pkcs11 debug"
+IUSE="nls pkcs11 debug"
 
 DEPEND=">=app-crypt/trousers-0.3.0
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
pkcs11? ( dev-libs/opencryptoki )"
 RDEPEND="${DEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
index 27bfb41b11f..5c3f6dd63c6 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,11 +12,10 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~x86"
-IUSE="libressl nls pkcs11 debug"
+IUSE="nls pkcs11 debug"
 
 DEPEND=">=app-crypt/trousers-0.3.0
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
pkcs11? ( dev-libs/opencryptoki )"
 RDEPEND="${DEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2021-04-25 Thread Michał Górny 
commit: 00df719f7c200344422f9f76e0fa8482e57a05e4
Author: Christopher Byrne  gmail  com>
AuthorDate: Sun Apr 25 07:10:02 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Apr 25 07:59:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00df719f

app-crypt/tpm-tools: Update maintainer name

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Christopher Byrne  gmail.com>
Signed-off-by: Michał Górny  gentoo.org>

 app-crypt/tpm-tools/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm-tools/metadata.xml b/app-crypt/tpm-tools/metadata.xml
index 9bad4aa3216..39a3a46e37a 100644
--- a/app-crypt/tpm-tools/metadata.xml
+++ b/app-crypt/tpm-tools/metadata.xml
@@ -3,7 +3,7 @@
 

salah.coro...@gmail.com
-   Salah Coronya
+   Christopher Byrne


proxy-ma...@gentoo.org

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2020-11-09 Thread Patrice Clement 
commit: 7cd4e2bab39441a4d902c916549c4d422962fa89
Author: Salah Coronya  gmail  com>
AuthorDate: Sun Nov  8 02:18:19 2020 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Nov  9 20:30:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cd4e2ba

app-crypt/tpm-tools: version bump to 1.3.9.2.

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Salah Coronya  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18179
Signed-off-by: Patrice Clement  gentoo.org>

 app-crypt/tpm-tools/Manifest |  1 +
 app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild | 53 
 2 files changed, 54 insertions(+)

diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index 4d121ec3312..81566e78b41 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1 +1,2 @@
 DIST tpm-tools-1.3.9.1.tar.gz 482859 BLAKE2B 
ee915679e23bead04672bf719ce59bb6f20b550be39855b5304caeff554bf54d3cfe9104d464af7762388995e51d2bed0f9bedad83e42146cb7457382d09f4b2
 SHA512 
63a9c0e761cd890cc0a218de79a9c0169e151aba7824c19bf6b7ec894cf41c4950de1f63bd849aa93a4bdff36cf0fe557bc17113912b6d77f57f2bf1190b6a08
+DIST tpm-tools-1.3.9.2.tar.gz 431930 BLAKE2B 
bbea3848765d9907c6faa1b5f4a60002e94243040985ce503f392bc8d7392bea41b54317b15fd227b5d73d589cf2c330729532448751d4375484375725310dfa
 SHA512 
b684716c71702140591d89eb03d3724ed5b448e7ba2881bc44de9d44ffc23a9f7dfcf4351eec24e5438cc883f49a7dafee82bb19f90800610cf764ce74e60ccb

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
new file mode 100644
index 000..27bfb41b11f
--- /dev/null
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
+HOMEPAGE="http://trousers.sourceforge.net;
+SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~x86"
+IUSE="libressl nls pkcs11 debug"
+
+DEPEND=">=app-crypt/trousers-0.3.0
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   pkcs11? ( dev-libs/opencryptoki )"
+RDEPEND="${DEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+   default
+
+# upstream didn't generate the tarball correctly so we must bootstrap
+# ouselves
+   mkdir -p po || die
+   mkdir -p m4 || die
+   cp -R po_/* po/ || die
+   touch po/Makefile.in.in || die
+   touch m4/Makefile.am || die
+
+   sed -i -r \
+   -e '/CFLAGS/s/ -m64//' \
+   configure.ac || die
+
+   eautoreconf
+}
+
+src_configure() {
+   append-cppflags $(usex debug -DDEBUG -DNDEBUG)
+
+   econf \
+   $(use_enable nls) \
+   $(use pkcs11 || echo --disable-pkcs11-support)
+}
+
+src_install() {
+   default
+   find "${D}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2020-02-26 Thread Joonas Niilola 
commit: ff93c1308b643c9b8348733cbc93c11a80ba25f4
Author: Salah Coronya  gmail  com>
AuthorDate: Thu Feb 20 02:06:07 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Feb 26 16:17:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff93c130

app-crypt/tpm-tools: Add salah.coronya  gmail.com as proxy maintainer

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Salah Coronya  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14310
Signed-off-by: Joonas Niilola  gentoo.org>

 app-crypt/tpm-tools/metadata.xml | 27 +--
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/app-crypt/tpm-tools/metadata.xml b/app-crypt/tpm-tools/metadata.xml
index c53b4aaedf5..d0084064703 100644
--- a/app-crypt/tpm-tools/metadata.xml
+++ b/app-crypt/tpm-tools/metadata.xml
@@ -1,14 +1,21 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-  
-
-  Build Token data management utilities based on OpenCryptoki's
-  (dev-libs/opencryptoki) PKCS#11 implementation.
-
-  
-  
-trousers
-  
+   
+   salah.coro...@gmail.com
+   Salah Coronya
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   
+   Build Token data management utilities based on OpenCryptoki's
+   (dev-libs/opencryptoki) PKCS#11 implementation.
+   
+   
+   
+   trousers
+

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2019-05-12 Thread Alon Bar-Lev 
commit: f2e386cff1df54fe2d0ecdea5f4a0a3c1f05e779
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Mon May 13 04:16:48 2019 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Mon May 13 04:16:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e386cf

app-crypt/tpm-tools: cleanup old

Signed-off-by: Alon Bar-Lev  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild | 47 
 1 file changed, 47 deletions(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
deleted file mode 100644
index 3be16cf93ed..000
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
-HOMEPAGE="http://trousers.sourceforge.net;
-SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 ~sh x86"
-IUSE="libressl nls pkcs11 debug"
-
-DEPEND=">=app-crypt/trousers-0.3.0
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   pkcs11? ( dev-libs/opencryptoki )"
-RDEPEND="${DEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}"
-
-src_prepare() {
-   default
-
-   sed -i -r \
-   -e '/CFLAGS/s/ -m64//' \
-   configure.ac || die
-
-   eautoreconf
-}
-
-src_configure() {
-   append-cppflags $(usex debug -DDEBUG -DNDEBUG)
-
-   econf \
-   $(use_enable nls) \
-   $(use pkcs11 || echo --disable-pkcs11-support)
-}
-
-src_install() {
-   default
-   find "${D}" -name '*.la' -delete || die
-}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2019-05-12 Thread Thomas Deutschmann 
commit: b90677d413ed58e940b47026d45c3b527a61bff9
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun May 12 20:35:30 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May 12 20:56:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b90677d4

app-crypt/tpm-tools: x86 stable (bug #684612)

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
index fb185e8819c..f92377d5791 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 ~sh ~x86"
+KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 ~sh x86"
 IUSE="libressl nls pkcs11 debug"
 
 DEPEND=">=app-crypt/trousers-0.3.0

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2019-05-11 Thread Mikle Kolyada 
commit: bc3103259e20f6194049acdd3260de097bf0c543
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat May 11 11:13:32 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat May 11 11:13:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc310325

app-crypt/tpm-tools: amd64 stable wrt bug #684612

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
index 17a81045fb1..fb185e8819c 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~m68k ~s390 ~sh ~x86"
+KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 ~sh ~x86"
 IUSE="libressl nls pkcs11 debug"
 
 DEPEND=">=app-crypt/trousers-0.3.0

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2019-05-03 Thread Aaron Bauman 
commit: e09442d332bcd90fe80ae849aa7b055e3123d1aa
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri May  3 15:38:39 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri May  3 16:08:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e09442d3

app-crypt/tpm-tools: arm64 stable (bug #684612)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
index e59af9e38d9..17a81045fb1 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 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"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~sh ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~m68k ~s390 ~sh ~x86"
 IUSE="libressl nls pkcs11 debug"
 
 DEPEND=">=app-crypt/trousers-0.3.0

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/, app-crypt/tpm-tools/files/

2018-12-08 Thread Alon Bar-Lev 
commit: 46685dd4934db31ab2c732f28a1a7909750e4c59
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Sat Dec  8 21:40:59 2018 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Sat Dec  8 21:41:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46685dd4

app-crypt/tpm-tools: support openssl-1.1

Closes: https://bugs.gentoo.org/show_bug.cgi?id=672756
Signed-off-by: Alon Bar-Lev  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../files/tpm-tools-1.3.9.1-openssl-1.1.patch  | 241 +
 app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild|  51 +
 2 files changed, 292 insertions(+)

diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch 
b/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch
new file mode 100644
index 000..a5747dbca70
--- /dev/null
+++ b/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch
@@ -0,0 +1,241 @@
+From 31d9cebc43833de939a0e13be0110ed830b66cbd Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev 
+Date: Sat, 8 Dec 2018 23:28:54 +0200
+Subject: [PATCH] data_import.c: support openssl-1.1
+
+Signed-off-by: Alon Bar-Lev 
+Bug: https://sourceforge.net/p/trousers/bugs/227/
+---
+ src/data_mgmt/data_import.c | 159 +---
+ 1 file changed, 112 insertions(+), 47 deletions(-)
+
+diff --git a/src/data_mgmt/data_import.c b/src/data_mgmt/data_import.c
+index f534717..33c76e7 100644
+--- a/src/data_mgmt/data_import.c
 b/src/data_mgmt/data_import.c
+@@ -39,6 +39,30 @@
+ #include 
+ #include 
+ 
++#if OPENSSL_VERSION_NUMBER < 0x1010L || (defined(LIBRESSL_VERSION_NUMBER) 
&& LIBRESSL_VERSION_NUMBER < 0x2070L)
++static void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, 
const BIGNUM **d) {
++  if ( n )
++  *n = r->n;
++  if ( e )
++  *e = r->e;
++  if ( d )
++  *d = r->d;
++}
++static void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM 
**q) {
++  if ( p )
++  *p = r->p;
++  if ( q )
++  *q = r->q;
++}
++static void RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const 
BIGNUM **dmq1, const BIGNUM **iqmp) {
++  if ( dmp1 )
++  *dmp1 = r->dmp1;
++  if ( dmq1 )
++  *dmq1 = r->dmq1;
++  if ( iqmp )
++  *iqmp = r->iqmp;
++}
++#endif
+ 
+ /*
+  * Global variables
+@@ -372,7 +396,7 @@ readX509Cert( const char  *a_pszFile,
+   goto out;
+   }
+ 
+-  if ( EVP_PKEY_type( pKey->type ) != EVP_PKEY_RSA ) {
++  if ( EVP_PKEY_base_id( pKey ) != EVP_PKEY_RSA ) {
+   logError( TOKEN_RSA_KEY_ERROR );
+ 
+   X509_free( pX509 );
+@@ -691,17 +715,35 @@ createRsaPubKeyObject( RSA   *a_pRsa,
+ 
+   int  rc = -1;
+ 
+-  int  nLen = BN_num_bytes( a_pRsa->n );
+-  int  eLen = BN_num_bytes( a_pRsa->e );
++  const BIGNUM *bn;
++  const BIGNUM *be;
++  int  nLen;
++  int  eLen;
++  CK_BYTE *n = NULL;
++  CK_BYTE *e = NULL;
++
++  RSA_get0_key( a_pRsa, , , NULL );
++
++  nLen = BN_num_bytes( bn );
++  eLen = BN_num_bytes( be );
++  n = malloc( nLen );
++  e = malloc( eLen );
++
++  if ( !n || !e ) {
++  logError( TOKEN_MEMORY_ERROR );
++  goto out;
++  }
++
++  // Get binary representations of the RSA key information
++  BN_bn2bin( bn, n );
++  BN_bn2bin( be, e );
+ 
++  {
+   CK_RV  rv;
+ 
+   CK_BBOOL  bTrue  = TRUE;
+   CK_BBOOL  bFalse = FALSE;
+ 
+-  CK_BYTE *n = malloc( nLen );
+-  CK_BYTE *e = malloc( eLen );
+-
+   CK_OBJECT_CLASS  clPubClass  = CKO_PUBLIC_KEY;
+   CK_KEY_TYPE  tKeyType= CKK_RSA;
+   CK_BBOOL bPrivate= ( !g_bPublic ) ? TRUE : FALSE;
+@@ -726,21 +768,13 @@ createRsaPubKeyObject( RSA   *a_pRsa,
+ 
+   *a_hObject = 0;
+ 
+-  if ( !n || !e ) {
+-  logError( TOKEN_MEMORY_ERROR );
+-  goto out;
+-  }
+-
+-  // Get binary representations of the RSA key information
+-  BN_bn2bin( a_pRsa->n, n );
+-  BN_bn2bin( a_pRsa->e, e );
+-
+   // Create the RSA public key object
+   rv = createObject( a_hSession, tAttr, ulAttrCount, a_hObject );
+   if ( rv != CKR_OK )
+   goto out;
+ 
+   rc = 0;
++  }
+ 
+ out:
+   free( n );
+@@ -760,29 +794,74 @@ createRsaPrivKeyObject( RSA   *a_pRsa,
+ 
+   int  rc = -1;
+ 
+-  int  nLen = BN_num_bytes( a_pRsa->n );
+-  int  eLen = BN_num_bytes( a_pRsa->e );
+-  int  dLen = BN_num_bytes( a_pRsa->d );
+-  int  pLen = BN_num_bytes( a_pRsa->p );
+-  int  qLen = BN_num_bytes( a_pRsa->q );
+-  int  dmp1Len = BN_num_bytes( a_pRsa->dmp1 );
+-  int  dmq1Len = BN_num_bytes( a_pRsa->dmq1 );
+-  int  iqmpLen = BN_num_bytes( a_pRsa->iqmp );
++  const BIGNUM *bn;
++  const BIGNUM *be;
++  const BIGNUM *bd;
++

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2018-09-27 Thread Alon Bar-Lev 
commit: 45cd1dd9d55b18ddfe2109e86b9fe382900eed06
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Sun Sep 23 13:47:33 2018 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Thu Sep 27 23:51:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45cd1dd9

app-crypt/tpm-tools: eapi bump

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild | 18 +++---
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
index eac3a3944ab..3be16cf93ed 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools flag-o-matic ltprune
+inherit autotools flag-o-matic
 
 DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
 HOMEPAGE="http://trousers.sourceforge.net;
@@ -14,16 +14,12 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 ~sh x86"
 IUSE="libressl nls pkcs11 debug"
 
-COMMON_DEPEND="
-   >=app-crypt/trousers-0.3.0
+DEPEND=">=app-crypt/trousers-0.3.0
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
-   pkcs11? ( dev-libs/opencryptoki )
-   "
-RDEPEND="${COMMON_DEPEND}
-   nls? ( virtual/libintl )"
-DEPEND="${COMMON_DEPEND}
-   nls? ( sys-devel/gettext )"
+   pkcs11? ( dev-libs/opencryptoki )"
+RDEPEND="${DEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 S="${WORKDIR}"
 
@@ -47,5 +43,5 @@ src_configure() {
 
 src_install() {
default
-   prune_libtool_files
+   find "${D}" -name '*.la' -delete || die
 }

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/files/

2018-09-11 Thread Alon Bar-Lev 
commit: 8b59a66a410b696f8f4face3dd681cf62249cbea
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Sep 11 17:15:51 2018 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Tue Sep 11 17:25:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b59a66a

app-crypt/tpm-tools: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/9827

 app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch | 10 --
 1 file changed, 10 deletions(-)

diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch 
b/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
deleted file mode 100644
index 1745c690e57..000
--- a/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index cef6a2f..d7092a7 100644
 a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -80,4 +80,4 @@ endif
- # Unseal library - for addition to existing apps, counter part of seal cmd
- libtpm_unseal_la_SOURCES =tpm_unseal.c
- libtpm_unseal_la_LDFLAGS =-shared -version-info 1:0:0
--libtpm_unseal_la_LIBADD  =-ltspi  libtpm_tspi.la @INTLLIBS@
-+libtpm_unseal_la_LIBADD  =-ltspi  libtpm_tspi.la -lcrypto @INTLLIBS@

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2018-08-24 Thread Alon Bar-Lev 
commit: 52bfba3f97019b516ee8c0fd009126d37e21da96
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Fri Aug 24 18:36:14 2018 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Sat Aug 25 03:58:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52bfba3f

app-crypt/tpm-tools: cleanup old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-crypt/tpm-tools/Manifest   |  1 -
 app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild | 55 --
 2 files changed, 56 deletions(-)

diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index 53518912814..4d121ec3312 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1,2 +1 @@
 DIST tpm-tools-1.3.9.1.tar.gz 482859 BLAKE2B 
ee915679e23bead04672bf719ce59bb6f20b550be39855b5304caeff554bf54d3cfe9104d464af7762388995e51d2bed0f9bedad83e42146cb7457382d09f4b2
 SHA512 
63a9c0e761cd890cc0a218de79a9c0169e151aba7824c19bf6b7ec894cf41c4950de1f63bd849aa93a4bdff36cf0fe557bc17113912b6d77f57f2bf1190b6a08
-DIST tpm-tools-1.3.9.tar.gz 484023 BLAKE2B 
5f9809a8dd4c565c647ceb394e6a6086cd42d256feb39599331b979f73150f60881ba9f25a3b0171173d66da8718f1475c6945b243b86c2261c4e8c489802803
 SHA512 
460e56031aa65ede6b7aebf0c594d4093d870fb46f7c453c429e53cca442d4c7797ac29b519bca28d42133bc6d7701cdf938adbdf11f8be841157d4f4a3e17ca

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
deleted file mode 100644
index ff712c720ce..000
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic ltprune
-
-DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
-HOMEPAGE="http://trousers.sourceforge.net;
-SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 ~sh x86"
-IUSE="libressl nls pkcs11 debug"
-
-COMMON_DEPEND="
-   >=app-crypt/trousers-0.3.0
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   pkcs11? ( dev-libs/opencryptoki )
-   "
-RDEPEND="${COMMON_DEPEND}
-   nls? ( virtual/libintl )"
-DEPEND="${COMMON_DEPEND}
-   nls? ( sys-devel/gettext )"
-
-PATCHES=(
-   "${FILESDIR}/${P}-gold.patch"
-)
-
-S="${WORKDIR}"
-
-src_prepare() {
-   default
-
-   sed -i -r \
-   -e '/CFLAGS/s/ -m64//' \
-   configure.ac || die
-
-   eautoreconf
-}
-
-src_configure() {
-   append-cppflags $(usex debug -DDEBUG -DNDEBUG)
-
-   econf \
-   $(use_enable nls) \
-   $(use pkcs11 || echo --disable-pkcs11-support)
-}
-
-src_install() {
-   default
-   prune_libtool_files
-}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2018-08-22 Thread Mart Raudsepp 
commit: f706724f2322f0d2091006275fa0a6d7727cdef1
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed Aug 22 18:14:02 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Aug 22 19:19:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f706724f

app-crypt/tpm-tools-1.3.9.1: arm64 stable (bug #663600)

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
index 6b5020fa6e6..eac3a3944ab 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~m68k ~s390 ~sh x86"
+KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 ~sh x86"
 IUSE="libressl nls pkcs11 debug"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2018-08-16 Thread Mikle Kolyada 
commit: 85bc8738395d0e4ff3c9ff5e756a84e2b12afecb
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Aug 17 00:20:01 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Aug 17 00:20:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85bc8738

app-crypt/tpm-tools: amd64 stable wrt bug #663600

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
index 985d505f152..6b5020fa6e6 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~sh x86"
+KEYWORDS="amd64 ~arm ~arm64 ~m68k ~s390 ~sh x86"
 IUSE="libressl nls pkcs11 debug"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2018-08-15 Thread Thomas Deutschmann 
commit: 2f3125c3735871e70ff3a7df1332770a1dec56bd
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Aug 16 00:17:14 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Aug 16 00:17:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f3125c3

app-crypt/tpm-tools: x86 stable (bug #663600)

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
index 4b922742df4..985d505f152 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~sh ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~sh x86"
 IUSE="libressl nls pkcs11 debug"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2018-04-23 Thread Alon Bar-Lev 
commit: 7c832997cc88ac284da61b772ca6c8dc98ad8765
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Mon Apr 23 11:02:01 2018 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Mon Apr 23 11:02:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c832997

app-crypt/tpm-tools: version bump

Thanks-To: Edward Kigwana
Closes: https://bugs.gentoo.org/649702
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-crypt/tpm-tools/Manifest |  1 +
 app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild | 51 
 2 files changed, 52 insertions(+)

diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index 72623e1db74..53518912814 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1 +1,2 @@
+DIST tpm-tools-1.3.9.1.tar.gz 482859 BLAKE2B 
ee915679e23bead04672bf719ce59bb6f20b550be39855b5304caeff554bf54d3cfe9104d464af7762388995e51d2bed0f9bedad83e42146cb7457382d09f4b2
 SHA512 
63a9c0e761cd890cc0a218de79a9c0169e151aba7824c19bf6b7ec894cf41c4950de1f63bd849aa93a4bdff36cf0fe557bc17113912b6d77f57f2bf1190b6a08
 DIST tpm-tools-1.3.9.tar.gz 484023 BLAKE2B 
5f9809a8dd4c565c647ceb394e6a6086cd42d256feb39599331b979f73150f60881ba9f25a3b0171173d66da8718f1475c6945b243b86c2261c4e8c489802803
 SHA512 
460e56031aa65ede6b7aebf0c594d4093d870fb46f7c453c429e53cca442d4c7797ac29b519bca28d42133bc6d7701cdf938adbdf11f8be841157d4f4a3e17ca

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
new file mode 100644
index 000..4b922742df4
--- /dev/null
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic ltprune
+
+DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
+HOMEPAGE="http://trousers.sourceforge.net;
+SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~sh ~x86"
+IUSE="libressl nls pkcs11 debug"
+
+COMMON_DEPEND="
+   >=app-crypt/trousers-0.3.0
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   pkcs11? ( dev-libs/opencryptoki )
+   "
+RDEPEND="${COMMON_DEPEND}
+   nls? ( virtual/libintl )"
+DEPEND="${COMMON_DEPEND}
+   nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}"
+
+src_prepare() {
+   default
+
+   sed -i -r \
+   -e '/CFLAGS/s/ -m64//' \
+   configure.ac || die
+
+   eautoreconf
+}
+
+src_configure() {
+   append-cppflags $(usex debug -DDEBUG -DNDEBUG)
+
+   econf \
+   $(use_enable nls) \
+   $(use pkcs11 || echo --disable-pkcs11-support)
+}
+
+src_install() {
+   default
+   prune_libtool_files
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2017-03-25 Thread Alon Bar-Lev 
commit: faa75bc7dd0946c42d65720538d45911febba612
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Sat Mar 25 18:00:19 2017 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Sat Mar 25 18:11:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faa75bc7

app-crypt/tpm-tools: use ltprune

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
index d19eff06625..ff712c720ce 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools eutils flag-o-matic
+inherit autotools flag-o-matic ltprune
 
 DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
 HOMEPAGE="http://trousers.sourceforge.net;

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/files/, app-crypt/tpm-tools/

2017-03-15 Thread Alon Bar-Lev 
commit: 6754d3ce6adfc42aa7c7c8a3fd1982e1f9a3780e
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Wed Mar 15 18:27:26 2017 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Wed Mar 15 18:27:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6754d3ce

app-crypt/tpm-tools: cleanup

Bug: 611492

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-crypt/tpm-tools/Manifest   |  1 -
 .../tpm-tools/files/tpm-tools-1.3.8-build.patch| 10 -
 .../tpm-tools/files/tpm-tools-1.3.8-gold.patch | 10 -
 app-crypt/tpm-tools/tpm-tools-1.3.8-r1.ebuild  | 52 --
 app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild | 51 -
 5 files changed, 124 deletions(-)

diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index 7218765a3ab..49a9b1ffab2 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1,2 +1 @@
-DIST tpm-tools-1.3.8.tar.gz 473339 SHA256 
66eb4ff095542403db6b4bd4b574e8a5c08084fe4e9e5aa9a829ee84e20bea83 SHA512 
727113625645b01f8e77817d7f1cc6a8bf814f96061754fdfefceb125da4eebbea54804d1fec9e36559ffd61801b318bbc327907a3bdd661f872c32f811c7e74
 WHIRLPOOL 
201677976c97961a20578f7ca1b4dd0a8a9b105a718c0c67c34b9f1de0c75332532c62389711f732c99edda8fe45639dd3c8293df0a62a11f88ed4c9dc987270
 DIST tpm-tools-1.3.9.tar.gz 484023 SHA256 
ea126c5cd2ada56beb5118a141a498053f2d85f56263d215784f0ed86fff4213 SHA512 
460e56031aa65ede6b7aebf0c594d4093d870fb46f7c453c429e53cca442d4c7797ac29b519bca28d42133bc6d7701cdf938adbdf11f8be841157d4f4a3e17ca
 WHIRLPOOL 
96760809fb5f2029f51a4051621cb4dd3a39af08d2ecb091619f848d541b2bd1d6f5e9cbd2606fcde2fb55c554cb3baf74c8b58ec29660d95c42bfad178bd96c

diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.8-build.patch 
b/app-crypt/tpm-tools/files/tpm-tools-1.3.8-build.patch
deleted file mode 100644
index 928f94f8e69..000
--- a/app-crypt/tpm-tools/files/tpm-tools-1.3.8-build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 a/src/tpm_mgmt/tpm_nvread.c2015-06-07 13:00:30.250314575 +
-+++ b/src/tpm_mgmt/tpm_nvread.c2015-06-07 12:54:45.590302275 +
-@@ -23,6 +23,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include "tpm_nvcommon.h"
- #include "tpm_tspi.h"

diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.8-gold.patch 
b/app-crypt/tpm-tools/files/tpm-tools-1.3.8-gold.patch
deleted file mode 100644
index bc52c30f4fc..000
--- a/app-crypt/tpm-tools/files/tpm-tools-1.3.8-gold.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index cef6a2f..d7092a7 100644
 a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -80,4 +80,4 @@ endif
- # Unseal library - for addition to existing apps, counter part of seal cmd
- libtpm_unseal_la_SOURCES =tpm_unseal.c
- libtpm_unseal_la_LDFLAGS =-shared -version-info 1:0:0
--libtpm_unseal_la_LIBADD  =-ltspi  libtpm_tspi.la
-+libtpm_unseal_la_LIBADD  =-ltspi  libtpm_tspi.la -lcrypto

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.8-r1.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.8-r1.ebuild
deleted file mode 100644
index e5e76501c9f..000
--- a/app-crypt/tpm-tools/tpm-tools-1.3.8-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
-HOMEPAGE="http://trousers.sourceforge.net;
-SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~sh ~x86"
-IUSE="libressl nls pkcs11 debug"
-
-COMMON_DEPEND="
-   >=app-crypt/trousers-0.3.0
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   pkcs11? ( dev-libs/opencryptoki )
-   "
-RDEPEND="${COMMON_DEPEND}
-   nls? ( virtual/libintl )"
-DEPEND="${COMMON_DEPEND}
-   nls? ( sys-devel/gettext )"
-
-src_prepare() {
-   sed -i -r \
-   -e '/CFLAGS/s/ -(Werror|m64)//' \
-   configure.in || die
-   epatch "${FILESDIR}/${P}-gold.patch"
-   epatch "${FILESDIR}/${P}-build.patch"
-
-   eautoreconf
-}
-
-src_configure() {
-   local myconf
-   # don't use --enable-pkcs11-support, configure is a mess.
-   use pkcs11 || myconf+=" --disable-pkcs11-support"
-
-   append-cppflags $(usex debug -DDEBUG -DNDEBUG)
-
-   econf \
-   $(use_enable nls) \
-   ${myconf}
-}
-
-src_install() {
-   default
-   rm -f "${ED}"/usr/lib*/libtpm_unseal.la
-}

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild
deleted file mode 100644
index 2b48a9e19b2..000
--- a/app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2017-03-15 Thread Michael Weber 
commit: 30c0949e9ce19b5edd71bb6937d41e9636238de3
Author: Michael Weber  gentoo  org>
AuthorDate: Wed Mar 15 14:29:55 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Wed Mar 15 14:34:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30c0949e

app-crypt/tpm-tools: arm64 stable (bug 611492).

Package-Manager: Portage-2.3.4, Repoman-2.3.2
RepoMan-Options: --include-arches="arm64"

 app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
index 30f0c7ee052..d19eff06625 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~m68k ~s390 ~sh x86"
+KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 ~sh x86"
 IUSE="libressl nls pkcs11 debug"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2017-03-04 Thread Agostino Sarubbo 
commit: 12c212ca51aa6fab60f9ebed47c1525dc463fe5c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Mar  4 13:44:09 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Mar  4 13:44:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12c212ca

app-crypt/tpm-tools: x86 stable wrt bug #611492

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
index ca9e5c1bc2e..30f0c7ee052 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~m68k ~s390 ~sh ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~m68k ~s390 ~sh x86"
 IUSE="libressl nls pkcs11 debug"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2017-03-04 Thread Agostino Sarubbo 
commit: be0bebefc774fcb2d9551e521c192e6bce0c6ba1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Mar  4 13:35:07 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Mar  4 13:38:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be0bebef

app-crypt/tpm-tools: amd64 stable wrt bug #611492

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
index 7cec3550bbe..ca9e5c1bc2e 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~sh ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~m68k ~s390 ~sh ~x86"
 IUSE="libressl nls pkcs11 debug"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/files/

2016-12-07 Thread Alon Bar-Lev 
commit: 661388c0f554646131627f4276ed5d14bdc6dffa
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Wed Dec  7 19:35:44 2016 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Wed Dec  7 19:37:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=661388c0

Revert "app-crypt/tpm-tools: hopefully better gold support"

This reverts commit c36af760171e28c16a6c386b0fdebe81b68555a4.

 .../tpm-tools/files/tpm-tools-1.3.9-gold.patch | 98 +-
 1 file changed, 2 insertions(+), 96 deletions(-)

diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch 
b/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
index 8f999a8..1745c69 100644
--- a/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
+++ b/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
@@ -1,57 +1,5 @@
-From 4cf41d367e3248fecee7620501d12449c374c055 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev 
-Date: Tue, 6 Dec 2016 09:38:06 +0200
-Subject: [PATCH] build: -lcrypto is required for tspi
-
-Signed-off-by: Alon Bar-Lev 

- configure.ac  | 13 +
- lib/Makefile.am   |  2 +-
- src/cmds/Makefile.am  |  2 +-
- src/data_mgmt/Makefile.am |  2 +-
- src/tpm_mgmt/Makefile.am  |  2 +-
- 5 files changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 279954a..99f9c4b 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -90,14 +90,22 @@ AC_ARG_WITH(openssl,
-   AC_MSG_ERROR([$OPENSSL_INCLUDE_DIR or $OPENSSL_LIB_DIR 
doen't exist!])
-   else
-   AC_MSG_RESULT([yes])
--  CFLAGS="$CFLAGS -L$OPENSSL_LIB_DIR -I$OPENSSL_INCLUDE_DIR"
-+  CFLAGS="$CFLAGS -I$OPENSSL_INCLUDE_DIR"
-+  LDFLAGS="$LDFLAGS -L$OPENSSL_LIB_DIR"
-   AC_SUBST([OPENSSL_LIB_DIR])
-   fi],
-   [AC_MSG_RESULT([no])
-   AC_SUBST([OPENSSL_LIB_DIR], []) ] )
- 
-+AC_CHECK_LIB(crypto, PEM_read_X509, [OPENSSL_LIB="1"], [AC_MSG_ERROR([openssl 
lib not found: libcrypto.so])])
-+AC_CHECK_HEADER(openssl/evp.h, [OPENSSL_INC="1"], [AC_MSG_ERROR([openssl 
header not found: openssl/evp.h])])
-+
-+OLD_LIBS="$LIBS"
-+LIBS="$LIBS -lcrypto"
- AC_CHECK_LIB(tspi, Tspi_Context_Create, [TSS_LIB="1"], [AC_MSG_ERROR([tss lib 
not found: libtspi.so])])
- AC_CHECK_LIB(tspi, Tspi_TPM_SetOperatorAuth, [TSS_12="1"], [TSS_12="0"])
-+AC_SUBST([TSPI_LIBS], ["-ltspi -lcrypto"])
-+LIBS="$OLD_LIBS"
- if test "$TSS_12" = "1"; then
-   AM_CONDITIONAL(TSS_LIB_IS_12, true)
-   AC_MSG_NOTICE([Configuring tpm-tools for TSS 1.2])
-@@ -107,9 +115,6 @@ else
- fi
- AC_CHECK_HEADER(trousers/tss.h, [TSS_INC="1"], [AC_MSG_ERROR([tss header not 
found: trousers/tss.h])])
- 
--AC_CHECK_LIB(crypto, PEM_read_X509, [OPENSSL_LIB="1"], [AC_MSG_ERROR([openssl 
lib not found: libcrypto.so])])
--AC_CHECK_HEADER(openssl/evp.h, [OPENSSL_INC="1"], [AC_MSG_ERROR([openssl 
header not found: openssl/evp.h])])
--
- OPENCRYPTOKI="0"
- AC_ARG_ENABLE(pkcs11_support, 
-   AC_HELP_STRING([--disable-pkcs11-support], [don't build data_mgmt commands 
[[default=no]]]),
 diff --git a/lib/Makefile.am b/lib/Makefile.am
-index c1d7009..af9bc49 100644
+index cef6a2f..d7092a7 100644
 --- a/lib/Makefile.am
 +++ b/lib/Makefile.am
 @@ -80,4 +80,4 @@ endif
@@ -59,46 +7,4 @@ index c1d7009..af9bc49 100644
  libtpm_unseal_la_SOURCES =tpm_unseal.c
  libtpm_unseal_la_LDFLAGS =-shared -version-info 1:0:0
 -libtpm_unseal_la_LIBADD  =-ltspi  libtpm_tspi.la @INTLLIBS@
-+libtpm_unseal_la_LIBADD  =libtpm_tspi.la -lcrypto @TSPI_LIBS@ @INTLLIBS@
-diff --git a/src/cmds/Makefile.am b/src/cmds/Makefile.am
-index 27fc9ef..d7508bf 100644
 a/src/cmds/Makefile.am
-+++ b/src/cmds/Makefile.am
-@@ -30,7 +30,7 @@ else
- AM_CPPFLAGS   =   -I$(top_srcdir)/include -D_LINUX
- endif
- 
--LDADD =   $(top_builddir)/lib/libtpm_tspi.la -ltspi 
$(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto @INTLLIBS@
-+LDADD =   $(top_builddir)/lib/libtpm_tspi.la 
$(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto @TSPI_LIBS@ 
@INTLLIBS@
- 
- tpm_sealdata_SOURCES = tpm_sealdata.c
- tpm_unsealdata_SOURCES = tpm_unsealdata.c
-diff --git a/src/data_mgmt/Makefile.am b/src/data_mgmt/Makefile.am
-index de505e4..765a2fa 100644
 a/src/data_mgmt/Makefile.am
-+++ b/src/data_mgmt/Makefile.am
-@@ -38,7 +38,7 @@ noinst_HEADERS = data_common.h \
- # Common build flags
- AM_CPPFLAGS   =   -I$(top_srcdir)/include -D_LINUX
- 
--LDADD =   $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl 
@INTLLIBS@
-+LDADD =   $(top_builddir)/lib/libtpm_pkcs11.la @TSPI_LIBS@ -ldl 
@INTLLIBS@
- 
- 
- #
-diff --git a/src/tpm_mgmt/Makefile.am b/src/tpm_mgmt/Makefile.am
-index 7ca47c9..6205b64 100644
 a/src/tpm_mgmt/Makefile.am
-+++ b/src/tpm_mgmt/Makefile.am
-@@ -55,7 +55,7 @@ else
- AM_CPPFLAGS   =   -I$(top_srcdir)/include -D_LINUX
- endif
-

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/files/

2016-12-06 Thread Alon Bar-Lev 
commit: c36af760171e28c16a6c386b0fdebe81b68555a4
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Tue Dec  6 07:55:34 2016 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Tue Dec  6 07:55:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c36af760

app-crypt/tpm-tools: hopefully better gold support

Bug: 601776

Package-Manager: portage-2.3.0

 .../tpm-tools/files/tpm-tools-1.3.9-gold.patch | 98 +-
 1 file changed, 96 insertions(+), 2 deletions(-)

diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch 
b/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
index 1745c69..8f999a8 100644
--- a/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
+++ b/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
@@ -1,5 +1,57 @@
+From 4cf41d367e3248fecee7620501d12449c374c055 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev 
+Date: Tue, 6 Dec 2016 09:38:06 +0200
+Subject: [PATCH] build: -lcrypto is required for tspi
+
+Signed-off-by: Alon Bar-Lev 
+---
+ configure.ac  | 13 +
+ lib/Makefile.am   |  2 +-
+ src/cmds/Makefile.am  |  2 +-
+ src/data_mgmt/Makefile.am |  2 +-
+ src/tpm_mgmt/Makefile.am  |  2 +-
+ 5 files changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 279954a..99f9c4b 100644
+--- a/configure.ac
 b/configure.ac
+@@ -90,14 +90,22 @@ AC_ARG_WITH(openssl,
+   AC_MSG_ERROR([$OPENSSL_INCLUDE_DIR or $OPENSSL_LIB_DIR 
doen't exist!])
+   else
+   AC_MSG_RESULT([yes])
+-  CFLAGS="$CFLAGS -L$OPENSSL_LIB_DIR -I$OPENSSL_INCLUDE_DIR"
++  CFLAGS="$CFLAGS -I$OPENSSL_INCLUDE_DIR"
++  LDFLAGS="$LDFLAGS -L$OPENSSL_LIB_DIR"
+   AC_SUBST([OPENSSL_LIB_DIR])
+   fi],
+   [AC_MSG_RESULT([no])
+   AC_SUBST([OPENSSL_LIB_DIR], []) ] )
+ 
++AC_CHECK_LIB(crypto, PEM_read_X509, [OPENSSL_LIB="1"], [AC_MSG_ERROR([openssl 
lib not found: libcrypto.so])])
++AC_CHECK_HEADER(openssl/evp.h, [OPENSSL_INC="1"], [AC_MSG_ERROR([openssl 
header not found: openssl/evp.h])])
++
++OLD_LIBS="$LIBS"
++LIBS="$LIBS -lcrypto"
+ AC_CHECK_LIB(tspi, Tspi_Context_Create, [TSS_LIB="1"], [AC_MSG_ERROR([tss lib 
not found: libtspi.so])])
+ AC_CHECK_LIB(tspi, Tspi_TPM_SetOperatorAuth, [TSS_12="1"], [TSS_12="0"])
++AC_SUBST([TSPI_LIBS], ["-ltspi -lcrypto"])
++LIBS="$OLD_LIBS"
+ if test "$TSS_12" = "1"; then
+   AM_CONDITIONAL(TSS_LIB_IS_12, true)
+   AC_MSG_NOTICE([Configuring tpm-tools for TSS 1.2])
+@@ -107,9 +115,6 @@ else
+ fi
+ AC_CHECK_HEADER(trousers/tss.h, [TSS_INC="1"], [AC_MSG_ERROR([tss header not 
found: trousers/tss.h])])
+ 
+-AC_CHECK_LIB(crypto, PEM_read_X509, [OPENSSL_LIB="1"], [AC_MSG_ERROR([openssl 
lib not found: libcrypto.so])])
+-AC_CHECK_HEADER(openssl/evp.h, [OPENSSL_INC="1"], [AC_MSG_ERROR([openssl 
header not found: openssl/evp.h])])
+-
+ OPENCRYPTOKI="0"
+ AC_ARG_ENABLE(pkcs11_support, 
+   AC_HELP_STRING([--disable-pkcs11-support], [don't build data_mgmt commands 
[[default=no]]]),
 diff --git a/lib/Makefile.am b/lib/Makefile.am
-index cef6a2f..d7092a7 100644
+index c1d7009..af9bc49 100644
 --- a/lib/Makefile.am
 +++ b/lib/Makefile.am
 @@ -80,4 +80,4 @@ endif
@@ -7,4 +59,46 @@ index cef6a2f..d7092a7 100644
  libtpm_unseal_la_SOURCES =tpm_unseal.c
  libtpm_unseal_la_LDFLAGS =-shared -version-info 1:0:0
 -libtpm_unseal_la_LIBADD  =-ltspi  libtpm_tspi.la @INTLLIBS@
-+libtpm_unseal_la_LIBADD  =-ltspi  libtpm_tspi.la -lcrypto @INTLLIBS@
++libtpm_unseal_la_LIBADD  =libtpm_tspi.la -lcrypto @TSPI_LIBS@ @INTLLIBS@
+diff --git a/src/cmds/Makefile.am b/src/cmds/Makefile.am
+index 27fc9ef..d7508bf 100644
+--- a/src/cmds/Makefile.am
 b/src/cmds/Makefile.am
+@@ -30,7 +30,7 @@ else
+ AM_CPPFLAGS   =   -I$(top_srcdir)/include -D_LINUX
+ endif
+ 
+-LDADD =   $(top_builddir)/lib/libtpm_tspi.la -ltspi 
$(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto @INTLLIBS@
++LDADD =   $(top_builddir)/lib/libtpm_tspi.la 
$(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto @TSPI_LIBS@ 
@INTLLIBS@
+ 
+ tpm_sealdata_SOURCES = tpm_sealdata.c
+ tpm_unsealdata_SOURCES = tpm_unsealdata.c
+diff --git a/src/data_mgmt/Makefile.am b/src/data_mgmt/Makefile.am
+index de505e4..765a2fa 100644
+--- a/src/data_mgmt/Makefile.am
 b/src/data_mgmt/Makefile.am
+@@ -38,7 +38,7 @@ noinst_HEADERS = data_common.h \
+ # Common build flags
+ AM_CPPFLAGS   =   -I$(top_srcdir)/include -D_LINUX
+ 
+-LDADD =   $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl 
@INTLLIBS@
++LDADD =   $(top_builddir)/lib/libtpm_pkcs11.la @TSPI_LIBS@ -ldl 
@INTLLIBS@
+ 
+ 
+ #
+diff --git a/src/tpm_mgmt/Makefile.am b/src/tpm_mgmt/Makefile.am
+index 7ca47c9..6205b64 100644
+--- a/src/tpm_mgmt/Makefile.am
 b/src/tpm_mgmt/Makefile.am
+@@ -55,7 +55,7 @@ else
+ AM_CPPFLAGS   =

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/, app-crypt/tpm-tools/files/

2016-12-05 Thread Alon Bar-Lev 
commit: 2d3830eedbe2d38207d02c355f7d90feaf0ce25b
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Mon Dec  5 18:45:23 2016 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Mon Dec  5 18:45:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d3830ee

app-crypt/tpm-tools: version bump

Bug: 601538
Thanks: Conrad Kostecki

Package-Manager: portage-2.3.0

 app-crypt/tpm-tools/Manifest   |  1 +
 .../tpm-tools/files/tpm-tools-1.3.9-gold.patch | 10 
 app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild | 56 ++
 3 files changed, 67 insertions(+)

diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index 91d8e0f..7218765 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1 +1,2 @@
 DIST tpm-tools-1.3.8.tar.gz 473339 SHA256 
66eb4ff095542403db6b4bd4b574e8a5c08084fe4e9e5aa9a829ee84e20bea83 SHA512 
727113625645b01f8e77817d7f1cc6a8bf814f96061754fdfefceb125da4eebbea54804d1fec9e36559ffd61801b318bbc327907a3bdd661f872c32f811c7e74
 WHIRLPOOL 
201677976c97961a20578f7ca1b4dd0a8a9b105a718c0c67c34b9f1de0c75332532c62389711f732c99edda8fe45639dd3c8293df0a62a11f88ed4c9dc987270
+DIST tpm-tools-1.3.9.tar.gz 484023 SHA256 
ea126c5cd2ada56beb5118a141a498053f2d85f56263d215784f0ed86fff4213 SHA512 
460e56031aa65ede6b7aebf0c594d4093d870fb46f7c453c429e53cca442d4c7797ac29b519bca28d42133bc6d7701cdf938adbdf11f8be841157d4f4a3e17ca
 WHIRLPOOL 
96760809fb5f2029f51a4051621cb4dd3a39af08d2ecb091619f848d541b2bd1d6f5e9cbd2606fcde2fb55c554cb3baf74c8b58ec29660d95c42bfad178bd96c

diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch 
b/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
new file mode 100644
index ..1745c69
--- /dev/null
+++ b/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
@@ -0,0 +1,10 @@
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index cef6a2f..d7092a7 100644
+--- a/lib/Makefile.am
 b/lib/Makefile.am
+@@ -80,4 +80,4 @@ endif
+ # Unseal library - for addition to existing apps, counter part of seal cmd
+ libtpm_unseal_la_SOURCES =tpm_unseal.c
+ libtpm_unseal_la_LDFLAGS =-shared -version-info 1:0:0
+-libtpm_unseal_la_LIBADD  =-ltspi  libtpm_tspi.la @INTLLIBS@
++libtpm_unseal_la_LIBADD  =-ltspi  libtpm_tspi.la -lcrypto @INTLLIBS@

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
new file mode 100644
index ..22944bd
--- /dev/null
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
+HOMEPAGE="http://trousers.sourceforge.net;
+SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~sh ~x86"
+IUSE="libressl nls pkcs11 debug"
+
+COMMON_DEPEND="
+   >=app-crypt/trousers-0.3.0
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   pkcs11? ( dev-libs/opencryptoki )
+   "
+RDEPEND="${COMMON_DEPEND}
+   nls? ( virtual/libintl )"
+DEPEND="${COMMON_DEPEND}
+   nls? ( sys-devel/gettext )"
+
+PATCHES=(
+   "${FILESDIR}/${P}-gold.patch"
+)
+
+S="${WORKDIR}"
+
+src_prepare() {
+   default
+
+   sed -i -r \
+   -e '/CFLAGS/s/ -m64//' \
+   configure.ac || die
+
+   eautoreconf
+}
+
+src_configure() {
+   append-cppflags $(usex debug -DDEBUG -DNDEBUG)
+
+   econf \
+   $(use_enable nls) \
+   $(use pkcs11 || echo --disable-pkcs11-support)
+}
+
+src_install() {
+   default
+   prune_libtool_files
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/

2016-06-03 Thread Anthony G. Basile 
commit: 511ae892e46b82189e199a76f0f505ffd6e9f73d
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Jun  3 14:51:03 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Jun  3 14:51:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=511ae892

app-crypt/tpm-tools: add libressl support

Package-Manager: portage-2.2.28

 app-crypt/tpm-tools/tpm-tools-1.3.8-r1.ebuild | 53 +++
 1 file changed, 53 insertions(+)

diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.8-r1.ebuild 
b/app-crypt/tpm-tools/tpm-tools-1.3.8-r1.ebuild
new file mode 100644
index 000..96502e1
--- /dev/null
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.8-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
+HOMEPAGE="http://trousers.sourceforge.net;
+SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~sh ~x86"
+IUSE="libressl nls pkcs11 debug"
+
+COMMON_DEPEND="
+   >=app-crypt/trousers-0.3.0
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   pkcs11? ( dev-libs/opencryptoki )
+   "
+RDEPEND="${COMMON_DEPEND}
+   nls? ( virtual/libintl )"
+DEPEND="${COMMON_DEPEND}
+   nls? ( sys-devel/gettext )"
+
+src_prepare() {
+   sed -i -r \
+   -e '/CFLAGS/s/ -(Werror|m64)//' \
+   configure.in || die
+   epatch "${FILESDIR}/${P}-gold.patch"
+   epatch "${FILESDIR}/${P}-build.patch"
+
+   eautoreconf
+}
+
+src_configure() {
+   local myconf
+   # don't use --enable-pkcs11-support, configure is a mess.
+   use pkcs11 || myconf+=" --disable-pkcs11-support"
+
+   append-cppflags $(usex debug -DDEBUG -DNDEBUG)
+
+   econf \
+   $(use_enable nls) \
+   ${myconf}
+}
+
+src_install() {
+   default
+   rm -f "${ED}"/usr/lib*/libtpm_unseal.la
+}