version bump

(Portage version: 2.1.2.2)

4 files changed, 92 insertions, 2 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/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
+}
+