Merge remote-tracking branch 'last/sisyphus' into sisyphus

.gear/mpd.conf

+######################## REQUIRED PATHS ###############################
+music_directory	"~/Music"
+playlist_directory "@localstatedir@/mpd/playlists"
+log_file "@logdir@/mpd/mpd.log"
+db_file "@localstatedir@/mpd/mpd.db"
+#######################################################################
+
+######################## OPTIONAL PATHS ###############################
+pid_file "@localstatedir@/mpd/mpd.pid"
+state_file "@localstatedir@/mpd/mpdstate"
+#######################################################################
+
+######################## DAEMON OPTIONS ###############################
+#user "nobody"
+bind_to_address "127.0.0.1"
+#bind_to_address "any"
+port "6600"
+# "default", "secure", or "verbose".
+log_level "default"
+#zeroconf_name "Music Player"
+
+audio_output {
+type "alsa"
+name "alsa"
+}
+
+#samplerate_converter "Fastest Sinc Interpolator"
+
+mixer_type "alsa"
+#mixer_device "default"
+#mixer_control "PCM"
+
+#mixer_type "software"
+
+#replaygain "album"
+
+#volume_normalization "no"
+
+#audio_buffer_size "2048"
+#buffer_before_play "10%"
+
+#http_buffer_size "128"
+#http_prebuffer_size "25%"
+
+########################### HTTP PROXY ################################
+#http_proxy_host "proxy"
+#http_proxy_port "8080"
+#http_proxy_user "user"
+#http_proxy_password "password"
+
+############################# LIMITS ##################################
+#connection_timeout "60"
+#max_connections "5"
+#max_playlist_length "16384"
+#max_command_list_size "2048"
+#max_output_buffer_size "8192"
+
+###################### CHARACTER ENCODINGS ############################
+#filesystem_charset "ISO-8859-1"
+id3v1_encoding "CP1251"
+
+######################### OTHER OPTIONS ###############################
+#gapless_mp3_playback             "yes"
+#save_absolute_paths_in_playlists "no"
+#metadata_to_use "artist,album,title,track,name,genre,date,composer,performer,disc"

.gear/mpd.init.in

+#!/bin/sh
+#
+# mpd		This shell script takes care of starting and stopping
+#               Music Player Daemon (MPD).
+# chkconfig: - 99 01
+# description: Music Player Daemon (MPD) allows remote access \
+#              for playing music and managing playlists.
+# processname: mpd
+# config: /etc/mpd.sys.conf
+# pidfile: /var/run/mpd/pid
+### BEGIN INIT INFO
+# Provides:          mpd
+# Required-Start:    $local_fs
+# Required-Stop:     $local_fs
+# Should-Start:      autofs $network $named alsa-utils pulseaudio avahi-daemon
+# Should-Stop:       autofs $network $named alsa-utils pulseaudio avahi-daemon
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Music Player Daemon
+# Description:       Start the Music Player Daemon (MPD) service
+#                    for network access to the local audio queue.
+### END INIT INFO
+
+# Do not load RH compatibility interface.
+WITHOUT_RC_COMPAT=1
+
+# Source function library.
+. /etc/init.d/functions
+
+USER=@MPD_USER@
+CONFFILE=/etc/mpd.sys.conf
+PIDFILE=/var/run/mpd/pid
+LOCKFILE=/var/lock/subsys/mpd
+RETVAL=0
+
+start()
+{
+	start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user $USER -- mpd $CONFFILE
+	RETVAL=$?
+	return $RETVAL
+}
+
+stop()
+{
+	stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user $USER -- mpd --kill $CONFFILE
+	RETVAL=$?
+	return $RETVAL
+}
+
+restart()
+{
+	stop
+	start
+}
+
+createdb()
+{
+	mpd --create-db $CONFFILE
+	RETVAL=$?
+	return $RETVAL
+}
+
+case "$1" in
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	restart)
+		restart
+		;;
+	condstop)
+		if [ -e "$LOCKFILE" ]; then
+			stop
+		fi
+		;;
+	condrestart)
+		if [ -e "$LOCKFILE" ]; then
+			restart
+		fi
+		;;
+	createdb)
+		createdb
+		;;
+	status)
+		status --pidfile "$PIDFILE" --expect-user $USER -- mpd
+		RETVAL=$?
+		;;
+	*)
+		msg_usage "${0##*/} {start|stop|restart|condstop|condrestart|createdb|status}"
+		RETVAL=1
+esac
+
+exit $RETVAL

.gear/mpd.logrotate

+/var/log/mpd/* {
+	notifempty
+	missingok
+	nocompress
+}
\ No newline at end of file

.gear/mpd.sys.conf.in

+######################## REQUIRED PATHS ###############################
+music_directory "/var/empty"
+playlist_directory "/var/lib/mpd/playlists"
+log_file "/var/log/mpd/info"
+db_file "/var/lib/mpd/mpd.db"
+#######################################################################
+
+######################## OPTIONAL PATHS ###############################
+pid_file "/var/run/mpd/pid"
+state_file "/var/lib/mpd/state"
+#######################################################################
+
+######################## DAEMON OPTIONS ###############################
+user "@MPD_USER@"
+bind_to_address "127.0.0.1"
+#bind_to_address "any"
+port "6600"
+# "default", "secure", or "verbose".
+log_level "default"
+#zeroconf_name "Music Player"
+
+########################## PERMISSIONS ################################
+#password                        "password@read,add,control,admin"
+#default_permissions             "read,add,control,admin"
+
+audio_output {
+type "alsa"
+name "alsa"
+}
+
+#audio_output {
+#        type "shout"
+#        name "My Shout Stream"
+#        host "localhost"
+#        port "8000"
+#        mount "/mpd.ogg"
+#        password "hackme"
+#        quality "5.0"
+#        bitrate "128"
+#        format "44100:16:1"
+#        user "source"				# optional
+#        description "My Stream Description"	# optional
+#        genre "jazz"				# optional
+#        public "no"				# optional
+#}
+
+#samplerate_converter "Fastest Sinc Interpolator"
+
+mixer_type "alsa"
+#mixer_device "default"
+#mixer_control "PCM"
+
+#mixer_type "software"
+
+#replaygain "album"
+
+#volume_normalization "no"
+
+#audio_buffer_size "2048"
+#buffer_before_play "10%"
+
+#http_buffer_size "128"
+#http_prebuffer_size "25%"
+
+########################### HTTP PROXY ################################
+#http_proxy_host "proxy"
+#http_proxy_port "8080"
+#http_proxy_user "user"
+#http_proxy_password "password"
+
+############################# LIMITS ##################################
+#connection_timeout "60"
+#max_connections "5"
+#max_playlist_length "16384"
+#max_command_list_size "2048"
+#max_output_buffer_size "8192"
+
+###################### CHARACTER ENCODINGS ############################
+#filesystem_charset "ISO-8859-1"
+id3v1_encoding "CP1251"
+
+######################### OTHER OPTIONS ###############################
+#gapless_mp3_playback             "yes"
+#save_absolute_paths_in_playlists "no"
+#metadata_to_use "artist,album,title,track,name,genre,date,composer,performer,disc"

.gear/mpd.tmpfile

+d /var/run/mpd 0775 root @MPD_USER@ -

.gear/rules

+spec: .gear/mpd.spec
+tar:  v@version@:.
+copy?: .gear/*.patch
+copy: .gear/*.conf
+copy: .gear/*.in
+copy: .gear/*.logrotate
+copy: .gear/*.tmpfile

.gear/tags/a74b16880c2cfc03de4879084a3a6f27385e8439

+object 98afae2520fbe5a322f803335b3142612fda4762
+type commit
+tag v0.20.21
+tagger Max Kellermann <max@musicpd.org> 1534528259 +0200
+
+release v0.20.21
+-----BEGIN PGP SIGNATURE-----
+
+iQJEBAABCgAuFiEEA5IzWngIOJSkMBxDI26KWMbbRRIFAlt3CwMQHG1heEBtdXNp
+Y3BkLm9yZwAKCRAjbopYxttFEiQcD/0S7NzE9nLsuTJJB9ElzOW17XiKkLKuDErQ
+P1r46APwa0agqfHFTUM5a+ifMCFQ4QTh0p+MiImYniBKmTnuKYBxZJFgHYojrPOS
+jxJbPJI6R7vLfo07kIem1jw/3YjqF4BDJyn9FYLBLgWz3IiFC/H4XH4XYxoQhTYL
+Xv0aGMCnil6gD2ENvx4by3tqsM9l5ktvPwR6bktRw4ImhgT5zHShpuPYZekas1ic
++A1oCXFO4UrlZQ0sHdcG7Up8NOEJvAiNR5+BCnb9aR8l6M2Mzu2u715zSSWvTBI+
+SCa8lE/gkndJC2Q3BmPRp+OcWU/uwVIkWdJdCF8DgN5vmk3cLRJ/SpHGkR1iYSvF
+MUW8QF0tc2Xctv0NHYXlDj6wVVJ+OWNUcNy6SWHAT7o5S0ppB+2nesAfTVqqGK/Z
+yRmcW5CvYNH8dfN7WBkLehN57dpI6O1YkfF30xCPcT+fu4oBYv7owU4MqFVcJN2r
+FEbTZCfRFGjF7Kmb6aF+mFMhTnqYNEZjFS0SljLJWjlimLaSfgTXdEv23IpxIMnV
+i+CEy7B2RseR31tmCekyWxdLnNJPYC4Zqwer8dd7yrY/exEM/6x9JQDUbCaGccar
+NlwmCj6uDKXxU3tkb9Mk77oX51dFL58BtpoQw/DfXRWSX+UsAxFioyAbJ9juJUrM
+JO9WMABo0Q==
+=2zvn
+-----END PGP SIGNATURE-----

.gear/tags/list

+a74b16880c2cfc03de4879084a3a6f27385e8439 v0.20.21