From 0d980b3a34fe71eda731cda69da710a36244129b Mon Sep 17 00:00:00 2001 From: Alexander M Pickering Date: Wed, 18 Dec 2024 23:47:46 -0600 Subject: work --- init | 4 +- luaossl-git-0.rockspec | 153 +++++++++++++++++++++++++++++++++++++++++++++++++ luaossl-git.rockspec | 153 ------------------------------------------------- meta.lua | 3 + 4 files changed, 158 insertions(+), 155 deletions(-) create mode 100644 luaossl-git-0.rockspec delete mode 100644 luaossl-git.rockspec diff --git a/init b/init index 9d9ba52..12517f5 100755 --- a/init +++ b/init @@ -1,9 +1,9 @@ #!/bin/sh -ex -cp luaossl-packaging/luaossl-git.rockspec luaossl +cp luaossl-packaging/luaossl-git-0.rockspec luaossl cd luaossl luarocks config variables.CFLAGS " $CFLAGS" -luarocks make --pack-binary-rock luafilesystem-scm-1.rockspec +luarocks make --pack-binary-rock luaossl-git-0.rockspec obj="luaossl-git.$(luarocks config arch).rock" cp $obj /root cd /root diff --git a/luaossl-git-0.rockspec b/luaossl-git-0.rockspec new file mode 100644 index 0000000..dc740b7 --- /dev/null +++ b/luaossl-git-0.rockspec @@ -0,0 +1,153 @@ +package = "luaossl" +version = "git-0" +source = { + url = "file:///root/luaossl"; +} +description = { + summary = "Most comprehensive OpenSSL module in the Lua universe."; + homepage = "http://25thandclement.com/~william/projects/luaossl.html"; + license = "MIT/X11"; +} +supported_platforms = { + "unix"; + "windows"; +} +dependencies = { + "lua"; +} +external_dependencies = { + OPENSSL = { + header = "openssl/ssl.h"; + library = "ssl"; + }; + CRYPTO = { + header = "openssl/crypto.h"; + library = "crypto"; + }; + platforms = { + windows = { + OPENSSL = { + library = "libeay32" + }; + CRYPTO = { + library = "ssleay32" + }; + } + }; +} +build = { + type = "builtin"; + modules = { + ["_openssl"] = { + sources = { + "src/openssl.c"; + "vendor/compat53/c-api/compat-5.3.c"; + }; + libraries = { + "ssl"; + "crypto"; + }; + defines = { + "_REENTRANT"; "_THREAD_SAFE"; + "COMPAT53_PREFIX=luaossl"; + }; + incdirs = { + "$(OPENSSL_INCDIR)"; + "$(CRYPTO_INCDIR)"; + }; + libdirs = { + "$(OPENSSL_LIBDIR)"; + "$(CRYPTO_LIBDIR)"; + }; + }; + ["openssl"] = "src/openssl.lua"; + ["openssl.auxlib"] = "src/openssl.auxlib.lua"; + ["openssl.bignum"] = "src/openssl.bignum.lua"; + ["openssl.cipher"] = "src/openssl.cipher.lua"; + ["openssl.des"] = "src/openssl.des.lua"; + ["openssl.digest"] = "src/openssl.digest.lua"; + ["openssl.hmac"] = "src/openssl.hmac.lua"; + ["openssl.kdf"] = "src/openssl.kdf.lua"; + ["openssl.ocsp.basic"] = "src/openssl.ocsp.basic.lua"; + ["openssl.ocsp.response"] = "src/openssl.ocsp.response.lua"; + ["openssl.pkcs12"] = "src/openssl.pkcs12.lua"; + ["openssl.pkey"] = "src/openssl.pkey.lua"; + ["openssl.pubkey"] = "src/openssl.pubkey.lua"; + ["openssl.rand"] = "src/openssl.rand.lua"; + ["openssl.ssl.context"] = "src/openssl.ssl.context.lua"; + ["openssl.ssl"] = "src/openssl.ssl.lua"; + ["openssl.x509"] = "src/openssl.x509.lua"; + ["openssl.x509.altname"] = "src/openssl.x509.altname.lua"; + ["openssl.x509.chain"] = "src/openssl.x509.chain.lua"; + ["openssl.x509.crl"] = "src/openssl.x509.crl.lua"; + ["openssl.x509.csr"] = "src/openssl.x509.csr.lua"; + ["openssl.x509.extension"] = "src/openssl.x509.extension.lua"; + ["openssl.x509.name"] = "src/openssl.x509.name.lua"; + ["openssl.x509.store"] = "src/openssl.x509.store.lua"; + ["openssl.x509.verify_param"] = "src/openssl.x509.verify_param.lua"; + }; + platforms = { + -- Unixy systems need to link with pthreads and libm. + -- We also define _GNU_SOURCE in the hope for extra functionality + unix = { + modules = { + ["_openssl"] = { + libraries = { + nil, nil; + "pthread"; + "m"; + }; + defines = { + nil, nil, nil; + "_GNU_SOURCE"; + } + }; + }; + }; + -- Only linux needs to link with libdl + linux = { + modules = { + ["_openssl"] = { + libraries = { + nil, nil, nil, nil; + "dl"; + }; + }; + }; + }; + -- On windows, OpenSSL libraries are named differently + -- We also have to guide autoguess around some incorrect assumptions + win32 = { + modules = { + ["_openssl"] = { + libraries = { + "libeay32"; + "ssleay32"; + "ws2_32"; + "advapi32"; + "kernel32"; + }; + defines = { + nil, nil, nil; + "HAVE_SYS_PARAM_H=0"; + "HAVE_DLFCN_H=0"; + -- Need to set version to at least Vista to get inet_pton + "_WIN32_WINNT=0x0600"; + }; + }; + }; + }; + }; + patches = { + ["config.h.diff"] = [[ +--- a/src/openssl.c ++++ b/src/openssl.c +@@ -26,3 +26 @@ +-#if HAVE_CONFIG_H +-#include "config.h" +-#endif ++#include "../config.h.guess" +]]; + } +} + diff --git a/luaossl-git.rockspec b/luaossl-git.rockspec deleted file mode 100644 index 5ce0dd6..0000000 --- a/luaossl-git.rockspec +++ /dev/null @@ -1,153 +0,0 @@ -package = "luaossl" -version = "git" -source = { - url = "file:///root/luaossl"; -} -description = { - summary = "Most comprehensive OpenSSL module in the Lua universe."; - homepage = "http://25thandclement.com/~william/projects/luaossl.html"; - license = "MIT/X11"; -} -supported_platforms = { - "unix"; - "windows"; -} -dependencies = { - "lua"; -} -external_dependencies = { - OPENSSL = { - header = "openssl/ssl.h"; - library = "ssl"; - }; - CRYPTO = { - header = "openssl/crypto.h"; - library = "crypto"; - }; - platforms = { - windows = { - OPENSSL = { - library = "libeay32" - }; - CRYPTO = { - library = "ssleay32" - }; - } - }; -} -build = { - type = "builtin"; - modules = { - ["_openssl"] = { - sources = { - "src/openssl.c"; - "vendor/compat53/c-api/compat-5.3.c"; - }; - libraries = { - "ssl"; - "crypto"; - }; - defines = { - "_REENTRANT"; "_THREAD_SAFE"; - "COMPAT53_PREFIX=luaossl"; - }; - incdirs = { - "$(OPENSSL_INCDIR)"; - "$(CRYPTO_INCDIR)"; - }; - libdirs = { - "$(OPENSSL_LIBDIR)"; - "$(CRYPTO_LIBDIR)"; - }; - }; - ["openssl"] = "src/openssl.lua"; - ["openssl.auxlib"] = "src/openssl.auxlib.lua"; - ["openssl.bignum"] = "src/openssl.bignum.lua"; - ["openssl.cipher"] = "src/openssl.cipher.lua"; - ["openssl.des"] = "src/openssl.des.lua"; - ["openssl.digest"] = "src/openssl.digest.lua"; - ["openssl.hmac"] = "src/openssl.hmac.lua"; - ["openssl.kdf"] = "src/openssl.kdf.lua"; - ["openssl.ocsp.basic"] = "src/openssl.ocsp.basic.lua"; - ["openssl.ocsp.response"] = "src/openssl.ocsp.response.lua"; - ["openssl.pkcs12"] = "src/openssl.pkcs12.lua"; - ["openssl.pkey"] = "src/openssl.pkey.lua"; - ["openssl.pubkey"] = "src/openssl.pubkey.lua"; - ["openssl.rand"] = "src/openssl.rand.lua"; - ["openssl.ssl.context"] = "src/openssl.ssl.context.lua"; - ["openssl.ssl"] = "src/openssl.ssl.lua"; - ["openssl.x509"] = "src/openssl.x509.lua"; - ["openssl.x509.altname"] = "src/openssl.x509.altname.lua"; - ["openssl.x509.chain"] = "src/openssl.x509.chain.lua"; - ["openssl.x509.crl"] = "src/openssl.x509.crl.lua"; - ["openssl.x509.csr"] = "src/openssl.x509.csr.lua"; - ["openssl.x509.extension"] = "src/openssl.x509.extension.lua"; - ["openssl.x509.name"] = "src/openssl.x509.name.lua"; - ["openssl.x509.store"] = "src/openssl.x509.store.lua"; - ["openssl.x509.verify_param"] = "src/openssl.x509.verify_param.lua"; - }; - platforms = { - -- Unixy systems need to link with pthreads and libm. - -- We also define _GNU_SOURCE in the hope for extra functionality - unix = { - modules = { - ["_openssl"] = { - libraries = { - nil, nil; - "pthread"; - "m"; - }; - defines = { - nil, nil, nil; - "_GNU_SOURCE"; - } - }; - }; - }; - -- Only linux needs to link with libdl - linux = { - modules = { - ["_openssl"] = { - libraries = { - nil, nil, nil, nil; - "dl"; - }; - }; - }; - }; - -- On windows, OpenSSL libraries are named differently - -- We also have to guide autoguess around some incorrect assumptions - win32 = { - modules = { - ["_openssl"] = { - libraries = { - "libeay32"; - "ssleay32"; - "ws2_32"; - "advapi32"; - "kernel32"; - }; - defines = { - nil, nil, nil; - "HAVE_SYS_PARAM_H=0"; - "HAVE_DLFCN_H=0"; - -- Need to set version to at least Vista to get inet_pton - "_WIN32_WINNT=0x0600"; - }; - }; - }; - }; - }; - patches = { - ["config.h.diff"] = [[ ---- a/src/openssl.c -+++ b/src/openssl.c -@@ -26,3 +26 @@ --#if HAVE_CONFIG_H --#include "config.h" --#endif -+#include "../config.h.guess" -]]; - } -} - diff --git a/meta.lua b/meta.lua index 470b515..0e8b22d 100644 --- a/meta.lua +++ b/meta.lua @@ -28,6 +28,9 @@ for version, _, name, optimization, rel, flag, _, image in cartesian(lua_version {"git", "luaossl"}, {"cicd","image-luarocks-" .. version .. "-" .. image}, {"cicd","lua" .. version .. "-" .. name .. "-" .. rel .. "-" .. image .. ":lua" .. version .. ".dll"}, + {"cicd","libressl-" .. optimization .. "-" .. rel .. "-" .. image .. ":include.tar.gz"}, + {"cicd","libressl-" .. optimization .. "-" .. rel .. "-" .. image .. ":libcrypto.a"}, + {"cicd","libressl-" .. optimization .. "-" .. rel .. "-" .. image .. ":libssl.a"}, }, produces = { ["luaossl-git.mingw32-x86_64.rock"] = {"luarocks.sh", "luaossl", image, version, name, rel}, -- cgit v1.2.3-55-g6feb