Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Stefan Hellermann 2014-12-08 14:43:28 +01:00
parent c088105ae2
commit 9c2110c7e2
2 changed files with 38 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lang/luasec/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2009-2010 OpenWrt.org # Copyright (C) 2009-2014 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,12 +8,17 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luasec PKG_NAME:=luasec
PKG_VERSION:=0.4 PKG_VERSION:=0.5
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://files.luaforge.net/releases/luasec/LuaSec/LuaSec0.4/ PKG_SOURCE_URL:=https://github.com/brunoos/luasec/archive/
PKG_MD5SUM:=712158d60207bdbb6215fc7e07d8db24 PKG_MD5SUM:=0518f4524f399f33424c6f450e1d06db
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
PKG_INSTALL:=1 PKG_INSTALL:=1
@ -24,8 +29,7 @@ define Package/luasec
SECTION:=lang SECTION:=lang
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=LuaSec TITLE:=LuaSec
URL:=http://luasec.luaforge.net/ URL:=https://github.com/brunoos/luasec
MAINTAINER:=W. Michael Petullo <mike@flyn.org>
DEPENDS:=+lua +libopenssl +luasocket DEPENDS:=+lua +libopenssl +luasocket
endef endef
@ -36,16 +40,15 @@ endef
define Build/Configure define Build/Configure
endef endef
MAKE_PATH = ./src
MAKE_FLAGS += \ MAKE_FLAGS += \
INCDIR="$(TARGET_CPPFLAGS)" \ INCDIR="$(TARGET_CPPFLAGS) -I." \
LIBDIR="$(TARGET_LDFLAGS)" \ LIBDIR="$(TARGET_LDFLAGS) -L./luasocket" \
CC="$(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99" \ LUACPATH="/usr/lib/lua" \
LD="$(TARGET_CROSS)ld -shared" \ LUAPATH="/usr/lib/lua"
LUACPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \
LUAPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \ define Build/Compile
linux \ $(call Build/Compile/Default,linux)
endef
define Package/luasec/install define Package/luasec/install
$(INSTALL_DIR) $(1)/usr/lib/lua $(INSTALL_DIR) $(1)/usr/lib/lua

20
lang/luasec/patches/100-luasocket-Makefile.patch Normal file
View file

@ -0,0 +1,20 @@
--- 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: