mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
dev-lua/luasocket: Patch to fix proxy variable issue, EAPI 7
This is needed for games-simulation/corsix-th, which I will add back into the repository. Closes: https://bugs.gentoo.org/585962 Package-Manager: Portage-2.3.48, Repoman-2.3.10
This commit is contained in:
31
dev-lua/luasocket/files/proxy-fix.patch
Normal file
31
dev-lua/luasocket/files/proxy-fix.patch
Normal file
@@ -0,0 +1,31 @@
|
||||
From 1f9ccb2b586c3a7e29db3c99a23ac1cee6907cf2 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre Chapuis <catwell@archlinux.us>
|
||||
Date: Fri, 5 Jul 2013 18:00:29 +0200
|
||||
Subject: [PATCH] http: look for PROXY in _M, not as a global
|
||||
|
||||
---
|
||||
src/http.lua | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/http.lua b/src/http.lua
|
||||
index 5f70a374..f83dcc55 100644
|
||||
--- a/src/http.lua
|
||||
+++ b/src/http.lua
|
||||
@@ -186,7 +186,7 @@ end
|
||||
local function adjusturi(reqt)
|
||||
local u = reqt
|
||||
-- if there is a proxy, we need the full url. otherwise, just a part.
|
||||
- if not reqt.proxy and not PROXY then
|
||||
+ if not reqt.proxy and not _M.PROXY then
|
||||
u = {
|
||||
path = socket.try(reqt.path, "invalid path 'nil'"),
|
||||
params = reqt.params,
|
||||
@@ -198,7 +198,7 @@ local function adjusturi(reqt)
|
||||
end
|
||||
|
||||
local function adjustproxy(reqt)
|
||||
- local proxy = reqt.proxy or PROXY
|
||||
+ local proxy = reqt.proxy or _M.PROXY
|
||||
if proxy then
|
||||
proxy = url.parse(proxy)
|
||||
return proxy.host, proxy.port or 3128
|
||||
55
dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
Normal file
55
dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
Normal file
@@ -0,0 +1,55 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit multilib multilib-minimal flag-o-matic
|
||||
|
||||
DESCRIPTION="Networking support library for the Lua language"
|
||||
HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/"
|
||||
SRC_URI="https://github.com/diegonehab/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="debug"
|
||||
|
||||
RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}]"
|
||||
DEPEND="${RDEPEND}
|
||||
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
|
||||
|
||||
S=${WORKDIR}/${PN}-${PV/_/-}
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/proxy-fix.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
multilib_copy_sources
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
emake \
|
||||
CC="$(tc-getCC) ${CFLAGS}" \
|
||||
LD="$(tc-getCC) ${LDFLAGS}"\
|
||||
$(usex debug DEBUG="DEBUG" "")
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
local luav=$($(tc-getPKG_CONFIG) --variable V lua)
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
LUAPREFIX_linux=/usr \
|
||||
LUAV=${luav} \
|
||||
CDIR_linux=$(get_libdir)/lua/${luav} \
|
||||
install-unix
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
dodoc NEW README
|
||||
docinto html
|
||||
dodoc -r doc/.
|
||||
}
|
||||
Reference in New Issue
Block a user