[gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/files/

[gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/files/

[Robin H. Johnson]

commit:     8083fcc5e0412ce34c19ad5c8a161d7269429134
Author:     Nado <nado <AT> troglodyte <DOT> be>
AuthorDate: Thu Nov 17 14:08:08 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 00:50:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8083fcc5

media-sound/mpd: Fix pid_file presence check in init file

Package-Manager: portage-2.3.2
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 media-sound/mpd/files/mpd2.init | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/mpd/files/mpd2.init b/media-sound/mpd/files/mpd2.init
index d8b9de8938..7e6e239799 100644
--- a/media-sound/mpd/files/mpd2.init
+++ b/media-sound/mpd/files/mpd2.init
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ checkconfig() {
 		return 1
 	fi
 
-	if ! grep -q ^pid_file /etc/mpd.conf; then
+	if ! grep -q '^\s*pid_file' /etc/mpd.conf; then
 		eerror "Invalid configuration: pid_file needs to be set."
 		return 1
 	fi

[gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/files/

[Patrice Clement]

commit:     d47f408a8d1780414744e29bff5bf193aee345e6
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Feb 20 18:16:31 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Apr  1 21:53:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d47f408a

media-sound/mpd: remove unused files.

Closes: https://bugs.gentoo.org/651330
Closes: https://github.com/gentoo/gentoo/pull/7240

 media-sound/mpd/files/mpd.logrotate |  7 -------
 media-sound/mpd/files/mpd2.init     | 36 ------------------------------------
 2 files changed, 43 deletions(-)

diff --git a/media-sound/mpd/files/mpd.logrotate b/media-sound/mpd/files/mpd.logrotate
deleted file mode 100644
index c913c1facc4..00000000000
--- a/media-sound/mpd/files/mpd.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/lib/mpd/log {
-	missingok
-	postrotate
-	[ -f /var/run/mpd.pid ] && cat /var/run/mpd.pid | xargs /bin/kill -HUP
-	[ -f /var/lib/mpd/pid ] && cat /var/lib/mpd/pid | xargs /bin/kill -HUP
-	endscript
-}

diff --git a/media-sound/mpd/files/mpd2.init b/media-sound/mpd/files/mpd2.init
deleted file mode 100644
index ae5a2cce0eb..00000000000
--- a/media-sound/mpd/files/mpd2.init
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-	use net netmount nfsmount alsasound esound pulseaudio
-}
-
-checkconfig() {
-	if ! [ -f /etc/mpd.conf ]; then
-		eerror "Configuration file /etc/mpd.conf does not exist."
-		return 1
-	fi
-
-	if ! grep -q '^\s*pid_file' /etc/mpd.conf; then
-		eerror "Invalid configuration: pid_file needs to be set."
-		return 1
-	fi
-
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting Music Player Daemon"
-	start-stop-daemon --start --quiet --exec /usr/bin/mpd -- /etc/mpd.conf 2>/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Music Player Daemon"
-	/usr/bin/mpd --kill
-	eend $?
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/files/

[Conrad Kostecki]

commit:     e9dc359d78eab4d11752df168c6fed443447f82e
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Oct  1 12:17:12 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Oct  2 14:42:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9dc359d

media-sound/mpd: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27558
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 media-sound/mpd/files/mpd-0.18.conf.patch | 78 -------------------------------
 1 file changed, 78 deletions(-)

diff --git a/media-sound/mpd/files/mpd-0.18.conf.patch b/media-sound/mpd/files/mpd-0.18.conf.patch
deleted file mode 100644
index d71056f7cd0d..000000000000
--- a/media-sound/mpd/files/mpd-0.18.conf.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/doc/mpdconf.dist b/doc/mpdconf.dist
-index 470a5c9..9f595a6 100644
---- a/doc/mpdconf.dist
-+++ b/doc/mpdconf.dist
-@@ -10,14 +10,14 @@
- # be disabled and audio files will only be accepted over ipc socket (using
- # file:// protocol) or streaming files over an accepted protocol.
- #
--#music_directory		"~/music"
-+music_directory			"/var/lib/mpd/music"
- #
- # This setting sets the MPD internal playlist directory. The purpose of this
- # directory is storage for playlists created by MPD. The server will use 
- # playlist files not created by the server but only if they are in the MPD
- # format. This setting defaults to playlist saving being disabled.
- #
--#playlist_directory		"~/.mpd/playlists"
-+playlist_directory		"/var/lib/mpd/playlists"
- #
- # This setting sets the location of the MPD database. This file is used to
- # load the database at server start up and store the database while the 
-@@ -25,7 +25,7 @@
- # MPD to accept files over ipc socket (using file:// protocol) or streaming
- # files over an accepted protocol.
- #
--#db_file			"~/.mpd/database"
-+db_file			"/var/lib/mpd/database"
- # 
- # These settings are the locations for the daemon log files for the daemon.
- # These logs are great for troubleshooting, depending on your log_level
-@@ -34,20 +34,20 @@
- # The special value "syslog" makes MPD use the local syslog daemon. This
- # setting defaults to logging to syslog, otherwise logging is disabled.
- #
--#log_file			"~/.mpd/log"
-+log_file			"/var/lib/mpd/log"
- #
- # This setting sets the location of the file which stores the process ID
--# for use of mpd --kill and some init scripts. This setting is disabled by
--# default and the pid file will not be stored.
-+# for use of mpd --kill and some init scripts. This setting is required when
-+# using the Gentoo init script.
- #
--#pid_file			"~/.mpd/pid"
-+pid_file			"/var/lib/mpd/pid"
- #
- # This setting sets the location of the file which contains information about
- # most variables to get MPD back into the same general shape it was in before
- # it was brought down. This setting is disabled by default and the server 
- # state will be reset on server start up.
- #
--#state_file			"~/.mpd/state"
-+state_file			"/var/lib/mpd/state"
- #
- # The location of the sticker database.  This is a database which
- # manages dynamic information attached to songs.
-@@ -64,7 +64,7 @@
- # initialization. This setting is disabled by default and MPD is run as the
- # current user.
- #
--#user				"nobody"
-+user				"mpd"
- #
- # This setting specifies the group that MPD will run as. If not specified
- # primary group of user specified with "user" setting will be used (if set).
-@@ -78,10 +78,10 @@
- # This setting can deny access to control of the daemon.
- #
- # For network
--#bind_to_address		"any"
-+bind_to_address		"localhost"
- #
- # And for Unix Socket
--#bind_to_address		"~/.mpd/socket"
-+bind_to_address		"/var/lib/mpd/socket"
- #
- # This setting is the TCP port that is desired for the daemon to get assigned
- # to.