* app-crypt/ekeyd: Add
authorkristianf <devnull@localhost>
Mon, 28 Oct 2013 01:15:02 +0000 (02:15 +0100)
committerkristianf <devnull@localhost>
Mon, 28 Oct 2013 01:15:02 +0000 (02:15 +0100)
18 files changed:
app-crypt/ekeyd/ChangeLog [new file with mode: 0644]
app-crypt/ekeyd/Manifest [new file with mode: 0644]
app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild [new file with mode: 0644]
app-crypt/ekeyd/ekeyd-1.1.5.ebuild [new file with mode: 0644]
app-crypt/ekeyd/files/90-ekeyd.rules [new file with mode: 0644]
app-crypt/ekeyd/files/ekey-egd-linux.conf.2 [new file with mode: 0644]
app-crypt/ekeyd/files/ekey-egd-linux.init.2 [new file with mode: 0644]
app-crypt/ekeyd/files/ekey-ulusbd.conf.2 [new file with mode: 0644]
app-crypt/ekeyd/files/ekey-ulusbd.init.2 [new file with mode: 0644]
app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch [new file with mode: 0644]
app-crypt/ekeyd/files/ekeyd-1.patch [new file with mode: 0644]
app-crypt/ekeyd/files/ekeyd-2.patch [new file with mode: 0644]
app-crypt/ekeyd/files/ekeyd-3.patch [new file with mode: 0644]
app-crypt/ekeyd/files/ekeyd-4.patch [new file with mode: 0644]
app-crypt/ekeyd/files/ekeyd-5.patch [new file with mode: 0644]
app-crypt/ekeyd/files/ekeyd-6.patch [new file with mode: 0644]
app-crypt/ekeyd/files/ekeyd.init.2 [new file with mode: 0644]
app-crypt/ekeyd/metadata.xml [new file with mode: 0644]

diff --git a/app-crypt/ekeyd/ChangeLog b/app-crypt/ekeyd/ChangeLog
new file mode 100644 (file)
index 0000000..3c64d46
--- /dev/null
@@ -0,0 +1,193 @@
+# ChangeLog for app-crypt/ekeyd
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.31 2012/12/11 08:42:46 ssuominen Exp $
+
+  11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> ekeyd-1.1.4-r2.ebuild:
+  Use virtual/udev and udev.eclass
+
+  23 Nov 2012; Ulrich Müller <ulm@gentoo.org> ekeyd-1.1.4-r2.ebuild:
+  Fix LICENSE, MIT/Expat license according to COPYING in tarball. Whitespace.
+
+  12 Jul 2012; Ian Stakenvicius <axs@gentoo.org> ekeyd-1.1.4-r2.ebuild:
+  added GPL-2 to LICENSE per bug 425890
+
+  08 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
+  Re-assign to maintainer-needed.
+
+  31 May 2012; Zac Medico <zmedico@gentoo.org> ekeyd-1.1.4-r2.ebuild:
+  inherit eutils for epatch
+
+*ekeyd-1.1.4-r2 (01 Nov 2011)
+
+  01 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> +ekeyd-1.1.4-r2.ebuild,
+  -ekeyd-1.1.4-r1.ebuild, files/ekeyd-1.1.4-gentoo.patch:
+  Patch the udev rules to not use the deprecated BUS match (bug #388821).
+
+*ekeyd-1.1.4-r1 (20 Oct 2011)
+
+  20 Oct 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/ekeyd-1.1.1-earlyboot.patch, -ekeyd-1.1.3-r4.ebuild,
+  -files/ekeyd-1.1.3-format.patch, -files/ekeyd-1.1.3-libusb_compat.patch,
+  -files/ekeyd-1.1.3-slashes.patch, -ekeyd-1.1.4.ebuild,
+  +ekeyd-1.1.4-r1.ebuild, +files/ekey-egd-linux.conf.2,
+  +files/ekey-egd-linux.init.2, +files/ekey-ulusbd.conf.2,
+  +files/ekey-ulusbd.init.2, +files/ekeyd.init.2, -files/ekey-egd-linux.conf,
+  -files/ekey-egd-linux.init, -files/ekey-ulusbd.conf, -files/ekey-ulusbd.init,
+  -files/ekeyd.init:
+  Remove old 1.1.3 ebuild; revbump 1.1.4 to use new init scripts that are
+  OpenRC-specific, and thus much shorter. The WATERMARK option has been dropped
+  from ekey-egd-linux, as it should be set in sysctl.conf instead.
+
+*ekeyd-1.1.4 (05 Sep 2011)
+
+  05 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org> +ekeyd-1.1.4.ebuild,
+  +files/ekeyd-1.1.4-gentoo.patch:
+  Bump to version 1.1.4; the patches have been collapsed into one, big gentoo
+  patch for now.
+
+  08 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> ekeyd-1.1.3-r4.ebuild:
+  Fix DEPEND value.
+
+*ekeyd-1.1.3-r4 (08 Apr 2011)
+
+  08 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> -ekeyd-1.1.3-r2.ebuild,
+  -ekeyd-1.1.3-r3.ebuild, +ekeyd-1.1.3-r4.ebuild,
+  +files/ekeyd-1.1.3-format.patch, +files/ekey-egd-linux.conf,
+  +files/ekey-egd-linux.init, files/ekeyd.init, metadata.xml:
+  Merge ekey-egd-linux daemon (and init script) within ekeyd, and suggest using
+  it for heavy-loaded machines; the ekeyd init script provides entropy if (and
+  only if) it is not set to provide EGD sockets; add a warning about using the
+  userland USB access method; fix the only warning that was still present
+  (false positive on format strings).
+
+*ekeyd-1.1.3-r3 (01 Apr 2011)
+
+  01 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> +ekeyd-1.1.3-r3.ebuild,
+  metadata.xml:
+  Add a munin USE flag to install the munin plugin to graph the ekeyd
+  statistical data.
+
+  27 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org> ekeyd-1.1.3-r2.ebuild:
+  Fix think in log output.
+
+*ekeyd-1.1.3-r2 (27 Mar 2011)
+
+  27 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org> -ekeyd-1.1.3-r1.ebuild,
+  +ekeyd-1.1.3-r2.ebuild, +files/ekeyd-1.1.3-slashes.patch:
+  Revision bump: fix udev rules for keys with slashes in serial numbers (bug
+  #349503, huge thanks to Daniel Weigert for the help and the patience);
+  install udev rules to /lib/udev/rules.d (or lib64); fix rules for
+  non-symlinked lib64; use the same name for both rule files.
+
+  06 Nov 2010; Rafael G. Martins <rafaelmartins@gentoo.org>
+  ekeyd-1.1.3-r1.ebuild:
+  Fixed luasocket dependency.
+
+  23 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org> -ekeyd-1.1.3.ebuild,
+  ekeyd-1.1.3-r1.ebuild:
+  Remove old; add note regarding app-crypt/ekey-egd-linux; fix CC not being
+  used.
+
+*ekeyd-1.1.3-r1 (29 Sep 2010)
+
+  29 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +ekeyd-1.1.3-r1.ebuild, +files/ekeyd-1.1.3-libusb_compat.patch,
+  metadata.xml:
+  Add patch to that worksaround a libusb-compat bug and allows using the
+  virtual with ekeyd-ulusbd.
+
+*ekeyd-1.1.3 (24 Sep 2010)
+
+  24 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -ekeyd-1.1.1-r1.ebuild, -ekeyd-1.1.2.ebuild, +ekeyd-1.1.3.ebuild:
+  Version bump, add ChangeLog to the list of installed doc files. Cleanup
+  old versions.
+
+*ekeyd-1.1.2 (25 Aug 2010)
+
+  25 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org> +ekeyd-1.1.2.ebuild:
+  Version bump.
+
+*ekeyd-1.1.1-r1 (07 Aug 2010)
+
+  07 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org> -ekeyd-1.1.1.ebuild,
+  +ekeyd-1.1.1-r1.ebuild, +files/ekeyd-1.1.1-earlyboot.patch:
+  Revision bump, add a patch to use /dev for sockets and pid files, inspired
+  by mdadm, so that it works even if the rule is started early when / is yet
+  to be pivoted or mounted r/w.
+
+  24 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> ekeyd-1.1.1.ebuild:
+  Diego reports that while it compiles against libusb-compat, it does not
+  seem to work presently. Change depend for now until I have hardware access
+  to fix it properly.
+
+*ekeyd-1.1.1 (17 Nov 2009)
+
+  17 Nov 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -ekeyd-1.0.6-r1.ebuild, -ekeyd-1.0.7.ebuild, -ekeyd-1.1.0.ebuild,
+  +ekeyd-1.1.1.ebuild:
+  Version bump, remove older versions (would be stabled only when upstream
+  stops releasing new ones for a while).
+
+  16 Nov 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  ekeyd-1.0.6-r1.ebuild, ekeyd-1.0.7.ebuild, ekeyd-1.1.0.ebuild:
+  Make the linux-info check non fatal since the code builds anyway.
+
+  11 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> ekeyd-1.0.6-r1.ebuild,
+  ekeyd-1.0.7.ebuild, ekeyd-1.1.0.ebuild:
+  Compiles fine against libusb-compat, changing to virtual/libusb:0.
+
+*ekeyd-1.1.0 (09 Nov 2009)
+
+  09 Nov 2009; Diego E. Pettenò <flameeyes@gentoo.org> +ekeyd-1.1.0.ebuild:
+  Version bump.
+
+*ekeyd-1.0.7 (15 Oct 2009)
+
+  15 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org> +ekeyd-1.0.7.ebuild:
+  Version bump.
+
+  09 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  ekeyd-1.0.6-r1.ebuild:
+  Remove pointless keepdir.
+
+*ekeyd-1.0.6-r1 (04 Oct 2009)
+
+  04 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org> -ekeyd-1.0.6.ebuild,
+  +ekeyd-1.0.6-r1.ebuild, files/ekey-ulusbd.init, files/ekeyd.init:
+  Revision bump to fix the init scripts, require localmount to be completed
+  before starting or ekeyd will not start. Also drop udev dependency on the
+  ekey-ulusbd init script since it's limited to non-Linux systems.
+
+*ekeyd-1.0.6 (29 Sep 2009)
+
+  29 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -ekeyd-1.0.5-r2.ebuild, +ekeyd-1.0.6.ebuild:
+  Version bump.
+
+*ekeyd-1.0.5-r2 (29 Sep 2009)
+
+  29 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -ekeyd-1.0.5-r1.ebuild, +ekeyd-1.0.5-r2.ebuild, files/ekey-ulusbd.conf,
+  files/ekey-ulusbd.init:
+  New revision, thanks to the comments from Rob Kendrick (upstream); the
+  init script now uses lsusb, and is only installed for non-Linux systems,
+  while the correct udev rules are installed on Linux. Add a check for the
+  CDC driver, and also add warnings about both the userland USB and CDC
+  options.
+
+*ekeyd-1.0.5-r1 (28 Sep 2009)
+
+  28 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org> -ekeyd-1.0.5.ebuild,
+  +ekeyd-1.0.5-r1.ebuild, +files/ekey-ulusbd.conf, +files/ekey-ulusbd.init,
+  files/ekeyd.init:
+  Bump already, add init script for the userland USB daemon, and move the
+  two daemon executables in /usr/libexec.
+
+*ekeyd-1.0.5 (28 Sep 2009)
+
+  28 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org> +ekeyd-1.0.5.ebuild,
+  +files/ekeyd.init, +metadata.xml:
+  Initial import of the EntropyKey daemon; this is still a work-in-progress
+  ebuild, as it lacks an init script for the USB userland driver, and checks
+  for Linux kernel options for CDC modem support.
diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
new file mode 100644 (file)
index 0000000..e78a90c
--- /dev/null
@@ -0,0 +1,19 @@
+AUX 90-ekeyd.rules 684 SHA256 81c748d27954300082b0a755a93ba7fcad294698111825d036f357bb869a66c7 SHA512 85a73581ab599da3652db0dc398713d105f5286226ab26a4b66b8088c0cede60e457d3d69e8918d3f1d27da0b4729f4664a40eaf095f5ac6af9a16890694d50f WHIRLPOOL c67289cc4637a373682ce2cdd31fbb35a897c56fed0c42f3051a438606a8353c2c554ad1d28653ac6279f34a3b367898a760a37889cd201eaa22388ebcde97ec
+AUX ekey-egd-linux.conf.2 266 SHA256 89b5cf30b7cad64503f85c6bfc7e3868245870aae659d79dd05cc50869b5eaa8 SHA512 3e8db66552a5c04045226debbf6a7add01301bf98bb26c48033f4bceacde82f25e449fced2d46667009165e9d2f327134e6c963142295d7ef065eaa47b383393 WHIRLPOOL 2a34d84d96a53c5f8c39bff0d5b39c6a88f1cfeca44d1b52c7e7c3aece453bcb51cf00e9f1f1c6ed2a91cddc944857eae31bed67980805e9dcbef020c7de081e
+AUX ekey-egd-linux.init.2 576 SHA256 b527d0f658644a13552359678e346ddc41839478ce51cfc018db830c8af79d07 SHA512 a6a1eab6c8416e302c9fa3b97d308ddc8d3dd1500fd2b9d9d17670b25b360287db855fc2f8bc039020a2eca1e2142fe07c45a647acc81a13d7145ab1083f331a WHIRLPOOL b4f208ae0f1c02d6e292a8d63ab1a5967e953edb8c0bb4826a19ee2126e293cc92735e6f5ccef5d707a13f7074eec9354d37ab305cda0e13d270e961fd3487fc
+AUX ekey-ulusbd.conf.2 613 SHA256 d12e3ada8c979b4605aede3001e3735fcfdc7fea4a64e408df5d185380050a06 SHA512 59888423becadc8bd88e696ea41ae96641516bd555309caf604bedc7bd5449f1f66e9b2f5f67e7becf92f5a817eef9bd1927c38d678054743f17dba651156488 WHIRLPOOL 88e66189452edc7804054ff2904c78d38d3b3785f5ea4a3abbbbc7a4b584fd6adb1581dbd98c981f7fb1e913c92e4586b61806f73b1a75ad1da4d546850d93cf
+AUX ekey-ulusbd.init.2 1017 SHA256 0383865a5d543296822836fa150a83ddbf63bf0b7c8a7fbc6266af099d176502 SHA512 daa452bd1b073f2fdb896bc5d2e8f18c80f77556bd18c0dd8b2f110bc704c0aa9b463b8228d381f7900c57417326a4f89235f191111b2efc76c1d58229f18d97 WHIRLPOOL 35ec3652f3dca7eca742bbbced79c82066ac3dd925cb9876da6f3a99fa13ffd4369e345734eeb6be43d52d58e1bc862e2221c44ca565dba72524ec027a24423b
+AUX ekeyd-1.1.4-gentoo.patch 6565 SHA256 ed663baf91af89db437150e04a1ec8dacfeb990c6c0659b632d8e895e2230f1d SHA512 f65a1cef8bd4e280a8dd8ce51f23661286ed3fd688d34943793eb326d417016a53312c6b344aab3465a8930c7de8cd10d6d572bd67f92cf8f65386f2f5ca1875 WHIRLPOOL 40e642b074031a538f2e2bba0a55a7d9c2ed83a22492c0cf1f3e4cb8fe2a360fd021ec0370264c81f611531748f1e1887a18df6665a1f8bff7938f56da9197e6
+AUX ekeyd-1.patch 1094 SHA256 5cca2edeacb1ff188a47d73b7df8f63d15debca4f6fca61e2f7e1a95dcf9f69a SHA512 92198522e3dd90d2274d9c5171c216c3a3db9d334b2b14363781456f167a65df5370a7dcf430246d944e1e14e5278bf130e068063e600589f74026ca39e319a5 WHIRLPOOL 1562ad67c31d4ea9903a67651d3dbfce49b848c7a5a4f5da6ef46f33527f6762dc58e579ff3e831852c484a091af1dd9d924355d7a628e740d3604b8fee57cc3
+AUX ekeyd-2.patch 863 SHA256 8055cffd030a97c9011b9f3aba9ee4558a93e2da919c25c8cd7d73c3a571423b SHA512 ace451e7aafc61e21422a81e50d3954189f80fec50160002c579db27865b46c95dc6db557533a9aa6ef3ca744394542754ba46f96de90a026e19a14477522e50 WHIRLPOOL 270b12c836ce9231ce5bcc5331feb9261a541e251b553dd08cabc5dfe6ea0c9707724b4d42c631a36e51b1c626a2431565c175445cfd9446c4cbc41dd9fc55fe
+AUX ekeyd-3.patch 1918 SHA256 cea37f22aac5264eacecf640bd7199cc9b2adf116024ad8ecaf2dd3b926e823b SHA512 aba7b1cba96e678725fc8b47b56d815d59ce015ff6a4f72eaaf5fe8b7a99ddedf05ef3534a51772330209fb3cef235d76207103ee1e7a1f3315f4a52d2c0c2be WHIRLPOOL 23c101d3bf410c76d7bf09230f0564415c32fa44a1de92b64dc369dd0c3c495b3b76ab97bd8dd901056f4e15d87d48da866826e8c27b5de13db1efb481f1246d
+AUX ekeyd-4.patch 2325 SHA256 cc233ecb5ad894e5a8585028b4ed5679f1d99997393fd4acc1373b18f3ab78bd SHA512 05023ef85c454a9092cecf7f3826430caeda1e66ba5759ffe1e6f4c42f4da32048862dba6c6e19ab32febadc3a9f65cf5e1b8f0562a71fc854134b60df28a80c WHIRLPOOL 8f9ad5c55836e2370bb88a2721869f7212c8e652e6cbb6c1b424aa712fcdc69b3e6704ea27ec9547b2e5d451abe999009ba141ce455e96fcf075959b9b734ef0
+AUX ekeyd-5.patch 1205 SHA256 98cdb0271ed3f97f00120ff26e480ec0515662062f3059467ddf41b50bc57212 SHA512 2ea01bbe642bd52351e8ab9b7b62147c5bec7918305dc2c5be9291e3ae98fdd90f0e6e36c450e4db6220076a45a22cf870c81b3e23beed9170f262c857acecfd WHIRLPOOL 1a242838e5ddf710841313542d30e4111320d406139747d73d0ba770155fb87a6c151b01b87b7f8d9f4cb75a4cfa2d2e2386ac314a039c8852188712b16c0c63
+AUX ekeyd-6.patch 1245 SHA256 9643e1e185447afaa713375dd4e5ff768223580c9fa917e61eb87ce5e00e560d SHA512 5a1a523fab7146e97f8396ef82d6755e1b209df728ee83dae87619a0a6d84b0b44e41b9e67f287b7f3d54a2ef80a19320650662cca0f1dfe0053eba75d113f04 WHIRLPOOL 6d5ac6e136814ec155c5a557bae12ff9b3c980049ee5e9c50ca2338bf74b6c3649b0a80c1d0f8667c8bfaed6fb873ee85872692d1e55e6b6fc7cb01c0028bc0a
+AUX ekeyd.init.2 810 SHA256 a38169a3071fc3c2b7a736ff38c4e637c3ea4fb81b9bb36723dd24d13cc719ba SHA512 9984ced308ac743375e7cea42f99a51d2dc97b17bd0acf48df4a7a165a3facd7232038e65f5d0ea14bf3475c8438f62b7c4ceb30c17bdddadd9b22a8f95b280a WHIRLPOOL 087c68ff3688d1fd868f5e5d88682f76cef42d9ae437b66ca7fd0c33590acffd56baae5138f04bca248d93c0461f8901e87562dd01252e17f7914e1866bd52aa
+DIST ekeyd-1.1.4.tar.gz 100911 SHA256 147ca4ff964ab7b344a08d3cd6f9b1bf03ba18776a1941d603681d8102cce0c8 SHA512 40632722827e07ebc643fa32af9910b28053873329772681dba2b029ad0b3c63d1d6bba3fdd0549b84e23779d2e2ae0323a53e1fdf93eb963570bab2227b63e6 WHIRLPOOL 1dc89c735befeeb8fb2d840d27ddcce0b8b15cffb8be0b9e6fa978f0c14bc9cef8345b8b1f4a3c6140031b1a01d92c26674e011acec3c6605ddf7b5c2e56d248
+DIST ekeyd_1.1.5.orig.tar.gz 101366 SHA256 4aa8abe4bd8bb4517be3f751a75ae270ac2855ba4ba465099a3f29a2c8602ec4 SHA512 c30620d5e54a49929be72ed04448a4f08eb9658dbf7534586c49a3b43bdd5fc95a0659e09cc04b012c339ca20a1e914fa5a4b4d970171c46b64235f284516b9a WHIRLPOOL bfa6cbea82bea8aeed7a86cc5cc0e8e95bd9ceba00d57f78a0bd5bcf6694d4c37db1a43ff01a92493d83a33b41c2a17ddac366c6d2281b848d5f239b4240ea39
+EBUILD ekeyd-1.1.4-r2.ebuild 5724 SHA256 bb965d29810f26fcee13dd0b14de2a89096bcf4e203316e6e34bc16d0c066d09 SHA512 38f3956cfcbd0dc8f35c62d0e6760819b2c724e680c3c157190ca4997f8ce3fa0beac32030772e3c0b3affda3e0ab55c82fc8c1fe0c36b72075b0e011c634e3c WHIRLPOOL 33546918505b3c278ef28c3094b930c244d8fa121bc021423a981de720352771975515cd7b450808e91bcbd8968f95c6381c1fa73cc71be91ddd2086c9dca59f
+EBUILD ekeyd-1.1.5.ebuild 5658 SHA256 392eb6b65da4d50e55256e8b0da4ef85c92e449050603695a8c1f3f6651b1dc0 SHA512 4cbe302b03a18290f06da867150c25aa585c946ed67217c10a0e1de32ede07b81db0197e37c8761673ac0a29da0940005b34c5e7e32eb2217f713fe2a62d36bc WHIRLPOOL 24160279ba79cc38e65375fc3e7415a7897a564ffa25fff4ed27c8c7f5702caa4f9346432dc4ea79174fda54dd6b7c049e020203b9401393d69b69d69fab4783
+MISC ChangeLog 7848 SHA256 637b3cde643114fdf168d67cc593204587deee11d833cab752791a25fe5d6aa1 SHA512 da107708cb029f4fc473cbb41ef8ab4065eac3f1a230f05b94e1cbe218b4bb8652bcfab198e03f6e001833c741754c0f7c65813555ef876eb37389bd42df5a97 WHIRLPOOL 0264e55aaba38b2a132217a4099edb4621e75d2d62829a42bc0a7e366fc7362df67a6c0b35a40c889a43fb3e4df16c0ad1fbd0230de5762464bd48c07841b666
+MISC metadata.xml 869 SHA256 88e879d9e370b95619cc31e635cd9d712488891042ffa94ab42ff5c0d1f3c56e SHA512 b0faa8765cf1b568f2c255071cffd3af2c778bde3631fe4396ff814cb73dd2708bd447db7494bbbb6372411aef7f40beb7537076bb7e4bff442393e91a1e2764 WHIRLPOOL 6cd3433f8fc324ec47ad58c6b2abc5915e9e5403a258e4a116007de6af3b4318daa8cca81b3e9a9bda8e815a1c12fb6277cc63543e0803aa58cdebf1a5484c6b
diff --git a/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild b/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild
new file mode 100644 (file)
index 0000000..50febce
--- /dev/null
@@ -0,0 +1,186 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild,v 1.5 2012/12/11 08:42:46 ssuominen Exp $
+
+EAPI=4
+
+inherit eutils multilib linux-info toolchain-funcs udev
+
+DESCRIPTION="Entropy Key userspace daemon"
+HOMEPAGE="http://www.entropykey.co.uk/"
+SRC_URI="http://www.entropykey.co.uk/res/download/${P}.tar.gz"
+
+LICENSE="MIT GPL-2" # GPL-2 (only) for init script
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="usb kernel_linux munin minimal"
+REQUIRED_USE="minimal? ( !munin !usb )"
+
+EKEYD_RDEPEND="dev-lang/lua
+               usb? ( virtual/libusb:0 )"
+EKEYD_DEPEND="${EKEYD_RDEPEND}"
+EKEYD_RDEPEND="${EKEYD_RDEPEND}
+       dev-lua/luasocket
+       kernel_linux? ( virtual/udev )
+       usb? ( !kernel_linux? ( sys-apps/usbutils ) )
+       munin? ( net-analyzer/munin )"
+
+RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
+       !app-crypt/ekey-egd-linux
+       sys-apps/openrc"
+DEPEND="!minimal? ( ${EKEYD_DEPEND} )"
+
+CONFIG_CHECK="~USB_ACM"
+
+pkg_setup() {
+       if ! use minimal && use kernel_linux && ! use usb && linux_config_exists; then
+               check_extra_config
+       fi
+}
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+       local osname
+
+       # Override automatic detection: upstream provides this with uname,
+       # we don't like using uname.
+       case ${CHOST} in
+               *-linux-*)
+                       osname=linux;;
+               *-freebsd*)
+                       osname=freebsd;;
+               *-kfrebsd-gnu)
+                       osname=gnukfreebsd;;
+               *-openbsd*)
+                       osname=openbsd;;
+               *)
+                       die "Unsupported operating system!"
+                       ;;
+       esac
+
+       # We don't slot LUA so we don't really need to have the variables
+       # set at all.
+       emake -C host \
+               CC="$(tc-getCC)" \
+               LUA_V= LUA_INC= \
+               OSNAME=${osname} \
+               OPT="${CFLAGS}" \
+               BUILD_ULUSBD=$(use usb && echo yes || echo no) \
+               $(use minimal && echo egd-linux)
+}
+
+src_install() {
+       exeinto /usr/libexec
+       newexe host/egd-linux   ekey-egd-linux
+       newman host/egd-linux.8 ekey-egd-linux.8
+
+       newconfd "${FILESDIR}"/ekey-egd-linux.conf.2 ekey-egd-linux
+       newinitd "${FILESDIR}"/ekey-egd-linux.init.2 ekey-egd-linux
+
+       dodoc doc/* AUTHORS ChangeLog THANKS
+
+       use minimal && return
+       # from here on, install everything that is not part of the minimal
+       # support.
+
+       emake -C host \
+               DESTDIR="${D}" \
+               MANZCMD=cat MANZEXT= \
+               install-ekeyd $(use usb && echo install-ekey-ulusbd)
+
+       # We move the daemons around to avoid polluting the available
+       # commands.
+       dodir /usr/libexec
+       mv "${D}"/usr/sbin/ekey*d "${D}"/usr/libexec
+
+       newinitd "${FILESDIR}"/${PN}.init.2 ${PN}
+
+       if use usb && ! use kernel_linux; then
+               newinitd "${FILESDIR}"/ekey-ulusbd.init.2 ekey-ulusbd
+               newconfd "${FILESDIR}"/ekey-ulusbd.conf.2 ekey-ulusbd
+       fi
+
+       if use kernel_linux; then
+               local rules=udev/fedora15/60-entropykey.rules
+               use usb && rules=udev/fedora15/60-entropykey-uds.rules
+
+               udev_newrules ${rules} 70-${PN}.rules
+
+               exeinto "$(udev_get_udevdir)"
+               doexe udev/entropykey.sh
+       fi
+
+       if use munin; then
+               exeinto /usr/libexec/munin/plugins
+               doexe munin/ekeyd_stat_
+
+               insinto /etc/munin/plugin-conf.d
+               newins munin/plugin-conf.d_ekeyd ekeyd
+       fi
+}
+
+pkg_postinst() {
+       elog "${CATEGORY}/${PN} now install also the EGD client service ekey-egd-linux."
+       elog "To use this service, you need enable EGDTCPSocket for the ekeyd service"
+       elog "managing the key(s)."
+       elog ""
+       elog "The daemon will send more entropy to the kernel once the available pool"
+       elog "falls below the value set in the kernel.random.write_wakeup_threshold"
+       elog "sysctl entry."
+       elog ""
+       ewarn "Since version 1.1.4-r1, ekey-egd-linux will *not* set the watermark for"
+       ewarn "you, instead you'll have to configure the sysctl in /etc/sysctl.conf"
+
+       use minimal && return
+       # from here on, document everything that is not part of the minimal
+       # support.
+
+       elog ""
+       elog "To make use of your EntropyKey, make sure to execute ekey-rekey"
+       elog "the first time, and then start the ekeyd service."
+       elog ""
+       elog "By default ekeyd will feed the entropy directly to the kernel's pool;"
+       elog "if your system has jumps in load average, you might prefer using the"
+       elog "EGD compatibility mode, by enabling EGDTCPSocket for ekeyd and then"
+       elog "starting the ekey-egd-linux service."
+       elog ""
+       elog "The same applies if you intend to provide entropy for multiple hosts"
+       elog "over the network. If you want to have the ekey-egd-linux service on"
+       elog "other hosts, you can enable the 'minimal' USE flag."
+       elog ""
+       elog "The service supports multiplexing if you wish to use multiple"
+       elog "keys, just symlink /etc/init.d/ekeyd → /etc/init.d/ekeyd.identifier"
+       elog "and it'll be looking for /etc/entropykey/identifier.conf"
+       elog ""
+
+       if use usb; then
+               if use kernel_linux; then
+                       elog "You're going to use the userland USB daemon, the udev rules"
+                       elog "will be used accordingly. If you want to use the CDC driver"
+                       elog "please disable the usb USE flag."
+               else
+                       elog "You're going to use the userland USB daemon, since your OS"
+                       elog "does not support udev, you should start the ekey-ulusbd"
+                       elog "service before ekeyd."
+               fi
+
+               ewarn "The userland USB daemon has multiple known issues. If you can,"
+               ewarn "please consider disabling the 'usb' USE flag and instead use the"
+               ewarn "CDC-ACM access method."
+       else
+               if use kernel_linux; then
+                       elog "Some versions of Linux have a faulty CDC ACM driver that stops"
+                       elog "EntropyKey from working properly; please check the compatibility"
+                       elog "table at http://www.entropykey.co.uk/download/"
+               else
+                       elog "Make sure your operating system supports the CDC ACM driver"
+                       elog "or otherwise you won't be able to use the EntropyKey."
+               fi
+               elog ""
+               elog "If you're unsure about the working state of the CDC ACM driver"
+               elog "enable the usb USE flag and use the userland USB daemon"
+       fi
+}
diff --git a/app-crypt/ekeyd/ekeyd-1.1.5.ebuild b/app-crypt/ekeyd/ekeyd-1.1.5.ebuild
new file mode 100644 (file)
index 0000000..4d3a433
--- /dev/null
@@ -0,0 +1,184 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild,v 1.5 2012/12/11 08:42:46 ssuominen Exp $
+
+EAPI=4
+
+inherit eutils multilib linux-info toolchain-funcs udev
+
+DESCRIPTION="Entropy Key userspace daemon"
+HOMEPAGE="http://www.entropykey.co.uk/"
+SRC_URI="http://archive.ubuntu.com/ubuntu/pool/universe/e/ekeyd/ekeyd_${PV}.orig.tar.gz"
+
+LICENSE="MIT GPL-2" # GPL-2 (only) for init script
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="usb kernel_linux munin minimal"
+REQUIRED_USE="minimal? ( !munin !usb )"
+
+EKEYD_RDEPEND="dev-lang/lua
+               usb? ( virtual/libusb:0 )"
+EKEYD_DEPEND="${EKEYD_RDEPEND}"
+EKEYD_RDEPEND="${EKEYD_RDEPEND}
+       dev-lua/luasocket
+       kernel_linux? ( virtual/udev )
+       usb? ( !kernel_linux? ( sys-apps/usbutils ) )
+       munin? ( net-analyzer/munin )"
+
+RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
+       !app-crypt/ekey-egd-linux
+       sys-apps/openrc"
+DEPEND="!minimal? ( ${EKEYD_DEPEND} )"
+
+CONFIG_CHECK="~USB_ACM"
+
+pkg_setup() {
+       if ! use minimal && use kernel_linux && ! use usb && linux_config_exists; then
+               check_extra_config
+       fi
+}
+
+src_prepare() {
+       for i in `seq 1 6`; do
+               epatch "${FILESDIR}/ekeyd-$i.patch";
+       done;
+}
+
+src_compile() {
+       local osname
+
+       # Override automatic detection: upstream provides this with uname,
+       # we don't like using uname.
+       case ${CHOST} in
+               *-linux-*)
+                       osname=linux;;
+               *-freebsd*)
+                       osname=freebsd;;
+               *-kfrebsd-gnu)
+                       osname=gnukfreebsd;;
+               *-openbsd*)
+                       osname=openbsd;;
+               *)
+                       die "Unsupported operating system!"
+                       ;;
+       esac
+
+       # We don't slot LUA so we don't really need to have the variables
+       # set at all.
+       emake -C host \
+               CC="$(tc-getCC)" \
+               LUA_V= LUA_INC= \
+               OSNAME=${osname} \
+               OPT="${CFLAGS}" \
+               BUILD_ULUSBD=$(use usb && echo yes || echo no) \
+               $(use minimal && echo egd-linux)
+}
+
+src_install() {
+       exeinto /usr/libexec
+       newexe host/egd-linux   ekey-egd-linux
+       newman host/egd-linux.8 ekey-egd-linux.8
+
+       newconfd "${FILESDIR}"/ekey-egd-linux.conf.2 ekey-egd-linux
+       newinitd "${FILESDIR}"/ekey-egd-linux.init.2 ekey-egd-linux
+
+       dodoc doc/* AUTHORS ChangeLog THANKS
+
+       use minimal && return
+       # from here on, install everything that is not part of the minimal
+       # support.
+
+       emake -C host \
+               DESTDIR="${D}" \
+               MANZCMD=cat MANZEXT= \
+               install-ekeyd $(use usb && echo install-ekey-ulusbd)
+
+       # We move the daemons around to avoid polluting the available
+       # commands.
+       dodir /usr/libexec
+       mv "${D}"/usr/sbin/ekey*d "${D}"/usr/libexec
+
+       newinitd "${FILESDIR}"/${PN}.init.2 ${PN}
+
+       if use usb && ! use kernel_linux; then
+               newinitd "${FILESDIR}"/ekey-ulusbd.init.2 ekey-ulusbd
+               newconfd "${FILESDIR}"/ekey-ulusbd.conf.2 ekey-ulusbd
+       fi
+
+       if use kernel_linux; then
+               local rules="${FILESDIR}/90-ekeyd.rules"
+
+               udev_newrules ${rules} 90-${PN}.rules
+       fi
+
+       if use munin; then
+               exeinto /usr/libexec/munin/plugins
+               doexe munin/ekeyd_stat_
+
+               insinto /etc/munin/plugin-conf.d
+               newins munin/plugin-conf.d_ekeyd ekeyd
+       fi
+}
+
+pkg_postinst() {
+       elog "${CATEGORY}/${PN} now install also the EGD client service ekey-egd-linux."
+       elog "To use this service, you need enable EGDTCPSocket for the ekeyd service"
+       elog "managing the key(s)."
+       elog ""
+       elog "The daemon will send more entropy to the kernel once the available pool"
+       elog "falls below the value set in the kernel.random.write_wakeup_threshold"
+       elog "sysctl entry."
+       elog ""
+       ewarn "Since version 1.1.4-r1, ekey-egd-linux will *not* set the watermark for"
+       ewarn "you, instead you'll have to configure the sysctl in /etc/sysctl.conf"
+
+       use minimal && return
+       # from here on, document everything that is not part of the minimal
+       # support.
+
+       elog ""
+       elog "To make use of your EntropyKey, make sure to execute ekey-rekey"
+       elog "the first time, and then start the ekeyd service."
+       elog ""
+       elog "By default ekeyd will feed the entropy directly to the kernel's pool;"
+       elog "if your system has jumps in load average, you might prefer using the"
+       elog "EGD compatibility mode, by enabling EGDTCPSocket for ekeyd and then"
+       elog "starting the ekey-egd-linux service."
+       elog ""
+       elog "The same applies if you intend to provide entropy for multiple hosts"
+       elog "over the network. If you want to have the ekey-egd-linux service on"
+       elog "other hosts, you can enable the 'minimal' USE flag."
+       elog ""
+       elog "The service supports multiplexing if you wish to use multiple"
+       elog "keys, just symlink /etc/init.d/ekeyd → /etc/init.d/ekeyd.identifier"
+       elog "and it'll be looking for /etc/entropykey/identifier.conf"
+       elog ""
+
+       if use usb; then
+               if use kernel_linux; then
+                       elog "You're going to use the userland USB daemon, the udev rules"
+                       elog "will be used accordingly. If you want to use the CDC driver"
+                       elog "please disable the usb USE flag."
+               else
+                       elog "You're going to use the userland USB daemon, since your OS"
+                       elog "does not support udev, you should start the ekey-ulusbd"
+                       elog "service before ekeyd."
+               fi
+
+               ewarn "The userland USB daemon has multiple known issues. If you can,"
+               ewarn "please consider disabling the 'usb' USE flag and instead use the"
+               ewarn "CDC-ACM access method."
+       else
+               if use kernel_linux; then
+                       elog "Some versions of Linux have a faulty CDC ACM driver that stops"
+                       elog "EntropyKey from working properly; please check the compatibility"
+                       elog "table at http://www.entropykey.co.uk/download/"
+               else
+                       elog "Make sure your operating system supports the CDC ACM driver"
+                       elog "or otherwise you won't be able to use the EntropyKey."
+               fi
+               elog ""
+               elog "If you're unsure about the working state of the CDC ACM driver"
+               elog "enable the usb USE flag and use the userland USB daemon"
+       fi
+}
diff --git a/app-crypt/ekeyd/files/90-ekeyd.rules b/app-crypt/ekeyd/files/90-ekeyd.rules
new file mode 100644 (file)
index 0000000..fef6881
--- /dev/null
@@ -0,0 +1,16 @@
+# Entropy key udev rules
+#
+# Centos/RHEL 6 rules for udev version 147
+# 
+# These rules create devices under /dev/entropykey/<serialnumber>
+#
+# Copyright 2011 Simtec Electronics
+#
+# For licence terms refer to the COPYING file distributed with the source.
+
+ACTION=="add", SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="20df", ENV{ID_MODEL_ID}=="0001", SYMLINK+="entropykey/$env{ID_SERIAL_SHORT}"
+
+ACTION=="add", SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="20df", ENV{ID_MODEL_ID}=="0001", RUN+="/usr/sbin/ekeydctl add $env{DEVNAME} $env{ID_SERIAL_SHORT}"
+
+ACTION=="remove", SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="20df", ENV{ID_MODEL_ID}=="0001", RUN+="/usr/sbin/ekeydctl remove $env{ID_SERIAL_SHORT}"
+
diff --git a/app-crypt/ekeyd/files/ekey-egd-linux.conf.2 b/app-crypt/ekeyd/files/ekey-egd-linux.conf.2
new file mode 100644 (file)
index 0000000..8c0b089
--- /dev/null
@@ -0,0 +1,10 @@
+# Configuration file for ekey-egd-linux
+
+# Hostname or IP address to connect to.
+#HOST="localhost"
+# Port number to connect to.
+#PORT="8888"
+# Time  between reconnect attempts.
+#RECONNECTINTERVAL=10
+# Set the number of 1024 bit blocks to request each time
+#BLOCKS=2
diff --git a/app-crypt/ekeyd/files/ekey-egd-linux.init.2 b/app-crypt/ekeyd/files/ekey-egd-linux.init.2
new file mode 100644 (file)
index 0000000..91ca2ed
--- /dev/null
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-egd-linux.init.2,v 1.1 2011/10/20 11:40:27 flameeyes Exp $
+
+: ${HOST:=localhost}
+: ${PORT:=8888}
+: ${RECONNECTINTERVAL:=10}
+: ${BLOCKS:=2}
+
+description="EntropyKey EGD client"
+
+pidfile=/var/run/$SVCNAME.pid
+
+command=/usr/libexec/ekey-egd-linux
+command_args="-H ${HOST} -p ${PORT} -r ${RECONNECTINTERVAL} -b ${BLOCKS} -D ${pidfile}"
+
+depend() {
+        use net
+        after ekeyd
+
+        provide entropy
+}
diff --git a/app-crypt/ekeyd/files/ekey-ulusbd.conf.2 b/app-crypt/ekeyd/files/ekey-ulusbd.conf.2
new file mode 100644 (file)
index 0000000..7ed7301
--- /dev/null
@@ -0,0 +1,17 @@
+# Copyright 2009-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.conf.2,v 1.1 2011/10/20 11:40:27 flameeyes Exp $
+
+# The userland USB daemon has to know the USB path of the EntopyKey to
+# work properly; in alternative to providing these statically, they
+# can be found by giving the serial of the key.
+#
+# The serial will also be used to set the default path to open the
+# socket to.
+
+EKEY_SERIAL=""
+#USB_BUS=""
+#USB_DEV=""
+
+# this is set by default
+# SOCKET_PATH="/var/run/ekey-ulusbd-${EKEY_SERIAL}"
diff --git a/app-crypt/ekeyd/files/ekey-ulusbd.init.2 b/app-crypt/ekeyd/files/ekey-ulusbd.init.2
new file mode 100644 (file)
index 0000000..fd7192d
--- /dev/null
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+# Copyright 2009-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.init.2,v 1.1 2011/10/20 11:40:27 flameeyes Exp $
+
+INSTANCE="${SVCNAME#*.}"
+if [ -z "${INSTANCE}" -o "${SVCNAME}" = "ekey-ulusbd" ]; then
+       INSTANCE="ekey-ulusbd"
+fi
+
+: ${SOCKET_PATH:=/var/run/ekey-ulusbd-${EKEY_SERIAL}}
+
+description="EntropyKey Userland USB Daemon"
+
+pidfile=/var/run/$SVCNAME.pid
+command=/usr/libexec/ekey-ulusbd
+command_args="-P ${pidfile} -p ${SOCKET_PATH}"
+
+depend() {
+        need localmount
+}
+
+start() {
+       if [ -z ${USB_BUS} ]; then
+               set -- $(lsusb -v -d 20df:0001 | \
+                       egrep '(^Bus|iSerial)' | \
+                       grep -B1 "${EKEY_SERIAL}" | \
+                       head -n 1 | \
+                       cut -c 5-7,15-18)
+               USB_BUS=$1
+               USB_DEV=$2
+       fi
+
+       ebegin "Starting ${description}"
+       start-stop-daemon \
+               --start --pidfile ${pidfile} \
+               --exec ${command} -- \
+               ${command_args} \
+               -b $(printf %03d ${USB_BUS}) -d $(printf %03d ${USB_DEV}) -D
+       eend $?
+}
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch b/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch
new file mode 100644 (file)
index 0000000..f149136
--- /dev/null
@@ -0,0 +1,133 @@
+Index: ekeyd-1.1.4/host/ekeyd.c
+===================================================================
+--- ekeyd-1.1.4.orig/host/ekeyd.c
++++ ekeyd-1.1.4/host/ekeyd.c
+@@ -209,7 +209,7 @@ open_foldback_output(void)
+     return (output_stream != NULL);
+ }
+-static const char *usage=
++static const char usage[]=
+     "Usage: %s [-f <configfile>] [-p <pidfile>] [-v] [-h]\n"
+     "Entropy Key Daemon\n\n"
+     "\t-f Read configuration from configfile\n"
+Index: ekeyd-1.1.4/host/ekey-setkey.c
+===================================================================
+--- ekeyd-1.1.4.orig/host/ekey-setkey.c
++++ ekeyd-1.1.4/host/ekey-setkey.c
+@@ -79,7 +79,7 @@ calc_mac(uint8_t *snum, uint8_t *mkey, u
+     return mac;
+ }
+-static const char *usage =
++static const char usage[] =
+     "Usage: %s [-d] [-h] [-n] [-f <keyring>] [-m <master>]\n"
+     "       [-s <serial>] <path>\n"
+     "Entropy key device long term session key tool\n\n"
+Index: ekeyd-1.1.4/host/ekey-ulusbd.c
+===================================================================
+--- ekeyd-1.1.4.orig/host/ekey-ulusbd.c
++++ ekeyd-1.1.4/host/ekey-ulusbd.c
+@@ -100,7 +100,8 @@ find_usb_device(char *busmatch, char *de
+ #if LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
+     if ((r = usb_detach_kernel_driver_np(devh, EKEY_IFACE)) != 0) {
+-        if (r != -ENODATA) {
++        /* libusb_compat-0.1.3 mistakenly translate ENODATA to ENOENT */
++        if (r != -ENODATA && r != -ENOENT) {
+             fprintf(stderr, 
+                     "Unable to detach Entropy Key at %s/%s from kernel\n", 
+                     busmatch, devmatch);
+Index: ekeyd-1.1.4/udev/entropykey.sh
+===================================================================
+--- ekeyd-1.1.4.orig/udev/entropykey.sh
++++ ekeyd-1.1.4/udev/entropykey.sh
+@@ -19,9 +19,9 @@ wait_for_usb () {
+     COUNTER=$(( ${COUNTER} + 1 ))
+     test ${COUNTER} -ge 10 && exit 1
+   done
+-  $BINPATH/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid -p/var/run/entropykeys/${ENTROPY_KEY_SERIAL} -D
++  /usr/libexec/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid -p/dev/entropykey/${ENTROPY_KEY_SERIAL} -D
+   sleep 1
+-  $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
++  $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
+   exit 0
+ }
+@@ -34,18 +34,18 @@ else
+     if test "x${BUSNUM}" = "x" -o "x${DEVNUM}" = "x"; then
+       exit 0
+     fi
+-    if test -r "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid"; then
+-      kill $(cat "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid") || true
++    if test -r "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid"; then
++      kill $(< "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid") || true
+     fi
+-    mkdir -p /var/run/entropykeys
++    mkdir -p /dev/entropykey /dev/.ekeyd-ulusb
+     wait_for_usb &
+     exit 0
+   fi
+   # Update ekeyd with device operation
+-  $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
++  $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
+   if test "x$ACTION" = "xremove"; then
+-    rm "/var/run/ekey-ulusbd-${ENTROPYKEY_KEY_SERIAL}.pid"
+-    rm "/var/run/entropykeys/${ENTROPYKEY_KEY_SERIAL}"
++    rm "/dev/.ekey-ulusbd/${ENTROPYKEY_KEY_SERIAL}.pid"
++    rm "/dev/entropykey/${ENTROPYKEY_KEY_SERIAL}"
+   fi
+ fi
+Index: ekeyd-1.1.4/udev/fedora15/60-entropykey.rules
+===================================================================
+--- ekeyd-1.1.4.orig/udev/fedora15/60-entropykey.rules
++++ ekeyd-1.1.4/udev/fedora15/60-entropykey.rules
+@@ -9,10 +9,10 @@
+ # For licence terms refer to the COPYING file distributed with the source.
+ # Detect an Entropy Key being inserted and add info values to environment
+-ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
++ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
+ # Detect an Entropy Key being inserted and extract serial number
+-ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT}"
++ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c '/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT} | /bin/sed -e s:/:_:g'"
+ # Add the /dev/entropykey/<serialnumber> symbolic link
+ ENV{ENTROPY_KEY_SERIAL}!="", SYMLINK+="entropykey/$env{ENTROPY_KEY_SERIAL}"
+Index: ekeyd-1.1.4/udev/fedora15/60-entropykey-uds.rules
+===================================================================
+--- ekeyd-1.1.4.orig/udev/fedora15/60-entropykey-uds.rules
++++ ekeyd-1.1.4/udev/fedora15/60-entropykey-uds.rules
+@@ -9,7 +9,7 @@
+ # For licence terms refer to the COPYING file.
+ # Detect an Entropy Key being inserted and extract serial number
+-ACTION=="add|change|remove", SUBSYSTEM=="usb", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$attr{serial}"
++ACTION=="add|change|remove", SUBSYSTEM=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c '/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT} | /bin/sed -e s:/:_:g'"
+ # And tell the ekeyd about the device action.
+ ENV{ENTROPY_KEY_SERIAL}!="", RUN+="/lib/udev/entropykey.sh"
+Index: ekeyd-1.1.4/host/Makefile
+===================================================================
+--- ekeyd-1.1.4.orig/host/Makefile
++++ ekeyd-1.1.4/host/Makefile
+@@ -107,7 +107,7 @@ OPT ?= -O2
+ CFLAGS += $(INCLUDES)
+ CFLAGS += -g -Wall $(OPT)
+ CFLAGS += -fno-strict-aliasing
+-CFLAGS += -std=c99 -Wall -pedantic -Wshadow -Werror -D_GNU_SOURCE
++CFLAGS += -std=c99 -Wall -pedantic -Wshadow -D_GNU_SOURCE
+ CFLAGS += '-DCONFIGFILE="$(SYSCONFPREFIX)/ekeyd.conf"'
+ CFLAGS += '-DPIDFILE="$(RUNTIMEPREFIX)/ekeyd.pid"'
+ CFLAGS += '-DKEYRINGFILE="$(SYSCONFPREFIX)/keyring"'
+@@ -148,7 +148,7 @@ daemonise_ulusbd.o: daemonise.c
+       $(COMPILE.c) $(OUTPUT_OPTION) $(PTHFLAGS) $^
+ egd-linux: egd-linux.o daemonise.o
+-      $(CC) $(CFLAGS) -o $@ $^
++      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ ekeyd: ekeyd.o daemonise.o lstate.o connection.o stream.o frame.o packet.o keydb.o util.o fds.o krnlop.o foldback.o stats.o nonce.o ../device/frames/pem.o ../device/skeinwrap.o ../device/skein/skein.o ../device/skein/skein_block.o
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
diff --git a/app-crypt/ekeyd/files/ekeyd-1.patch b/app-crypt/ekeyd/files/ekeyd-1.patch
new file mode 100644 (file)
index 0000000..81ad8e6
--- /dev/null
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User kristianf
+# Date 1382916823 -3600
+#      Mon Oct 28 00:33:43 2013 +0100
+# Node ID 0d99149615ec5ec70a6d03c685291ddc55babff6
+# Parent  fd192324ff9ae4c4c92cdb9c27f5ae100da136a6
+Rewrite static const char *usage
+
+diff -r fd192324ff9a -r 0d99149615ec host/ekey-setkey.c
+--- a/host/ekey-setkey.c       Mon Oct 28 00:31:59 2013 +0100
++++ b/host/ekey-setkey.c       Mon Oct 28 00:33:43 2013 +0100
+@@ -79,7 +79,7 @@
+     return mac;
+ }
+-static const char *usage =
++static const char usage[] =
+     "This is a low level tool. You probably wanted to use ekey-rekey instead.\n\n"
+     "Usage: %s [-d] [-h] [-n] [-f <keyring>] [-m <master>]\n"
+     "       [-s <serial>] <path>\n"
+diff -r fd192324ff9a -r 0d99149615ec host/ekeyd.c
+--- a/host/ekeyd.c     Mon Oct 28 00:31:59 2013 +0100
++++ b/host/ekeyd.c     Mon Oct 28 00:33:43 2013 +0100
+@@ -209,7 +209,7 @@
+     return (output_stream != NULL);
+ }
+-static const char *usage=
++static const char usage[] =
+     "Usage: %s [-f <configfile>] [-p <pidfile>] [-v] [-h]\n"
+     "Entropy Key Daemon\n\n"
+     "\t-f Read configuration from configfile\n"
diff --git a/app-crypt/ekeyd/files/ekeyd-2.patch b/app-crypt/ekeyd/files/ekeyd-2.patch
new file mode 100644 (file)
index 0000000..2d4cccb
--- /dev/null
@@ -0,0 +1,23 @@
+# HG changeset patch
+# User kristianf
+# Date 1382916946 -3600
+#      Mon Oct 28 00:35:46 2013 +0100
+# Node ID 0a9e41a05aafb98cc8c21562931cb1cbb5e30c1f
+# Parent  0d99149615ec5ec70a6d03c685291ddc55babff6
+libusb_compat
+
+diff -r 0d99149615ec -r 0a9e41a05aaf host/ekey-ulusbd.c
+--- a/host/ekey-ulusbd.c       Mon Oct 28 00:33:43 2013 +0100
++++ b/host/ekey-ulusbd.c       Mon Oct 28 00:35:46 2013 +0100
+@@ -100,8 +100,9 @@
+ #if LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
+     if ((r = usb_detach_kernel_driver_np(devh, EKEY_IFACE)) != 0) {
+-        if (r != -ENODATA) {
+-            fprintf(stderr, 
++        /* libusb_compat-0.1.3 mistakenly translate ENODATA to ENOENT */
++      if (r != -ENODATA && r != -ENOENT) {
++            fprintf(stderr, 
+                     "Unable to detach Entropy Key at %s/%s from kernel\n", 
+                     busmatch, devmatch);
+             usb_close(devh);
diff --git a/app-crypt/ekeyd/files/ekeyd-3.patch b/app-crypt/ekeyd/files/ekeyd-3.patch
new file mode 100644 (file)
index 0000000..0a9a591
--- /dev/null
@@ -0,0 +1,49 @@
+# HG changeset patch
+# User kristianf
+# Date 1382917171 -3600
+#      Mon Oct 28 00:39:31 2013 +0100
+# Node ID d96c42b36cb125e6e52cff623b7bdad1910284b4
+# Parent  0a9e41a05aafb98cc8c21562931cb1cbb5e30c1f
+entropykey.sh
+
+diff -r 0a9e41a05aaf -r d96c42b36cb1 udev/entropykey.sh
+--- a/udev/entropykey.sh       Mon Oct 28 00:35:46 2013 +0100
++++ b/udev/entropykey.sh       Mon Oct 28 00:39:31 2013 +0100
+@@ -19,9 +19,10 @@
+     COUNTER=$(( ${COUNTER} + 1 ))
+     test ${COUNTER} -ge 10 && exit 1
+   done
+-  $BINPATH/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid -p/var/run/entropykeys/${ENTROPY_KEY_SERIAL} -D
++  /usr/libexec/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid -p/dev/entropykey/${ENTROPY_KEY_SERIAL} -D
++
+   sleep 1
+-  $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
++  $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
+   exit 0
+ }
+@@ -34,18 +35,18 @@
+     if test "x${BUSNUM}" = "x" -o "x${DEVNUM}" = "x"; then
+       exit 0
+     fi
+-    if test -r "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid"; then
+-      kill $(cat "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid") || true
++    if test -r "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid"; then
++      kill $(< "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid") || true
+     fi
+-    mkdir -p /var/run/entropykeys
++    mkdir -p /dev/entropykey /dev/.ekeyd-ulusb
+     wait_for_usb &
+     exit 0
+   fi
+   # Update ekeyd with device operation
+-  $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
++  $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
+   if test "x$ACTION" = "xremove"; then
+-    rm "/var/run/ekey-ulusbd-${ENTROPYKEY_KEY_SERIAL}.pid"
+-    rm "/var/run/entropykeys/${ENTROPYKEY_KEY_SERIAL}"
++    rm "/dev/.ekey-ulusbd/${ENTROPYKEY_KEY_SERIAL}.pid"
++    rm "/dev/entropykey/${ENTROPYKEY_KEY_SERIAL}"
+   fi
+ fi
diff --git a/app-crypt/ekeyd/files/ekeyd-4.patch b/app-crypt/ekeyd/files/ekeyd-4.patch
new file mode 100644 (file)
index 0000000..c4b53a8
--- /dev/null
@@ -0,0 +1,36 @@
+# HG changeset patch
+# User kristianf
+# Date 1382917319 -3600
+#      Mon Oct 28 00:41:59 2013 +0100
+# Node ID 902b9c6908618864319835d69981f9ea902be324
+# Parent  d96c42b36cb125e6e52cff623b7bdad1910284b4
+udev rule
+
+diff -r d96c42b36cb1 -r 902b9c690861 udev/fedora15/60-entropykey-uds.rules
+--- a/udev/fedora15/60-entropykey-uds.rules    Mon Oct 28 00:39:31 2013 +0100
++++ b/udev/fedora15/60-entropykey-uds.rules    Mon Oct 28 00:41:59 2013 +0100
+@@ -9,7 +9,7 @@
+ # For licence terms refer to the COPYING file.
+ # Detect an Entropy Key being inserted and extract serial number
+-ACTION=="add|change|remove", SUBSYSTEM=="usb", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$attr{serial}"
++ACTION=="add|change|remove", SUBSYSTEM=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c /bin/echo ENTROPY_KEY_SERIAL=$attr{serial}"
+ # And tell the ekeyd about the device action.
+ ENV{ENTROPY_KEY_SERIAL}!="", RUN+="/lib/udev/entropykey.sh"
+diff -r d96c42b36cb1 -r 902b9c690861 udev/fedora15/60-entropykey.rules
+--- a/udev/fedora15/60-entropykey.rules        Mon Oct 28 00:39:31 2013 +0100
++++ b/udev/fedora15/60-entropykey.rules        Mon Oct 28 00:41:59 2013 +0100
+@@ -9,10 +9,10 @@
+ # For licence terms refer to the COPYING file distributed with the source.
+ # Detect an Entropy Key being inserted and add info values to environment
+-ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
++ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{builtin}="usb_id"
+ # Detect an Entropy Key being inserted and extract serial number
+-ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT}"
++ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c /bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT}"
+ # Add the /dev/entropykey/<serialnumber> symbolic link
+ ENV{ENTROPY_KEY_SERIAL}!="", SYMLINK+="entropykey/$env{ENTROPY_KEY_SERIAL}"
diff --git a/app-crypt/ekeyd/files/ekeyd-5.patch b/app-crypt/ekeyd/files/ekeyd-5.patch
new file mode 100644 (file)
index 0000000..bb5862d
--- /dev/null
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User kristianf
+# Date 1382917429 -3600
+#      Mon Oct 28 00:43:49 2013 +0100
+# Node ID 724cf5abf164dd5889a7c72916aa524c3822b8bd
+# Parent  902b9c6908618864319835d69981f9ea902be324
+Makefile
+
+diff -r 902b9c690861 -r 724cf5abf164 host/Makefile
+--- a/host/Makefile    Mon Oct 28 00:41:59 2013 +0100
++++ b/host/Makefile    Mon Oct 28 00:43:49 2013 +0100
+@@ -107,7 +107,7 @@
+ CFLAGS += $(INCLUDES)
+ CFLAGS += -g -Wall $(OPT)
+ CFLAGS += -fno-strict-aliasing
+-CFLAGS += -std=c99 -Wall -pedantic -Wshadow -Werror -D_GNU_SOURCE
++CFLAGS += -std=c99 -Wall -pedantic -Wshadow -D_GNU_SOURCE
+ CFLAGS += '-DCONFIGFILE="$(SYSCONFPREFIX)/ekeyd.conf"'
+ CFLAGS += '-DPIDFILE="$(RUNTIMEPREFIX)/ekeyd.pid"'
+ CFLAGS += '-DKEYRINGFILE="$(SYSCONFPREFIX)/keyring"'
+@@ -148,7 +148,7 @@
+       $(COMPILE.c) $(OUTPUT_OPTION) $(PTHFLAGS) $^
+ egd-linux: egd-linux.o daemonise.o
+-      $(CC) $(CFLAGS) -o $@ $^
++      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ ekeyd: ekeyd.o daemonise.o lstate.o connection.o stream.o frame.o packet.o keydb.o util.o fds.o krnlop.o foldback.o stats.o nonce.o ../device/frames/pem.o ../device/skeinwrap.o ../device/skein/skein.o ../device/skein/skein_block.o
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
diff --git a/app-crypt/ekeyd/files/ekeyd-6.patch b/app-crypt/ekeyd/files/ekeyd-6.patch
new file mode 100644 (file)
index 0000000..660f0ba
--- /dev/null
@@ -0,0 +1,50 @@
+diff -r 724cf5abf164 host/Makefile
+--- a/host/Makefile    Mon Oct 28 00:43:49 2013 +0100
++++ b/host/Makefile    Mon Oct 28 00:54:01 2013 +0100
+@@ -19,7 +19,7 @@
+ RM ?= rm -f
+ LUA_V ?= 5.1
+ EXTRA_INC ?=
+-LUA_INC ?= -I/usr/include/lua5.1
++LUA_INC ?= -I/usr/include
+ LIBDL ?= -ldl
+ PTHFLAGS ?=
+ PTHLIBS ?= -lpthread
+@@ -31,7 +31,7 @@
+ MANZEXT := .gz
+ # Current tool version as returned from tools
+-EKEYD_VERSION_S="1.1.4"
++EKEYD_VERSION_S="1.1.5"
+ # Attempt to detect an OS and set build options as appropriate
+ OSNAME=$(shell uname -s | tr A-Z a-z | tr -d /)
+@@ -91,10 +91,7 @@
+ override MANZCMD:=cat
+ override MANZEXT:=
+ endif
+-override LUA_INC:=-I/usr/local/include/lua51
+ override LIBDL:=
+-LIBDIRS += -L/usr/local/lib
+-INCLUDES += -I/usr/local/include
+ endif
+ endif
+ endif
+@@ -114,7 +111,7 @@
+ CFLAGS += '-DEKEYD_VERSION_S=""$(EKEYD_VERSION_S)""'
+ CFLAGS += $(EXTRA_CFLAGS)
+-LIBS += -llua$(LUA_V) -lm $(LIBDL)
++LIBS += -llua -lm $(LIBDL)
+ LDFLAGS += $(LIBDIRS)
+@@ -157,7 +154,7 @@
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ control.inc: bin2c.lua control.lua
+-      lua$(LUA_V) bin2c.lua +control.lua result > control.inc.new
++      lua bin2c.lua +control.lua result > control.inc.new
+       mv control.inc.new control.inc
+ lstate.o: lstate.c control.inc
diff --git a/app-crypt/ekeyd/files/ekeyd.init.2 b/app-crypt/ekeyd/files/ekeyd.init.2
new file mode 100644 (file)
index 0000000..a3f372c
--- /dev/null
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekeyd.init.2,v 1.1 2011/10/20 11:40:27 flameeyes Exp $
+
+INSTANCE="${SVCNAME#*.}"
+if [ -z "${INSTANCE}" -o "${SVCNAME}" = "ekeyd" ]; then
+       INSTANCE="ekeyd"
+fi
+
+description="EntropyKey daemon"
+
+pidfile=/var/run/$SVCNAME.pid
+cfgfile=/etc/entropykey/${INSTANCE}.conf
+
+command=/usr/libexec/ekeyd
+command_args="-f ${cfgfile} -p ${pidfile}"
+
+depend() {
+        config $cfgfile
+
+        use udev ekey-ulusbd
+        need localmount
+
+        # quickly parse the configuration file; we only provide entropy
+        # if we're not using the egd server/client split method.
+        if sed -e 's:--.*::' "${cfgfile}" | grep -q SetOutputToKernel; then
+                provide entropy
+        fi
+}
diff --git a/app-crypt/ekeyd/metadata.xml b/app-crypt/ekeyd/metadata.xml
new file mode 100644 (file)
index 0000000..d5a9416
--- /dev/null
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name='usb'>
+      Build the libusb-based userland daemon for accessing the
+      EntropyKey (alternative to the CDC USB driver). It is suggested
+      to use this option by default, as the CDC driver in the kernel
+      often seems to be fragile (or the gadget implementation on the
+      EntropyKey is too buggy), and can cause various problems.
+    </flag>
+
+    <flag name='munin'>
+      Install a plugin for <pkg>net-analyzer/munin</pkg> to graph
+      statistical data from ekeyd.
+    </flag>
+
+    <flag name='minimal'>
+      Only install the ekey-egd-linux service rather than the full
+      ekeyd package.
+    </flag>
+  </use>
+</pkgmetadata>