From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 476231396D9 for ; Wed, 8 Nov 2017 19:51:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D5D2E0C0D; Wed, 8 Nov 2017 19:51:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 38B6AE0C0D for ; Wed, 8 Nov 2017 19:51:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD47833BF0F for ; Wed, 8 Nov 2017 19:51:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 73CA99675 for ; Wed, 8 Nov 2017 19:51:50 +0000 (UTC) From: "Vadim A. Misbakh-Soloviov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Vadim A. Misbakh-Soloviov" Message-ID: <1510170681.1919c9800e5ed637746ff8bfc7c843c34029779e.mva@gentoo> Subject: [gentoo-commits] proj/lua:master commit in: net-im/prosody/files/ X-VCS-Repository: proj/lua X-VCS-Files: net-im/prosody/files/prosody-0.8.0-cfg.lua.patch X-VCS-Directories: net-im/prosody/files/ X-VCS-Committer: mva X-VCS-Committer-Name: Vadim A. Misbakh-Soloviov X-VCS-Revision: 1919c9800e5ed637746ff8bfc7c843c34029779e X-VCS-Branch: master Date: Wed, 8 Nov 2017 19:51:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 15d6c37b-bc3e-4a7f-a571-fdf3975d69a5 X-Archives-Hash: 11d631355381fa8f99c547990c7c1651 commit: 1919c9800e5ed637746ff8bfc7c843c34029779e Author: Andrey Utkin gentoo org> AuthorDate: Sun Nov 5 16:52:37 2017 +0000 Commit: Vadim A. Misbakh-Soloviov mva name> CommitDate: Wed Nov 8 19:51:21 2017 +0000 URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=1919c980 net-im/prosody: update the patch Make prosody-0.8.0-cfg.lua.patch, used by ebuild, applicable again. Since upstream commit 8258:503f424d4f07 ("prosody.cfg.lua.dist: Update in preparation for 0.10.0 release") existing patch no longer applied which led to emerge failure. net-im/prosody/files/prosody-0.8.0-cfg.lua.patch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 index 6444a6b..d2c38dc 100644 --- a/net-im/prosody/files/prosody-0.8.0-cfg.lua.patch +++ b/net-im/prosody/files/prosody-0.8.0-cfg.lua.patch @@ -13,7 +13,7 @@ index e513b11..08ebca6 100644 @@ -123,12 +125,19 @@ authentication = "internal_plain" -- Logging configuration - -- For advanced logging see http://prosody.im/doc/logging + -- For advanced logging see https://prosody.im/doc/logging log = { - info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging - error = "prosody.err"; @@ -31,6 +31,10 @@ index e513b11..08ebca6 100644 +prosody_user = "jabber" +prosody_group = "jabber" + + -- Uncomment to enable statistics + -- For more info see https://prosody.im/doc/statistics + -- statistics = "internal" + ----------- 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.