Remove app-crypt/ekeyd
authorKristian Fiskerstrand <kf@sumptuouscapital.com>
Sat, 26 Sep 2015 19:22:03 +0000 (21:22 +0200)
committerKristian Fiskerstrand <kf@sumptuouscapital.com>
Sat, 26 Sep 2015 19:22:03 +0000 (21:22 +0200)
This package is in the main tree

15 files changed:
app-crypt/ekeyd/Manifest [deleted file]
app-crypt/ekeyd/ekeyd-1.1.5.ebuild [deleted file]
app-crypt/ekeyd/files/90-ekeyd.rules [deleted file]
app-crypt/ekeyd/files/ekey-egd-linux.conf.2 [deleted file]
app-crypt/ekeyd/files/ekey-egd-linux.init.2 [deleted file]
app-crypt/ekeyd/files/ekey-ulusbd.conf.2 [deleted file]
app-crypt/ekeyd/files/ekey-ulusbd.init.2 [deleted file]
app-crypt/ekeyd/files/ekeyd-1.1.5-const_char_usage.patch [deleted file]
app-crypt/ekeyd/files/ekeyd-1.1.5-enoent.patch [deleted file]
app-crypt/ekeyd/files/ekeyd-1.1.5-misc.patch [deleted file]
app-crypt/ekeyd/files/ekeyd-1.1.5-path-fixes.patch [deleted file]
app-crypt/ekeyd/files/ekeyd-1.1.5-remove-werror.patch [deleted file]
app-crypt/ekeyd/files/ekeyd-1.1.5-udev-rule.patch [deleted file]
app-crypt/ekeyd/files/ekeyd.init.2 [deleted file]
app-crypt/ekeyd/files/ekeyd.service [deleted file]

diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
deleted file mode 100644 (file)
index 6a4b3aa..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX 90-ekeyd.rules 686 SHA256 e466ef0364f6733f7bc44338a049543e1882f373f611e6f9e7608fc2a8ce7925 SHA512 54bbe32ffbc162ee564bc448fc80e3a94c721ee3f89bc7c614584621c7ecdd6de3d97e67802bbaf2288eb0cc82325258f4d11217f7c96a1b9d0327bcb68c4636 WHIRLPOOL fa9f8a26aa245388a6b5142d9ba5a9e398477d38d08707ce27775f109748ad63e55c55646785e82e0dfcd31675de6fef5ed093b209d4b4a937ab2f3bd956776f
-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.5-const_char_usage.patch 1094 SHA256 5cca2edeacb1ff188a47d73b7df8f63d15debca4f6fca61e2f7e1a95dcf9f69a SHA512 92198522e3dd90d2274d9c5171c216c3a3db9d334b2b14363781456f167a65df5370a7dcf430246d944e1e14e5278bf130e068063e600589f74026ca39e319a5 WHIRLPOOL 1562ad67c31d4ea9903a67651d3dbfce49b848c7a5a4f5da6ef46f33527f6762dc58e579ff3e831852c484a091af1dd9d924355d7a628e740d3604b8fee57cc3
-AUX ekeyd-1.1.5-enoent.patch 863 SHA256 8055cffd030a97c9011b9f3aba9ee4558a93e2da919c25c8cd7d73c3a571423b SHA512 ace451e7aafc61e21422a81e50d3954189f80fec50160002c579db27865b46c95dc6db557533a9aa6ef3ca744394542754ba46f96de90a026e19a14477522e50 WHIRLPOOL 270b12c836ce9231ce5bcc5331feb9261a541e251b553dd08cabc5dfe6ea0c9707724b4d42c631a36e51b1c626a2431565c175445cfd9446c4cbc41dd9fc55fe
-AUX ekeyd-1.1.5-misc.patch 1245 SHA256 9643e1e185447afaa713375dd4e5ff768223580c9fa917e61eb87ce5e00e560d SHA512 5a1a523fab7146e97f8396ef82d6755e1b209df728ee83dae87619a0a6d84b0b44e41b9e67f287b7f3d54a2ef80a19320650662cca0f1dfe0053eba75d113f04 WHIRLPOOL 6d5ac6e136814ec155c5a557bae12ff9b3c980049ee5e9c50ca2338bf74b6c3649b0a80c1d0f8667c8bfaed6fb873ee85872692d1e55e6b6fc7cb01c0028bc0a
-AUX ekeyd-1.1.5-path-fixes.patch 1918 SHA256 cea37f22aac5264eacecf640bd7199cc9b2adf116024ad8ecaf2dd3b926e823b SHA512 aba7b1cba96e678725fc8b47b56d815d59ce015ff6a4f72eaaf5fe8b7a99ddedf05ef3534a51772330209fb3cef235d76207103ee1e7a1f3315f4a52d2c0c2be WHIRLPOOL 23c101d3bf410c76d7bf09230f0564415c32fa44a1de92b64dc369dd0c3c495b3b76ab97bd8dd901056f4e15d87d48da866826e8c27b5de13db1efb481f1246d
-AUX ekeyd-1.1.5-remove-werror.patch 1205 SHA256 98cdb0271ed3f97f00120ff26e480ec0515662062f3059467ddf41b50bc57212 SHA512 2ea01bbe642bd52351e8ab9b7b62147c5bec7918305dc2c5be9291e3ae98fdd90f0e6e36c450e4db6220076a45a22cf870c81b3e23beed9170f262c857acecfd WHIRLPOOL 1a242838e5ddf710841313542d30e4111320d406139747d73d0ba770155fb87a6c151b01b87b7f8d9f4cb75a4cfa2d2e2386ac314a039c8852188712b16c0c63
-AUX ekeyd-1.1.5-udev-rule.patch 2325 SHA256 cc233ecb5ad894e5a8585028b4ed5679f1d99997393fd4acc1373b18f3ab78bd SHA512 05023ef85c454a9092cecf7f3826430caeda1e66ba5759ffe1e6f4c42f4da32048862dba6c6e19ab32febadc3a9f65cf5e1b8f0562a71fc854134b60df28a80c WHIRLPOOL 8f9ad5c55836e2370bb88a2721869f7212c8e652e6cbb6c1b424aa712fcdc69b3e6704ea27ec9547b2e5d451abe999009ba141ce455e96fcf075959b9b734ef0
-AUX ekeyd.init.2 810 SHA256 a38169a3071fc3c2b7a736ff38c4e637c3ea4fb81b9bb36723dd24d13cc719ba SHA512 9984ced308ac743375e7cea42f99a51d2dc97b17bd0acf48df4a7a165a3facd7232038e65f5d0ea14bf3475c8438f62b7c4ceb30c17bdddadd9b22a8f95b280a WHIRLPOOL 087c68ff3688d1fd868f5e5d88682f76cef42d9ae437b66ca7fd0c33590acffd56baae5138f04bca248d93c0461f8901e87562dd01252e17f7914e1866bd52aa
-AUX ekeyd.service 117 SHA256 4b676db5443cf088256add409414e944da3ce9f00f9b7ca55a8d0fbfd1802d86 SHA512 3372ed067594cd7e1c0f02402ced141fe9e9c96e6df0dbfeae2ed707c837e48860450ec1971689245d62f79351c294c222456dcb489629095e7707a7026a878d WHIRLPOOL 67a93e965c938bcb0d816b4b2072357392166de546d292251da67739c66ace97e218e8aa29ff92c745cac6966b265037b85772f7233ed80f2b254cfb17305663
-DIST ekeyd_1.1.5.orig.tar.gz 101366 SHA256 4aa8abe4bd8bb4517be3f751a75ae270ac2855ba4ba465099a3f29a2c8602ec4 SHA512 c30620d5e54a49929be72ed04448a4f08eb9658dbf7534586c49a3b43bdd5fc95a0659e09cc04b012c339ca20a1e914fa5a4b4d970171c46b64235f284516b9a WHIRLPOOL bfa6cbea82bea8aeed7a86cc5cc0e8e95bd9ceba00d57f78a0bd5bcf6694d4c37db1a43ff01a92493d83a33b41c2a17ddac366c6d2281b848d5f239b4240ea39
-EBUILD ekeyd-1.1.5.ebuild 4998 SHA256 00d96b375ca91de91ff927a986058919995666604cc91195eb207e7ebd3f2e6a SHA512 247ed8ded86d02e9f40642c3eb198cd06212e3291397f8bbbab8b5b9253021bfea9445b4f3f776f0c0cc9573e8b69a0b722f55e23bf07c20ce3ffa8d640c4a86 WHIRLPOOL 894a7c414200e06d4f4899ddbca389c6687fe3bc0f77876a934264d549588ef1a904154f2d03d53a97a8748b8bc6f3fb083b57690b9c43041bd1fbf04853e757
diff --git a/app-crypt/ekeyd/ekeyd-1.1.5.ebuild b/app-crypt/ekeyd/ekeyd-1.1.5.ebuild
deleted file mode 100644 (file)
index 7363d56..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-# 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 systemd
-
-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="kernel_linux munin minimal"
-REQUIRED_USE="minimal? ( !munin )"
-
-EKEYD_RDEPEND="dev-lang/lua"
-EKEYD_DEPEND="${EKEYD_RDEPEND}"
-EKEYD_RDEPEND="${EKEYD_RDEPEND}
-       dev-lua/luasocket
-       kernel_linux? ( virtual/udev )
-       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}-const_char_usage.patch";
-       epatch "${FILESDIR}/${P}-enoent.patch";
-       epatch "${FILESDIR}/${P}-path-fixes.patch";
-       epatch "${FILESDIR}/${P}-udev-rule.patch";
-       epatch "${FILESDIR}/${P}-remove-werror.patch";
-       epatch "${FILESDIR}/${P}-misc.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=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
-
-       # We move the daemons around to avoid polluting the available
-       # commands.
-       dodir /usr/libexec
-       mv "${D}"/usr/sbin/ekey*d "${D}"/usr/libexec
-       
-       systemd_dounit "${FILESDIR}/ekeyd.service"
-
-       newinitd "${FILESDIR}"/${PN}.init.2 ${PN}
-
-       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 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"
-}
diff --git a/app-crypt/ekeyd/files/90-ekeyd.rules b/app-crypt/ekeyd/files/90-ekeyd.rules
deleted file mode 100644 (file)
index 7529c36..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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 /dev/entropykey/$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
deleted file mode 100644 (file)
index 8c0b089..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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
deleted file mode 100644 (file)
index 91ca2ed..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/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
deleted file mode 100644 (file)
index 7ed7301..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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
deleted file mode 100644 (file)
index fd7192d..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/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.5-const_char_usage.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-const_char_usage.patch
deleted file mode 100644 (file)
index 81ad8e6..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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-1.1.5-enoent.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-enoent.patch
deleted file mode 100644 (file)
index 2d4cccb..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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-1.1.5-misc.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-misc.patch
deleted file mode 100644 (file)
index 660f0ba..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-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-1.1.5-path-fixes.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-path-fixes.patch
deleted file mode 100644 (file)
index 0a9a591..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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-1.1.5-remove-werror.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-remove-werror.patch
deleted file mode 100644 (file)
index bb5862d..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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-1.1.5-udev-rule.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-udev-rule.patch
deleted file mode 100644 (file)
index c4b53a8..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.init.2 b/app-crypt/ekeyd/files/ekeyd.init.2
deleted file mode 100644 (file)
index a3f372c..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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/files/ekeyd.service b/app-crypt/ekeyd/files/ekeyd.service
deleted file mode 100644 (file)
index 637b424..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Entropy key daemon
-
-[Service]
-ExecStart=/usr/libexec/ekeyd 
-
-[Install]
-WantedBy=multi-user.target