<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7c1d58a4a4745f9f72c7c061e4718fecfa37085d">https://github.com/macports/macports-ports/commit/7c1d58a4a4745f9f72c7c061e4718fecfa37085d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7c1d58a4a4745f9f72c7c061e4718fecfa37085d
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Mar 16 04:58:40 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> lua-luasec: update to 1.3.0 & use luarocks_org PG
</span>---
lua/lua-luasec/Portfile | 75 ++++++++-----------------------
lua/lua-luasec/files/patch-luasocket.diff | 12 -----
lua/lua-luasec/files/patch-makefiles.diff | 42 -----------------
3 files changed, 18 insertions(+), 111 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-luasec/Portfile b/lua/lua-luasec/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 53b3fb23925..521bd12afd5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-luasec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lua/lua-luasec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,64 +1,25 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup luarocks_org 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup brunoos luasec 1.2.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name lua-luasec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories lua devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license MIT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description LuaSec depends on OpenSSL, and integrates with LuaSocket \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- to make it easy to add secure connections to any Lua \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- applications or scripts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name lua-luasec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.rock luasec-${version}-1.src.rock
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description {*}${description} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This version includes a new X509 certificate API.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description a binding for OpenSSL library to provide TLS/SSL communication over LuaSocket
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description A binding for OpenSSL library to provide TLS/SSL communication over LuaSocket. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This version delegates to LuaSocket the TCP connection establishment between the client and server. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Then LuaSec uses this connection to start a secure TLS/SSL session.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 68f30192f6b69421bb78e6788d2f3ec83cc3ba50 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fc65a7f1cf56a786fcdec7040c1a273f507864d75b901c8beed9296c06595657 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 53417
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c38f5ca306dca36b5e57ae7481f0f25d32175928 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a6128cecffe6a9a2f8650b7c64a18774cadb24b60e7051375556963eaa0822e1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 117163
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# builds with bundled copy of LuaSocket by default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# so dependency on lua-luasocket is not necessary.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.dependencies luasocket
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-makefiles.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-luasocket.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@MACOS_VER@|${macosx_deployment_target}|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@SSLDIR@|[openssl::lib_dir]|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.c_standard 1999
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set lua_version 5.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set lua_path ${prefix}/share/lua/${lua_version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set lua_cpath ${prefix}/lib/lua/${lua_version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set extra_flags "-D_DARWIN_C_SOURCE -std=gnu99"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set extra_flags "-std=c99"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env "CC=${configure.cc} [get_canonical_archflags] ${extra_flags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INC_PATH=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIB_PATH=-L${prefix}/lib -L[openssl::lib_dir] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUAPATH=${lua_path} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUACPATH=${lua_cpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env LUAPATH=${lua_path} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUACPATH=${lua_cpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.uploader brunoos
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-luasec/files/patch-luasocket.diff b/lua/lua-luasec/files/patch-luasocket.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5bd263f5343..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-luasec/files/patch-luasocket.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/luasocket/usocket.c.orig 2022-07-30 19:42:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/luasocket/usocket.c 2022-11-26 17:38:51.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -426,7 +426,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case EAI_MEMORY: return "memory allocation failure";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case EAI_NONAME:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "host or service not provided, or not known";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef EAI_OVERFLOW
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case EAI_OVERFLOW: return "argument buffer overflow";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef EAI_PROTOCOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case EAI_PROTOCOL: return "resolved protocol is unknown";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-luasec/files/patch-makefiles.diff b/lua/lua-luasec/files/patch-makefiles.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 671b443f1eb..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-luasec/files/patch-makefiles.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2022-07-30 19:42:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2022-12-04 05:34:57.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Inform the location to install the modules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LUAPATH ?= /usr/share/lua/5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LUACPATH ?= /usr/lib/lua/5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# LUAPATH ?= /usr/share/lua/5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# LUACPATH ?= /usr/lib/lua/5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Compile with build-in LuaSocket's help files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Comment this lines if you will link with non-internal LuaSocket's help files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,13 +10,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Edit the lines below to inform new path, if necessary.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Path below points to internal LuaSocket's help files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INC_PATH ?= -I/usr/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIB_PATH ?= -L/usr/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INC_PATH ?= -I@PREFIX@/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIB_PATH ?= -L@PREFIX@/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCDIR = -I. $(INC_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBDIR = -L./luasocket $(LIB_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBDIR = -L./luasocket -L@SSLDIR@ $(LIB_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For Mac OS X: set the system version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MACOSX_VERSION=10.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MACOSX_VERSION=@MACOS_VER@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #----------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Do not edit this part
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.orig 2022-07-30 19:42:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2022-11-26 17:27:12.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,8 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAC_LDFLAGS=-bundle -undefined dynamic_lookup $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL = install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CC ?= cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CCLD ?= $(MYENV) $(CC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CCLD ?= $(MYENV) $(CC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += $(MYCFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS += $(MYLDFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>