Hi, in response to Debian bugs, the Debian mpd package has accumulated a number of smallish patches (mostly docmentation), which I'd like to forward for discussion and inclusion. Please see attached.
Florian
Description: Fix a doc typo Author: Florian Schlichting <[email protected]> --- a/doc/user.xml +++ b/doc/user.xml @@ -16,7 +16,7 @@ <application>MPD</application> (Music Player Daemon) is, as the name suggests, a server software allowing you to remotely play your music, handle playlists, deliver music (HTTP streams with - various sub-protocols) and organizze playlists. + various sub-protocols) and organize playlists. </para> <para>
Description: also disable mpd.socket when disabling mpd.service e.g. when running 'update-rc.d mpd disable' Author: Clément B. <[email protected]> Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769951 --- a/systemd/mpd.service.in +++ b/systemd/mpd.service.in @@ -20,3 +20,4 @@ [Install] WantedBy=multi-user.target +Also=mpd.socket
Description: Protect /usr when running under systemd Author: Florian Schlichting <[email protected]> Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771634 --- a/systemd/mpd.service.in +++ b/systemd/mpd.service.in @@ -18,6 +18,9 @@ # assign a real-time budget ControlGroupAttribute=cpu.rt_runtime_us 500000 +# disallow writing to /usr, /bin, /sbin, ... +ProtectSystem=yes + [Install] WantedBy=multi-user.target Also=mpd.socket
Description: Fix "Unknown lvalue 'ControlGroup' in section 'Service'" warnings systemd 205 removed the ControlGroup and ControlGroupAttribute directives (see http://lists.freedesktop.org/archives/systemd-devel/2013-July/011679.html), so they have been ineffective since and only caused the above warnings to be written to the journal. However the above changelog suggests "Please use high-level attribute settings instead as well as slice units." Author: Florian Schlichting <[email protected]> Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=781377 --- a/systemd/mpd.service.in +++ b/systemd/mpd.service.in @@ -9,15 +9,6 @@ LimitRTPRIO=50 LimitRTTIME=-1 -# move MPD to a top-level cgroup, as real-time budget assignment fails -# in cgroup /system/mpd.service, because /system has a zero real-time -# budget; see -# http://www.freedesktop.org/wiki/Software/systemd/MyServiceCantGetRealtime/ -ControlGroup=cpu:/mpd - -# assign a real-time budget -ControlGroupAttribute=cpu.rt_runtime_us 500000 - # disallow writing to /usr, /bin, /sbin, ... ProtectSystem=yes
Description: document effect of http_proxy envvar on curl plugin Author: Florian Schlichting <[email protected]> Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624774 --- a/doc/user.xml +++ b/doc/user.xml @@ -1684,6 +1684,13 @@ Opens remote files or streams over HTTP. </para> + <para> + Note that unless overridden by the below settings (e.g. by + setting them to a blank value), general curl configuration + from environment variables such as http_proxy or specified + in ~/.curlrc will be in effect. + </para> + <informaltable> <tgroup cols="2"> <thead>
Description: document that socket activation voids bind_to_address setting Author: Florian Schlichting <[email protected]> Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=785418 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -75,7 +75,8 @@ # # This setting sets the address for the daemon to listen on. Careful attention # should be paid if this is assigned to anything other then the default, any. -# This setting can deny access to control of the daemon. +# This setting can deny access to control of the daemon. Not effective if +# systemd socket activiation is in use. # # For network #bind_to_address "any"
_______________________________________________ mpd-devel mailing list [email protected] http://mailman.blarg.de/listinfo/mpd-devel
