Browse Source

luasec: update to 0.5 to fix memory leak hit by prosody

Noted in luasec 0.4.1 Changelog:
Activate SSL_MODE_RELEASE_BUFFERS by default if it is available (thanks Prosody project)

Update to latest 0.5 to fix a few other leaks.
luasec moved to github, so update URL and license info.
Move package maintainer to correct place in Makefile, hope he is okay with it.

Signed-off-by: Stefan Hellermann <stefan@the2masters.de>
Stefan Hellermann 10 years ago
parent
commit
9c2110c7e2
2 changed files with 38 additions and 15 deletions
  1. 18
    15
      lang/luasec/Makefile
  2. 20
    0
      lang/luasec/patches/100-luasocket-Makefile.patch

+ 18
- 15
lang/luasec/Makefile View File

@@ -1,5 +1,5 @@
1 1
 #
2
-# Copyright (C) 2009-2010 OpenWrt.org
2
+# Copyright (C) 2009-2014 OpenWrt.org
3 3
 #
4 4
 # This is free software, licensed under the GNU General Public License v2.
5 5
 # See /LICENSE for more information.
@@ -8,12 +8,17 @@
8 8
 include $(TOPDIR)/rules.mk
9 9
 
10 10
 PKG_NAME:=luasec
11
-PKG_VERSION:=0.4
11
+PKG_VERSION:=0.5
12 12
 PKG_RELEASE:=1
13 13
 
14 14
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
15
-PKG_SOURCE_URL:=http://files.luaforge.net/releases/luasec/LuaSec/LuaSec0.4/
16
-PKG_MD5SUM:=712158d60207bdbb6215fc7e07d8db24
15
+PKG_SOURCE_URL:=https://github.com/brunoos/luasec/archive/
16
+PKG_MD5SUM:=0518f4524f399f33424c6f450e1d06db
17
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
18
+
19
+MAINTAINER:=W. Michael Petullo <mike@flyn.org>
20
+PKG_LICENSE:=MIT
21
+PKG_LICENSE_FILES:=LICENSE
17 22
 
18 23
 PKG_INSTALL:=1
19 24
 
@@ -24,8 +29,7 @@ define Package/luasec
24 29
   SECTION:=lang
25 30
   CATEGORY:=Languages
26 31
   TITLE:=LuaSec
27
-  URL:=http://luasec.luaforge.net/
28
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
32
+  URL:=https://github.com/brunoos/luasec
29 33
   DEPENDS:=+lua +libopenssl +luasocket
30 34
 endef
31 35
 
@@ -36,16 +40,15 @@ endef
36 40
 define Build/Configure
37 41
 endef
38 42
 
39
-MAKE_PATH = ./src
40
-
41 43
 MAKE_FLAGS += \
42
-	INCDIR="$(TARGET_CPPFLAGS)" \
43
-	LIBDIR="$(TARGET_LDFLAGS)" \
44
-	CC="$(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99" \
45
-	LD="$(TARGET_CROSS)ld -shared" \
46
-	LUACPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \
47
-	LUAPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \
48
-	linux \
44
+	INCDIR="$(TARGET_CPPFLAGS) -I." \
45
+	LIBDIR="$(TARGET_LDFLAGS) -L./luasocket" \
46
+	LUACPATH="/usr/lib/lua" \
47
+	LUAPATH="/usr/lib/lua"
48
+
49
+define Build/Compile
50
+$(call Build/Compile/Default,linux)
51
+endef
49 52
 
50 53
 define Package/luasec/install
51 54
 	$(INSTALL_DIR) $(1)/usr/lib/lua

+ 20
- 0
lang/luasec/patches/100-luasocket-Makefile.patch View File

@@ -0,0 +1,20 @@
1
+--- luasec-luasec-0.5-old/src/luasocket/Makefile	2014-01-29 21:43:33.000000000 +0100
2
++++ luasec-luasec-0.5/src/luasocket/Makefile	2014-11-30 13:07:44.850051000 +0100
3
+@@ -6,7 +6,7 @@
4
+ 
5
+ CC	?= cc
6
+ CFLAGS	+= $(MYCFLAGS) -DLUASOCKET_DEBUG
7
+-AR	:= ar rcu
8
++AR	?= ar
9
+ RANLIB	?= ranlib
10
+ 
11
+ .PHONY: all clean
12
+@@ -14,7 +14,7 @@
13
+ all: libluasocket.a
14
+ 
15
+ libluasocket.a: $(OBJS)
16
+-	$(AR) $@ $(OBJS)
17
++	$(AR) rcu $@ $(OBJS)
18
+ 	$(RANLIB) $@
19
+ 
20
+ clean: