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

[Sergej Pupykin]

    Date: Wednesday, August 21, 2013 @ 14:27:54
  Author: spupykin
Revision: 96185

upgpkg: prosody 0.9.0-1

upd

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

------------------+
 PKGBUILD         |    8 ++++----
 fix-config.patch |   36 +++++++++++++++++++-----------------
 prosody.install  |    1 +
 3 files changed, 24 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-21 12:27:48 UTC (rev 96184)
+++ PKGBUILD	2013-08-21 12:27:54 UTC (rev 96185)
@@ -4,8 +4,8 @@
 # Contributor: Paul-Sebastian Manole <brokenthorn at gmail.com>
 
 pkgname=prosody
-pkgver=0.8.2
-pkgrel=9
+pkgver=0.9.0
+pkgrel=1
 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua."
 arch=('i686' 'x86_64')
 url="http://prosody.im/"
@@ -20,9 +20,9 @@
 	'fix-config.patch'
 	'prosody.tmpfile.d'
 	'prosody.service')
-md5sums=('6e907bf0d0acf24f1011083020ba6ffb'
+md5sums=('cf0dd4f3389ab666d2d2b3a43464afc4'
          '5b44aee99f1fa9e7f055e067688cafbd'
-         'a4a5b968b5809037f83465c571eb9afe'
+         'a21d6a6efef8a08ae21109c2aa9c2fc7'
          'e2f5a1df410b05696a30dcb058841084'
          'e74045f27cb60908d535969906781f75')
 

Modified: fix-config.patch
===================================================================
--- fix-config.patch	2013-08-21 12:27:48 UTC (rev 96184)
+++ fix-config.patch	2013-08-21 12:27:54 UTC (rev 96185)
@@ -1,32 +1,34 @@
-diff -wbBur prosody-0.8.0/prosody.cfg.lua.dist prosody-0.8.0.my/prosody.cfg.lua.dist
---- prosody-0.8.0/prosody.cfg.lua.dist	2011-04-05 13:47:06.000000000 +0000
-+++ prosody-0.8.0.my/prosody.cfg.lua.dist	2011-04-07 16:03:42.000000000 +0000
-@@ -21,6 +21,8 @@
- -- (see http://prosody.im/doc/creating_accounts for info)
- -- Example: admins = { "user1 at example.com", "user2 at example.net" }
- admins = { }
+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 @@
+ -- 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"
  
- -- Enable use of libevent for better performance under high load
- -- For more information see: http://prosody.im/doc/libevent
-@@ -59,7 +61,7 @@
- 		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
+ ---------- Server-wide settings ----------
+ -- Settings in this section apply to the whole server and are the default settings
+@@ -63,7 +65,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.
- 		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
- 		--"httpserver"; -- Serve static files from a directory over HTTP
  		--"groups"; -- Shared roster support
-@@ -123,8 +125,8 @@
+ 		--"announce"; -- Send announcement to all online users
+ 		--"welcome"; -- Welcome users who register accounts
+@@ -139,9 +141,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";
-+	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
+-	-- "*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
  }
+ 

Modified: prosody.install
===================================================================
--- prosody.install	2013-08-21 12:27:48 UTC (rev 96184)
+++ prosody.install	2013-08-21 12:27:54 UTC (rev 96185)
@@ -16,6 +16,7 @@
 
 post_upgrade() {
     post_install $1
+    echo "Now prosody logs to syslog by default"
 }
 
 post_remove() {