From 7c86c8909fd684fa09cd0ef4b7ddac0f969adfb6 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 28 Nov 2015 02:47:02 +0100 Subject: [PATCH] luasec: update to 0.5.1. --- srcpkgs/luasec/patches/lua51.patch | 153 ----------------------------- srcpkgs/luasec/template | 8 +- 2 files changed, 4 insertions(+), 157 deletions(-) delete mode 100644 srcpkgs/luasec/patches/lua51.patch diff --git a/srcpkgs/luasec/patches/lua51.patch b/srcpkgs/luasec/patches/lua51.patch deleted file mode 100644 index 598e1fc3a16..00000000000 --- a/srcpkgs/luasec/patches/lua51.patch +++ /dev/null @@ -1,153 +0,0 @@ -diff --git src/context.c src/context.c -index cafc222..107ed60 100644 ---- src/context.c -+++ src/context.c -@@ -18,8 +18,8 @@ - #include - #include - --#include --#include -+#include "lua5.1/lua.h" -+#include "lua5.1/lauxlib.h" - - #include "context.h" - #include "options.h" -diff --git src/context.h src/context.h -index 293f615..e346096 100644 ---- src/context.h -+++ src/context.h -@@ -7,7 +7,7 @@ - * - *--------------------------------------------------------------------------*/ - --#include -+#include "lua5.1/lua.h" - #include - - #include "config.h" -diff --git src/luasocket/buffer.c src/luasocket/buffer.c -index 4ef4e8e..5886207 100644 ---- src/luasocket/buffer.c -+++ src/luasocket/buffer.c -@@ -2,8 +2,8 @@ - * Input/Output interface for Lua programs - * LuaSocket toolkit - \*=========================================================================*/ --#include "lua.h" --#include "lauxlib.h" -+#include "lua5.1/lua.h" -+#include "lua5.1/lauxlib.h" - - #include "buffer.h" - -diff --git src/luasocket/buffer.h src/luasocket/buffer.h -index 1281bb3..cd7da2e 100644 ---- src/luasocket/buffer.h -+++ src/luasocket/buffer.h -@@ -15,7 +15,7 @@ - * The module is built on top of the I/O abstraction defined in io.h and the - * timeout management is done with the timeout.h interface. - \*=========================================================================*/ --#include "lua.h" -+#include "lua5.1/lua.h" - - #include "io.h" - #include "timeout.h" -diff --git src/luasocket/io.h src/luasocket/io.h -index 76a3e58..fe72085 100644 ---- src/luasocket/io.h -+++ src/luasocket/io.h -@@ -13,7 +13,7 @@ - * is very simple. - \*=========================================================================*/ - #include --#include "lua.h" -+#include "lua5.1/lua.h" - - #include "timeout.h" - -diff --git src/luasocket/timeout.c src/luasocket/timeout.c -index 94a524b..32edaa4 100644 ---- src/luasocket/timeout.c -+++ src/luasocket/timeout.c -@@ -6,8 +6,8 @@ - #include - #include - --#include "lua.h" --#include "lauxlib.h" -+#include "lua5.1/lua.h" -+#include "lua5.1/lauxlib.h" - - #include "timeout.h" - -diff --git src/luasocket/timeout.h src/luasocket/timeout.h -index 6715ca7..d758270 100644 ---- src/luasocket/timeout.h -+++ src/luasocket/timeout.h -@@ -4,7 +4,7 @@ - * Timeout management functions - * LuaSocket toolkit - \*=========================================================================*/ --#include "lua.h" -+#include "lua5.1/lua.h" - - /* timeout control structure */ - typedef struct t_timeout_ { -diff --git src/ssl.c src/ssl.c -index bd8a744..b26e99e 100644 ---- src/ssl.c -+++ src/ssl.c -@@ -19,8 +19,8 @@ - #include - #include - --#include --#include -+#include "lua5.1/lua.h" -+#include "lua5.1/lauxlib.h" - - #include - #include -diff --git src/ssl.h src/ssl.h -index b357196..1bb42fc 100644 ---- src/ssl.h -+++ src/ssl.h -@@ -8,7 +8,7 @@ - *--------------------------------------------------------------------------*/ - - #include --#include -+#include "lua5.1/lua.h" - - #include - #include -diff --git src/x509.c src/x509.c -index 5e7a1dd..9865561 100644 ---- src/x509.c -+++ src/x509.c -@@ -20,8 +20,8 @@ - #include - #include - --#include --#include -+#include "lua5.1/lua.h" -+#include "lua5.1/lauxlib.h" - - #include "x509.h" - -diff --git src/x509.h src/x509.h -index 2b32cdd..9c52f12 100644 ---- src/x509.h -+++ src/x509.h -@@ -10,7 +10,7 @@ - #define LSEC_X509_H - - #include --#include -+#include "lua5.1/lua.h" - - #include "config.h" - diff --git a/srcpkgs/luasec/template b/srcpkgs/luasec/template index 8937792f4b2..650f8ec921b 100644 --- a/srcpkgs/luasec/template +++ b/srcpkgs/luasec/template @@ -1,17 +1,17 @@ # Template file for 'luasec' pkgname=luasec -version=0.5 -revision=3 +version=0.5.1 +revision=1 wrksrc=${pkgname}-${pkgname}-${version} build_style=gnu-makefile makedepends="lua51-devel libressl-devel" depends="lua51" short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication" -maintainer="Duncaen " +maintainer="Duncaen " license="MIT" homepage="https://github.com/brunoos/luasec" distfiles="https://github.com/brunoos/luasec/archive/${pkgname}-${version}.tar.gz" -checksum=6480598f7492ac479b6b608b5fb1488226bfa6ef675e29f6b24dbe9099083523 +checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406 do_build() { make linux CC=$CC LD=$CC INC_PATH=-I${XBPS_CROSS_BASE}/usr/include LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib