gentoo resync : 03.03.2021

3 files changed, 93 insertions, 1 deletions

diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
index 9bbccb410c61..3ee83c0217d4 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-luasocket.patch 2995 BLAKE2B f27a794eec6bbcffd1510090f39e336e6af770895766e0ea0e8cfaba32e99adca2f77702976909f563ddd2c28fee97fc37da9c1398656cd034cc1d1e3a8f5efb SHA512 a83f5a8c93bcf48d4d2a1658b8c425bf6c0b7c3f1e511d5621e1b2746c7f71e28e1e5427b1117dac10b396841a78c4608e53d8b3ee24a35f34505ea11ba93995
 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
@@ -11,5 +12,5 @@ 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-r100.ebuild 4898 BLAKE2B cfef82e459b492409b1e4622d17f10806c924017922437d3229db2c583aa1f1f03330418a24cd13d127c7be41df113aebef99a69df75cb905072b9ab6c8281bd SHA512 c4d880416c9fbbcac5f45d3f2a039b256ec900873079ba9a0f3e570b4c15b9e08fc19872ec297f6a6b5fd1b19f362820fbea92543208ebd3e1fe17ba1fad427a
+EBUILD ekeyd-1.1.5-r101.ebuild 4934 BLAKE2B 9900c445c49ca14a4a4281ba37fcf32a04fa5e0bbbc8c751ca2f5d621281e8cdae814cd7ad53f496512fedf72d2ba969340844e321ebd87ba4b0aaa62bafcb78 SHA512 9fdf7b20e9ab86398d3978a98befcc9c569b4148de9c922985e2d688987f012b101e5b008c117c1c1ee07cd6d5f1a3b64000a2c411d136ab29d78f160dc72237
 MISC metadata.xml 775 BLAKE2B f20c01d6a705492bfeeb4788f3f2950ac5f3a012abaaacb4e526ff7b5685475515c229f8c14ca7961ad946497a3636d02e6a9e4ee4e6bedf5cbeee39af6c4a27 SHA512 7a202bbf5b18e938f16ecb0773fdb80ec72d00d3d88f396632e552cfa3c7e7c4104362e34aec356833800833b7b531d9694906dd1174ee76f06ad8ef09758b03
diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild b/app-crypt/ekeyd/ekeyd-1.1.5-r101.ebuild
index c3a1d948e95b..a1a139660f3c 100644
--- a/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild
+++ b/app-crypt/ekeyd/ekeyd-1.1.5-r101.ebuild
@@ -49,6 +49,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-remove-werror.patch
 	"${FILESDIR}"/${P}-misc.patch
 	"${FILESDIR}"/${P}-makefile-lua-libs.patch
+	"${FILESDIR}"/${P}-luasocket.patch
 )
 
 src_compile() {
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.5-luasocket.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-luasocket.patch
new file mode 100644
index 000000000000..604913bc5cb2
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.5-luasocket.patch
@@ -0,0 +1,90 @@
+From: Courtney Bane <debian-bugs-4450@cbane.org>
+Date: Mon, 23 Jan 2017 20:30:59 -0600
+Subject: Fix compatibility problems with Unix domain sockets in newer
+ versions of luasocket.
+
+---
+ host/control.lua | 14 ++++++++------
+ host/ekeydctl.in |  7 ++++---
+ 2 files changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/host/control.lua b/host/control.lua
+index 7b9b1b8..22d700f 100644
+--- a/host/control.lua
++++ b/host/control.lua
+@@ -38,11 +38,11 @@ local PROTOCOL_VERSION = "1"
+ local dos_callcount = 0
+ 
+ -- Libraries we need
+-require "socket"
++socket = require "socket"
+ 
+ local have_unix_domain_sockets = false
+ function tryload_unix()
+-   require "socket.unix"
++   socket.unix = require "socket.unix"
+    have_unix_domain_sockets = true
+ end
+ 
+@@ -521,14 +521,15 @@ end
+ 
+ if have_unix_domain_sockets then
+    function UnixControlSocket(sockname)
++      local sock = socket.unix.stream or socket.unix.tcp or socket.unix
+       -- Add a UDS control socket to the set of control sockets available
+       -- First, try and connect, so we can abort if it's present.
+-      if socket.unix():connect(sockname) then
++      if sock():connect(sockname) then
+ 	 error("Control socket " .. sockname .. " already present. Is ekeyd already running?")
+       end
+       -- Okay, clean up (ignoring errors) and create a fresh socket
+       unlink(sockname)
+-      local u = socket.unix()
++      local u = sock()
+       assert(u:bind(sockname))
+       assert(u:listen())
+       addctlsocket(u, "U:" .. sockname)
+@@ -554,12 +555,13 @@ end _ "TCPControlSocket"
+ if have_unix_domain_sockets then
+    function EGDUnixSocket(sockname, modestr, user, group)
+       SetFoldedOutput()
+-      if socket.unix():connect(sockname) then
++      local sock = socket.unix.stream or socket.unix.tcp or socket.unix
++      if sock():connect(sockname) then
+ 	 error("EGD socket " .. sockname .. " already present. Is ekeyd/EGD already running?")
+       end
+       -- Add a UDS control socket to the set of control sockets available
+       unlink(sockname)
+-      local u = socket.unix()
++      local u = sock()
+       assert(u:bind(sockname))
+       assert(u:listen())
+       addctlsocket(u, "U:" .. sockname, false, egd_ctlread)
+diff --git a/host/ekeydctl.in b/host/ekeydctl.in
+index 9292ac6..802cf38 100755
+--- a/host/ekeydctl.in
++++ b/host/ekeydctl.in
+@@ -1,11 +1,11 @@
+ #!/usr/bin/env lua@LUA_V@
+ -- -*- Lua -*-
+ 
+-require "socket"
++local socket = require "socket"
+ 
+ -- Try to load the UNIX domain sockets support
+ pcall(function()
+-	 require "socket.unix"
++	 socket.unix = require "socket.unix"
+       end)
+ 
+ 
+@@ -98,7 +98,8 @@ end
+ 
+ function connect_to_daemon()
+    if __unixcontrolpath then
+-      __socket = socket.unix()
++      local sock = socket.unix.stream or socket.unix.tcp or socket.unix
++      __socket = sock()
+       local result, msg = __socket:connect(__unixcontrolpath)
+       if not result then
+ 	 error("Unable to connect to ekeyd at " .. __unixcontrolpath .. " (" .. msg .. ") Is ekeyd running?")