From 1c6c6d62ca665f9d1126b6bad849f7fd584b6a80 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Sat, 29 Mar 2008 18:22:21 +0000 Subject: * Replaced luafilesystem with luaposix library * Introduced privilege dropping capability * Automatically drop privileges for "public" to "nobody/nogroup" (as defined in ffluci.uci) --- contrib/ffluci.uci | 2 ++ contrib/package/ffluci/Makefile | 2 +- contrib/package/luafilesystem/Makefile | 44 ---------------------------------- contrib/package/luaposix/Makefile | 44 ++++++++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 45 deletions(-) delete mode 100644 contrib/package/luafilesystem/Makefile create mode 100644 contrib/package/luaposix/Makefile (limited to 'contrib') 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 endef diff --git a/contrib/package/luafilesystem/Makefile b/contrib/package/luafilesystem/Makefile deleted file mode 100644 index 6c73cf501c..0000000000 --- a/contrib/package/luafilesystem/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=luafilesystem -PKG_VERSION:=1.4.0 -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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - -include $(INCLUDE_DIR)/package.mk - -define Package/luafilesystem - SECTION:=lib - CATEGORY:=Libraries - TITLE:=Lua FS library - URL:=http://www.keplerproject.org/luafilesystem/ - DEPENDS:=+liblua - MAINTAINER:=Steven Barth -endef - -define Build/Configure -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - CC="$(TARGET_CROSS)gcc" \ - LD="$(TARGET_CROSS)ld" \ - AR="$(TARGET_CROSS)ar rcu" \ - RANLIB="$(TARGET_CROSS)ranlib" \ - INSTALL_ROOT=/usr \ - LUA_INC=$(STAGING_DIR)/usr/include -endef - -define Package/luafilesystem/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 -endef - -$(eval $(call BuildPackage,luafilesystem)) diff --git a/contrib/package/luaposix/Makefile b/contrib/package/luaposix/Makefile new file mode 100644 index 0000000000..177583bb82 --- /dev/null +++ b/contrib/package/luaposix/Makefile @@ -0,0 +1,44 @@ +include $(TOPDIR)/rules.mk + +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/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/luaposix + SECTION:=lib + CATEGORY:=Libraries + TITLE:=Lua Posix library + URL:=http://luaforge.net/projects/luaposix/ + DEPENDS:=+liblua + MAINTAINER:=Steven Barth +endef + +define Build/Configure +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) \ + CC="$(TARGET_CROSS)gcc" \ + LD="$(TARGET_CROSS)ld" \ + AR="$(TARGET_CROSS)ar rcu" \ + RANLIB="$(TARGET_CROSS)ranlib" \ + INSTALL_ROOT=/usr \ + LUAINC=$(STAGING_DIR)/usr/include +endef + +define Package/luaposix/install + $(INSTALL_DIR) $(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,luaposix)) \ No newline at end of file -- cgit v1.2.3