version bump

Package-Manager: portage-2.1.2.2

5 files changed, 112 insertions, 10 deletions

diff --git a/dev-libs/opencryptoki/ChangeLog b/dev-libs/opencryptoki/ChangeLog
index 5756e4dc297a..6fe2b29d4576 100644
--- a/dev-libs/opencryptoki/ChangeLog
+++ b/dev-libs/opencryptoki/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/opencryptoki
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.2 2006/06/10 15:51:56 swegener Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.3 2007/03/25 18:09:47 kaiowas Exp $
+
+*opencryptoki-2.2.4.1 (25 Mar 2007)
+
+  25 Mar 2007; Petre Rodan <kaiowas@gentoo.org>
+  +files/opencryptoki-2.2.4.1-tpm_util.c.patch,
+  +opencryptoki-2.2.4.1.ebuild:
+  version bump
 
 *opencryptoki-2.2.4-r1 (03 Jun 2006)
 
diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index 93f6287bdab7..3d1c1b5dc409 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -1,20 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX opencryptoki-2.2.4.1-tpm_util.c.patch 482 RMD160 35c367185c0b02c37a4b507c38373c6eb4bd0aa8 SHA1 2bcfde7b8ca02c57af7903e8cbd65cb45cf5f18a SHA256 1cab3094e34e12ba2418b81d5143abde8f7ebd26b20826e22462e2e1cf603787
+MD5 91eae4f79b49f69e4b6f18b2adc7344a files/opencryptoki-2.2.4.1-tpm_util.c.patch 482
+RMD160 35c367185c0b02c37a4b507c38373c6eb4bd0aa8 files/opencryptoki-2.2.4.1-tpm_util.c.patch 482
+SHA256 1cab3094e34e12ba2418b81d5143abde8f7ebd26b20826e22462e2e1cf603787 files/opencryptoki-2.2.4.1-tpm_util.c.patch 482
 AUX pkcsslotd.init 607 RMD160 2df71e5f00dcedb4f386f6046348e0f0ad840811 SHA1 ab9c7e350ec55077290255c2a8fdf58f49c6a204 SHA256 02da6e1290363e2ef8abfe883e98dd0212a9ed8e406f3c77dd154b1623633553
 MD5 af5e8784bd4fc3a0b68ac35ea0dea5aa files/pkcsslotd.init 607
 RMD160 2df71e5f00dcedb4f386f6046348e0f0ad840811 files/pkcsslotd.init 607
 SHA256 02da6e1290363e2ef8abfe883e98dd0212a9ed8e406f3c77dd154b1623633553 files/pkcsslotd.init 607
+DIST opencryptoki-2.2.4.1.tar.bz2 1025518 RMD160 32ee4f642637a83145ba5ebb54b382e6d00f36cf SHA1 a8766f542c419aab0844c15cf76524a0c406f7ce SHA256 ceef11d1c32e08fc34d2becf319dfd163ac89482180dd10c8e0e1795c603899e
 DIST opencryptoki-2.2.4.tar.bz2 606881 RMD160 fc31c97c4ae269d00b756a29212629ab90f40177 SHA1 aa9f360e2cd5f68901477401a587bbaeed7733f3 SHA256 802d8034fddf0dd73d444682c9f197d6f764bb306caf9fdee98dbea23999b043
 DIST opencryptoki-tpm_stdll-sw_fallback-June012006.patch.bz2 3199 RMD160 779cdb6c86c1d3b923f2349d4d3f3ff9bf720c54 SHA1 8835c4ed3a55d48d2b45d3867eedbb7d29ef17d9 SHA256 599b4ce1daea201756bbe1a615b74cc40c8a9a635bc1baffa942fe91f5f82f8b
 EBUILD opencryptoki-2.2.4-r1.ebuild 1613 RMD160 5df999173b08447716849004ce2d4ca91e823801 SHA1 90f191301cd5718382290f1b05e3f40603fd3ffc SHA256 00dc2e1636d559cdd9f04af225fe54ead5d37de067784c93b3a858c58594df06
 MD5 6957f2eb148493135ec176788ea180fd opencryptoki-2.2.4-r1.ebuild 1613
 RMD160 5df999173b08447716849004ce2d4ca91e823801 opencryptoki-2.2.4-r1.ebuild 1613
 SHA256 00dc2e1636d559cdd9f04af225fe54ead5d37de067784c93b3a858c58594df06 opencryptoki-2.2.4-r1.ebuild 1613
-MISC ChangeLog 392 RMD160 f748fa0a592b6892fc305ac51bc366064caa7dbc SHA1 ff19e2779612b7f16cd13dea547f2c0304fbd31e SHA256 a27a2c9f9e3fb6ef236b4bb8fba1dbefb0c3c399003c33327b93beb4f8d9b6bd
-MD5 3dd14f4b1cd599d66248ae319b6f95c6 ChangeLog 392
-RMD160 f748fa0a592b6892fc305ac51bc366064caa7dbc ChangeLog 392
-SHA256 a27a2c9f9e3fb6ef236b4bb8fba1dbefb0c3c399003c33327b93beb4f8d9b6bd ChangeLog 392
+EBUILD opencryptoki-2.2.4.1.ebuild 1783 RMD160 300efd9e19d9165a6fc6183ab8e37cddf8771088 SHA1 4261c0348476d4b6b7a6d30c3258758aa9f32b94 SHA256 0717723eb57f3294a6bd8378365255e1c53c549bff83bca1ab788f63f2cfc9a5
+MD5 638b2d95676eade70f7549ecf2ff4f49 opencryptoki-2.2.4.1.ebuild 1783
+RMD160 300efd9e19d9165a6fc6183ab8e37cddf8771088 opencryptoki-2.2.4.1.ebuild 1783
+SHA256 0717723eb57f3294a6bd8378365255e1c53c549bff83bca1ab788f63f2cfc9a5 opencryptoki-2.2.4.1.ebuild 1783
+MISC ChangeLog 572 RMD160 e72d9853ac4d85dd80e74b6bc97742955cafc689 SHA1 714887ce876edf79bc206ad8c1c42a8e84425a8f SHA256 367dff7ecfb0a4713598ce66c035db8597203ac84128e9b57c2df24521e2a67d
+MD5 162900e7e1afe56ddb63f6a6bfc37a0d ChangeLog 572
+RMD160 e72d9853ac4d85dd80e74b6bc97742955cafc689 ChangeLog 572
+SHA256 367dff7ecfb0a4713598ce66c035db8597203ac84128e9b57c2df24521e2a67d ChangeLog 572
 MISC metadata.xml 336 RMD160 559bf87720f6d79ea0ef7c49a953bd8499ae4707 SHA1 eda7fdae39835d0b5f22bbd1e224612aa411657d SHA256 e51fd1c6ac5a62e4459c80c9326bf9afab23b684cb942bbbc4709bd6835b1537
 MD5 14b2ec1cefc5a6428a0995aa522fe091 metadata.xml 336
 RMD160 559bf87720f6d79ea0ef7c49a953bd8499ae4707 metadata.xml 336
@@ -22,10 +31,13 @@ SHA256 e51fd1c6ac5a62e4459c80c9326bf9afab23b684cb942bbbc4709bd6835b1537 metadata
 MD5 0437931c9ce6602f9032c5f85f54538e files/digest-opencryptoki-2.2.4-r1 599
 RMD160 4c8f4f4bf47cfb8f5c594f2f4d8e74356ea1ffec files/digest-opencryptoki-2.2.4-r1 599
 SHA256 4b2973eabdd063346c81d4e38b1d0d32da45e1ade246050a3d6ada45d727fcb4 files/digest-opencryptoki-2.2.4-r1 599
+MD5 eecf4860653ab2129360e9ab047b529d files/digest-opencryptoki-2.2.4.1 608
+RMD160 bad2a7038f6cc04fa54d1cbfbbe41e3defa62bb9 files/digest-opencryptoki-2.2.4.1 608
+SHA256 f68b30ce2421756ac8390a38e5203c827de880fdf35395790e68acbd5fcc12c9 files/digest-opencryptoki-2.2.4.1 608
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
 
-iD8DBQFEiuqMI1lqEGTUzyQRAtNEAKC50vgnyUltqg6EfsmGZa1elWQCYQCgly2k
-J2vGr9pXl5fQFrNFVYNEza0=
-=P1Z0
+iD8DBQFGBrsMGSBEIeh4AEYRAtLiAJ9EmuSmBDnYo2wdXn/CXjGvyWLfdACfQQRl
+6ZmNGgbR5tKpInAvDS3MV9U=
+=WGfq
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/opencryptoki/files/digest-opencryptoki-2.2.4.1 b/dev-libs/opencryptoki/files/digest-opencryptoki-2.2.4.1
new file mode 100644
index 000000000000..2803207dcee1
--- /dev/null
+++ b/dev-libs/opencryptoki/files/digest-opencryptoki-2.2.4.1
@@ -0,0 +1,6 @@
+MD5 d26093eb733ed9052b16dc33b445778a opencryptoki-2.2.4.1.tar.bz2 1025518
+RMD160 32ee4f642637a83145ba5ebb54b382e6d00f36cf opencryptoki-2.2.4.1.tar.bz2 1025518
+SHA256 ceef11d1c32e08fc34d2becf319dfd163ac89482180dd10c8e0e1795c603899e opencryptoki-2.2.4.1.tar.bz2 1025518
+MD5 56d44fa2c280937d8ebdeb834d017192 opencryptoki-tpm_stdll-sw_fallback-June012006.patch.bz2 3199
+RMD160 779cdb6c86c1d3b923f2349d4d3f3ff9bf720c54 opencryptoki-tpm_stdll-sw_fallback-June012006.patch.bz2 3199
+SHA256 599b4ce1daea201756bbe1a615b74cc40c8a9a635bc1baffa942fe91f5f82f8b opencryptoki-tpm_stdll-sw_fallback-June012006.patch.bz2 3199
diff --git a/dev-libs/opencryptoki/files/opencryptoki-2.2.4.1-tpm_util.c.patch b/dev-libs/opencryptoki/files/opencryptoki-2.2.4.1-tpm_util.c.patch
new file mode 100644
index 000000000000..d1b7eef7fe38
--- /dev/null
+++ b/dev-libs/opencryptoki/files/opencryptoki-2.2.4.1-tpm_util.c.patch
@@ -0,0 +1,14 @@
+diff -upr opencryptoki-2.2.4.1.orig/usr/lib/pkcs11/tpm_stdll/tpm_util.c opencryptoki-2.2.4.1/usr/lib/pkcs11/tpm_stdll/tpm_util.c
+--- opencryptoki-2.2.4.1.orig/usr/lib/pkcs11/tpm_stdll/tpm_util.c	2007-02-03 00:19:41.000000000 +0200
++++ opencryptoki-2.2.4.1/usr/lib/pkcs11/tpm_stdll/tpm_util.c	2007-03-25 20:42:38.926868516 +0300
+@@ -51,6 +51,10 @@
+ 
+ #include "tpm_specific.h"
+ 
++#ifndef UINT64
++#define UINT64 unsigned long long
++#endif
++
+ extern TSS_HCONTEXT tspContext;
+ 
+ UINT32
diff --git a/dev-libs/opencryptoki/opencryptoki-2.2.4.1.ebuild b/dev-libs/opencryptoki/opencryptoki-2.2.4.1.ebuild
new file mode 100644
index 000000000000..cba4462d250b
--- /dev/null
+++ b/dev-libs/opencryptoki/opencryptoki-2.2.4.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.2.4.1.ebuild,v 1.1 2007/03/25 18:09:47 kaiowas Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="PKCS#11 provider for IBM cryptographic hardware"
+HOMEPAGE="http://sourceforge.net/projects/opencryptoki"
+SRC_URI="mirror://sourceforge/opencryptoki/${P}.tar.bz2
+		 mirror://gentoo/opencryptoki-tpm_stdll-sw_fallback-June012006.patch.bz2"
+LICENSE="CPL-0.5"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="tpmtok"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i '/groupadd/d' ${S}/usr/lib/pkcs11/api/Makefile.am
+	sed -i 's|$(DESTDIR)||' ${S}/usr/include/pkcs11/Makefile.am
+
+	# enable fallback operation mode for imported keys
+	# patch written by Kent Yoder
+	epatch "${WORKDIR}/opencryptoki-tpm_stdll-sw_fallback-June012006.patch" || die
+
+	epatch "${FILESDIR}/opencryptoki-2.2.4.1-tpm_util.c.patch" || die
+
+	eautoreconf
+}
+
+src_compile() {
+	econf `use_enable tpmtok` || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+
+	newinitd "${FILESDIR}/pkcsslotd.init" pkcsslotd
+
+	# no need for this
+	rm -rf "${D}/etc/ld.so.conf.d"
+
+	# tpmtoken_* binaries expect to find the libs in /usr/lib/
+	ln -s pkcs11/stdll/libpkcs11_sw.so.0.0.0 "${D}/usr/lib/libpkcs11_sw.so"
+	ln -s pkcs11/stdll/libpkcs11_tpm.so.0.0.0 "${D}/usr/lib/libpkcs11_tpm.so"
+
+	# we have no man pages so at least these should be installed
+	dodoc doc/openCryptoki-HOWTO.pdf
+	dodoc doc/opencryptoki_man.txt
+	dodoc doc/pk_config_data_man.txt
+	dodoc doc/pkcs11_startup_man.txt
+	dodoc doc/pkcsconf_man.txt
+	dodoc doc/pkcsslotd_man.txt
+}
+
+pkg_setup() {
+	enewgroup pkcs11
+}
+