From: Jakub Bogusz Date: Mon, 20 Jun 2011 19:01:57 +0000 (+0000) Subject: - updated to 1.3.6 X-Git-Tag: auto/th/tpm-tools-1_3_6-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Ftpm-tools.git;a=commitdiff_plain;h=b7843a2 - updated to 1.3.6 - added link patch to fix linking with no-add-needed - added missing-mans patch (missing man pages taken from git) Changed files: tpm-tools-link.patch -> 1.1 tpm-tools-missing-mans.patch -> 1.1 tpm-tools.spec -> 1.4 --- diff --git a/tpm-tools-link.patch b/tpm-tools-link.patch new file mode 100644 index 0000000..a02fbc5 --- /dev/null +++ b/tpm-tools-link.patch @@ -0,0 +1,11 @@ +--- tpm-tools-1.3.6/lib/Makefile.am.orig 2010-09-30 19:28:09.000000000 +0200 ++++ tpm-tools-1.3.6/lib/Makefile.am 2011-06-20 18:45:09.291658421 +0200 +@@ -52,7 +52,7 @@ + noinst_LTLIBRARIES += libtpm_pkcs11.la + + libtpm_pkcs11_la_SOURCES= tpm_pkcs11.c +-libtpm_pkcs11_la_LIBADD = libtpm_utils.la ++libtpm_pkcs11_la_LIBADD = libtpm_utils.la -ldl + endif + + # diff --git a/tpm-tools-missing-mans.patch b/tpm-tools-missing-mans.patch new file mode 100644 index 0000000..04dd748 --- /dev/null +++ b/tpm-tools-missing-mans.patch @@ -0,0 +1,386 @@ +--- tpm-tools-1.3.6/man/man1.orig/tpmtoken_import.1 1970-01-01 01:00:00.000000000 +0100 ++++ tpm-tools-1.3.6/man/man1/tpmtoken_import.1 2011-06-20 20:40:37.725223744 +0200 +@@ -0,0 +1,92 @@ ++.\" Copyright (C) 2005 International Business Machines Corporation ++.\" ++.de Sh \" Subsection ++.br ++.if t .Sp ++.ne 5 ++.PP ++\fB\\$1\fR ++.PP ++.. ++.de Sp \" Vertical space (when we can't use .PP) ++.if t .sp .5v ++.if n .sp ++.. ++.de Ip \" List item ++.br ++.ie \\n(.$>=3 .ne \\$3 ++.el .ne 3 ++.IP "\\$1" \\$2 ++.. ++.TH "tpmtoken_import" 1 "2005-04-25" "TPM Management" ++.ce 1 ++TPM Management - tpmtoken_import ++.SH NAME ++tpmtoken_import \- import an X.509 certficate and/or an RSA key pair into ++the user's TPM PKCS#11 data store ++.SH "SYNOPSIS" ++.ad l ++.hy 0 ++.B tpmtoken_import ++[ OPTION ] FILE ++ ++.SH "DESCRIPTION" ++.PP ++\fBtpmtoken_import\fR imports a PEM formatted representation of an ++X.509 certificate and/or an RSA key contained in FILE. ++.PP ++Importing an X.509 certificate creates an X.509 Public Key Certificate ++PKCS#11 object and also an RSA Public Key PKCS#11 object using the RSA public ++key contained in the certificate. The certificate's key must be an RSA ++key in order for the certificate to be successfully processed by this command. ++.PP ++Importing an RSA key creates an RSA Public Key and an RSA Private Key PKCS#11 ++object. In order to associate the RSA PKCS#11 objects with an ++X.509 Public Key Certificate PKCS#11 object, the RSA PKCS#11 objects must have ++a subject name and key identifier associated with them. This can be accomplished ++by supplying the corresponding X.509 certificate as an optional command parameter. ++.PP ++The input can contain PEM formatted representations of both an ++X.509 certificate and an RSA key. If both representations are present then ++an X.509 Public Key Certificate PKCS#11 object, an RSA Public Key PKCS#11 object ++and an RSA Private Key PKCS#11 object are created. ++ ++.TP ++\fB\-h\fR, \fB\-\-help\fR ++Display command usage info. ++.TP ++\fB-v\fR, \fB\-\-version\fR ++Display command version info. ++.TP ++\fB-l\fR, \fB\-\-log\fR [none|error|info|debug] ++Set logging level. ++.TP ++\fB-i\fR, \fB\-\-idfile\fR FILE ++Use FILE as the PEM formatted X.509 certificate input used ++to obtain the subject and id attributes ++.TP ++\fB-k\fR, \fB\-\-token\fR STRING ++Use STRING to identify the label of the PKCS#11 token to ++be used ++.TP ++\fB-n\fR, \fB\-\-name\fR STRING ++Use STRING as the label for the imported object(s) ++.TP ++\fB-p\fR, \fB\-\-public\fR ++Import the object(s) as a public object ++.TP ++\fB-t\fR, \fB\-\-type\fR key|cert ++Import only the specified object type ++.TP ++\fB-y\fR, \fB\-\-yes\fR ++Assume an answer of yes for any confirmation prompts that would normally be asked ++ ++.SH "SEE ALSO" ++.PP ++\fBtpmtoken_init\fR(1), ++\fBtpmtoken_setpasswd\fR(1), ++\fBtpmtoken_objects\fR(1), ++\fBtpmtoken_protect\fR(1) ++ ++.SH "REPORTING BUGS" ++Report bugs to +--- tpm-tools-1.3.6/man/man1.orig/tpmtoken_init.1 1970-01-01 01:00:00.000000000 +0100 ++++ tpm-tools-1.3.6/man/man1/tpmtoken_init.1 2011-06-20 20:40:37.725223744 +0200 +@@ -0,0 +1,67 @@ ++.\" Copyright (C) 2005 International Business Machines Corporation ++.\" ++.de Sh \" Subsection ++.br ++.if t .Sp ++.ne 5 ++.PP ++\fB\\$1\fR ++.PP ++.. ++.de Sp \" Vertical space (when we can't use .PP) ++.if t .sp .5v ++.if n .sp ++.. ++.de Ip \" List item ++.br ++.ie \\n(.$>=3 .ne \\$3 ++.el .ne 3 ++.IP "\\$1" \\$2 ++.. ++.TH "tpmtoken_init" 1 "2005-04-25" "TPM Management" ++.ce 1 ++TPM Management - tpmtoken_init ++.SH NAME ++tpmtoken_init \- initialize the user's TPM PKCS#11 data store ++.SH "SYNOPSIS" ++.ad l ++.hy 0 ++.B tpmtoken_init ++.RB [ OPTION ] ++ ++.SH "DESCRIPTION" ++.PP ++\fBtpmtoken_init\fR initializes the user's TPM PKCS#11 data store ++so that applications can exploit the TPM capabilities through ++the PKCS#11 interface. ++.PP ++PKCS#11 requires a password (or PIN) for the Security Officer (SO) ++and the User. The SO is responsible for initializing the token and setting ++the User password (or PIN). ++ ++.TP ++\fB\-h\fR, \fB\-\-help\fR ++Display command usage info. ++.TP ++\fB-v\fR, \fB\-\-version\fR ++Display command version info. ++.TP ++\fB-l\fR, \fB\-\-log\fR [none|error|info|debug] ++Set logging level. ++.TP ++\fB-k\fR, \fB\-\-token\fR STRING ++Use STRING to identify the label of the PKCS#11 token to ++be used ++.TP ++\fB-y\fR, \fB\-\-yes\fR ++Assume an answer of yes for any confirmation prompts that would normally be asked ++ ++.SH "SEE ALSO" ++.PP ++\fBtpmtoken_setpasswd\fR(1), ++\fBtpmtoken_import\fR(1), ++\fBtpmtoken_objects\fR(1), ++\fBtpmtoken_protect\fR(1) ++ ++.SH "REPORTING BUGS" ++Report bugs to +--- tpm-tools-1.3.6/man/man1.orig/tpmtoken_objects.1 1970-01-01 01:00:00.000000000 +0100 ++++ tpm-tools-1.3.6/man/man1/tpmtoken_objects.1 2011-06-20 20:40:37.725223744 +0200 +@@ -0,0 +1,65 @@ ++.\" Copyright (C) 2005 International Business Machines Corporation ++.\" ++.de Sh \" Subsection ++.br ++.if t .Sp ++.ne 5 ++.PP ++\fB\\$1\fR ++.PP ++.. ++.de Sp \" Vertical space (when we can't use .PP) ++.if t .sp .5v ++.if n .sp ++.. ++.de Ip \" List item ++.br ++.ie \\n(.$>=3 .ne \\$3 ++.el .ne 3 ++.IP "\\$1" \\$2 ++.. ++.TH "tpmtoken_objects" 1 "2005-04-25" "TPM Management" ++.ce 1 ++TPM Management - tpmtoken_objects ++.SH NAME ++tpmtoken_objects \- display the objects in the user's TPM PKCS#11 data store ++.SH "SYNOPSIS" ++.ad l ++.hy 0 ++.B tpmtoken_objects ++[ OPTION ] ++ ++.SH "DESCRIPTION" ++.PP ++\fBtpmtoken_objects\fR displays information about the PKCS#11 objects ++that are in the user's data store. ++ ++.TP ++\fB\-h\fR, \fB\-\-help\fR ++Display command usage info. ++.TP ++\fB-v\fR, \fB\-\-version\fR ++Display command version info. ++.TP ++\fB-l\fR, \fB\-\-log\fR [none|error|info|debug] ++Set logging level. ++.TP ++\fB-k\fR, \fB\-\-token\fR STRING ++Use STRING to identify the label of the PKCS#11 token to ++be used ++.TP ++\fB-p\fR, \fB\-\-public\fR ++Display only public objects ++.TP ++\fB-x\fR, \fB\-\-extended\fR ++Display additional information about an object not displayed by default ++ ++.SH "SEE ALSO" ++.PP ++\fBtpmtoken_init\fR(1), ++\fBtpmtoken_setpasswd\fR(1), ++\fBtpmtoken_import\fR(1), ++\fBtpmtoken_protect\fR(1) ++ ++.SH "REPORTING BUGS" ++Report bugs to +--- tpm-tools-1.3.6/man/man1.orig/tpmtoken_protect.1 1970-01-01 01:00:00.000000000 +0100 ++++ tpm-tools-1.3.6/man/man1/tpmtoken_protect.1 2011-06-20 20:40:37.725223744 +0200 +@@ -0,0 +1,79 @@ ++.\" Copyright (C) 2005 International Business Machines Corporation ++.\" ++.de Sh \" Subsection ++.br ++.if t .Sp ++.ne 5 ++.PP ++\fB\\$1\fR ++.PP ++.. ++.de Sp \" Vertical space (when we can't use .PP) ++.if t .sp .5v ++.if n .sp ++.. ++.de Ip \" List item ++.br ++.ie \\n(.$>=3 .ne \\$3 ++.el .ne 3 ++.IP "\\$1" \\$2 ++.. ++.TH "tpmtoken_protect" 1 "2005-04-25" "TPM Management" ++.ce 1 ++TPM Management - tpmtoken_protect ++.SH NAME ++tpmtoken_protect \- encrypt or decrypt data using a symmetric key stored ++in the user's TPM PKCS#11 data store ++.SH "SYNOPSIS" ++.ad l ++.hy 0 ++.B tpmtoken_protect ++[ OPTION ] ++ ++.SH "DESCRIPTION" ++.PP ++\fBtpmtoken_protect\fR will encrypt or decrypt data using a symmetric key that ++is stored in the user's data store. The key used to protect the data ++is a 256-bit AES key stored as a private Secret Key PKCS#11 object. The object ++has the PKCS#11 label attribute of \'User Data Protection Key\'. ++The key is generated by the TPM PKCS#11 implementation when it is needed the ++first time. Since it is generated as a private object, it is protected by the ++TPM on the platform. ++.PP ++This command requires the \'-i\' and \'-o\' command options to be specified. ++ ++.TP ++\fB\-h\fR, \fB\-\-help\fR ++Display command usage info. ++.TP ++\fB-v\fR, \fB\-\-version\fR ++Display command version info. ++.TP ++\fB-l\fR, \fB\-\-log\fR [none|error|info|debug] ++Set logging level. ++.TP ++\fB-d\fR, \fB\-\-decrypt\fR ++Perform a decryption operation ++.TP ++\fB-e\fR, \fB\-\-encrypt\fR ++Perform an encryption operation ++.TP ++\fB-i\fR, \fB\-\-infile\fR FILE ++Use FILE as the input to the specified operation ++.TP ++\fB-k\fR, \fB\-\-token\fR STRING ++Use STRING to identify the label of the PKCS#11 token to ++be used ++.TP ++\fB-o\fR, \fB\-\-outfile\fR FILE ++Use FILE as the output of the specified operation ++ ++.SH "SEE ALSO" ++.PP ++\fBtpmtoken_init\fR(1), ++\fBtpmtoken_import\fR(1), ++\fBtpmtoken_setpasswd\fR(1), ++\fBtpmtoken_objects\fR(1) ++ ++.SH "REPORTING BUGS" ++Report bugs to +--- tpm-tools-1.3.6/man/man1.orig/tpmtoken_setpasswd.1 1970-01-01 01:00:00.000000000 +0100 ++++ tpm-tools-1.3.6/man/man1/tpmtoken_setpasswd.1 2011-06-20 20:40:37.725223744 +0200 +@@ -0,0 +1,68 @@ ++.\" Copyright (C) 2005 International Business Machines Corporation ++.\" ++.de Sh \" Subsection ++.br ++.if t .Sp ++.ne 5 ++.PP ++\fB\\$1\fR ++.PP ++.. ++.de Sp \" Vertical space (when we can't use .PP) ++.if t .sp .5v ++.if n .sp ++.. ++.de Ip \" List item ++.br ++.ie \\n(.$>=3 .ne \\$3 ++.el .ne 3 ++.IP "\\$1" \\$2 ++.. ++.TH "tpmtoken_setpasswd" 1 "2005-04-25" "TPM Management" ++.ce 1 ++TPM Management - tpmtoken_setpasswd ++.SH NAME ++tpmtoken_setpasswd \- change the password(s) associated with ++the user's TPM PKCS#11 data store ++.SH "SYNOPSIS" ++.ad l ++.hy 0 ++.B tpmtoken_setpasswd ++[ OPTION ] ++ ++.SH "DESCRIPTION" ++.PP ++\fBtpmtoken_setpasswd\fR is used to change the password(s) associated with the ++user's data store. ++.PP ++PKCS#11 requires a password (or PIN) for the Security Officer (SO) ++and the User. The SO and User password are set when the data store ++is initialized. This command will allow the user change either password. ++.PP ++ ++.TP ++\fB\-h\fR, \fB\-\-help\fR ++Display command usage info. ++.TP ++\fB-v\fR, \fB\-\-version\fR ++Display command version info. ++.TP ++\fB-l\fR, \fB\-\-log\fR [none|error|info|debug] ++Set logging level. ++.TP ++\fB-k\fR, \fB\-\-token\fR STRING ++Use STRING to identify the label of the PKCS#11 token to ++be used ++.TP ++\fB-s\fR, \fB\-\-security-officer\fR ++Set the Security Officer password instead of the User password ++ ++.SH "SEE ALSO" ++.PP ++\fBtpmtoken_init\fR(1), ++\fBtpmtoken_import\fR(1), ++\fBtpmtoken_objects\fR(1), ++\fBtpmtoken_protect\fR(1) ++ ++.SH "REPORTING BUGS" ++Report bugs to diff --git a/tpm-tools.spec b/tpm-tools.spec index 1c46635..8af8bac 100644 --- a/tpm-tools.spec +++ b/tpm-tools.spec @@ -1,13 +1,19 @@ Summary: Management tools for the TPM hardware Summary(pl.UTF-8): Narzędzia zarządzające sprzętem TPM Name: tpm-tools -Version: 1.3.5 +Version: 1.3.6 Release: 1 License: CPL v1.0+ Group: Applications/System Source0: http://downloads.sourceforge.net/trousers/%{name}-%{version}.tar.gz -# Source0-md5: b64baa248cf30a57ad0e5fb6f096e7dc +# Source0-md5: 7c11a7f890e21efd01b14c59f144298b +Patch0: %{name}-link.patch +Patch1: %{name}-missing-mans.patch URL: http://trousers.sourceforge.net/ +BuildRequires: autoconf >= 2.12 +BuildRequires: automake >= 1.6 +BuildRequires: gettext >= 0.15 +BuildRequires: libtool BuildRequires: opencryptoki-devel >= 2.2.4 BuildRequires: openssl-devel BuildRequires: trousers-devel >= 0.3.6 @@ -63,8 +69,19 @@ obiektów w kontenerze i chronić dane. %prep %setup -q +%patch0 -p1 +%patch1 -p1 + +# some undefined variable causes warning +%{__sed} -i -e 's/-Werror //' configure.in %build +%{__gettextize} +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__autoheader} +%{__automake} %configure %{__make}