Version bump

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64

4 files changed, 137 insertions, 3 deletions

diff --git a/dev-libs/opencryptoki/ChangeLog b/dev-libs/opencryptoki/ChangeLog
index bd4304f28952..bde415388818 100644
--- a/dev-libs/opencryptoki/ChangeLog
+++ b/dev-libs/opencryptoki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/opencryptoki
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.23 2012/06/06 03:43:03 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.24 2012/12/15 21:25:32 alonbl Exp $
+
+*opencryptoki-2.4.2 (15 Dec 2012)
+
+  15 Dec 2012; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/opencryptoki-2.4.2-destdir.patch, +opencryptoki-2.4.2.ebuild:
+  Version bump
 
   06 Jun 2012; Zac Medico <zmedico@gentoo.org> opencryptoki-2.3.3-r5.ebuild:
   inherit user for enewgroup
@@ -126,4 +132,3 @@
   03 Jun 2006; Petre Rodan <kaiowas@gentoo.org> +files/pkcsslotd.init,
   +metadata.xml, +opencryptoki-2.2.4-r1.ebuild:
   initial commit
-
diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index bf41f8f3c3f2..82c256af2e7c 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -1,6 +1,9 @@
+AUX opencryptoki-2.4.2-destdir.patch 688 SHA256 b6fcf826c3ec12cb0544f869016c9821d3f56739b1b59ff438f0b87cb1245d61 SHA512 2f1059d71b5cd0da4f7126ffe7789abbe528600817c2a2dc3b318d4154800e924e5703a9b31c66731dfc15814f1b1727b420b23be1e4240d60f3fcb6c86de330 WHIRLPOOL 5f54f24136e2ca419c5c5ee553a24aa1086b1cd76a2a048dd290efd7317defe11f942f70589da146e9b3b37483fab3f14677be6d11c0eb2c55b37136959f6021
 AUX pkcsslotd.init.2 663 SHA256 80c2e13cb0e9255fa3fc13977c4d1c73a10be4740a50959b8d487d328a1e1192 SHA512 f7da05fa2fe5d4632ea78a5f54d6c671ee96923ff5711c637b6e0895b20bb605576439438a547ef0fbeaf8eccf8290c113586a88229172be15bff18858965409 WHIRLPOOL 61de41ae5dae26cac477029779659494904e90bc340e488bf189c70cda66e8d3fb0710a3e9682ee0feed6bd093fb302a2ae6f9006cd7da38777431ff8450afed
 DIST opencryptoki-2.3.3-backports-3.tar.bz2 5972 SHA256 fb913dbb5c2b0d87067d9738892b2a4c4a7c192d6335cc0bae2a7083e913aa74 SHA512 bff2b1cd907d814a61296a99eaa5cdcb983355def8022ec09620048415e66b5feea425cba2d19b9f023073165969e981358dc6e406b1bc62f1e00f49e91ef943 WHIRLPOOL c77b1aa0268043d31b3d9d9d53d6416d9d8af5fbb29b07f498aaed61807c1848961b046192ca7eab227f055ba829c13bfa2696d016795b4df71e467c2a0185cc
 DIST opencryptoki-2.3.3.tar.bz2 694854 SHA256 7ccae6350a7043c2abade1eb1517edb987f13e98584dd28733172e8d36600aa2 SHA512 2c7ea2f689daba92ec178198dc1a3ffbc4812f4547a574b86cc8b69ada4e3aefb2613d4d291829d81b97d91d5d3fbe1735bd9b3f99db415ddcb4ca03863ddc4a WHIRLPOOL 3a955b464ea44c1dc50ce9869bbc48ced2a3962ef533491aa53956cccbca1fcf9411ffcccd1839384e7f3ba87368dba4c8c415f283139169391224a1f4cf5092
+DIST opencryptoki-2.4.2.tar.gz 1083876 SHA256 0bfbcf956fec078af12c34cd447c6274a5e7e886335c3b8b81106d20ccefa0d9 SHA512 2f760968cec7f15f7de38f0c74e0444d75d1a247d1efd9fc17a17ac5f2bcc4fd283def49d46baeea0c5adb6e19236993b4e8937f0e32162bcc7dbac8066144b9 WHIRLPOOL d7df0db3450d33c3e28be0031b48f22d89387f12f35ca868f593f82a87abb9eea89f28be43fb4ce3b17dee6e1d226fc08586320fbce4e0bf7d57db871d3cd76c
 EBUILD opencryptoki-2.3.3-r5.ebuild 3627 SHA256 d7ebe5f519375f3789137e241851f96116ae6ecc374807dc07b87e9f72343930 SHA512 dd323fb20bf486ecbd6e7de5db56fbfc286aae7aa30bda2017bd8ecd4df01d4da32138707fe4c84898d2911cc1c45957c14bd25985c1322d7571caeded2cd261 WHIRLPOOL 231cf8ce9e22c2e09455465692f8b53dc356c34dbcf1f8a4aecf6df892b821d788575d27d171a17e29d3a9ae91cafe728b1f361365db846c113d0bb5900d312d
-MISC ChangeLog 5060 SHA256 d4825febe8fa49d71ebff09384c962c5f5f19587c71c6ef6ba9fbb78dfebf1b9 SHA512 44f6d594d1d5dc40a256449ba7b92a6d20d440c9acef01c647c6009c2cd3f2726a8881e6b0d050cca1f2f00c20c8c7321e0d9fd38e790b180aa3e64f4be2e80e WHIRLPOOL 73dcdd994eec4892bc960b871277addc02fd8f87664c2ac06b2d40e45dcb7e0afe5883fd7d984f0f453061b47cc590ad245f8cd38ae8b22e1dbb3f8a0b804bf4
+EBUILD opencryptoki-2.4.2.ebuild 3236 SHA256 9a9b779cf84668ddaf6838f8cf1bcf30d42c0a81163fb84abdd0e122e3350c8c SHA512 6fccc3fccc918c51c18a0c6b0727b5d76f4d926c8b6296a81fd6eb98af0a514826ae92edc7318cf19351127507fc52582fc3201a541e87f3674435e9878109e0 WHIRLPOOL 828925560acaec77ff58dcd0d015e474fdcd00d39b527279f8d35a6a5aa4a794c08843cc7ebecc50ab6c59e773d30f87eba0dd7974f74e515c48b425049583d3
+MISC ChangeLog 5228 SHA256 182bd4e75f4e44b6f5b0f0933963994206eb73fc19882b21989a2c318a3c9366 SHA512 b8e8ac70bd3f1c381cb31e33e1534f835ca33dc4395e35c38bcf90f330a7e137f3d86cf134abc006b89464e138b35aa081ebd1f04d2b85fb160faa20eafd4a65 WHIRLPOOL d8ecface2e9060a8795a675071f67711f6db9eadd4dd2891ce2993729ac3429d67f1a043675c4ce951a5960a312f8453e61af5ecf4d6081c642b923b5ac9180d
 MISC metadata.xml 303 SHA256 6f37596c4a13d63dcbfe0b13494aacf994e803dbdf3190d1545f9fd8b355cead SHA512 0baa0b541224eb841eb8e768fb8972e40d8d6791451f9396c4897ffbf1e593de6c626b8b90517400288476bb2fca22f8a6cf1410a6e5468255139b27249f7d80 WHIRLPOOL b5e72ed8ea3c1b04d47257a6b39f04d41da4a5afc25ab2138c62946d5ef28908821af559020cb933d1fd725661bb3f297f153ada45485beb2dd195e1c5b99d0e
diff --git a/dev-libs/opencryptoki/files/opencryptoki-2.4.2-destdir.patch b/dev-libs/opencryptoki/files/opencryptoki-2.4.2-destdir.patch
new file mode 100644
index 000000000000..e1375c7130bc
--- /dev/null
+++ b/dev-libs/opencryptoki/files/opencryptoki-2.4.2-destdir.patch
@@ -0,0 +1,26 @@
+From fcc24176398ab2f40c33ebc686c2f803782af8d6 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 15 Dec 2012 22:13:56 +0200
+Subject: [PATCH] Always use DESTDIR when installing
+
+---
+ usr/Makefile.am |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/usr/Makefile.am b/usr/Makefile.am
+index bced120..20352d5 100644
+--- a/usr/Makefile.am
++++ b/usr/Makefile.am
+@@ -5,6 +5,6 @@ endif
+ SUBDIRS = lib $(DAEMONDIRS)
+ 
+ install-data-hook:
+-	$(MKDIR_P) $(lockdir)
+-	$(CHGRP) pkcs11 $(lockdir)
+-	$(CHMOD) 0770 $(lockdir)
++	$(MKDIR_P) $(DESTDIR)$(lockdir)
++	$(CHGRP) pkcs11 $(DESTDIR)$(lockdir)
++	$(CHMOD) 0770 $(DESTDIR)$(lockdir)
+-- 
+1.7.8.6
+
diff --git a/dev-libs/opencryptoki/opencryptoki-2.4.2.ebuild b/dev-libs/opencryptoki/opencryptoki-2.4.2.ebuild
new file mode 100644
index 000000000000..62b2bc7ddafb
--- /dev/null
+++ b/dev-libs/opencryptoki/opencryptoki-2.4.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.4.2.ebuild,v 1.1 2012/12/15 21:25:32 alonbl Exp $
+
+EAPI="2"
+
+inherit autotools eutils multilib flag-o-matic user
+
+DESCRIPTION="PKCS#11 provider cryptographic hardware"
+HOMEPAGE="http://sourceforge.net/projects/opencryptoki"
+SRC_URI="mirror://sourceforge/opencryptoki/${P}.tar.gz"
+
+# Upstream is looking into relicensing it into CPL-1.0 entirely; the CCA
+# token sources are under CPL-1.0 already.
+LICENSE="CPL-0.5"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="tpm? ( app-crypt/trousers )
+		 dev-libs/openssl"
+DEPEND="${RDEPEND}"
+
+IUSE="+tpm debug"
+
+# tests right now basically don't exist; the only available thing would
+# test against an installed copy and would kill a running pcscd, all
+# things that we're not interested to.
+RESTRICT=test
+
+pkg_setup() {
+	enewgroup pkcs11
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-destdir.patch"
+	eautoreconf
+}
+
+src_configure() {
+	# package uses ${localstatedir}/lib as the default path, so if we
+	# leave it to econf, it'll create /var/lib/lib.
+
+	# Since upstream by default seem to enable any possible token, even
+	# when they don't seem to be used, we limit ourselves to the
+	# software emulation token (swtok) and if the user enabled the tpm
+	# USE flag, tpmtok.  The rest of the tokens seem to be hardware- or
+	# software-dependent even when they build fine without their
+	# requirements, but until somebody asks for those, I'd rather not
+	# enable them.
+
+	# We don't use --enable-debug because that tinkers with the CFLAGS
+	# and we don't want that. Instead we append -DDEBUG which enables
+	# debug information.
+	use debug && append-flags -DDEBUG
+
+	econf \
+		--localstatedir=/var \
+		--enable-fast-install \
+		--disable-dependency-tracking \
+		--disable-debug \
+		--enable-daemon \
+		--enable-library \
+		--disable-icatok \
+		--enable-swtok \
+		$(use_enable tpm tpmtok) \
+		--disable-aeptok \
+		--disable-bcomtok \
+		--disable-ccatok \
+		--disable-crtok \
+		--disable-icctok \
+		--disable-pkcscca_migrate
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+
+	# Install libopencryptoki in the standard directory for libraries.
+	mv "${D}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${D}"/usr/$(get_libdir) || die
+	rm "${D}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so
+	dosym ../libopencryptoki.so /usr/$(get_libdir)/pkcs11/libopencryptoki.so
+
+	# Remove compatibility symlinks as we _never_ required those and
+	# they seem unused even upstream.
+	find "${D}" -name 'PKCS11_*' -delete
+
+	# doesn't use libltdl; only dlopen()-based interfaces
+	find "${D}" -name '*.la' -delete
+
+	# We replace their ld.so and init files (mostly designed for RedHat
+	# as far as I can tell) with our own replacements.
+	rm -rf "${D}"/etc/ld.so.conf.d "${D}"/etc/rc.d
+
+	# make sure that we don't modify the init script if the USE flags
+	# are enabled for the needed services.
+	cp "${FILESDIR}"/pkcsslotd.init.2 "${T}"/pkcsslotd.init
+	use tpm || sed -i -e '/use tcsd/d' "${T}"/pkcsslotd.init
+	newinitd "${T}/pkcsslotd.init" pkcsslotd
+
+	dodoc README AUTHORS FAQ TODO doc/openCryptoki-HOWTO.pdf || die
+}