[SCM] rtkit/master: Pick up no-ptrace patch from ubuntu

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Sun Oct 18 15:50:40 UTC 2015


The following commit has been merged in the master branch:
commit ff042490c9874396a4d67eeb0825e39ec123b5ec
Author: Felipe Sateler <fsateler at debian.org>
Date:   Sun Oct 18 12:44:17 2015 -0300

    Pick up no-ptrace patch from ubuntu

diff --git a/debian/patches/01-no_ptrace_cap.patch b/debian/patches/0005-no-ptrace-cap.patch
similarity index 66%
rename from debian/patches/01-no_ptrace_cap.patch
rename to debian/patches/0005-no-ptrace-cap.patch
index 8621a62..3896832 100644
--- a/debian/patches/01-no_ptrace_cap.patch
+++ b/debian/patches/0005-no-ptrace-cap.patch
@@ -2,15 +2,15 @@
  rtkit-daemon.c |    3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
---- rtkit.orig/rtkit-daemon.c
-+++ rtkit/rtkit-daemon.c
-@@ -1766,8 +1766,7 @@ static int drop_privileges(void) {
-                 cap_t caps;
-                 const cap_value_t cap_values[] = {
+--- a/rtkit-daemon.c
++++ b/rtkit-daemon.c
+@@ -1775,8 +1775,7 @@ static int drop_privileges(void) {
+         if (do_drop_privileges) {
+                 static const cap_value_t cap_values[] = {
                          CAP_SYS_NICE,             /* Needed for obvious reasons */
 -                        CAP_DAC_READ_SEARCH,      /* Needed so that we can verify resource limits */
 -                        CAP_SYS_PTRACE            /* Needed so that we can read /proc/$$/exe. Linux is weird. */
 +                        CAP_DAC_READ_SEARCH      /* Needed so that we can verify resource limits */
                  };
  
-                 /* Third, say that we want to keep caps */
+                 cap_value_t c, m;
diff --git a/debian/patches/series b/debian/patches/series
index 1a090fc..f53aacc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Drop-Removed-ControlGroup-stanza.patch
 0003-Fix-rtkit-test.patch
 0004-link-with-rt.patch
+0005-no-ptrace-cap.patch

-- 
rtkit packaging



More information about the pkg-multimedia-commits mailing list