Date: Tuesday, February 28, 2017 @ 17:43:17 Author: spupykin Revision: 214229
upgpkg: prosody 1:0.10.r7198+.2fd20f372cb1+-1 upd Modified: prosody/trunk/PKGBUILD Deleted: prosody/trunk/fix-config.patch ------------------+ PKGBUILD | 12 +++++++----- fix-config.patch | 44 -------------------------------------------- 2 files changed, 7 insertions(+), 49 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-02-28 17:43:13 UTC (rev 214228) +++ PKGBUILD 2017-02-28 17:43:17 UTC (rev 214229) @@ -7,9 +7,10 @@ # Contributor: Christoph Stahl <[email protected]> pkgname=prosody -pkgrel=2 -_revision=41f783d4e127 -pkgver=0.10.r7900+.41f783d4e127+ +epoch=1 +pkgrel=1 +_revision=2fd20f372cb1 +pkgver=0.10.r7198+.2fd20f372cb1+ pkgver() { cd "$srcdir/prosody-hg" printf "0.10.r%s.%s" "$(hg identify -n)" "$(hg identify -i)" @@ -25,10 +26,11 @@ provides=('prosody') optdepends=('lua51-sec: TLS encryption support' 'lua51-bitop: websocket support' - 'lua51-event: libevent support') + 'lua51-event: libevent support' + 'lua51-dbi: SQL storage support') install=prosody.install backup=('etc/prosody/prosody.cfg.lua') -source=("prosody-hg::hg+https://hg.prosody.im/trunk#revision=${_revision}"; +source=("prosody-hg::hg+https://hg.prosody.im/0.10#revision=${_revision}"; 'prosody.tmpfile.d' 'sysuser.conf' 'prosody.service') Deleted: fix-config.patch =================================================================== --- fix-config.patch 2017-02-28 17:43:13 UTC (rev 214228) +++ fix-config.patch 2017-02-28 17:43:17 UTC (rev 214229) @@ -1,44 +0,0 @@ -diff -wbBur prosody-0.9.4/prosody.cfg.lua.dist prosody-0.9.4.my/prosody.cfg.lua.dist ---- prosody-0.9.4/prosody.cfg.lua.dist 2014-04-01 20:05:32.000000000 +0400 -+++ prosody-0.9.4.my/prosody.cfg.lua.dist 2014-05-20 19:00:36.414576199 +0400 -@@ -11,6 +11,9 @@ - -- 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! - -+daemonize = true -+pidfile = "/run/prosody/prosody.pid" -+s2s_require_encryption = true - - ---------- Server-wide settings ---------- - -- Settings in this section apply to the whole server and are the default settings -@@ -63,7 +66,7 @@ - --"http_files"; -- Serve static files from a directory over HTTP - - -- Other specific functionality -- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. -+ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. - --"groups"; -- Shared roster support - --"announce"; -- Send announcement to all online users - --"welcome"; -- Welcome users who register accounts -@@ -94,7 +97,7 @@ - -- Force clients to use encrypted connections? This option will - -- prevent clients from authenticating unless they are using encryption. - --c2s_require_encryption = false -+c2s_require_encryption = true - - -- Force certificate authentication for server-to-server connections? - -- This provides ideal security, but requires servers you communicate -@@ -139,9 +142,9 @@ - -- Logging configuration - -- For advanced logging see http://prosody.im/doc/logging - log = { -- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging -- error = "prosody.err"; -- -- "*syslog"; -- Uncomment this for logging to syslog -+ -- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging -+ -- error = "prosody.err"; -+ "*syslog"; -- Uncomment this for logging to syslog - -- "*console"; -- Log to the console, useful for debugging with daemonize=false - } -
