update to 0.6

(some of patches were merged upstream...
for now SSLv3 is guarded by OPENSSL_NO_SSL3 and will be definitely
removed in future release.
This commit is contained in:
gsoares 2016-03-10 01:04:51 +00:00
parent d5803c3bbe
commit 115e886a90
5 changed files with 15 additions and 38 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.15 2014/07/17 21:06:16 sthen Exp $ # $OpenBSD: Makefile,v 1.16 2016/03/10 01:04:51 gsoares Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
COMMENT= lua binding to OpenSSL to provide TLS/SSL communication COMMENT= lua binding to OpenSSL to provide TLS/SSL communication
VERSION= 0.5 VERSION= 0.6
REVISION= 1
DISTNAME= luasec-${VERSION} DISTNAME= luasec-${VERSION}
CATEGORIES= security CATEGORIES= security
MASTER_SITES= https://github.com/brunoos/luasec/archive/ MASTER_SITES= https://github.com/brunoos/luasec/archive/

View File

@ -1,2 +1,2 @@
SHA256 (luasec-0.5.tar.gz) = ZIBZj3SSrEeba2CLX7FIgia/pu9nXin2sk2+kJkINSM= SHA256 (luasec-0.6.tar.gz) = zvOjXBi+uKVNnIzmJgpMq72aOG3ocRMg0ITa/60K7V0=
SIZE (luasec-0.5.tar.gz) = 46738 SIZE (luasec-0.6.tar.gz) = 51071

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_context_c,v 1.2 2015/11/13 02:48:29 gsoares Exp $
merged upstream
github.com/brunoos/luasec/commit/49ea6b8ba654f118fbb158da098e6ef288519126
--- src/context.c.orig Sat Jul 18 11:36:23 2015
+++ src/context.c Sat Jul 18 11:42:12 2015
@@ -66,7 +66,9 @@ static int set_option_flag(const char *opt, unsigned l
static LSEC_SSL_METHOD* str2method(const char *method)
{
if (!strcmp(method, "sslv23")) return SSLv23_method();
+#ifndef OPENSSL_NO_SSL3
if (!strcmp(method, "sslv3")) return SSLv3_method();
+#endif
if (!strcmp(method, "tlsv1")) return TLSv1_method();
#if (OPENSSL_VERSION_NUMBER >= 0x1000100fL)
if (!strcmp(method, "tlsv1_1")) return TLSv1_1_method();

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_ssl_c,v 1.1 2014/07/17 21:06:16 sthen Exp $
--- src/ssl.c.orig Mon Jul 14 22:58:19 2014
+++ src/ssl.c Mon Jul 14 23:01:06 2014
@@ -401,7 +401,11 @@ static int meth_want(lua_State *L)
*/
static int meth_compression(lua_State *L)
{
+#ifdef OPENSSL_NO_COMP
+ const void *comp;
+#else
const COMP_METHOD *comp;
+#endif
p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
if (ssl->state != LSEC_STATE_CONNECTED) {
lua_pushnil(L);

View File

@ -1,18 +1,25 @@
@comment $OpenBSD: PLIST,v 1.5 2014/03/20 19:21:00 gsoares Exp $ @comment $OpenBSD: PLIST,v 1.6 2016/03/10 01:04:51 gsoares Exp $
lib/lua/${MODLUA_VERSION}/ssl.so lib/lua/${MODLUA_VERSION}/ssl.so
share/examples/${FULLPKGNAME}/ share/examples/${FULLPKGNAME}/
share/examples/${FULLPKGNAME}/README share/examples/${FULLPKGNAME}/README
share/examples/${FULLPKGNAME}/certs/ share/examples/${FULLPKGNAME}/certs/
share/examples/${FULLPKGNAME}/certs/all.bat
share/examples/${FULLPKGNAME}/certs/clientA.bat
share/examples/${FULLPKGNAME}/certs/clientA.cnf share/examples/${FULLPKGNAME}/certs/clientA.cnf
share/examples/${FULLPKGNAME}/certs/clientA.sh share/examples/${FULLPKGNAME}/certs/clientA.sh
share/examples/${FULLPKGNAME}/certs/clientB.bat
share/examples/${FULLPKGNAME}/certs/clientB.cnf share/examples/${FULLPKGNAME}/certs/clientB.cnf
share/examples/${FULLPKGNAME}/certs/clientB.sh share/examples/${FULLPKGNAME}/certs/clientB.sh
share/examples/${FULLPKGNAME}/certs/rootA.bat
share/examples/${FULLPKGNAME}/certs/rootA.cnf share/examples/${FULLPKGNAME}/certs/rootA.cnf
share/examples/${FULLPKGNAME}/certs/rootA.sh share/examples/${FULLPKGNAME}/certs/rootA.sh
share/examples/${FULLPKGNAME}/certs/rootB.bat
share/examples/${FULLPKGNAME}/certs/rootB.cnf share/examples/${FULLPKGNAME}/certs/rootB.cnf
share/examples/${FULLPKGNAME}/certs/rootB.sh share/examples/${FULLPKGNAME}/certs/rootB.sh
share/examples/${FULLPKGNAME}/certs/serverA.bat
share/examples/${FULLPKGNAME}/certs/serverA.cnf share/examples/${FULLPKGNAME}/certs/serverA.cnf
share/examples/${FULLPKGNAME}/certs/serverA.sh share/examples/${FULLPKGNAME}/certs/serverA.sh
share/examples/${FULLPKGNAME}/certs/serverB.bat
share/examples/${FULLPKGNAME}/certs/serverB.cnf share/examples/${FULLPKGNAME}/certs/serverB.cnf
share/examples/${FULLPKGNAME}/certs/serverB.sh share/examples/${FULLPKGNAME}/certs/serverB.sh
share/examples/${FULLPKGNAME}/chain/ share/examples/${FULLPKGNAME}/chain/
@ -44,6 +51,9 @@ share/examples/${FULLPKGNAME}/loop/server.lua
share/examples/${FULLPKGNAME}/oneshot/ share/examples/${FULLPKGNAME}/oneshot/
share/examples/${FULLPKGNAME}/oneshot/client.lua share/examples/${FULLPKGNAME}/oneshot/client.lua
share/examples/${FULLPKGNAME}/oneshot/server.lua share/examples/${FULLPKGNAME}/oneshot/server.lua
share/examples/${FULLPKGNAME}/sni/
share/examples/${FULLPKGNAME}/sni/client.lua
share/examples/${FULLPKGNAME}/sni/server.lua
share/examples/${FULLPKGNAME}/verification/ share/examples/${FULLPKGNAME}/verification/
share/examples/${FULLPKGNAME}/verification/fail-string/ share/examples/${FULLPKGNAME}/verification/fail-string/
share/examples/${FULLPKGNAME}/verification/fail-string/client.lua share/examples/${FULLPKGNAME}/verification/fail-string/client.lua