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 D086913835A for ; Wed, 17 Jun 2020 17:49:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF7C6E0993; Wed, 17 Jun 2020 17:49:57 +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 C40DFE0993 for ; Wed, 17 Jun 2020 17:49:57 +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 5D0D334EEE4 for ; Wed, 17 Jun 2020 17:49:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3342D175 for ; Wed, 17 Jun 2020 17:49:53 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1592416183.40548982669f3da305444b43e313dba30f10be2a.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/prosody/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/prosody/files/prosody-0.9.2-cfg.lua.patch X-VCS-Directories: net-im/prosody/files/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 40548982669f3da305444b43e313dba30f10be2a X-VCS-Branch: master Date: Wed, 17 Jun 2020 17:49:53 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 54e8f1e4-8836-4a44-8123-2f8f29b3742e X-Archives-Hash: 2d5eb2d336627b4b382e8a11a81d62d7 commit: 40548982669f3da305444b43e313dba30f10be2a Author: Michael Mair-Keimberger gmail com> AuthorDate: Wed Jun 17 14:17:50 2020 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Wed Jun 17 17:49:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40548982 net-im/prosody: remove unused patch Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16297 Signed-off-by: Aaron Bauman gentoo.org> net-im/prosody/files/prosody-0.9.2-cfg.lua.patch | 52 ------------------------ 1 file changed, 52 deletions(-) diff --git a/net-im/prosody/files/prosody-0.9.2-cfg.lua.patch b/net-im/prosody/files/prosody-0.9.2-cfg.lua.patch deleted file mode 100644 index 15c09a24fd8..00000000000 --- a/net-im/prosody/files/prosody-0.9.2-cfg.lua.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -ru prosody-0.9.2/prosody.cfg.lua.dist prosody-0.9.2-gentoo/prosody.cfg.lua.dist ---- prosody-0.9.2/prosody.cfg.lua.dist 2013-12-08 19:05:39.000000000 +0100 -+++ prosody-0.9.2-gentoo/prosody.cfg.lua.dist 2014-01-27 03:00:44.929196948 +0100 -@@ -1,5 +1,3 @@ ---- Prosody Example Configuration File ---- - -- Information on configuring Prosody can be found on our - -- website at http://prosody.im/doc/configure - -- -@@ -7,9 +5,6 @@ - -- when you have finished by running: luac -p prosody.cfg.lua - -- If there are any errors, it will let you know what and where - -- they are, otherwise it will keep quiet. ---- ---- 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! - - - ---------- Server-wide settings ---------- -@@ -63,7 +58,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. (Keep enabled for Gentoo.) - --"groups"; -- Shared roster support - --"announce"; -- Send announcement to all online users - --"welcome"; -- Welcome users who register accounts -@@ -72,6 +67,12 @@ - --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots. - }; - -+-- Settings for Gentoo init script and net-im/jabber-base permissions system: -+daemonize = true; -+prosody_user = "jabber"; -+prosody_group = "jabber"; -+pidfile = "/var/run/jabber/prosody.pid"; -+ - -- These modules are auto-loaded, but should you want - -- to disable them then uncomment them here: - modules_disabled = { -@@ -139,8 +140,8 @@ - -- 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/jabber/prosody.log"; -- Change 'info' to 'debug' for verbose logging -+ error = "/var/log/jabber/prosody.err"; - -- "*syslog"; -- Uncomment this for logging to syslog - -- "*console"; -- Log to the console, useful for debugging with daemonize=false - }