lede-packages-rs

commit e128a2c3d9310d74fff6dfff79be56a0dc0c86c9
parent b2c20d4f223bc097806b4a9a32c6869f53ce6b21
Author: champtar <champetier.etienne@gmail.com>
Date:   Thu, 18 Aug 2016 16:00:16 +0200

Merge pull request #3035 from jow-/luasec-no-compression-fix

luasec: fix build with OPENSSL_NO_COMP
Diffstat:
M
lang/luasec/Makefile
 | 
2
+-
A
lang/luasec/patches/200-compression-method-fix.patch
 | 
24
++++++++++++++++++++++++

2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/lang/luasec/Makefile b/lang/luasec/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luasec
 PKG_VERSION:=0.5.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/brunoos/luasec/archive/
diff --git a/lang/luasec/patches/200-compression-method-fix.patch b/lang/luasec/patches/200-compression-method-fix.patch
@@ -0,0 +1,24 @@
+--- a/src/ssl.c
++++ b/src/ssl.c
+@@ -401,17 +401,21 @@ static int meth_want(lua_State *L)
+  */
+ static int meth_compression(lua_State *L)
+ {
++#ifndef OPENSSL_NO_COMP
+   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);
+     lua_pushstring(L, "closed");
+     return 2;
+   }
++#ifndef OPENSSL_NO_COMP
+   comp = SSL_get_current_compression(ssl->ssl);
+   if (comp)
+     lua_pushstring(L, SSL_COMP_get_name(comp));
+   else
++#endif
+     lua_pushnil(L);
+   return 1;
+ }