Fix prosody

4 files changed, 43 insertions, 29 deletions

diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 987e8c4..544bc12 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,8 +1,8 @@
 AUX prosody-0.6.2-cfg.lua.patch 637 RMD160 b3bdeaffbb8318debd9e99d006451ae9fb3cb514 SHA1 355faa0dfee2616c4a30a2393f5879c70666d572 SHA256 06057f56a0858b2d4596de874b8ea3465a984fe3dbebab0d58a10359c74dd94d
 AUX prosody-0.7.0-cfg.lua.patch 1517 RMD160 ea1e8459c61d93e1b196177a42f089e153c79f8e SHA1 635bdc90428249d5846eabaf7cb8bac975dee3c5 SHA256 5bc54faaf365be5a3568f201fa53f0ff094bb51bb4d8300cdca60ec8aaffb4e8
-AUX prosody-0.8.0.cfg.lua.patch 1097 RMD160 eba74dba5b9dca69f3a211d722a81ad20ecc9399 SHA1 f0a00f9f895909e4f17ce13cee64a6b5f2676c7c SHA256 944b31092a49b7d386aeedffd8b7398c9f927439e06cb2ffd8cf67fb2b914808
+AUX prosody-0.8.0-cfg.lua.patch 1478 RMD160 afc3b4dcf038dc305d8e194d14cb3ce3e3384081 SHA1 aff62afc9ffdcc24d1319a96df59ffde3b214b4c SHA256 a09043584dbbe69812716204c83d4f901a25b5c51835b04f014386c8e8febb87
 AUX prosody.initd 1062 RMD160 2e9ba3ba0e759355ec07fc16782f17b74074c6d5 SHA1 a62d975b12e0bd485c80ccfcca8d6a6e6c09fc8d SHA256 6b88ffcf2fd7a38030480073b19f99e8dc078e6008e8adf8f9e00827a37b7981
 DIST prosody-0.7.0.tar.gz 177412 RMD160 2e40b4f807b6120971c611f52d4df3264a82cbb9 SHA1 3f3a6c4f262a062a9c027cc843cd6827104fb8ba SHA256 a8b826805dd55282706c5683c2028899b3721eb0f84d3e35c0509a6c1bc32390
 DIST prosody-0.8.0.tar.gz 210945 RMD160 98817b1f40c6fd9ab402b70f73dae308e5990cdc SHA1 f20baab36bd2570825a24f49e0643cb9c2a65541 SHA256 0b9e39a6b555b4c848af288f27107e99b1480d9733556a2c9b3a9f249eba602d
 EBUILD prosody-0.7.0.ebuild 2082 RMD160 c143b7de9495f3bb068bc89e98aea552fa669846 SHA1 2f0de036674b644e6386923f679f690d9b831a99 SHA256 5d4efc6be5fda92dd4ead4d13a8ca801be47a7335d522114e589813a586e4bf2
-EBUILD prosody-0.8.0.ebuild 2036 RMD160 64fece90eb5d15dd5a1622a248b91e2376093923 SHA1 869720f93cfa6a95490963ddeea35591e65ccf61 SHA256 005bf1e6d4e34b432eb15dd194166554e0b967ff571bceb8d2bb6dfd41af8915
+EBUILD prosody-0.8.0.ebuild 2138 RMD160 ad874ce5c0e2469fe29667aac1c03c2202aca69b SHA1 80eb8af4f8648107d63038bf3df55f977b53f2f4 SHA256 5c97565137d0357b4cb14c6f9717209ee6a19b58dcfab8445bed74b1aadb5183
diff --git a/net-im/prosody/files/prosody-0.8.0-cfg.lua.patch b/net-im/prosody/files/prosody-0.8.0-cfg.lua.patch
new file mode 100644
index 0000000..6444a6b
--- /dev/null
+++ b/net-im/prosody/files/prosody-0.8.0-cfg.lua.patch
@@ -0,0 +1,36 @@
+diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
+index e513b11..08ebca6 100644
+--- a/prosody.cfg.lua.dist
++++ b/prosody.cfg.lua.dist
+@@ -105,6 +105,8 @@ ssl = {
+ -- 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.
++-- See http://prosody.im/doc/authentication for other possibilities including
++-- Cyrus SASL.
+ 
+ authentication = "internal_plain"
+ 
+@@ -123,12 +125,19 @@ authentication = "internal_plain"
+ -- 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 = "/var/log/jabber/prosody.log"; -- Change 'info' to 'debug' for verbose logging
++	error = "/var/log/jabber/prosody.err";
++	-- "*syslog"; -- Uncomment this for logging to syslog; needs mod_posix
+ 	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
+ }
+ 
++-- Pidfile, used by prosodyctl and the init.d script
++pidfile = "/var/run/jabber/prosody.pid"
++
++-- User and group, used for daemon
++prosody_user = "jabber"
++prosody_group = "jabber"
++
+ ----------- 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.
diff --git a/net-im/prosody/files/prosody-0.8.0.cfg.lua.patch b/net-im/prosody/files/prosody-0.8.0.cfg.lua.patch
deleted file mode 100644
index a5cbab2..0000000
--- a/net-im/prosody/files/prosody-0.8.0.cfg.lua.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- prosody.cfg.lua.dist.old	2011-01-13 02:29:32.000000000 +0100
-+++ prosody.cfg.lua.dist	2011-01-14 17:17:28.000000000 +0100
-@@ -114,15 +114,20 @@
- -- to update the logrotate config at /etc/logrotate.d/prosody
- log = {
-         -- Log all error messages to prosody.err
--	error = "/var/log/prosody/prosody.err";
-+	error = "/var/log/jabber/prosody.err";
-         -- Log everything of level "info" and higher (that is, all except "debug" messages)
-         -- to prosody.log
--        info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for more verbose logging
-+        info = "/var/log/jabber/prosody.log"; -- Change 'info' to 'debug' for more verbose logging
-         --"*syslog"; -- Uncomment this for logging to syslog
- }
- 
- -- Pidfile, used by prosodyctl and the init.d script
--pidfile = "/var/run/prosody/prosody.pid";
-+pidfile = "/var/run/jabber/prosody.pid";
-+
-+-- User and group, used for daemon
-+prosody_user = "jabber";
-+prosody_group = "jabber";
-+
- 
- ----------- Virtual hosts -----------
- -- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
diff --git a/net-im/prosody/prosody-0.8.0.ebuild b/net-im/prosody/prosody-0.8.0.ebuild
index 75bf13b..89c8741 100644
--- a/net-im/prosody/prosody-0.8.0.ebuild
+++ b/net-im/prosody/prosody-0.8.0.ebuild
@@ -35,7 +35,7 @@ JABBER_ETC="/etc/jabber"
 JABBER_SPOOL="/var/spool/jabber"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-${PV}.cfg.lua.patch"
+	epatch "${FILESDIR}/${PN}-${PV}-cfg.lua.patch"
 	sed -i "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!" Makefile
 	sed -i "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!" Makefile
 	sed -i "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!" Makefile
@@ -64,3 +64,7 @@ src_test() {
 	cd tests
 	./run_tests.sh
 }
+
+pkg_postinst() {
+	elog "Please note that the module 'console' has been renamed to 'admin_telnet'."
+}