[gentoo-commits] repo/gentoo:master commit in: app-crypt/ekeyd/

2023-06-10 Thread Sam James
commit: 25d99355502f9657f6c13d5d8a9ba16b909bc294
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 02:12:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 10 10:23:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25d99355

app-crypt/ekeyd: drop dead prefix targets

Signed-off-by: Sam James  gentoo.org>

 app-crypt/ekeyd/ekeyd-1.1.5-r101.ebuild | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r101.ebuild 
b/app-crypt/ekeyd/ekeyd-1.1.5-r101.ebuild
index 2c084ce419f0..583f31b28010 100644
--- a/app-crypt/ekeyd/ekeyd-1.1.5-r101.ebuild
+++ b/app-crypt/ekeyd/ekeyd-1.1.5-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -60,12 +60,6 @@ src_compile() {
case ${CHOST} in
*-linux-*)
osname=linux;;
-   *-freebsd*)
-   osname=freebsd;;
-   *-kfrebsd-gnu)
-   osname=gnukfreebsd;;
-   *-openbsd*)
-   osname=openbsd;;
*)
die "Unsupported operating system!"
;;



[gentoo-commits] repo/gentoo:master commit in: app-crypt/ekeyd/, app-crypt/ekeyd/files/

2021-02-17 Thread Conrad Kostecki
commit: 551aca45762a103d027dec5ea9e63b50062b1f9d
Author: Alan Swanson  improbability  net>
AuthorDate: Wed Feb 17 18:07:51 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Feb 17 19:42:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=551aca45

app-crypt/ekeyd: Update for luasocket API change

Due to changes in the luasocket API from luasocket-3.0_rc1-r5
to luasocket-3.0_rc1_p20200328 the ekeyd daemon and ekeydctl
utility now fail to start.

control.lua:755: control.lua:526: attempt to index global 'socket' (a nil value)

Patch from a Debian bug:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=852380

Closes: https://github.com/gentoo/gentoo/pull/19508
Closes: https://bugs.gentoo.org/770967
Signed-off-by: Alan Swanson  improbability.net>
Signed-off-by: Conrad Kostecki  gentoo.org>

 app-crypt/ekeyd/ekeyd-1.1.5-r101.ebuild   | 171 ++
 app-crypt/ekeyd/files/ekeyd-1.1.5-luasocket.patch |  90 
 2 files changed, 261 insertions(+)

diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r101.ebuild 
b/app-crypt/ekeyd/ekeyd-1.1.5-r101.ebuild
new file mode 100644
index 000..a1a139660f3
--- /dev/null
+++ b/app-crypt/ekeyd/ekeyd-1.1.5-r101.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+inherit linux-info lua-single systemd toolchain-funcs udev
+
+DESCRIPTION="Entropy Key userspace daemon"
+HOMEPAGE="http://www.entropykey.co.uk/;
+SRC_URI="mirror://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 usb"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+   minimal? ( !munin )"
+
+EKEYD_RDEPEND="${LUA_DEPS}"
+EKEYD_DEPEND="${EKEYD_RDEPEND}"
+EKEYD_RDEPEND="${EKEYD_RDEPEND}
+   $(lua_gen_cond_dep '
+   dev-lua/luasocket[${LUA_USEDEP}]
+   ')
+   kernel_linux? ( virtual/udev )
+   munin? ( net-analyzer/munin )"
+
+RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
+   virtual/service-manager"
+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
+   lua-single_pkg_setup
+}
+
+PATCHES=(
+   "${FILESDIR}"/${P}-const_char_usage.patch
+   "${FILESDIR}"/${P}-enoent.patch
+   "${FILESDIR}"/${P}-path-fixes.patch
+   "${FILESDIR}"/${P}-udev-rule.patch
+   "${FILESDIR}"/${P}-remove-werror.patch
+   "${FILESDIR}"/${P}-misc.patch
+   "${FILESDIR}"/${P}-makefile-lua-libs.patch
+   "${FILESDIR}"/${P}-luasocket.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
+
+   emake -C host \
+   CC="$(tc-getCC)" \
+   LUA_V=${ELUA#lua} \
+   LUA_INC="-I$(lua_get_include_dir)" \
+   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 

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ekeyd/

2021-02-17 Thread Conrad Kostecki
commit: 1e0b76540d09e1225b56a8ac0582cf1758d5ebd2
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Feb 17 19:44:59 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Feb 17 19:44:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e0b7654

app-crypt/ekeyd: drop old version

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild | 170 
 1 file changed, 170 deletions(-)

diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild 
b/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild
deleted file mode 100644
index c3a1d948e95..000
--- a/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 )
-
-inherit linux-info lua-single systemd toolchain-funcs udev
-
-DESCRIPTION="Entropy Key userspace daemon"
-HOMEPAGE="http://www.entropykey.co.uk/;
-SRC_URI="mirror://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 usb"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
-   minimal? ( !munin )"
-
-EKEYD_RDEPEND="${LUA_DEPS}"
-EKEYD_DEPEND="${EKEYD_RDEPEND}"
-EKEYD_RDEPEND="${EKEYD_RDEPEND}
-   $(lua_gen_cond_dep '
-   dev-lua/luasocket[${LUA_USEDEP}]
-   ')
-   kernel_linux? ( virtual/udev )
-   munin? ( net-analyzer/munin )"
-
-RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
-   virtual/service-manager"
-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
-   lua-single_pkg_setup
-}
-
-PATCHES=(
-   "${FILESDIR}"/${P}-const_char_usage.patch
-   "${FILESDIR}"/${P}-enoent.patch
-   "${FILESDIR}"/${P}-path-fixes.patch
-   "${FILESDIR}"/${P}-udev-rule.patch
-   "${FILESDIR}"/${P}-remove-werror.patch
-   "${FILESDIR}"/${P}-misc.patch
-   "${FILESDIR}"/${P}-makefile-lua-libs.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
-
-   emake -C host \
-   CC="$(tc-getCC)" \
-   LUA_V=${ELUA#lua} \
-   LUA_INC="-I$(lua_get_include_dir)" \
-   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 

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ekeyd/

2021-01-25 Thread Marek Szuba
commit: f6e043a1da85c0fa1cf23f07287fcc14859c98dc
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Jan 25 14:00:14 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Jan 25 17:37:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6e043a1

app-crypt/ekeyd: remove old

Signed-off-by: Marek Szuba  gentoo.org>

 app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild | 163 --
 1 file changed, 163 deletions(-)

diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild 
b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
deleted file mode 100644
index afdd149626d..000
--- a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd toolchain-funcs udev
-
-DESCRIPTION="Entropy Key userspace daemon"
-HOMEPAGE="http://www.entropykey.co.uk/;
-SRC_URI="mirror://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 usb"
-REQUIRED_USE="minimal? ( !munin )"
-
-EKEYD_RDEPEND="dev-lang/lua:0"
-EKEYD_DEPEND="${EKEYD_RDEPEND}"
-EKEYD_RDEPEND="${EKEYD_RDEPEND}
-   dev-lua/luasocket
-   kernel_linux? ( virtual/udev )
-   munin? ( net-analyzer/munin )"
-
-RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
-   virtual/service-manager"
-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
-}
-
-PATCHES=(
-   "${FILESDIR}"/${P}-const_char_usage.patch
-   "${FILESDIR}"/${P}-enoent.patch
-   "${FILESDIR}"/${P}-path-fixes.patch
-   "${FILESDIR}"/${P}-udev-rule.patch
-   "${FILESDIR}"/${P}-remove-werror.patch
-   "${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 

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ekeyd/

2020-12-05 Thread Conrad Kostecki
commit: 772d50989448ba09ca0400d0c50feb86f8f17f36
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Dec  5 22:59:16 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Dec  5 23:25:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=772d5098

app-crypt/ekeyd: drop unused multilib eclass

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild   | 2 +-
 app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild 
b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
index 7816044711f..afdd149626d 100644
--- a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
+++ b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib linux-info toolchain-funcs udev systemd
+inherit linux-info systemd toolchain-funcs udev
 
 DESCRIPTION="Entropy Key userspace daemon"
 HOMEPAGE="http://www.entropykey.co.uk/;

diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild 
b/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild
index 7bec7620063..c3a1d948e95 100644
--- a/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild
+++ b/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-1 )
 
-inherit multilib linux-info lua-single toolchain-funcs udev systemd
+inherit linux-info lua-single systemd toolchain-funcs udev
 
 DESCRIPTION="Entropy Key userspace daemon"
 HOMEPAGE="http://www.entropykey.co.uk/;



[gentoo-commits] repo/gentoo:master commit in: app-crypt/ekeyd/

2020-11-24 Thread Marek Szuba
commit: c40300c9a8a6f40cb7bc16103e1a013e09e6551a
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Nov 24 12:32:08 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Nov 24 13:15:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c40300c9

app-crypt/ekeyd: migrate to EAPI-7

In preparation for slotted-Lua support. Very nearly trivial.

Signed-off-by: Marek Szuba  gentoo.org>

 app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild | 23 +++
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild 
b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
index 4cdadc14084..7816044711f 100644
--- a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
+++ b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils multilib linux-info toolchain-funcs udev systemd
+inherit multilib linux-info toolchain-funcs udev systemd
 
 DESCRIPTION="Entropy Key userspace daemon"
 HOMEPAGE="http://www.entropykey.co.uk/;
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="kernel_linux munin minimal usb"
 REQUIRED_USE="minimal? ( !munin )"
 
-EKEYD_RDEPEND="dev-lang/lua"
+EKEYD_RDEPEND="dev-lang/lua:0"
 EKEYD_DEPEND="${EKEYD_RDEPEND}"
 EKEYD_RDEPEND="${EKEYD_RDEPEND}
dev-lua/luasocket
@@ -23,7 +23,6 @@ EKEYD_RDEPEND="${EKEYD_RDEPEND}
munin? ( net-analyzer/munin )"
 
 RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
-   !app-crypt/ekey-egd-linux
virtual/service-manager"
 DEPEND="!minimal? ( ${EKEYD_DEPEND} )"
 
@@ -35,14 +34,14 @@ pkg_setup() {
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";
-}
+PATCHES=(
+   "${FILESDIR}"/${P}-const_char_usage.patch
+   "${FILESDIR}"/${P}-enoent.patch
+   "${FILESDIR}"/${P}-path-fixes.patch
+   "${FILESDIR}"/${P}-udev-rule.patch
+   "${FILESDIR}"/${P}-remove-werror.patch
+   "${FILESDIR}"/${P}-misc.patch
+)
 
 src_compile() {
local osname



[gentoo-commits] repo/gentoo:master commit in: app-crypt/ekeyd/, profiles/, app-crypt/ekeyd/files/

2020-11-24 Thread Marek Szuba
commit: a493d13cd0653e1b3d2703339d0cf9d3cb74c9d5
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Nov 24 13:11:27 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Nov 24 13:15:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a493d13c

app-crypt/ekeyd: migrate to lua-single.eclass

Confirmed not to work with lua5.2 - linking ekeyd fails with

host/lstate.c:430: undefined reference to `luaL_register' .

In light of the above and given the age of this code, didn't even bother
testing it with 5.3 and 5.4.

Closes: https://bugs.gentoo.org/752894
Signed-off-by: Marek Szuba  gentoo.org>

 app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild| 170 +
 .../files/ekeyd-1.1.5-makefile-lua-libs.patch  |  15 ++
 profiles/package.mask  |   1 +
 3 files changed, 186 insertions(+)

diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild 
b/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild
new file mode 100644
index 000..7bec7620063
--- /dev/null
+++ b/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+inherit multilib linux-info lua-single toolchain-funcs udev systemd
+
+DESCRIPTION="Entropy Key userspace daemon"
+HOMEPAGE="http://www.entropykey.co.uk/;
+SRC_URI="mirror://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 usb"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+   minimal? ( !munin )"
+
+EKEYD_RDEPEND="${LUA_DEPS}"
+EKEYD_DEPEND="${EKEYD_RDEPEND}"
+EKEYD_RDEPEND="${EKEYD_RDEPEND}
+   $(lua_gen_cond_dep '
+   dev-lua/luasocket[${LUA_USEDEP}]
+   ')
+   kernel_linux? ( virtual/udev )
+   munin? ( net-analyzer/munin )"
+
+RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
+   virtual/service-manager"
+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
+   lua-single_pkg_setup
+}
+
+PATCHES=(
+   "${FILESDIR}"/${P}-const_char_usage.patch
+   "${FILESDIR}"/${P}-enoent.patch
+   "${FILESDIR}"/${P}-path-fixes.patch
+   "${FILESDIR}"/${P}-udev-rule.patch
+   "${FILESDIR}"/${P}-remove-werror.patch
+   "${FILESDIR}"/${P}-misc.patch
+   "${FILESDIR}"/${P}-makefile-lua-libs.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
+
+   emake -C host \
+   CC="$(tc-getCC)" \
+   LUA_V=${ELUA#lua} \
+   LUA_INC="-I$(lua_get_include_dir)" \
+   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 

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ekeyd/

2020-01-12 Thread David Seifert
commit: a9efe8c8e24042cb5d40b34b8d428358deaf5808
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jan 12 17:06:35 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan 12 17:06:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9efe8c8

app-crypt/ekeyd: Replace unicode arrow

* Mandated by GLEP 31

Closes: https://bugs.gentoo.org/704970
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild 
b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
index cd17249ebd0..4cdadc14084 100644
--- a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
+++ b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -146,7 +146,7 @@ pkg_postinst() {
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 "keys, just symlink /etc/init.d/ekeyd -> 
/etc/init.d/ekeyd.identifier"
elog "and it'll be looking for /etc/entropykey/identifier.conf"
elog ""
 



[gentoo-commits] repo/gentoo:master commit in: app-crypt/ekeyd/files/

2019-11-18 Thread Aaron Bauman
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
--  

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ekeyd/

2019-11-10 Thread Aaron Bauman
commit: a80bd887c44ebfdcec1beea6629dbedd1986d089
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sun Nov 10 01:22:11 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Nov 10 01:22:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a80bd887

app-crypt/ekeyd: drop old EAPIs

Signed-off-by: Aaron Bauman  gentoo.org>

 app-crypt/ekeyd/Manifest  |   1 -
 app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild | 185 --
 app-crypt/ekeyd/ekeyd-1.1.5.ebuild| 164 --
 3 files changed, 350 deletions(-)

diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
index 00f8f588cf9..d41fd57288d 100644
--- a/app-crypt/ekeyd/Manifest
+++ b/app-crypt/ekeyd/Manifest
@@ -1,2 +1 @@
-DIST ekeyd-1.1.4.tar.gz 100911 BLAKE2B 
7b0c6ed31f73ed559ed0a34325680618d700d069b873e7ebc92dc8d8082c9d03e5ea2d7ddfc2b31e927914a0d2cd130faed97ce07eea4af3005f1499b1fd2d1c
 SHA512 
40632722827e07ebc643fa32af9910b28053873329772681dba2b029ad0b3c63d1d6bba3fdd0549b84e23779d2e2ae0323a53e1fdf93eb963570bab2227b63e6
 DIST ekeyd_1.1.5.orig.tar.gz 101366 BLAKE2B 
7edd6d291f7553864c9aa96ee3d9533e33b6c94989b2c6b1a56eda42f61afe1633af5e7c3c8f5f57920ac0577f8567d1b09238eae35138ab2023600f01096466
 SHA512 
c30620d5e54a49929be72ed04448a4f08eb9658dbf7534586c49a3b43bdd5fc95a0659e09cc04b012c339ca20a1e914fa5a4b4d970171c46b64235f284516b9a

diff --git a/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild 
b/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild
deleted file mode 100644
index 70403d447d8..000
--- a/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-
-

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ekeyd/files/

2018-03-21 Thread Kristian Fiskerstrand
commit: c766d91b7081958681fb5fc7c113ffdd5bb7
Author: Kristian Fiskerstrand  gentoo  org>
AuthorDate: Wed Mar 21 19:55:59 2018 +
Commit: Kristian Fiskerstrand  gentoo  org>
CommitDate: Wed Mar 21 19:55:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c766d91b

app-crypt/ekeyd: Fixes for systemd service file

Closes: https://bugs.gentoo.org/649478
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-crypt/ekeyd/files/ekeyd.service | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-crypt/ekeyd/files/ekeyd.service 
b/app-crypt/ekeyd/files/ekeyd.service
index 637b424b703..0529574db5c 100644
--- a/app-crypt/ekeyd/files/ekeyd.service
+++ b/app-crypt/ekeyd/files/ekeyd.service
@@ -3,6 +3,8 @@ Description=Entropy key daemon
 
 [Service]
 ExecStart=/usr/libexec/ekeyd 
+Type=forking
+PIDFile=/var/run/ekeyd.pid
 
 [Install]
 WantedBy=multi-user.target



[gentoo-commits] repo/gentoo:master commit in: app-crypt/ekeyd/

2018-03-21 Thread Kristian Fiskerstrand
commit: f2530bd9707c3ddd8e3dd26f248586e938aba29b
Author: Kristian Fiskerstrand  gentoo  org>
AuthorDate: Wed Mar 21 19:52:56 2018 +
Commit: Kristian Fiskerstrand  gentoo  org>
CommitDate: Wed Mar 21 19:52:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2530bd9

app-crypt/ekeyd: don't depend directly on openrc

Closes: https://bugs.gentoo.org/649476
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild | 164 ++
 1 file changed, 164 insertions(+)

diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild 
b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
new file mode 100644
index 000..cd17249ebd0
--- /dev/null
+++ b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib linux-info toolchain-funcs udev systemd
+
+DESCRIPTION="Entropy Key userspace daemon"
+HOMEPAGE="http://www.entropykey.co.uk/;
+SRC_URI="mirror://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 usb"
+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
+   virtual/service-manager"
+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