Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-crypt/tpm-tools: tpm-tools-1.3.5-r1.ebuild metadata.xml ChangeLog tpm-tools-1.3.5.ebuild
Date: Thu, 31 Mar 2011 22:19:50
Message-Id: 20110331221941.13FDF20054@flycatcher.gentoo.org
1 flameeyes 11/03/31 22:19:41
2
3 Modified: metadata.xml ChangeLog tpm-tools-1.3.5.ebuild
4 Added: tpm-tools-1.3.5-r1.ebuild
5 Log:
6 Disable opencryptoki/pkcs#11 in 1.3.5 stable ebuild (and fix up homepage). Revision bump: add pkcs11 USE flag to bring in opencryptoki, apply patch for linking with gold (thanks to Raymes Khoury from ChromiumOS), add debug USE flag.
7
8 (Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.2 app-crypt/tpm-tools/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/tpm-tools/metadata.xml?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/tpm-tools/metadata.xml?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/tpm-tools/metadata.xml?r1=1.1&r2=1.2
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/metadata.xml,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- metadata.xml 19 Jun 2005 13:12:08 -0000 1.1
24 +++ metadata.xml 31 Mar 2011 22:19:40 -0000 1.2
25 @@ -1,9 +1,16 @@
26 <?xml version="1.0" encoding="UTF-8"?>
27 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
28 <pkgmetadata>
29 - <herd>crypto</herd>
30 - <maintainer>
31 - <email>crypto@g.o</email>
32 - <name>Crypto Herd</name>
33 - </maintainer>
34 + <herd>crypto</herd>
35 + <maintainer>
36 + <email>crypto@g.o</email>
37 + <name>Crypto Herd</name>
38 + </maintainer>
39 +
40 + <use>
41 + <flag name='pkcs11'>
42 + Build Token data management utilities based on OpenCryptoki's
43 + (<pkg>dev-libs/opencryptoki</pkg>) PKCS#11 implementation.
44 + </flag>
45 + </use>
46 </pkgmetadata>
47
48
49
50 1.15 app-crypt/tpm-tools/ChangeLog
51
52 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/tpm-tools/ChangeLog?rev=1.15&view=markup
53 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/tpm-tools/ChangeLog?rev=1.15&content-type=text/plain
54 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/tpm-tools/ChangeLog?r1=1.14&r2=1.15
55
56 Index: ChangeLog
57 ===================================================================
58 RCS file: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/ChangeLog,v
59 retrieving revision 1.14
60 retrieving revision 1.15
61 diff -u -r1.14 -r1.15
62 --- ChangeLog 22 Mar 2011 10:35:05 -0000 1.14
63 +++ ChangeLog 31 Mar 2011 22:19:40 -0000 1.15
64 @@ -1,6 +1,16 @@
65 # ChangeLog for app-crypt/tpm-tools
66 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
67 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/ChangeLog,v 1.14 2011/03/22 10:35:05 arfrever Exp $
68 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/ChangeLog,v 1.15 2011/03/31 22:19:40 flameeyes Exp $
69 +
70 +*tpm-tools-1.3.5-r1 (31 Mar 2011)
71 +
72 + 31 Mar 2011; Diego E. Pettenò <flameeyes@g.o>
73 + +files/tpm-tools-1.3.1-gold.patch, tpm-tools-1.3.5.ebuild,
74 + +tpm-tools-1.3.5-r1.ebuild, metadata.xml:
75 + Disable opencryptoki/pkcs#11 in 1.3.5 stable ebuild (and fix up homepage).
76 + Revision bump: add pkcs11 USE flag to bring in opencryptoki, apply patch for
77 + linking with gold (thanks to Raymes Khoury from ChromiumOS), add debug USE
78 + flag.
79
80 22 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
81 -tpm-tools-1.3.1.ebuild:
82
83
84
85 1.4 app-crypt/tpm-tools/tpm-tools-1.3.5.ebuild
86
87 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.5.ebuild?rev=1.4&view=markup
88 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.5.ebuild?rev=1.4&content-type=text/plain
89 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.5.ebuild?r1=1.3&r2=1.4
90
91 Index: tpm-tools-1.3.5.ebuild
92 ===================================================================
93 RCS file: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.5.ebuild,v
94 retrieving revision 1.3
95 retrieving revision 1.4
96 diff -u -r1.3 -r1.4
97 --- tpm-tools-1.3.5.ebuild 21 Mar 2011 09:57:05 -0000 1.3
98 +++ tpm-tools-1.3.5.ebuild 31 Mar 2011 22:19:40 -0000 1.4
99 @@ -1,12 +1,12 @@
100 # Copyright 1999-2011 Gentoo Foundation
101 # Distributed under the terms of the GNU General Public License v2
102 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.5.ebuild,v 1.3 2011/03/21 09:57:05 tomka Exp $
103 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.5.ebuild,v 1.4 2011/03/31 22:19:40 flameeyes Exp $
104
105 EAPI="2"
106 inherit autotools
107
108 DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
109 -HOMEPAGE="http://trousers.sf.net"
110 +HOMEPAGE="http://trousers.sourceforge.net"
111 SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
112 LICENSE="CPL-1.0"
113 SLOT="0"
114 @@ -16,7 +16,6 @@
115 COMMON_DEPEND=">=app-crypt/trousers-0.3.0"
116 RDEPEND="${COMMON_DEPEND}
117 nls? ( virtual/libintl )"
118 -# TODO: add optionnal opencryptoki support
119 DEPEND="${COMMON_DEPEND}
120 nls? ( sys-devel/gettext )"
121
122 @@ -26,7 +25,8 @@
123 }
124
125 src_configure() {
126 - econf $(use_enable nls)
127 + econf $(use_enable nls) \
128 + --disable-pkcs11-support
129 }
130
131 src_install() {
132
133
134
135 1.1 app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild
136
137 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild?rev=1.1&view=markup
138 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild?rev=1.1&content-type=text/plain
139
140 Index: tpm-tools-1.3.5-r1.ebuild
141 ===================================================================
142 # Copyright 1999-2011 Gentoo Foundation
143 # Distributed under the terms of the GNU General Public License v2
144 # $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild,v 1.1 2011/03/31 22:19:40 flameeyes Exp $
145
146 EAPI=4
147 inherit autotools eutils flag-o-matic
148
149 DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
150 HOMEPAGE="http://trousers.sourceforge.net"
151 SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
152 LICENSE="CPL-1.0"
153 SLOT="0"
154 KEYWORDS="~amd64 ~x86"
155 IUSE="nls pkcs11 debug"
156
157 COMMON_DEPEND="
158 >=app-crypt/trousers-0.3.0
159 dev-libs/openssl
160 pkcs11? ( dev-libs/opencryptoki )
161 "
162 RDEPEND="${COMMON_DEPEND}
163 nls? ( virtual/libintl )"
164 DEPEND="${COMMON_DEPEND}
165 nls? ( sys-devel/gettext )"
166
167 src_prepare() {
168 sed -i -e "s/-Werror //" configure.in || die "Sed failed"
169 epatch "${FILESDIR}"/${PN}-1.3.1-gold.patch
170
171 eautoreconf
172 }
173
174 src_configure() {
175 local myconf="$(use_enable nls)"
176
177 # don't use --enable-pkcs11-support, configure is a mess.
178 use pkcs11 || myconf+=" --disable-pkcs11-support"
179
180 use debug && append-flags -DDEBUG || append-flags -DNDEBUG
181
182 econf ${myconf}
183 }
184
185 src_install() {
186 emake DESTDIR="${D}" install || die "emake install failed"
187 dodoc README
188 }