manuel
/
void-packages
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request from Duncaen/prosody 

Prosody
This commit is contained in:
Duncan Overbruck 2015-03-22 23:04:02 +01:00
parent 041b9aa4fe 38b53c1dd3
commit 747cfb1863
7 changed files with 454 additions and 0 deletions
srcpkgs
luaexpat
template
luasec
patches
libressl.patchlua51.patch
template
prosody
files
prosody.cfg.lua
prosody
run
template

14
srcpkgs/luaexpat/template Normal file
View File

@ -0,0 +1,14 @@
# Template file for 'luaexpat'
pkgname=luaexpat
version=1.3.0
revision=1
build_style=gnu-makefile
make_build_args="LUA_INC=-I${XBPS_CROSS_BASE}/usr/include/lua5.1 EXPAT_INC=-I${XBPS_CROSS_BASE}/usr/include"
makedepends="lua51-devel expat-devel"
depends="lua51"
short_desc="XML Expat parsing for the Lua programming language"
maintainer="Duncaen <mail@duncano.de>"
license="MIT"
homepage="https://matthewwild.co.uk/projects/luaexpat/"
distfiles="https://matthewwild.co.uk/projects/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=d060397960d87b2c89cf490f330508b7def1a0677bdc120531c571609fc57dc3

36
srcpkgs/luasec/patches/libressl.patch Normal file
View File

@ -0,0 +1,36 @@
diff --git src/ssl.c src/ssl.c
index 2fa6ede..bd8a744 100644
--- src/ssl.c
+++ src/ssl.c
@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
}
return 1;
}
-
+
/**
* Return the compression method used.
*/
static int meth_compression(lua_State *L)
{
+#if !defined(OPENSSL_NO_COMP)
const COMP_METHOD *comp;
+#endif
p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
if (ssl->state != LSEC_STATE_CONNECTED) {
lua_pushnil(L);
lua_pushstring(L, "closed");
return 2;
}
+#if !defined(OPENSSL_NO_COMP)
comp = SSL_get_current_compression(ssl->ssl);
if (comp)
lua_pushstring(L, SSL_COMP_get_name(comp));
else
lua_pushnil(L);
+#else
+ lua_pushnil(L);
+#endif
return 1;
}

153
srcpkgs/luasec/patches/lua51.patch Normal file
View File

@ -0,0 +1,153 @@
diff --git src/context.c src/context.c
index cafc222..107ed60 100644
--- src/context.c
+++ src/context.c
@@ -18,8 +18,8 @@
#include <openssl/x509.h>
#include <openssl/x509v3.h>
-#include <lua.h>
-#include <lauxlib.h>
+#include "lua5.1/lua.h"
+#include "lua5.1/lauxlib.h"
#include "context.h"
#include "options.h"
diff --git src/context.h src/context.h
index 293f615..e346096 100644
--- src/context.h
+++ src/context.h
@@ -7,7 +7,7 @@
*
*--------------------------------------------------------------------------*/
-#include <lua.h>
+#include "lua5.1/lua.h"
#include <openssl/ssl.h>
#include "config.h"
diff --git src/luasocket/buffer.c src/luasocket/buffer.c
index 4ef4e8e..5886207 100644
--- src/luasocket/buffer.c
+++ src/luasocket/buffer.c
@@ -2,8 +2,8 @@
* Input/Output interface for Lua programs
* LuaSocket toolkit
\*=========================================================================*/
-#include "lua.h"
-#include "lauxlib.h"
+#include "lua5.1/lua.h"
+#include "lua5.1/lauxlib.h"
#include "buffer.h"
diff --git src/luasocket/buffer.h src/luasocket/buffer.h
index 1281bb3..cd7da2e 100644
--- src/luasocket/buffer.h
+++ src/luasocket/buffer.h
@@ -15,7 +15,7 @@
* The module is built on top of the I/O abstraction defined in io.h and the
* timeout management is done with the timeout.h interface.
\*=========================================================================*/
-#include "lua.h"
+#include "lua5.1/lua.h"
#include "io.h"
#include "timeout.h"
diff --git src/luasocket/io.h src/luasocket/io.h
index 76a3e58..fe72085 100644
--- src/luasocket/io.h
+++ src/luasocket/io.h
@@ -13,7 +13,7 @@
* is very simple.
\*=========================================================================*/
#include <stdio.h>
-#include "lua.h"
+#include "lua5.1/lua.h"
#include "timeout.h"
diff --git src/luasocket/timeout.c src/luasocket/timeout.c
index 94a524b..32edaa4 100644
--- src/luasocket/timeout.c
+++ src/luasocket/timeout.c
@@ -6,8 +6,8 @@
#include <limits.h>
#include <float.h>
-#include "lua.h"
-#include "lauxlib.h"
+#include "lua5.1/lua.h"
+#include "lua5.1/lauxlib.h"
#include "timeout.h"
diff --git src/luasocket/timeout.h src/luasocket/timeout.h
index 6715ca7..d758270 100644
--- src/luasocket/timeout.h
+++ src/luasocket/timeout.h
@@ -4,7 +4,7 @@
* Timeout management functions
* LuaSocket toolkit
\*=========================================================================*/
-#include "lua.h"
+#include "lua5.1/lua.h"
/* timeout control structure */
typedef struct t_timeout_ {
diff --git src/ssl.c src/ssl.c
index bd8a744..b26e99e 100644
--- src/ssl.c
+++ src/ssl.c
@@ -19,8 +19,8 @@
#include <openssl/x509_vfy.h>
#include <openssl/err.h>
-#include <lua.h>
-#include <lauxlib.h>
+#include "lua5.1/lua.h"
+#include "lua5.1/lauxlib.h"
#include <luasocket/io.h>
#include <luasocket/buffer.h>
diff --git src/ssl.h src/ssl.h
index b357196..1bb42fc 100644
--- src/ssl.h
+++ src/ssl.h
@@ -8,7 +8,7 @@
*--------------------------------------------------------------------------*/
#include <openssl/ssl.h>
-#include <lua.h>
+#include "lua5.1/lua.h"
#include <luasocket/io.h>
#include <luasocket/buffer.h>
diff --git src/x509.c src/x509.c
index 5e7a1dd..9865561 100644
--- src/x509.c
+++ src/x509.c
@@ -20,8 +20,8 @@
#include <openssl/bio.h>
#include <openssl/bn.h>
-#include <lua.h>
-#include <lauxlib.h>
+#include "lua5.1/lua.h"
+#include "lua5.1/lauxlib.h"
#include "x509.h"
diff --git src/x509.h src/x509.h
index 2b32cdd..9c52f12 100644
--- src/x509.h
+++ src/x509.h
@@ -10,7 +10,7 @@
#define LSEC_X509_H
#include <openssl/x509v3.h>
-#include <lua.h>
+#include "lua5.1/lua.h"
#include "config.h"

18
srcpkgs/luasec/template Normal file
View File

@ -0,0 +1,18 @@
# Template file for 'luasec'
pkgname=luasec
version=0.5
revision=1
wrksrc=${pkgname}-${pkgname}-${version}
build_style=gnu-makefile
makedepends="lua51-devel libressl-devel"
depends="lua51"
short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
maintainer="Duncaen <mail@duncano.de>"
license="MIT"
homepage="https://github.com/brunoos/luasec"
distfiles="https://github.com/brunoos/luasec/archive/${pkgname}-${version}.tar.gz"
checksum=6480598f7492ac479b6b608b5fb1488226bfa6ef675e29f6b24dbe9099083523
do_build() {
make linux CC=$CC LD=$CC INC_PATH=-I${XBPS_CROSS_BASE}/usr/include LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
}

188
srcpkgs/prosody/files/prosody.cfg.lua Normal file
View File

@ -0,0 +1,188 @@
-- Prosody Example Configuration File
--
-- Information on configuring Prosody can be found on our
-- website at http://prosody.im/doc/configure
--
-- Tip: You can check that the syntax of this file is correct
-- when you have finished by running: luac -p prosody.cfg.lua
-- If there are any errors, it will let you know what and where
-- they are, otherwise it will keep quiet.
--
-- The only thing left to do is rename this file to remove the .dist ending, and fill in the
-- blanks. Good luck, and happy Jabbering!
------ Void settings ------
daemonize = false;
pidfile = "/run/prosody/prosody.pid"
---------- Server-wide settings ----------
-- Settings in this section apply to the whole server and are the default settings
-- for any virtual hosts
-- This is a (by default, empty) list of accounts that are admins
-- for the server. Note that you must create the accounts separately
-- (see http://prosody.im/doc/creating_accounts for info)
-- Example: admins = { "user1@example.com", "user2@example.net" }
admins = { }
-- Enable use of libevent for better performance under high load
-- For more information see: http://prosody.im/doc/libevent
--use_libevent = true;
-- This is the list of modules Prosody will load on startup.
-- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
-- Documentation on modules can be found at: http://prosody.im/doc/modules
modules_enabled = {
-- Generally required
"roster"; -- Allow users to have a roster. Recommended ;)
"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
"tls"; -- Add support for secure TLS on c2s/s2s connections
"dialback"; -- s2s dialback support
"disco"; -- Service discovery
-- Not essential, but recommended
"private"; -- Private XML storage (for room bookmarks, etc.)
"vcard"; -- Allow users to set vCards
-- These are commented by default as they have a performance impact
--"privacy"; -- Support privacy lists
--"compression"; -- Stream compression
-- Nice to have
"version"; -- Replies to server version requests
"uptime"; -- Report how long server has been running
"time"; -- Let others know the time here on this server
"ping"; -- Replies to XMPP pings with pongs
"pep"; -- Enables users to publish their mood, activity, playing music and more
"register"; -- Allow users to register on this server using a client and change passwords
-- Admin interfaces
"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
-- HTTP modules
--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
--"http_files"; -- Serve static files from a directory over HTTP
-- Other specific functionality
"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. (Keep enabled for Void.)
--"groups"; -- Shared roster support
--"announce"; -- Send announcement to all online users
--"welcome"; -- Welcome users who register accounts
--"watchregistrations"; -- Alert admins of registrations
--"motd"; -- Send a message to users when they log in
--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
};
-- These modules are auto-loaded, but should you want
-- to disable them then uncomment them here:
modules_disabled = {
-- "offline"; -- Store offline messages
-- "c2s"; -- Handle client connections
-- "s2s"; -- Handle server-to-server connections
};
-- Disable account creation by default, for security
-- For more information see http://prosody.im/doc/creating_accounts
allow_registration = false;
-- These are the SSL/TLS-related settings. If you don't want
-- to use SSL/TLS, you may comment or remove this
ssl = {
key = "certs/localhost.key";
certificate = "certs/localhost.crt";
}
-- Force clients to use encrypted connections? This option will
-- prevent clients from authenticating unless they are using encryption.
c2s_require_encryption = false
-- Force certificate authentication for server-to-server connections?
-- This provides ideal security, but requires servers you communicate
-- with to support encryption AND present valid, trusted certificates.
-- NOTE: Your version of LuaSec must support certificate verification!
-- For more information see http://prosody.im/doc/s2s#security
s2s_secure_auth = false
-- Many servers don't support encryption or have invalid or self-signed
-- certificates. You can list domains here that will not be required to
-- authenticate using certificates. They will be authenticated using DNS.
--s2s_insecure_domains = { "gmail.com" }
-- Even if you leave s2s_secure_auth disabled, you can still require valid
-- certificates for some domains by specifying a list here.
--s2s_secure_domains = { "jabber.org" }
-- Select the authentication backend to use. The 'internal' providers
-- use Prosody's configured data storage to store the authentication data.
-- To allow Prosody to offer secure authentication mechanisms to clients, the
-- default provider stores passwords in plaintext. If you do not trust your
-- server please see http://prosody.im/doc/modules/mod_auth_internal_hashed
-- for information about using the hashed backend.
authentication = "internal_plain"
-- Select the storage backend to use. By default Prosody uses flat files
-- in its configured data directory, but it also supports more backends
-- through modules. An "sql" backend is included by default, but requires
-- additional dependencies. See http://prosody.im/doc/storage for more info.
--storage = "sql" -- Default is "internal"
-- For the "sql" backend, you can uncomment *one* of the below to configure:
--sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename.
--sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
--sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
-- Logging configuration
-- For advanced logging see http://prosody.im/doc/logging
log = {
info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
error = "/var/log/prosody/prosody.err";
-- "*syslog"; -- Uncomment this for logging to syslog
-- "*console"; -- Log to the console, useful for debugging with daemonize=false
}
----------- Virtual hosts -----------
-- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
-- Settings under each VirtualHost entry apply *only* to that host.
VirtualHost "localhost"
VirtualHost "example.com"
enabled = false -- Remove this line to enable this host
-- Assign this host a certificate for TLS, otherwise it would use the one
-- set in the global section (if any).
-- Note that old-style SSL on port 5223 only supports one certificate, and will always
-- use the global one.
ssl = {
key = "certs/example.com.key";
certificate = "certs/example.com.crt";
}
------ Components ------
-- You can specify components to add hosts that provide special services,
-- like multi-user conferences, and transports.
-- For more information on components, see http://prosody.im/doc/components
---Set up a MUC (multi-user chat) room server on conference.example.com:
--Component "conference.example.com" "muc"
-- Set up a SOCKS5 bytestream proxy for server-proxied file transfers:
--Component "proxy.example.com" "proxy65"
---Set up an external component (default component port is 5347)
--
-- External components allow adding various services, such as gateways/
-- transports to other networks like ICQ, MSN and Yahoo. For more info
-- see: http://prosody.im/doc/components#adding_an_external_component
--
--Component "gateway.example.com"
-- component_secret = "password"

4
srcpkgs/prosody/files/prosody/run Normal file
View File

@ -0,0 +1,4 @@
#!/bin/sh
mkdir -p /var/lib/prosody /run/prosody
chown prosody:prosody /var/lib/prosody /run/prosody
exec chpst -u prosody:prosody prosody

41
srcpkgs/prosody/template Normal file
View File

@ -0,0 +1,41 @@
# Template file for 'prosody'
pkgname=prosody
version=0.9.7
revision=1
build_style=configure
conf_files="
/etc/prosody/prosody.cfg.lua
/etc/prosody/certs/localhost.cnf
/etc/prosody/certs/openssl.cnf
/etc/prosody/certs/Makefile"
system_accounts="prosody"
prosody_homedir="/var/lib/prosody"
make_dirs="/var/log/prosody 0750 root root"
makedepends="lua51-devel libressl-devel libidn-devel"
depends="lua51 luasocket luafilesystem luaexpat luasec"
short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
maintainer="Duncaen <mail@duncano.de>"
license="MIT"
homepage="https://prosody.im/"
distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
checksum=dd4b99b39976442055898c933c013598e558beed11d7795d76ffc0f1a87e2e00
pre_build() {
cp -f ${FILESDIR}/prosody.cfg.lua prosody.cfg.lua.dist
}
do_configure() {
./configure --ostype=linux \
--prefix=/usr \
--no-example-certs \
--c-compiler=${CC} \
--linker=${CC} \
--with-lua-include=${XBPS_CROSS_BASE}/usr/include/lua5.1 \
--with-lua=${XBPS_CROSS_BASE}/usr \
--lua-suffix=5.1 \
--runwith=lua5.1
}
post_install() {
vsv prosody
}