From: W. Michael Petullo <mike@flyn.org>
Date: Wed, 14 Sep 2016 02:58:26 +0000 (-0400)
Subject: luasec: update to 0.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a9222671eb95b04bdf3412c0a35d9ac32389bd62;p=feed%2Fpackages.git

luasec: update to 0.6

Signed-off-by: W. Michael Petullo <mike@flyn.org>
---

diff --git a/lang/luasec/Makefile b/lang/luasec/Makefile
index 6429b2d3e7..b2bde5762a 100644
--- a/lang/luasec/Makefile
+++ b/lang/luasec/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luasec
-PKG_VERSION:=0.5.1
+PKG_VERSION:=0.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/brunoos/luasec/archive/
-PKG_MD5SUM:=e34e274a57e9045641191eb7398cce2a
+PKG_MD5SUM:=14e1aef6d2aae96bbf98afc6b6634af2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
 
 MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -43,8 +43,8 @@ endef
 MAKE_FLAGS += \
 	INCDIR="$(TARGET_CPPFLAGS) -I." \
 	LIBDIR="$(TARGET_LDFLAGS) -L./luasocket" \
-	LUACPATH="/usr/lib/lua" \
-	LUAPATH="/usr/lib/lua"
+	LUACPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \
+	LUAPATH="$(PKG_INSTALL_DIR)/usr/lib/lua"
 
 define Build/Compile
 $(call Build/Compile/Default,linux)
diff --git a/lang/luasec/patches/100-luasocket-Makefile.patch b/lang/luasec/patches/100-luasocket-Makefile.patch
deleted file mode 100644
index 24de7fc794..0000000000
--- a/lang/luasec/patches/100-luasocket-Makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- luasec-luasec-0.5-old/src/luasocket/Makefile	2014-01-29 21:43:33.000000000 +0100
-+++ luasec-luasec-0.5/src/luasocket/Makefile	2014-11-30 13:07:44.850051000 +0100
-@@ -6,7 +6,7 @@
- 
- CC	?= cc
- CFLAGS	+= $(MYCFLAGS) -DLUASOCKET_DEBUG
--AR	:= ar rcu
-+AR	?= ar
- RANLIB	?= ranlib
- 
- .PHONY: all clean
-@@ -14,7 +14,7 @@
- all: libluasocket.a
- 
- libluasocket.a: $(OBJS)
--	$(AR) $@ $(OBJS)
-+	$(AR) rcu $@ $(OBJS)
- 	$(RANLIB) $@
- 
- clean: