* [gentoo-commits] repo/gentoo:master commit in: dev-lua/luasocket/, dev-lua/luasocket/files/
@ 2018-09-01 12:34 James Le Cuirot
0 siblings, 0 replies; 2+ messages in thread
From: James Le Cuirot @ 2018-09-01 12:34 UTC (permalink / raw
To: gentoo-commits
commit: 44350e8fd19acc4020b7524768ffdb4dfcd06f38
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 1 12:33:09 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 1 12:33:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44350e8f
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
dev-lua/luasocket/files/proxy-fix.patch | 31 +++++++++++++++
dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild | 55 +++++++++++++++++++++++++++
2 files changed, 86 insertions(+)
diff --git a/dev-lua/luasocket/files/proxy-fix.patch b/dev-lua/luasocket/files/proxy-fix.patch
new file mode 100644
index 00000000000..302e63663ff
--- /dev/null
+++ b/dev-lua/luasocket/files/proxy-fix.patch
@@ -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
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
new file mode 100644
index 00000000000..9789a03154f
--- /dev/null
+++ b/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
@@ -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/.
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lua/luasocket/, dev-lua/luasocket/files/
@ 2022-05-05 16:17 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2022-05-05 16:17 UTC (permalink / raw
To: gentoo-commits
commit: b61097f7317442a9ffe1e79e1a7b0cfa200719f7
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu May 5 16:14:43 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu May 5 16:14:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b61097f7
dev-lua/luasocket: drop 3.0_rc1_p20200328-r103
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-lua/luasocket/Manifest | 1 -
.../luasocket-3.0_rc1_p20200328_makefile.patch | 89 ---------------------
.../luasocket-3.0_rc1_p20200328-r103.ebuild | 90 ----------------------
3 files changed, 180 deletions(-)
diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index 9c1c2992f0e5..3a3d05df3569 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,2 +1 @@
DIST luasocket-3.0.0.tar.gz 336231 BLAKE2B 71b87041a1edb2616ba269160382ac5cea6ba9b623281e8069e8adf97b6898d7836add7eff949010a1bc890bff8d2e4797a2ff5c619b45f8ee3adee5d6633843 SHA512 4f93d6c0b602333df50ee4f939cd0419243f6de333472ffebf99334e301143e8cdee3bc1655c29f81608622d6e7850a9bcf6929a6d4748210a70cdb8218a1ec6
-DIST luasocket-3.0_rc1_p20200328.tar.gz 335628 BLAKE2B 9e5d3e415337903b689705669b586c4481179a319b4e3428823c8f442d04f26db86bfeca66db7e58d157e31431c31e4f687403f7163b75f57d6f87cdb934717f SHA512 bdf7086a0504b0072b9cfd1266fc4ae89504053801722859a426f567fca00ed76f4c295c2a3a968e93f0036d9b792cf97561e9baa82c09ea23999cfd473227eb
diff --git a/dev-lua/luasocket/files/luasocket-3.0_rc1_p20200328_makefile.patch b/dev-lua/luasocket/files/luasocket-3.0_rc1_p20200328_makefile.patch
deleted file mode 100644
index c6e25d7969f6..000000000000
--- a/dev-lua/luasocket/files/luasocket-3.0_rc1_p20200328_makefile.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 49f935a774661d5d0d9b1727c2eee12d11f3b692 Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Tue, 19 Oct 2021 01:13:28 +0300
-Subject: [PATCH 2/2] Fix CFLAGS and LDFLAGS options
-
-Remove CFLAGS optimization overrides, add -Wl,-soname option to LDFLAGS
-for external linking.
----
- src/makefile | 21 +++++++++------------
- 1 file changed, 9 insertions(+), 12 deletions(-)
-
-diff --git a/src/makefile b/src/makefile
-index 522d378..cf4a571 100755
---- a/src/makefile
-+++ b/src/makefile
-@@ -162,7 +162,7 @@ SO_macosx=so
- O_macosx=o
- CC_macosx=gcc
- DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
--CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
-+CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -fno-common
- LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o
- LD_macosx=gcc
- SOCKET_macosx=usocket.o
-@@ -174,8 +174,7 @@ SO_linux=so
- O_linux=o
- CC_linux=gcc
- DEF_linux=-DLUASOCKET_$(DEBUG)
--CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
-- -Wimplicit -O2 -ggdb3 -fpic
-+CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra -Wimplicit -fpic
- LDFLAGS_linux=-O -shared -fpic -o
- LD_linux=gcc
- SOCKET_linux=usocket.o
-@@ -187,8 +186,7 @@ SO_freebsd=so
- O_freebsd=o
- CC_freebsd=gcc
- DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
--CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
-- -Wimplicit -O2 -ggdb3 -fpic
-+CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra -Wimplicit -fpic
- LDFLAGS_freebsd=-O -shared -fpic -o
- LD_freebsd=gcc
- SOCKET_freebsd=usocket.o
-@@ -200,8 +198,7 @@ SO_solaris=so
- O_solaris=o
- CC_solaris=gcc
- DEF_solaris=-DLUASOCKET_$(DEBUG)
--CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
-- -Wimplicit -O2 -ggdb3 -fpic
-+CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra -Wimplicit -fpic
- LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o
- LD_solaris=gcc
- SOCKET_solaris=usocket.o
-@@ -214,7 +211,7 @@ O_mingw=o
- CC_mingw=gcc
- DEF_mingw= -DLUASOCKET_$(DEBUG) \
- -DWINVER=0x0501
--CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
-+CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -fno-common
- LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o
- LD_mingw=gcc
- SOCKET_mingw=wsocket.o
-@@ -396,18 +393,18 @@ none:
- all: $(SOCKET_SO) $(MIME_SO)
-
- $(SOCKET_SO): $(SOCKET_OBJS)
-- $(LD) $(SOCKET_OBJS) $(LDFLAGS)$@
-+ $(LD) $(SOCKET_OBJS) -Wl,-soname,socket/core.so $(LDFLAGS)$@
-
- $(MIME_SO): $(MIME_OBJS)
-- $(LD) $(MIME_OBJS) $(LDFLAGS)$@
-+ $(LD) $(MIME_OBJS) -Wl,-soname,mime/core.so $(LDFLAGS)$@
-
- all-unix: all $(UNIX_SO) $(SERIAL_SO)
-
- $(UNIX_SO): $(UNIX_OBJS)
-- $(LD) $(UNIX_OBJS) $(LDFLAGS)$@
-+ $(LD) $(UNIX_OBJS) -Wl,-soname,socket/unix.so $(LDFLAGS)$@
-
- $(SERIAL_SO): $(SERIAL_OBJS)
-- $(LD) $(SERIAL_OBJS) $(LDFLAGS)$@
-+ $(LD) $(SERIAL_OBJS) -Wl,-soname,socket/serial.so $(LDFLAGS)$@
-
- install:
- $(INSTALL_DIR) $(INSTALL_TOP_LDIR)
---
-2.32.0
-
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
deleted file mode 100644
index 283cd08f0c64..000000000000
--- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_COMMIT="5b18e475f38fcf28429b1cc4b17baee3b9793a62"
-LUA_COMPAT=( lua5-{1..4} luajit )
-MY_P="${PN}-${EGIT_COMMIT}"
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="Networking support library for the Lua language"
-HOMEPAGE="
- http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
- https://github.com/lunarmodules/luasocket
-"
-SRC_URI="https://github.com/lunarmodules/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="test"
-
-RDEPEND="${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-HTML_DOCS="doc/."
-
-PATCHES=(
- "${FILESDIR}/${P}_publish_API.patch"
- "${FILESDIR}/${P}_makefile.patch"
-)
-
-src_prepare() {
- default
- lua_copy_sources
-}
-
-lua_src_compile() {
- pushd "${BUILD_DIR}" || die
-
- local myemakeargs=(
- "CC=$(tc-getCC)"
- "LD=$(tc-getCC)"
- "LUAINC_linux=$(lua_get_include_dir)"
- "LUAV=${ELUA}"
- "MIME_V=1.0.3-${ELUA}"
- "MYCFLAGS=${CFLAGS}"
- "MYLDFLAGS=${LDFLAGS}"
- "SOCKET_V=3.0-rc1-${ELUA}"
- )
-
- emake "${myemakeargs[@]}" all
-
- popd
-}
-
-src_compile() {
- lua_foreach_impl lua_src_compile
-}
-
-lua_src_install() {
- pushd "${BUILD_DIR}" || die
-
- local myemakeargs=(
- "CDIR=$(lua_get_cmod_dir)"
- "DESTDIR=${ED}"
- "LDIR=$(lua_get_lmod_dir)"
- "LUAPREFIX_linux="
- "MIME_V=1.0.3-${ELUA}"
- "SOCKET_V=3.0-rc1-${ELUA}"
- )
-
- emake "${myemakeargs[@]}" install
- emake "${myemakeargs[@]}" install-unix
-
- insinto "$(lua_get_include_dir)"/luasocket
- doins src/*.h
-
- popd
-}
-
-src_install() {
- lua_foreach_impl lua_src_install
-
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-05 16:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-01 12:34 [gentoo-commits] repo/gentoo:master commit in: dev-lua/luasocket/, dev-lua/luasocket/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2022-05-05 16:17 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox