[Pkg-mpd-commits] [pkg-mpd] 04/13: Drop also-dis_en_able-socket.patch, protect_system.patch applied 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 41fc48f7b75d1fd4734348bb9fc12ecda6d1405b
Author: Florian Schlichting <fsfs at debian.org>
Date:   Mon Dec 12 22:40:03 2016 +0100

    Drop also-dis_en_able-socket.patch, protect_system.patch applied upstream
---
 debian/patches/also-dis_en_able-socket.patch | 13 -------------
 debian/patches/protect_system.patch          | 17 -----------------
 debian/patches/series                        |  2 --
 3 files changed, 32 deletions(-)

diff --git a/debian/patches/also-dis_en_able-socket.patch b/debian/patches/also-dis_en_able-socket.patch
deleted file mode 100644
index f8d5cb9..0000000
--- a/debian/patches/also-dis_en_able-socket.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: also disable mpd.socket when disabling mpd.service
- e.g. when running 'update-rc.d mpd disable'
-Author: Clément B. <cb+debianbugreport at rthelemy.eu>
-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769951
-Forwarded: http://mailman.blarg.de/pipermail/mpd-devel/2015-June/000363.html
-
---- a/systemd/mpd.service.in
-+++ b/systemd/mpd.service.in
-@@ -12,3 +12,4 @@
- 
- [Install]
- WantedBy=multi-user.target
-+Also=mpd.socket
diff --git a/debian/patches/protect_system.patch b/debian/patches/protect_system.patch
deleted file mode 100644
index d0489ef..0000000
--- a/debian/patches/protect_system.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Protect /usr when running under systemd
-Author: Florian Schlichting <fsfs at debian.org> 
-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771634
-Forwarded: http://mailman.blarg.de/pipermail/mpd-devel/2015-June/000363.html
-
---- a/systemd/mpd.service.in
-+++ b/systemd/mpd.service.in
-@@ -10,6 +10,9 @@
- LimitRTPRIO=50
- LimitRTTIME=infinity
- 
-+# disallow writing to /usr, /bin, /sbin, ...
-+ProtectSystem=yes
-+
- [Install]
- WantedBy=multi-user.target
- Also=mpd.socket
diff --git a/debian/patches/series b/debian/patches/series
index 14dd1e7..268e074 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 systemd_honor_MPDCONF.patch
-also-dis_en_able-socket.patch
-protect_system.patch
 libsystemd.patch
 curl-proxy.patch
 bind-to-address-socket-activation.patch

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