[arch-commits] Commit in prosody/trunk (PKGBUILD fix-config.patch)

[Sergej Pupykin]

    Date: Tuesday, May 20, 2014 @ 17:02:55
  Author: spupykin
Revision: 111565

upgpkg: prosody 0.9.4-3

upd

Modified:
  prosody/trunk/PKGBUILD
  prosody/trunk/fix-config.patch

------------------+
 PKGBUILD         |   20 +++++++-------------
 fix-config.patch |   22 ++++++++++++++++------
 2 files changed, 23 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-20 14:05:47 UTC (rev 111564)
+++ PKGBUILD	2014-05-20 15:02:55 UTC (rev 111565)
@@ -6,7 +6,7 @@
 
 pkgname=prosody
 pkgver=0.9.4
-pkgrel=1
+pkgrel=3
 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua"
 arch=('i686' 'x86_64')
 url="http://prosody.im/"
@@ -22,18 +22,12 @@
         'fix-config.patch'
         'prosody.tmpfile.d'
         'prosody.service')
-sha256sums=('22d2427fae4858d15b4f695348fb7781e4c65c04a24171837985024e76799ea0'
-            'SKIP'
-            '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f'
-            'db37b1b6bcd648f264164c5db5e754fc077671c74df6079c101384e146f4d6da'
-            '3f5cc5db2cfe74c4edf91f60e692e04c3504025e893d0880114d52728a2c4bc4'
-            '16fbfb54bf21bb73ce9d9acacb60d47f237c35e842c5a00f1153f72f0d2f7f6b')
-sha256sums=('be87cf31901a25477869b4ebd52e298f63a5effacae526911a0be876cc82e1c6'
-            'SKIP'
-            '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f'
-            'db37b1b6bcd648f264164c5db5e754fc077671c74df6079c101384e146f4d6da'
-            '3f5cc5db2cfe74c4edf91f60e692e04c3504025e893d0880114d52728a2c4bc4'
-            '16fbfb54bf21bb73ce9d9acacb60d47f237c35e842c5a00f1153f72f0d2f7f6b')
+md5sums=('94f9a613c834c276352ac5b142fb72e0'
+         'SKIP'
+         '5b44aee99f1fa9e7f055e067688cafbd'
+         '01b6aa0b1e1e3067756c45b0751bee78'
+         'e2f5a1df410b05696a30dcb058841084'
+         'e74045f27cb60908d535969906781f75')
 
 prepare() {
   cd ${pkgname}-${pkgver}

Modified: fix-config.patch
===================================================================
--- fix-config.patch	2014-05-20 14:05:47 UTC (rev 111564)
+++ fix-config.patch	2014-05-20 15:02:55 UTC (rev 111565)
@@ -1,16 +1,17 @@
-diff -wbBur prosody-0.9.0.q/prosody.cfg.lua.dist prosody-0.9.0/prosody.cfg.lua.dist
---- prosody-0.9.0.q/prosody.cfg.lua.dist	2013-08-19 23:37:36.000000000 +0400
-+++ prosody-0.9.0/prosody.cfg.lua.dist	2013-08-21 16:17:49.175521891 +0400
-@@ -11,6 +11,8 @@
+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 +65,7 @@
+@@ -63,7 +66,7 @@
  		--"http_files"; -- Serve static files from a directory over HTTP
  
  	-- Other specific functionality
@@ -19,7 +20,16 @@
  		--"groups"; -- Shared roster support
  		--"announce"; -- Send announcement to all online users
  		--"welcome"; -- Welcome users who register accounts
-@@ -139,9 +141,9 @@
+@@ -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 = {