[Pkg-mpd-commits] [pkg-mpd] 05/06: Drop unknown-lvalue-ControlGroup.patch, fixed upstream

[Florian Schlichting]

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository pkg-mpd.

commit 8d247fe762f2015e76c3c48111e47047cf165c4d
Author: Florian Schlichting <fsfs at debian.org>
Date:   Fri Nov 6 20:05:22 2015 +0100

    Drop unknown-lvalue-ControlGroup.patch, fixed upstream
---
 debian/patches/also-dis_en_able-socket.patch     |  2 +-
 debian/patches/curl-proxy.patch                  |  2 +-
 debian/patches/protect_system.patch              |  6 ++---
 debian/patches/series                            |  1 -
 debian/patches/unknown-lvalue-ControlGroup.patch | 29 ------------------------
 5 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/debian/patches/also-dis_en_able-socket.patch b/debian/patches/also-dis_en_able-socket.patch
index 476f3a6..f8d5cb9 100644
--- a/debian/patches/also-dis_en_able-socket.patch
+++ b/debian/patches/also-dis_en_able-socket.patch
@@ -6,7 +6,7 @@ Forwarded: http://mailman.blarg.de/pipermail/mpd-devel/2015-June/000363.html
 
 --- a/systemd/mpd.service.in
 +++ b/systemd/mpd.service.in
-@@ -21,3 +21,4 @@
+@@ -12,3 +12,4 @@
  
  [Install]
  WantedBy=multi-user.target
diff --git a/debian/patches/curl-proxy.patch b/debian/patches/curl-proxy.patch
index 356c461..c601d77 100644
--- a/debian/patches/curl-proxy.patch
+++ b/debian/patches/curl-proxy.patch
@@ -5,7 +5,7 @@ Forwarded: http://mailman.blarg.de/pipermail/mpd-devel/2015-June/000363.html
 
 --- a/doc/user.xml
 +++ b/doc/user.xml
-@@ -1684,6 +1684,13 @@
+@@ -1736,6 +1736,13 @@
            Opens remote files or streams over HTTP.
          </para>
  
diff --git a/debian/patches/protect_system.patch b/debian/patches/protect_system.patch
index e7e92bf..4bdfe3f 100644
--- a/debian/patches/protect_system.patch
+++ b/debian/patches/protect_system.patch
@@ -5,9 +5,9 @@ Forwarded: http://mailman.blarg.de/pipermail/mpd-devel/2015-June/000363.html
 
 --- a/systemd/mpd.service.in
 +++ b/systemd/mpd.service.in
-@@ -19,6 +19,9 @@
- # assign a real-time budget
- ControlGroupAttribute=cpu.rt_runtime_us 500000
+@@ -10,6 +10,9 @@
+ LimitRTPRIO=50
+ LimitRTTIME=-1
  
 +# disallow writing to /usr, /bin, /sbin, ...
 +ProtectSystem=yes
diff --git a/debian/patches/series b/debian/patches/series
index 042102c..87e7807 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ systemd_honor_MPDCONF.patch
 typo.patch
 also-dis_en_able-socket.patch
 protect_system.patch
-unknown-lvalue-ControlGroup.patch
 libsystemd.patch
 curl-proxy.patch
 bind-to-address-socket-activation.patch
diff --git a/debian/patches/unknown-lvalue-ControlGroup.patch b/debian/patches/unknown-lvalue-ControlGroup.patch
deleted file mode 100644
index 3fdea6c..0000000
--- a/debian/patches/unknown-lvalue-ControlGroup.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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 <fsfs at debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=781377
-Forwarded: http://mailman.blarg.de/pipermail/mpd-devel/2015-June/000363.html
-
---- a/systemd/mpd.service.in
-+++ b/systemd/mpd.service.in
-@@ -10,15 +10,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
- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/pkg-mpd.git