rendered paste bodyIndex: feeds/packages/net/prosody/files/prosody.init===================================================================--- feeds/packages/net/prosody/files/prosody.init (revision 0)+++ feeds/packages/net/prosody/files/prosody.init (revision 0)@@ -0,0 +1,31 @@+#!/bin/sh /etc/rc.common+# Copyright (C) 2009 OpenWrt.org++START=99+EXTRA_COMMANDS="status"+EXTRA_HELP=" status Print the status of the service"++BIN=/usr/bin/prosody+BINCTL=/usr/bin/prosodyctl+ETC_D=/etc/prosody+LOG_D=/var/log/prosody+RUN_D=/var/run/prosody+PID_F=$RUN_D/prosody.pid+RUN_USER=prosody+RUN_GROUP=prosody+SSD=start-stop-daemon++start() {+ [ -d $LOG_D ] || ( mkdir -p $LOG_D && chown $RUN_USER:$RUN_GROUP $LOG_D )+ [ -d $RUN_D ] || ( mkdir -p $RUN_D && chown $RUN_USER:$RUN_GROUP $RUN_D )++ $SSD -c $RUN_USER:$RUN_GROUP -q -x $BIN -S+}++stop() {+ $SSD -p $PID_F -q -K+}++status() {+ [ -f $BINCTL ] && $BINCTL status+}Index: feeds/packages/net/prosody/patches/002-prosody_conf.patch===================================================================--- feeds/packages/net/prosody/patches/002-prosody_conf.patch (revision 0)+++ feeds/packages/net/prosody/patches/002-prosody_conf.patch (revision 0)@@ -0,0 +1,12 @@+--- a/prosody.cfg.lua.dist++++ b/prosody.cfg.lua.dist+@@ -83,6 +83,9 @@ Host "*"+ -- For more information see http://prosody.im/doc/creating_accounts+ allow_registration = false;+ ++ -- The user to run prosody as++ prosody_user = "prosody"+++ -- Debian:+ -- send the server to background.+ --Index: feeds/packages/net/prosody/patches/001-debian_conf.patch===================================================================--- feeds/packages/net/prosody/patches/001-debian_conf.patch (revision 0)+++ feeds/packages/net/prosody/patches/001-debian_conf.patch (revision 0)@@ -0,0 +1,53 @@+Author: Enrico Tassi <gareuselesinge@debian.org>+Description: No description.+--- a/prosody.cfg.lua.dist++++ b/prosody.cfg.lua.dist+@@ -62,10 +62,12 @@ Host "*"+ "register"; -- Allow users to register on this server using a client and change passwords+ + -- Other specific functionality+- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.+ --"console"; -- telnet to port 5582 (needs console_enabled = true)+ --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"+ --"httpserver"; -- Serve static files from a directory over HTTP++ -- Debian: do not remove this module, or you loose syslog++ -- support++ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.+ };+ + -- These modules are auto-loaded, should you+@@ -80,6 +82,17 @@ Host "*"+ -- Disable account creation by default, for security+ -- For more information see http://prosody.im/doc/creating_accounts+ allow_registration = false;++++ -- Debian:++ -- send the server to background.++ --++ daemonize = true;++++ -- Debian:++ -- please, don't change this option since /var/run/prosody/++ -- is one of the few disrectories prosody is allowed to write to++ --++ pidfile = "/var/run/prosody/prosody.pid";+ + -- These are the SSL/TLS-related settings. If you don't want+ -- to use SSL/TLS, you may comment or remove this+@@ -88,6 +101,16 @@ Host "*"+ certificate = "certs/localhost.cert";+ }+ ++ -- Debian:++ -- all to var/log++ -- errors to syslog also++ log = {++ { levels = { "error" }; to = "syslog"; };++ -- { levels = { "error" }; to = "file"; filename = "/var/log/prosody/prosody.err"; };++ -- { levels = { "info"; "warn"; }; to = "file"; filename = "/var/log/prosody/prosody.log"; };++ -- { levels = { "debug"; }; to = "file"; filename = "/var/log/prosody/prosody.log"; };++ }+++ -- This allows clients to connect to localhost. No harm in it.+ Host "localhost"+ Index: feeds/packages/net/prosody/Makefile===================================================================--- feeds/packages/net/prosody/Makefile (revision 18883)+++ feeds/packages/net/prosody/Makefile (working copy)@@ -8,29 +8,50 @@ include $(TOPDIR)/rules.mk PKG_NAME:=prosody-PKG_VERSION:=0.5.2+PKG_VERSION:=0.6.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://prosody.im/downloads/source/-PKG_MD5SUM:=bcc7828c041e53b2c909822b1acdf600+PKG_MD5SUM:=c384f5ee145d8857e6aefae6a8c9610e include $(INCLUDE_DIR)/package.mk -define Package/prosody+define Package/prosody/Default SECTION:=net CATEGORY:=Network- DEPENDS:=+liblua +libidn +libopenssl +luasocket +luaexpat +luasec+ SUBMENU:=Instant Messaging+ DEPENDS:=+liblua-filesystem +libidn +luaexpat +luasec TITLE:=XMPP server URL:=http://prosody.im endef -define Package/prosody/description+define Package/prosody/Default/description Prosody is an exciting new server for Jabber/XMPP written in Lua. It aims to be easy to use, and light on resources endef +define Package/prosody+$(call Package/prosody/Default)+endef++define Package/prosodyctl+$(call Package/prosody/Default)+ DEPENDS:=prosody+ TITLE+= control utility+endef++define Package/prosody/description+$(call Package/prosody/Default/description)+endef++define Package/prosodyctl/description+$(call Package/prosody/Default/description)+ This package contains a small utility to control the+ server and manage users+endef+ define Package/prosody/conffiles /etc/prosody/prosody.cfg.lua endef@@ -45,6 +66,7 @@ --with-lua-include="$(STAGING_DIR)/usr/include" \ --with-lua-lib="$(STAGING_DIR)/usr/lib" \ --cflags="$(TARGET_CFLAGS)" \+ --datadir="/etc/prosody/data" \ ) endef @@ -59,12 +81,15 @@ endef define Package/prosody/install+ $(INSTALL_DIR) $(1)/etc/init.d+ $(INSTALL_BIN) ./files/prosody.init $(1)/etc/init.d/prosody $(INSTALL_DIR) $(1)/etc/prosody $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/prosody/prosody.cfg.lua $(1)/etc/prosody/ $(INSTALL_DIR) $(1)/etc/prosody/certs $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/prosody/certs/localhost.{cert,key} $(1)/etc/prosody/certs/+ $(INSTALL_DIR) $(1)/etc/prosody/data $(INSTALL_DIR) $(1)/usr/bin- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/prosody{,ctl} $(1)/usr/bin/+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/prosody $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/lib/prosody $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/prosody/prosody.version $(1)/usr/lib/prosody/ $(INSTALL_DIR) $(1)/usr/lib/prosody/core@@ -73,10 +98,57 @@ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/fallbacks/*.lua $(1)/usr/lib/prosody/fallbacks/ $(INSTALL_DIR) $(1)/usr/lib/prosody/modules $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/modules/*.lua $(1)/usr/lib/prosody/modules/+ $(INSTALL_DIR) $(1)/usr/lib/prosody/modules/muc+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/modules/muc/*.lua $(1)/usr/lib/prosody/modules/muc/ $(INSTALL_DIR) $(1)/usr/lib/prosody/net $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/net/*.lua $(1)/usr/lib/prosody/net/ $(INSTALL_DIR) $(1)/usr/lib/prosody/util- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/util/*.{lua,so} $(1)/usr/lib/prosody/util/+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/util/*.lua $(1)/usr/lib/prosody/util/+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/prosody/util/*.so $(1)/usr/lib/prosody/util/ endef +define Package/prosodyctl/install+ $(INSTALL_DIR) $(1)/usr/bin+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/prosodyctl $(1)/usr/bin/+endef++define Package/prosody/postinst+#!/bin/sh++id=54+name=prosody+home=/tmp/.prosody+shell=/bin/false++# do not change below+# check if we are on real system+if [ -z "$${IPKG_INSTROOT}" ]; then+ # create copies of passwd and group, if we use squashfs+ rootfs=`mount |awk '/root/ { print $$5 }'`+ if [ "$$rootfs" = "squashfs" ]; then+ if [ -h /etc/group ]; then+ rm /etc/group+ cp -p /rom/etc/group /etc/group+ fi+ if [ -h /etc/passwd ]; then+ rm /etc/passwd+ cp -p /rom/etc/passwd /etc/passwd+ fi+ fi+fi++echo ""+if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then+ echo "adding group $$name to /etc/group"+ echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group+fi+if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then+ echo "adding user $$name to /etc/passwd"+ echo "$${name}:x:$${id}:$${id}:$${name}:$${home}:$${shell}" >> $${IPKG_INSTROOT}/etc/passwd+fi++chown -R $${name}:$${name} $${IPKG_INSTROOT}/etc/prosody+endef+ $(eval $(call BuildPackage,prosody))+$(eval $(call BuildPackage,prosodyctl))Index: feeds/packages/lang/luafilesystem/Makefile===================================================================--- feeds/packages/lang/luafilesystem/Makefile (revision 18883)+++ feeds/packages/lang/luafilesystem/Makefile (working copy)@@ -8,12 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luafilesystem-PKG_VERSION:=1.4.2+PKG_REV:=8ff20138af779f6f38cbff12d22df1a3151d9fa6+PKG_VERSION:=1.5.0 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz-PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/3931-PKG_MD5SUM:=8e7b2a9b899d669280456d0f95afd961+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)+PKG_SOURCE_PROTO:=git+PKG_SOURCE_URL:=git://github.com/keplerproject/luafilesystem.git+PKG_SOURCE_VERSION:=$(PKG_REV) include $(INCLUDE_DIR)/package.mk @@ -22,7 +25,7 @@ SECTION:=lang CATEGORY:=Languages TITLE:=LuaFileSystem- URL:=http://www.luaforge.net/projects/luafilesystem+ URL:=http://github.com/keplerproject/luafilesystem DEPENDS:=+liblua endef @@ -49,7 +52,7 @@ define Build/InstallDev mkdir -p $(STAGING_DIR)/usr/include- mkdir -p $(STAGING_DIR)/usr/lib/lua/5.1/+ mkdir -p $(STAGING_DIR)/usr/lib/lua $(CP) $(PKG_BUILD_DIR)/src/lfs.h $(STAGING_DIR)/usr/include $(CP) $(PKG_BUILD_DIR)/src/lfs.so \ $(STAGING_DIR)/usr/lib/liblua-filesystem.so.0.0.0@@ -57,18 +60,18 @@ ln -fs liblua-filesystem.so.0.0.0 liblua-filesystem.so cd $(STAGING_DIR)/usr/lib/ && \ ln -fs liblua-filesystem.so.0.0.0 liblua-filesystem.so.0- cd $(STAGING_DIR)/usr/lib/lua/5.1/ && \- ln -fs ../../liblua-filesystem.so.0.0.0 lfs.so+ cd $(STAGING_DIR)/usr/lib/lua/ && \+ ln -fs ../liblua-filesystem.so.0.0.0 lfs.so $(CP) $(PKG_BUILD_DIR)/src/liblua-filesystem.a $(STAGING_DIR)/usr/lib endef define Package/liblua-filesystem/install- $(INSTALL_DIR) $(1)/usr/lib/lua/5.1+ $(INSTALL_DIR) $(1)/usr/lib/lua $(CP) $(PKG_BUILD_DIR)/src/lfs.so \ $(1)/usr/lib/liblua-filesystem.so.0.0.0 cd $(1)/usr/lib/ && ln -fs liblua-filesystem.so.0.0.0 liblua-filesystem.so- cd $(1)/usr/lib/lua/5.1/ && \- ln -fs ../../liblua-filesystem.so.0.0.0 lfs.so+ cd $(1)/usr/lib/lua/ && \+ ln -fs ../liblua-filesystem.so.0.0.0 lfs.so endef $(eval $(call BuildPackage,liblua-filesystem))Index: feeds/packages/lang/luasec/Makefile===================================================================--- feeds/packages/lang/luasec/Makefile (revision 18883)+++ feeds/packages/lang/luasec/Makefile (working copy)@@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luasec-PKG_VERSION:=0.3.3+PKG_VERSION:=0.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz-PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/4160-PKG_MD5SUM:=88261020372dfe8f850fdb60e4fae186+PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/4255+PKG_MD5SUM:=712158d60207bdbb6215fc7e07d8db24 include $(INCLUDE_DIR)/package.mk Index: feeds/packages/lang/luasocket/Makefile===================================================================--- feeds/packages/lang/luasocket/Makefile (revision 18883)+++ feeds/packages/lang/luasocket/Makefile (working copy)@@ -1,4 +1,4 @@-# +# # Copyright (C) 2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2.@@ -9,7 +9,7 @@ PKG_NAME:=luasocket PKG_VERSION:=2.0.2-PKG_RELEASE:=2+PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/2664@@ -36,20 +36,23 @@ endef define Build/Compile- $(MAKE) -C $(PKG_BUILD_DIR)/ all \- LIBDIR="$(TARGET_LDFLAGS)" \- CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -std=gnu99" \- LD="$(TARGET_CROSS)ld -shared" + $(MAKE) -C $(PKG_BUILD_DIR)/ \+ LIBDIR="$(TARGET_LDFLAGS)" \+ CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -std=gnu99" \+ LD="$(TARGET_CROSS)ld -shared" \+ all endef define Package/luasocket/install $(INSTALL_DIR) $(1)/usr/lib/lua- $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/mime.{so.1.0.2,lua} $(1)/usr/lib/lua- $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/socket.{so.2.0.2,lua} $(1)/usr/lib/lua+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ltn12,mime,socket}.lua $(1)/usr/lib/lua+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mime.so.1.0.2 $(1)/usr/lib/lua+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/socket.so.2.0.2 $(1)/usr/lib/lua $(INSTALL_DIR) $(1)/usr/lib/lua/mime ln -sf ../mime.so.1.0.2 $(1)/usr/lib/lua/mime/core.so $(INSTALL_DIR) $(1)/usr/lib/lua/socket+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ftp,http,smtp,tp,url}.lua $(1)/usr/lib/lua/socket ln -sf ../socket.so.2.0.2 $(1)/usr/lib/lua/socket/core.so endef