summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarinus Schraal <foser@gentoo.org>2005-02-06 17:09:45 +0000
committerMarinus Schraal <foser@gentoo.org>2005-02-06 17:09:45 +0000
commitd933c4394e718324ae5a02acdf70e1bb4d429473 (patch)
tree15454de20e34537dd12d297da7c21c22cf823631 /sys-apps/dbus/files
parentStable on ppc64 (diff)
downloadgentoo-2-d933c4394e718324ae5a02acdf70e1bb4d429473.tar.gz
gentoo-2-d933c4394e718324ae5a02acdf70e1bb4d429473.tar.bz2
gentoo-2-d933c4394e718324ae5a02acdf70e1bb4d429473.zip
bump with fixes
Diffstat (limited to 'sys-apps/dbus/files')
-rw-r--r--sys-apps/dbus/files/dbus-0.23-dbus_session_connect.patch35
-rw-r--r--sys-apps/dbus/files/dbus-0.23-fd_set.patch10
-rw-r--r--sys-apps/dbus/files/digest-dbus-0.23-r21
3 files changed, 46 insertions, 0 deletions
diff --git a/sys-apps/dbus/files/dbus-0.23-dbus_session_connect.patch b/sys-apps/dbus/files/dbus-0.23-dbus_session_connect.patch
new file mode 100644
index 000000000000..2247e4b5241f
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-0.23-dbus_session_connect.patch
@@ -0,0 +1,35 @@
+Index: bus/policy.c
+===================================================================
+RCS file: /cvs/dbus/dbus/bus/policy.c,v
+retrieving revision 1.22
+diff -u -p -u -r1.22 policy.c
+--- bus/policy.c 25 Aug 2004 22:11:49 -0000 1.22
++++ bus/policy.c 31 Jan 2005 23:57:32 -0000
+@@ -453,8 +453,9 @@ bus_policy_allow_user (BusPolicy
+ uid);
+ return FALSE;
+ }
+-
+- allowed = FALSE;
++
++ /* Default to "user owning bus" or root can connect */
++ allowed = uid == _dbus_getuid ();
+
+ allowed = list_allows_user (allowed,
+ &policy->default_rules,
+Index: bus/session.conf.in
+===================================================================
+RCS file: /cvs/dbus/dbus/bus/session.conf.in,v
+retrieving revision 1.8
+diff -u -p -u -r1.8 session.conf.in
+--- bus/session.conf.in 25 Oct 2004 18:48:58 -0000 1.8
++++ bus/session.conf.in 31 Jan 2005 23:57:32 -0000
+@@ -19,8 +19,6 @@
+ <allow eavesdrop="true"/>
+ <!-- Allow anyone to own anything -->
+ <allow own="*"/>
+- <!-- Allow any user to connect -->
+- <allow user="*"/>
+ </policy>
+
+ <!-- This is included last so local configuration can override what's
diff --git a/sys-apps/dbus/files/dbus-0.23-fd_set.patch b/sys-apps/dbus/files/dbus-0.23-fd_set.patch
new file mode 100644
index 000000000000..169b4907d559
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-0.23-fd_set.patch
@@ -0,0 +1,10 @@
+--- tools/dbus-launch.c.orig 2005-01-21 01:56:42.937860640 -0600
++++ tools/dbus-launch.c 2005-01-21 01:41:01.748943104 -0600
+@@ -26,6 +26,7 @@
+ #include <fcntl.h>
+ #include <signal.h>
+ #include <sys/wait.h>
++#include <sys/select.h>
+ #include <errno.h>
+ #include <stdio.h>
+ #include <string.h>
diff --git a/sys-apps/dbus/files/digest-dbus-0.23-r2 b/sys-apps/dbus/files/digest-dbus-0.23-r2
new file mode 100644
index 000000000000..729896ce139d
--- /dev/null
+++ b/sys-apps/dbus/files/digest-dbus-0.23-r2
@@ -0,0 +1 @@
+MD5 56a6a06144bd349f21afbd4cc386a60f dbus-0.23.tar.gz 1280646