diff options
Diffstat (limited to 'media-sound/mpd/files')
| -rw-r--r-- | media-sound/mpd/files/mpd-0.20.4.init | 32 | ||||
| -rw-r--r-- | media-sound/mpd/files/mpd-0.20.4.logrotate | 6 | ||||
| -rw-r--r-- | media-sound/mpd/files/mpd.logrotate | 6 | ||||
| -rw-r--r-- | media-sound/mpd/files/mpd2.init | 37 | ||||
| -rw-r--r-- | media-sound/mpd/files/mpdconf.patch | 70 | ||||
| -rw-r--r-- | media-sound/mpd/files/string_crashfix.patch | 74 |
6 files changed, 0 insertions, 225 deletions
diff --git a/media-sound/mpd/files/mpd-0.20.4.init b/media-sound/mpd/files/mpd-0.20.4.init deleted file mode 100644 index 3eb0bc2..0000000 --- a/media-sound/mpd/files/mpd-0.20.4.init +++ /dev/null @@ -1,32 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -: CFGFILE=${CFGFILE:=/etc/mpd.conf} - -depend() { - need localmount - use net netmount nfsmount alsasound esound pulseaudio - config ${CFGFILE} -} - -get_config() { - x=$1 - test -e ${CFGFILE} || return 1 - sed -n \ - -e '/^[ \t]*'${x}'/{s:^[ \t]*'${x}'[ \t]\+"\?\([^#"]\+\)[^"]*"\?$:\1: ; p }' \ - ${CFGFILE} -} - -extra_started_commands='reload' -command=/usr/bin/mpd -command_args=${opts:=${CFGFILE}} -required_files=${CFGFILE} -pidfile=$(get_config pid_file) -description="Music Player Daemon" - -reload() { - ebegin "Reloading ${SVCNAME}" - kill -HUP `cat ${pidfile}` - eend $? -} diff --git a/media-sound/mpd/files/mpd-0.20.4.logrotate b/media-sound/mpd/files/mpd-0.20.4.logrotate deleted file mode 100644 index ff47d10..0000000 --- a/media-sound/mpd/files/mpd-0.20.4.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/lib/mpd/log { - missingok - postrotate - /etc/init.d/mpd reload - endscript -} diff --git a/media-sound/mpd/files/mpd.logrotate b/media-sound/mpd/files/mpd.logrotate deleted file mode 100644 index 94933df..0000000 --- a/media-sound/mpd/files/mpd.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/lib/mpd/log { - missingok - postrotate - [ -f /var/run/mpd.pid ] && /bin/kill -HUP `cat /var/run/mpd.pid` - endscript -} diff --git a/media-sound/mpd/files/mpd2.init b/media-sound/mpd/files/mpd2.init deleted file mode 100644 index d8b9de8..0000000 --- a/media-sound/mpd/files/mpd2.init +++ /dev/null @@ -1,37 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 ^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 $? -} diff --git a/media-sound/mpd/files/mpdconf.patch b/media-sound/mpd/files/mpdconf.patch deleted file mode 100644 index 8f193c8..0000000 --- a/media-sound/mpd/files/mpdconf.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: mpd-0.16/doc/mpdconf.dist -=================================================================== ---- mpd-0.16.orig/doc/mpdconf.dist -+++ mpd-0.16/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,7 +34,7 @@ - # 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 -@@ -47,7 +47,7 @@ - # 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. diff --git a/media-sound/mpd/files/string_crashfix.patch b/media-sound/mpd/files/string_crashfix.patch deleted file mode 100644 index 0d2b7f9..0000000 --- a/media-sound/mpd/files/string_crashfix.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- mpd-0.20.9/src/util/FormatString.cxx 2017-01-27 10:46:51.000000000 +0300 -+++ mpd-0.20.9_patched/src/util/FormatString.cxx 2017-08-01 23:55:23.781161186 +0300 -@@ -23,42 +23,46 @@ - #include <stdio.h> - #include <stdlib.h> - --#ifdef WIN32 - #include <string.h> --#endif - - AllocatedString<> - FormatStringV(const char *fmt, va_list args) - { --#ifndef WIN32 -- va_list tmp; -- va_copy(tmp, args); -- const int length = vsnprintf(NULL, 0, fmt, tmp); -- va_end(tmp); -- -- if (length <= 0) -- /* wtf.. */ -- abort(); -- -- char *buffer = new char[length + 1]; -- vsnprintf(buffer, length + 1, fmt, args); -- return AllocatedString<>::Donate(buffer); --#else -+//#ifndef WIN32 -+// va_list tmp; -+// va_copy(tmp, args); -+// const int length = vsnprintf(NULL, 0, fmt, tmp); -+// va_end(tmp); -+ -+// if (length <= 0) -+// /* wtf.. */ -+// abort(); -+// -+// char *buffer = new char[length + 1]; -+// vsnprintf(buffer, length + 1, fmt, args); -+// return AllocatedString<>::Donate(buffer); -+// char *buf = new char[128]; -+// strcpy(buf, "fucked shit"); -+// return AllocatedString<>::Donate(buf); -+//#else - /* On mingw32, snprintf() expects a 64 bit integer instead of - a "long int" for "%li". This is not consistent with our - expectation, so we're using plain sprintf() here, hoping - the static buffer is large enough. Sorry for this hack, - but WIN32 development is so painful, I'm not in the mood to - do it properly now. */ -- -- char buffer[16384]; -- vsprintf(buffer, fmt, args); -- -- const size_t length = strlen(buffer); -- char *p = new char[length + 1]; -- memcpy(p, buffer, length + 1); -- return AllocatedString<>::Donate(buffer); --#endif -+ -+ if(!fmt) -+ abort(); -+ const int buf_len = 16384; -+ char buffer[buf_len]; -+ vsnprintf(buffer, buf_len-1, fmt, args); -+ -+// const size_t length = strlen(buffer); -+// char *p = new char[length + 1]; -+ char *p = strdup(buffer); -+ return AllocatedString<>::Donate(p); -+//#endif - } - - AllocatedString<> |