diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /app-crypt/ekeyd | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'app-crypt/ekeyd')
-rw-r--r-- | app-crypt/ekeyd/Manifest | 4 | ||||
-rw-r--r-- | app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild | 23 | ||||
-rw-r--r-- | app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild | 170 | ||||
-rw-r--r-- | app-crypt/ekeyd/files/ekeyd-1.1.5-makefile-lua-libs.patch | 15 |
4 files changed, 199 insertions, 13 deletions
diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest index 28e6f0628e50..b2ef3171ca57 100644 --- a/app-crypt/ekeyd/Manifest +++ b/app-crypt/ekeyd/Manifest @@ -3,6 +3,7 @@ AUX ekey-egd-linux.conf.2 266 BLAKE2B 387aa2985ddd362f2c0d9eedbfcd23b24a52b210d8 AUX ekey-egd-linux.init.2 456 BLAKE2B d4e7900bc0e2a089744cc1bf49084cf83c2d8f8ade84bbdea39d6c21f7896bc22e8ef7b650a2efb198b19bea5abb983b20dbafde019d8fc1ec3d57171f491a9f SHA512 55e7be6464b685aa5b290bd310020f4a01926d07a9cb071fc117081bc751a902ebbb9db51a81a5168a34cebc2ecc02360b4917356e25a2e205f57491739ff190 AUX ekeyd-1.1.5-const_char_usage.patch 1094 BLAKE2B e19d837be0652844c95cf87af8381a09f1913471609616ded55e6e3d7e0876f8996d31909e72c0ec759b324e54cc785bbde77c4eaf4f87e81935521d71427176 SHA512 92198522e3dd90d2274d9c5171c216c3a3db9d334b2b14363781456f167a65df5370a7dcf430246d944e1e14e5278bf130e068063e600589f74026ca39e319a5 AUX ekeyd-1.1.5-enoent.patch 863 BLAKE2B ec953667eaa23dcf91b15b01689c4be6315641dadaf9021240d67039ed88f651a3fe131581b60e71da8a4d9776952bed9db144c1340c98cf119e5746b53a16c9 SHA512 ace451e7aafc61e21422a81e50d3954189f80fec50160002c579db27865b46c95dc6db557533a9aa6ef3ca744394542754ba46f96de90a026e19a14477522e50 +AUX ekeyd-1.1.5-makefile-lua-libs.patch 355 BLAKE2B 89c73bb607a3a31d783027a3dff7feb2ad72e20041b76e54c656523323e017e7be12d29a628d808cc09208faed213ab2ea9b5982f138c24bc02ca3d95b3ac4e7 SHA512 a6c4a72760ec7b52db32d55d58e72e87e6d16a34a8a54bed410f17099249db044dcddf50c70b374fa71767184922bfb0bfc29d5603cb13177b652a9459aa7d9d AUX ekeyd-1.1.5-misc.patch 1245 BLAKE2B 555c6406461226ec8867f226e88bb9ca4f39d0a726c241c1638dd3339434b9f1d34620319de42c62e034da12cabebb739c92cc5df96ec9d3c79b339be839d6a2 SHA512 5a1a523fab7146e97f8396ef82d6755e1b209df728ee83dae87619a0a6d84b0b44e41b9e67f287b7f3d54a2ef80a19320650662cca0f1dfe0053eba75d113f04 AUX ekeyd-1.1.5-path-fixes.patch 1918 BLAKE2B cf29e1f7fbaef728d0c4db2b71b1ac611ba5905c16b20b511f282a649359a0e458d44e0ca9b46db9b9abbd1da8935caa5605312314fb6027589ba03aa23f9759 SHA512 aba7b1cba96e678725fc8b47b56d815d59ce015ff6a4f72eaaf5fe8b7a99ddedf05ef3534a51772330209fb3cef235d76207103ee1e7a1f3315f4a52d2c0c2be AUX ekeyd-1.1.5-remove-werror.patch 1205 BLAKE2B c10ae2dc785a3bcb98a47af002d3f96b7908046dddc091f8342a7a61d4a38278f05b677445bdf60ad3260af6d723c1a06b3bd0a279b1ba4ffb07e3a5ae2f3c5b SHA512 2ea01bbe642bd52351e8ab9b7b62147c5bec7918305dc2c5be9291e3ae98fdd90f0e6e36c450e4db6220076a45a22cf870c81b3e23beed9170f262c857acecfd @@ -10,5 +11,6 @@ AUX ekeyd-1.1.5-udev-rule.patch 2325 BLAKE2B 5617dd160c6f3617bb93dc97755f22c535e AUX ekeyd.init.2 699 BLAKE2B 4ce17a42ffc60b49232cc0bb5a19d36fecc55071df699a7ad7da6a49de352a599b8f0f11fc05fa4159d8975245e7b6181e96303182870519a7f57070a6b54da4 SHA512 3c1fe923e6f08d83d02b9559fa5b817e9abdbc97a50815ab01c7c17e3e953f54701eb1110340dc164bb67ef67905041054cd4fc98c11ea5932a539f4330c8b71 AUX ekeyd.service 157 BLAKE2B d7976301d7eb0d9be05de574f3b25c13ed3767629dff7024e7621a2d29686045cfd7664e2127a87b92d32e719b470a2795159e45c310bfdcfffa75897341213f SHA512 1082a1dc58b820882015c4f09d5154691d9d8810bfe953049a6853ea5025ec7cff2377ee931ec8ceef295241083c162e582a75fd0b134f7e8789f6d470285445 DIST ekeyd_1.1.5.orig.tar.gz 101366 BLAKE2B 7edd6d291f7553864c9aa96ee3d9533e33b6c94989b2c6b1a56eda42f61afe1633af5e7c3c8f5f57920ac0577f8567d1b09238eae35138ab2023600f01096466 SHA512 c30620d5e54a49929be72ed04448a4f08eb9658dbf7534586c49a3b43bdd5fc95a0659e09cc04b012c339ca20a1e914fa5a4b4d970171c46b64235f284516b9a -EBUILD ekeyd-1.1.5-r1.ebuild 4873 BLAKE2B dc8d7e9f7c66df2d5c9deeb86199cf7bb033de50ac8616f53351d9601eff49d6fa8b4eebcbfb22de9bf17119e3bce9da55bcea19d141f64b47b93abb144c9e16 SHA512 6fa70427d545a093f7316f06d61b7e7ebfb7a5b3e7c0735dfb59ef85a7bd2635f9a5065b244a40ba053419aa4baa4afbc9a0b99411a181b480321118edc6cb5e +EBUILD ekeyd-1.1.5-r1.ebuild 4787 BLAKE2B a7c0dca3f0eb471b061884e3898f254bf7f186d5cc0c70f93a1421248616ebbddeabaec1d802291ee64a4edbcb8a056fabc9775de839890e36e5a111f28269aa SHA512 99b54a375305242dd898cd62bcf1684f93ed3b9b3fb23504155dbb0c941df4c7eb309ccadb030a9fd7a52c4db74bd3c34bc0a245bf4144bdf23da86776a3501c +EBUILD ekeyd-1.1.5-r100.ebuild 4907 BLAKE2B aee773b503a180067973c06da3248f6ac315acdae9e6b53b07f76dd30fe08ff3f26c150fa490411abc5f63135487fd51b8186897a0a8494bd0e757d3cfdbc0a9 SHA512 00b228d5c04b5db68f49489d45150126c8582f63d9f1dddc1690f3f1b70b4e3565a8a147ae44efd820e78d173fe58327c46f2f227ceea7d0d9fbdab010a7f626 MISC metadata.xml 775 BLAKE2B f20c01d6a705492bfeeb4788f3f2950ac5f3a012abaaacb4e526ff7b5685475515c229f8c14ca7961ad946497a3636d02e6a9e4ee4e6bedf5cbeee39af6c4a27 SHA512 7a202bbf5b18e938f16ecb0773fdb80ec72d00d3d88f396632e552cfa3c7e7c4104362e34aec356833800833b7b531d9694906dd1174ee76f06ad8ef09758b03 diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild index 4cdadc140840..7816044711fd 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 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 000000000000..7bec76200631 --- /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 "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/ekeyd-1.1.5-makefile-lua-libs.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-makefile-lua-libs.patch new file mode 100644 index 000000000000..7a929bdb64c0 --- /dev/null +++ b/app-crypt/ekeyd/files/ekeyd-1.1.5-makefile-lua-libs.patch @@ -0,0 +1,15 @@ +If LUA_V is passed directly to LIBS it ends up being expanded to an empty +string at link time. + +--- a/host/Makefile ++++ b/host/Makefile +@@ -111,7 +111,8 @@ + CFLAGS += '-DEKEYD_VERSION_S=""$(EKEYD_VERSION_S)""' + CFLAGS += $(EXTRA_CFLAGS) + +-LIBS += -llua -lm $(LIBDL) ++LUA_LIBS += -llua$(LUA_V) -lm ++LIBS += $(LUA_LIBS) $(LIBDL) + LDFLAGS += $(LIBDIRS) + + |