Version bump

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

3 files changed, 116 insertions, 19 deletions

diff --git a/dev-libs/opencryptoki/ChangeLog b/dev-libs/opencryptoki/ChangeLog
index c9d22795104c..ffd602d4ffa1 100644
--- a/dev-libs/opencryptoki/ChangeLog
+++ b/dev-libs/opencryptoki/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/opencryptoki
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.27 2015/06/09 14:46:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.28 2015/06/09 21:04:47 alonbl Exp $
+
+*opencryptoki-3.3 (09 Jun 2015)
+
+  09 Jun 2015; Alon Bar-Lev <alonbl@gentoo.org> +opencryptoki-3.3.ebuild:
+  Version bump
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index cf0bec4cec88..3ec44651619f 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 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
@@ -7,27 +7,17 @@ DIST opencryptoki-2.3.3-backports-3.tar.bz2 5972 SHA256 fb913dbb5c2b0d87067d9738
 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
 DIST opencryptoki-2.4.3.tar.gz 1111897 SHA256 3ddc0a0e96957e64e61a960c8a7bfcff0030564ebf4f6848abe0740491fd52bc SHA512 e33d8df344161909c1fc0626880d89e47ac902c5f780cc04af07691fff20c50bdea5bfa0368df39fff84b365342f704638e90b329a3ae12ab5fb5f668c50a164 WHIRLPOOL ab5836f30749e7bb56b1ba882c15098096d7c36e1f9dd65a83a93d9b497231258a54c5a60cf4847fce8267c086a3aea380c33380fcb9d7a20c770f5f922846d7
+DIST opencryptoki-v3.3.tgz 937619 SHA256 e1deac5edd571621dc1624e9b7af8d1632d6db6f18815f5ed8824fc78f354609 SHA512 53efbc6009da178473abf17d092249781b1eb465f68c83653bd5e88703b9ad74ce9e0128486dffec65beaf8b8974ea6852d206ec5bf035c7296a40c8f84791ab WHIRLPOOL d939eb97bb7f2b54d510326ac4dba4dc49f9f725fa8900687fd8ebe199ce1c2a797a6e514378995f24ef5b9e904b29434edf962537dc545c2fc2206d180b1d43
 EBUILD opencryptoki-2.3.3-r5.ebuild 3627 SHA256 d7ebe5f519375f3789137e241851f96116ae6ecc374807dc07b87e9f72343930 SHA512 dd323fb20bf486ecbd6e7de5db56fbfc286aae7aa30bda2017bd8ecd4df01d4da32138707fe4c84898d2911cc1c45957c14bd25985c1322d7571caeded2cd261 WHIRLPOOL 231cf8ce9e22c2e09455465692f8b53dc356c34dbcf1f8a4aecf6df892b821d788575d27d171a17e29d3a9ae91cafe728b1f361365db846c113d0bb5900d312d
 EBUILD opencryptoki-2.4.2.ebuild 3236 SHA256 9a9b779cf84668ddaf6838f8cf1bcf30d42c0a81163fb84abdd0e122e3350c8c SHA512 6fccc3fccc918c51c18a0c6b0727b5d76f4d926c8b6296a81fd6eb98af0a514826ae92edc7318cf19351127507fc52582fc3201a541e87f3674435e9878109e0 WHIRLPOOL 828925560acaec77ff58dcd0d015e474fdcd00d39b527279f8d35a6a5aa4a794c08843cc7ebecc50ab6c59e773d30f87eba0dd7974f74e515c48b425049583d3
 EBUILD opencryptoki-2.4.3.ebuild 3309 SHA256 c48d52be1117c2c47852d7287b3929e45f5d547da7e0636d379c70e5ef0a1eb5 SHA512 b173c0e4cdaf0826b13b700710979dd953890269fb1b0a30a9ad5de56d589b07046ffbcd24952a54de6fd79d8491810171ff20ab503cda531d64b628f50e3656 WHIRLPOOL 4701468fb8c75084960cf0152a83e79bf818ffab93d36474f87397b06117eb5e8021efb5fa54385aa5bb9effe347ea8c7ecc1884f5c93b59956b306530b00d7d
-MISC ChangeLog 5642 SHA256 646d3b429a6f190e4402446c6288746fdec2738e7ab853ae503ccd7c6743b4b8 SHA512 a4df4c37bc85f0efd06084a0b566a95966b91cb78e155398a841de7ca0b52b876c245f897d656c13073fa4c93e885d6bf85ee4d8ec6bc527e1beab2368403e95 WHIRLPOOL 95988c7240f053fdd201f01b6f415b894d0b29ba66d90adf100ab069f2974d5c6f6cd0a17867fa9e317d69c3efc5e17b04403355b14f5624339e1751238daffe
+EBUILD opencryptoki-3.3.ebuild 3259 SHA256 933b49b5684359d6945a246eda26610b9be639e1dbf407141fa829a7a69a797b SHA512 be1e936c17e108a0617798f99b0834dc579b9aaf8267274a05ed54ebec19adc2dff0febef3693634298695fe3d3a8f8a0b731a28fe9a373a8e41f456d3ebf042 WHIRLPOOL 8126be529dc55f09853d45932868bc053ff1c113733ca18e998d1aba199208bb930d9e62834be9e6bbf33680b55fa9e287c9145d2e52fc28dbdf0e924f510498
+MISC ChangeLog 5767 SHA256 0ee0e67974a21780d7ea397dc3f9230be4e32b9efba65693ccb78bee1dd0f22d SHA512 629b771f547d8231ea971302288a0d7176ca6e82b2e8fe3068ba6d93be19eb070f35864759030f5f3c3355feca1d72f3d5cd618577bebd35176fedc21851e734 WHIRLPOOL a84c95ac9071cb0eca02287208e2a8f37a17fe1ae3cadf6fbbe279d877e076f4e71d47c5c28239928dc5704f537cb6e3f8316935bd84daef28297233ab0f8080
 MISC metadata.xml 380 SHA256 895827f3dea5a3dd79cb4b621f7f501c31cc55be9d075ed4cd3c592eb887b236 SHA512 2a577d55b2b59968d407cd584cf302b1639488163cd493949a5a275cb1cff9ba08581579b9ba3cfa1b547590ffa8550bf928cdc6e890ee2dc4564a860934bc3a WHIRLPOOL eeb827ef30332d94952ff06218557e0918b51465a8caa776f6f3ebd640d114180ee44024599e09396cfc9722787c0a0baee486dc384203edd66655d4e3055287
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdvw2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/JUP/ijpC5YvmTt/uXbY+KMglnXG
-MlMZ2S1njbpHZcmAbefGqsjhHmrlUFGp+x7b02aHnNcqxdmaGw2BmsJHZmrKxYXe
-dF5Nm7MzKFEg1u3IE3kRT44xVrn+9abiDJLhJaHOQm1QmcWHWLlXKP+Jdaw1UjwC
-0hS7V6UX17qI/fECZbMOQ6mhe3xLjOk3yBa1wVn4zuGUgQpoA00BUNHfCg2OpA/l
-U3hlutHuM3cr1BH6YRqZrJojvsc9A/TfZxFjdVAGtLJcC9k4HRqLixAijro6gp5q
-wmO9yinjd8dCz6ea8yZ5jnsaL/6IK/9X+KsfJ/OCGcyWTeCzlgw8lg3qI6JpxMyA
-FEXwQx9rhiMpSH1nP2Gk9Y3JyCglCKWnW/tsydIO7LduW78XiQnUei1mOkyG3smV
-g/QFsRMDLGR+f2ItMVFrjAjqhfI1w5rhVsXJJHHmzDaL5pKX78LxwzXUnn0TgEzn
-RuaHq1sPIznGde6z8lOVyUOVj8wSARCLUPneb2I/PsShxXMBB2UR/LHzWKfZnY11
-YAmzZ1ynxfciPit/G0yWhNGCHv0SAJlhjqNDCP+qHLouuo9S1Gm+lU8R23zJQihl
-7e7RWJdxj4j4Pmo1SIx3yHNdJwmCDiVOnafU36ILaVR6ONvX9az/iBCri4IVT7zH
-q7SSnU4SVrvEEWcIx01/
-=0Bu5
+iF4EAREIAAYFAlV3VP8ACgkQXYk9GL8g3FF++gD+MoXRCaXnGkdxJcUgCRf+QaDY
+AFAnN2PpFE3MK6n6AMMA/jwP23vx1TQ5yqm1h4Ti1DkRycEmRsFu71e47YFNXu6K
+=XhYO
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/opencryptoki/opencryptoki-3.3.ebuild b/dev-libs/opencryptoki/opencryptoki-3.3.ebuild
new file mode 100644
index 000000000000..12167e4a156c
--- /dev/null
+++ b/dev-libs/opencryptoki/opencryptoki-3.3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-3.3.ebuild,v 1.1 2015/06/09 21:04:47 alonbl Exp $
+
+EAPI="5"
+
+inherit autotools multilib flag-o-matic user
+
+DESCRIPTION="PKCS#11 provider cryptographic hardware"
+HOMEPAGE="http://sourceforge.net/projects/opencryptoki"
+SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${PN}-v${PV}.tgz"
+
+# 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"
+
+S="${WORKDIR}/${PN}"
+
+# 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() {
+	mv configure.in configure.ac || die
+	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-ccatok \
+		--disable-pkcscca_migrate
+}
+
+src_install() {
+	emake install DESTDIR="${ED}"
+
+	# 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
+
+	# We create /var dirs at runtime as needed, so don't bother installing
+	# our own.
+	rm -r "${D}"/var/{lib,lock} || die
+
+	dodoc README AUTHORS FAQ TODO doc/openCryptoki-HOWTO.pdf
+}