summaryrefslogtreecommitdiffhomepage
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ffluci.uci2
-rw-r--r--contrib/package/ffluci/Makefile2
-rw-r--r--contrib/package/luaposix/Makefile (renamed from contrib/package/luafilesystem/Makefile)24
3 files changed, 15 insertions, 13 deletions
diff --git a/contrib/ffluci.uci b/contrib/ffluci.uci
index c887b1b33e..640faf1703 100644
--- a/contrib/ffluci.uci
+++ b/contrib/ffluci.uci
@@ -2,6 +2,8 @@ config core main
option lang de
option mediaurlbase /ffluci/media
+config core category_privileges
+ option public nobody:nogroup
config public contact
option nickname
diff --git a/contrib/package/ffluci/Makefile b/contrib/package/ffluci/Makefile
index 04093a9748..4709767d16 100644
--- a/contrib/package/ffluci/Makefile
+++ b/contrib/package/ffluci/Makefile
@@ -15,7 +15,7 @@ define Package/ffluci
SECTION:=admin
CATEGORY:=Administration
TITLE:=FFLuCI
- DEPENDS:=+liblua +luafilesystem +haserl
+ DEPENDS:=+liblua +luaposix +haserl
MAINTAINER:=Steven Barth <steven-at-midlink-dot-org>
endef
diff --git a/contrib/package/luafilesystem/Makefile b/contrib/package/luaposix/Makefile
index 6c73cf501c..177583bb82 100644
--- a/contrib/package/luafilesystem/Makefile
+++ b/contrib/package/luaposix/Makefile
@@ -1,23 +1,23 @@
include $(TOPDIR)/rules.mk
-PKG_NAME:=luafilesystem
-PKG_VERSION:=1.4.0
+PKG_NAME:=luaposix
+PKG_VERSION:=5.1.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/3158
-PKG_MD5SUM:=6f3d247f27820b8f045431ad81bcd3ad
+PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/3063
+PKG_MD5SUM:=31deeb4add91f76b3c2d36aae2888d81
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(INCLUDE_DIR)/package.mk
-define Package/luafilesystem
+define Package/luaposix
SECTION:=lib
CATEGORY:=Libraries
- TITLE:=Lua FS library
- URL:=http://www.keplerproject.org/luafilesystem/
+ TITLE:=Lua Posix library
+ URL:=http://luaforge.net/projects/luaposix/
DEPENDS:=+liblua
MAINTAINER:=Steven Barth <steven-at-midlink-dot-org>
endef
@@ -32,13 +32,13 @@ define Build/Compile
AR="$(TARGET_CROSS)ar rcu" \
RANLIB="$(TARGET_CROSS)ranlib" \
INSTALL_ROOT=/usr \
- LUA_INC=$(STAGING_DIR)/usr/include
+ LUAINC=$(STAGING_DIR)/usr/include
endef
-define Package/luafilesystem/install
+define Package/luaposix/install
$(INSTALL_DIR) $(1)/usr/lib/lua
- $(STRIP) $(PKG_BUILD_DIR)/src/lfs.so
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lfs.so $(1)/usr/lib/lua
+ $(STRIP) $(PKG_BUILD_DIR)/posix.so
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/posix.so $(1)/usr/lib/lua
endef
-$(eval $(call BuildPackage,luafilesystem))
+$(eval $(call BuildPackage,luaposix)) \ No newline at end of file