summaryrefslogtreecommitdiff
path: root/security/lua-sec/patches
diff options
context:
space:
mode:
authoralnsn <alnsn>2016-06-04 21:48:11 +0000
committeralnsn <alnsn>2016-06-04 21:48:11 +0000
commit9c433a2e3a422037fa03fe8a466b9fe1a5da51c7 (patch)
treec3a9257d1e3d408d241c194b8bb595654d42322c /security/lua-sec/patches
parentbc2db6893b799ed99fa86cbd39ee7bd44d9fd0da (diff)
downloadpkgsrc-9c433a2e3a422037fa03fe8a466b9fe1a5da51c7.tar.gz
Update to luasec-0.6. Switch to MASTER_SITE_GITHUB.
Notable changes between 0.5 and 0.6: Options from OpenSSL 1.0.2f Use "any" protocol, but SSL. Merge pull request #20 from Zash/zash/checkissued Method for checking if one certificate issued another Merge pull request #68 from ignacio/master Enables building with LuaRocks and MS compilers Enables building with LuaRocks and MS compilers Merge pull request #56 from gleydsonsoares/Makefile-tweaks Makefile tweaks Keep 'sslv23' for compability, but deprected. (it will be removed in the next version) Merge pull request #62 from gleydsonsoares/update_protocol_samples add TLS_method / rename "sslv23" to "any" / update protocol samples. update protocol samples(bring "tlsv1_2" to clients and "any" to servers) for consistency and readability, rename "sslv23" to "any" since that it is related to {TLS, SSLv23}methods that handles all supported protocols. add TLS_method(). for now, keep SSLv23_method() for compatibility. Update samples (using 'tlsv1'). Merge pull request #55 from gleydsonsoares/ifndef-OPENSSL_NO_SSL3 guard SSLv3_method() with #ifndef OPENSSL_NO_SSL3 Add lsec_testcontext(). bump MACOSX_VERSION fix typo; s,intall,install, guard SSLv3_method() with #ifndef OPENSSL_NO_SSL3 Set flags to compile with internal inet_ntop() by default. Tag "alpha" explicit. MinGW progress. Merge pull request #53 from hishamhm/master Reuse tag in the LuaSec upstream repository. Merge pull request #26 from Tieske/master Update rockspec to fix Windows build Alternative implementation to inet_ntop() for old versions of Windows. Do not hardcode ar added batch files to generate sample certs on Windows Perform all validation before allocating structures Validate signatures too. API changes to root:issued([intermediate]*, cert) Fix inet_ntop() on Windows. Merge branch 'master' of https://github.com/brunoos/luasec Merge branch 'moteus_rock' added bindir to lib section, as mingw links against dll's to be found in bindir updated defines in rockspec Merge branch 'master' of github.com:Tieske/luasec into moteus_rock use winsock 2 Don't set globals from C. Fix unpack(). Stop using module(). Change to luaL_newlib(). Remove luaL_optint() and luaL_checkint(). BSD headers. Merge pull request #21 from Zash/zash/iPAddress-fix iPAddress encoding Stop if we don't have a string. Changed for strict compiles. Fix for LibreSSL/OPENSSL_NO_COMP Problem on Win64, since double does not represent SOCKET_INVALID exactly. - Add a parameter to server:sni(), so that we can accept an unknown name, using the initial context. - Add the method :getsniname() to retrieve the SNI hostname used. Updated (and renamed) rockspec Windows Encode iPAddress fields in human readable form Don't try to encode IP addresses as UTF-8 Return early if ASN1 string is invalid Push nil if unable to encode ASN1 string as UTF-8 Return human readable error message from cert:issued() SNI support. SNI support. Merge pull request #17 from Zash/zash/checkkey Verify that certificate and key belong together Merge pull request #19 from Zash/zash/pubkey Zash/pubkey Add cert:pubkey() to methods registry Add cert:issued(leafcert) for checking chains Check if private key matches cert only if both key and cert are set Check that certificate matches private key Add method for extracting public key, type and size from x509 objects
Diffstat (limited to 'security/lua-sec/patches')
-rw-r--r--security/lua-sec/patches/patch-Makefile (renamed from security/lua-sec/patches/patch-aa)14
-rw-r--r--security/lua-sec/patches/patch-src_Makefile (renamed from security/lua-sec/patches/patch-ab)23
2 files changed, 19 insertions, 18 deletions
diff --git a/security/lua-sec/patches/patch-aa b/security/lua-sec/patches/patch-Makefile
index 8cb4ed4eaa3..c76e1a02e24 100644
--- a/security/lua-sec/patches/patch-aa
+++ b/security/lua-sec/patches/patch-Makefile
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.4 2014/04/07 20:14:48 fhajny Exp $
+$NetBSD: patch-Makefile,v 1.1 2016/06/04 21:48:12 alnsn Exp $
-Pass installation dirs properly, fix search paths, add Solaris support
+Pass installation dirs properly, fix search paths, add Solaris support.
---- Makefile.orig 2014-01-29 20:43:33.000000000 +0000
+--- Makefile.orig 2016-03-03 19:11:46.000000000 +0000
+++ Makefile
-@@ -6,7 +6,7 @@ LUACPATH ?= /usr/lib/lua/5.1
+@@ -6,7 +6,7 @@ LUACPATH ?= /usr/lib/lua/5.1
# Comment this lines if you will link with non-internal LuaSocket's help files
# and edit INCDIR and LIBDIR properly.
- EXTRA = luasocket
--DEFS = -DWITH_LUASOCKET
-+DEFS = -DWITH_LUASOCKET -DLUA_COMPAT_MODULE
+ EXTRA = luasocket
+-DEFS = -DWITH_LUASOCKET
++DEFS = -DWITH_LUASOCKET -DLUA_COMPAT_MODULE
# Edit the lines below to inform new path, if necessary.
# Path below points to internal LuaSocket's help files.
diff --git a/security/lua-sec/patches/patch-ab b/security/lua-sec/patches/patch-src_Makefile
index 6814a8e54ff..ae144780bdb 100644
--- a/security/lua-sec/patches/patch-ab
+++ b/security/lua-sec/patches/patch-src_Makefile
@@ -1,7 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2014/04/16 14:07:50 fhajny Exp $
+$NetBSD: patch-src_Makefile,v 1.1 2016/06/04 21:48:12 alnsn Exp $
Pass proper libs for SunOS.
---- src/Makefile.orig 2014-01-29 20:43:33.000000000 +0000
+
+--- src/Makefile.orig 2016-03-03 19:11:46.000000000 +0000
+++ src/Makefile
@@ -6,7 +6,7 @@ OBJS= \
context.o \
@@ -19,17 +20,17 @@ Pass proper libs for SunOS.
+SOL_CFLAGS=-O2 -fpic $(WARN) $(INCDIR) $(DEFS)
+SOL_LDFLAGS=-O -shared -fpic $(LIBDIR)
+
- INSTALL ?= install
- CC ?= cc
- LD ?= $(MYENV) cc
-@@ -32,10 +35,11 @@ DESTDIR ?= /
+ INSTALL = install
+ CC = cc
+ LD = $(MYENV) cc
+@@ -31,10 +34,11 @@ LDFLAGS += $(MYLDFLAGS)
all:
install: $(CMOD) $(LMOD)
-- $(INSTALL) -d $(DESTDIR)$(LUAPATH)/ssl $(DESTDIR)$(LUACPATH)
-- $(INSTALL) -D $(CMOD) $(DESTDIR)$(LUACPATH)
-- $(INSTALL) -m644 -D $(LMOD) $(DESTDIR)$(LUAPATH)
-- $(INSTALL) -m644 -D https.lua $(DESTDIR)$(LUAPATH)/ssl
+- $(INSTALL) -d $(LUAPATH)/ssl $(LUACPATH)
+- $(INSTALL) $(CMOD) $(LUACPATH)
+- $(INSTALL) -m644 $(LMOD) $(LUAPATH)
+- $(INSTALL) -m644 https.lua $(LUAPATH)/ssl
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(LUAPATH)/ssl
+ $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(LUACPATH)
+ $(BSD_INSTALL_LIB) $(CMOD) $(DESTDIR)$(LUACPATH)
@@ -38,7 +39,7 @@ Pass proper libs for SunOS.
linux:
@$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" EXTRA="$(EXTRA)"
-@@ -46,6 +50,9 @@ bsd:
+@@ -45,6 +49,9 @@ bsd:
macosx:
@$(MAKE) $(CMOD) MYCFLAGS="$(MAC_CFLAGS)" MYLDFLAGS="$(MAC_LDFLAGS)" MYENV="$(MAC_ENV)" EXTRA="$(EXTRA)"