[SCM] rtkit/master: Drop 02-fix-undropped-supp-groups.patch, already adopted upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Apr 28 13:12:25 UTC 2014


The following commit has been merged in the master branch:
commit dd826cf44fbf3b4d4ad232a41b716a9cf8c6fadb
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Apr 28 14:03:28 2014 +0100

    Drop 02-fix-undropped-supp-groups.patch, already adopted upstream.

diff --git a/debian/patches/02-fix-undropped-supp-groups.patch b/debian/patches/02-fix-undropped-supp-groups.patch
deleted file mode 100644
index 8328870..0000000
--- a/debian/patches/02-fix-undropped-supp-groups.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Drop supplemental groups.
-From: http://git.0pointer.de/?p=rtkit.git;a=commitdiff;h=f9512c9c7d41
----
- rtkit-daemon.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- rtkit.orig/rtkit-daemon.c
-+++ rtkit/rtkit-daemon.c
-@@ -49,6 +49,7 @@
- #include <pthread.h>
- #include <dirent.h>
- #include <syslog.h>
-+#include <grp.h>
- 
- #include "rtkit.h"
- #include "sd-daemon.h"
-@@ -1777,7 +1778,8 @@ static int drop_privileges(void) {
-                 }
- 
-                 /* Fourth, drop privs */
--                if (setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) < 0 ||
-+                if (setgroups(0, NULL) < 0 ||
-+                    setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) < 0 ||
-                     setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid) < 0) {
-                         r = -errno;
-                         syslog(LOG_ERR, "Failed to become %s: %s\n", username, strerror(errno));
diff --git a/debian/patches/series b/debian/patches/series
index 498db83..cf9a390 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-02-fix-undropped-supp-groups.patch
 0001-SECURITY-Pass-uid-of-caller-to-polkit.patch

-- 
rtkit packaging



More information about the pkg-multimedia-commits mailing list