Gentoo Archives: gentoo-commits

From: Jason Donenfeld <zx2c4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lua/luasec/, dev-lua/luasec/files/
Date: Wed, 02 Mar 2016 14:49:26
Message-Id: 1456930165.7291ad522ab29193a30a2ec1e92cbc0349a8c792.zx2c4@gentoo
1 commit: 7291ad522ab29193a30a2ec1e92cbc0349a8c792
2 Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 2 14:49:25 2016 +0000
4 Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 2 14:49:25 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7291ad52
7
8 dev-lua/luasec: add patch for compression
9
10 dev-lua/luasec/files/luasec-0.5.1-compdefine.patch | 36 ++++++++++++++++++++++
11 dev-lua/luasec/luasec-0.5.1.ebuild | 3 +-
12 2 files changed, 38 insertions(+), 1 deletion(-)
13
14 diff --git a/dev-lua/luasec/files/luasec-0.5.1-compdefine.patch b/dev-lua/luasec/files/luasec-0.5.1-compdefine.patch
15 new file mode 100644
16 index 0000000..951b6fb
17 --- /dev/null
18 +++ b/dev-lua/luasec/files/luasec-0.5.1-compdefine.patch
19 @@ -0,0 +1,36 @@
20 +diff -ru luasec-0.5.1/src/ssl.c luasec-0.5.1-fixed/src/ssl.c
21 +--- luasec-0.5.1/src/ssl.c 2015-11-20 22:39:32.000000000 +0100
22 ++++ luasec-0.5.1-fixed/src/ssl.c 2016-03-02 15:48:09.439005988 +0100
23 +@@ -395,24 +395,30 @@
24 + }
25 + return 1;
26 + }
27 +-
28 ++
29 + /**
30 + * Return the compression method used.
31 + */
32 + static int meth_compression(lua_State *L)
33 + {
34 ++#if !defined(OPENSSL_NO_COMP)
35 + const COMP_METHOD *comp;
36 ++#endif
37 + p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
38 + if (ssl->state != LSEC_STATE_CONNECTED) {
39 + lua_pushnil(L);
40 + lua_pushstring(L, "closed");
41 + return 2;
42 + }
43 ++#if !defined(OPENSSL_NO_COMP)
44 + comp = SSL_get_current_compression(ssl->ssl);
45 + if (comp)
46 + lua_pushstring(L, SSL_COMP_get_name(comp));
47 + else
48 + lua_pushnil(L);
49 ++#else
50 ++ lua_pushnil(L);
51 ++#endif
52 + return 1;
53 + }
54 +
55 +Only in luasec-0.5.1-fixed/src: ssl.c.orig
56
57 diff --git a/dev-lua/luasec/luasec-0.5.1.ebuild b/dev-lua/luasec/luasec-0.5.1.ebuild
58 index d456bb5..29e04a7 100644
59 --- a/dev-lua/luasec/luasec-0.5.1.ebuild
60 +++ b/dev-lua/luasec/luasec-0.5.1.ebuild
61 @@ -4,7 +4,7 @@
62
63 EAPI=5
64
65 -inherit multilib toolchain-funcs
66 +inherit multilib toolchain-funcs eutils
67
68 DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
69 HOMEPAGE="https://github.com/brunoos/luasec http://www.inf.puc-rio.br/~brunoos/luasec/"
70 @@ -29,6 +29,7 @@ src_prepare() {
71 -e "s#^LUACPATH.*#LUACPATH=$(pkg-config --variable INSTALL_CMOD lua)#" Makefile || die
72 sed -i -e "s/-O2//" src/Makefile || die
73 lua src/options.lua -g /usr/include/openssl/ssl.h > src/options.h || die
74 + epatch "${FILESDIR}/${PN}-0.5.1-compdefine.patch"
75 }
76
77 src_compile() {