commit: c36bba976f4d77ece27af095b6b09900b14112fe
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Wed Nov 13 17:12:03 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon Nov 18 22:16:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c36bba97
app-crypt/ekeyd: remove unused patch/files
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13632
Signed-off-by: Aaron Bauman gentoo.org>
app-crypt/ekeyd/files/ekey-ulusbd.conf.2 | 16 ---
app-crypt/ekeyd/files/ekey-ulusbd.init.2 | 40
app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch | 133 -
3 files changed, 189 deletions(-)
diff --git a/app-crypt/ekeyd/files/ekey-ulusbd.conf.2
b/app-crypt/ekeyd/files/ekey-ulusbd.conf.2
deleted file mode 100644
index 15a641fa3ff..000
--- a/app-crypt/ekeyd/files/ekey-ulusbd.conf.2
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2009-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# 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
index ef52db2a668..000
--- a/app-crypt/ekeyd/files/ekey-ulusbd.init.2
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2009-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
deleted file mode 100644
index f1491362e83..000
--- a/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-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 ] [-p ] [-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 ] [-m ]\n"
- " [-s ] \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
--