summaryrefslogtreecommitdiff
path: root/source/a/dbus
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/dbus')
-rw-r--r--source/a/dbus/dbus-1.10.x-allow_root_globally.diff (renamed from source/a/dbus/dbus-1.6.x-allow_root_globally.diff)12
-rwxr-xr-xsource/a/dbus/dbus.SlackBuild12
-rw-r--r--source/a/dbus/dbus.set.home.diff22
-rw-r--r--source/a/dbus/doinst.sh6
-rw-r--r--source/a/dbus/rc.messagebus1
5 files changed, 17 insertions, 36 deletions
diff --git a/source/a/dbus/dbus-1.6.x-allow_root_globally.diff b/source/a/dbus/dbus-1.10.x-allow_root_globally.diff
index ae2d30a6..07d1ac33 100644
--- a/source/a/dbus/dbus-1.6.x-allow_root_globally.diff
+++ b/source/a/dbus/dbus-1.10.x-allow_root_globally.diff
@@ -1,9 +1,9 @@
-diff -Nur dbus-1.6.0.orig/bus/system.conf.in dbus-1.6.0/bus/system.conf.in
---- dbus-1.6.0.orig/bus/system.conf.in 2012-01-04 11:49:23.000000000 -0600
-+++ dbus-1.6.0/bus/system.conf.in 2012-06-12 23:07:14.541913190 -0500
-@@ -70,6 +70,14 @@
- send_member="UpdateActivationEnvironment"/>
- </policy>
+diff -Nur dbus-1.10.0.orig/bus/system.conf.in dbus-1.10.0/bus/system.conf.in
+--- dbus-1.10.0.orig/bus/system.conf.in 2015-07-21 11:46:00.000000000 -0500
++++ dbus-1.10.0/bus/system.conf.in 2015-10-03 17:47:18.646635691 -0500
+@@ -100,6 +100,14 @@
+ <!-- Include legacy configuration location -->
+ <include ignore_missing="yes">@DBUS_SYSCONFDIR@/dbus-1/system.conf</include>
+ <!-- Allow root to do anything over the messagebus.
+ Don't whine about "security" - anyone with root privileges
diff --git a/source/a/dbus/dbus.SlackBuild b/source/a/dbus/dbus.SlackBuild
index ee115afa..734c134c 100755
--- a/source/a/dbus/dbus.SlackBuild
+++ b/source/a/dbus/dbus.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright 2007-2010 Robby Workman, Northport, Alabama, USA
-# Copyright 2007-2012 Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2007-2015 Patrick Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -30,7 +30,7 @@ NUMJOBS=${NUMJOBS:-" -j7 "}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$( uname -m ) ;;
@@ -41,8 +41,8 @@ CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
@@ -68,8 +68,7 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-zcat $CWD/dbus-1.6.x-allow_root_globally.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/dbus.set.home.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/dbus-1.10.x-allow_root_globally.diff.gz | patch -p1 --verbose || exit 1
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -88,6 +87,7 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-x11-autolaunch \
--with-system-pid-file=/var/run/dbus/dbus.pid \
--with-system-socket=/var/run/dbus/system_bus_socket \
+ --with-console-auth-dir=/var/run/console \
--with-init-scripts=slackware \
--build=$ARCH-slackware-linux
diff --git a/source/a/dbus/dbus.set.home.diff b/source/a/dbus/dbus.set.home.diff
deleted file mode 100644
index 5c0f7976..00000000
--- a/source/a/dbus/dbus.set.home.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Set HOME environment variable when switching user.
-
-2011-08-05 Egor Y. Egorov
-
-References:
-https://bugs.freedesktop.org/show_bug.cgi?id=39857
-https://bugs.kde.org/show_bug.cgi?id=249217#c27
-
-diff --git a/bus/activation-helper.c b/bus/activation-helper.c
-index baba8f0..b75ea7c 100644
---- a/bus/activation-helper.c
-+++ b/bus/activation-helper.c
-@@ -344,6 +344,8 @@ switch_user (char *user, DBusError *error)
- "cannot setuid user %i", pw->pw_uid);
- return FALSE;
- }
-+
-+ _dbus_setenv ("HOME", pw->pw_dir);
- #endif
- return TRUE;
- }
-
diff --git a/source/a/dbus/doinst.sh b/source/a/dbus/doinst.sh
index d12d7756..dcefd1ff 100644
--- a/source/a/dbus/doinst.sh
+++ b/source/a/dbus/doinst.sh
@@ -18,5 +18,9 @@ if [ -e etc/rc.d/rc.messagebus ]; then
mv etc/rc.d/rc.messagebus.new.incoming etc/rc.d/rc.messagebus.new
fi
-config etc/rc.d/rc.messagebus.new
+#config etc/rc.d/rc.messagebus.new
+# No, just install the thing. Leaving it as .new will only lead to problems.
+if [ -r etc/rc.d/rc.messagebus.new ]; then
+ mv etc/rc.d/rc.messagebus.new etc/rc.d/rc.messagebus
+fi
diff --git a/source/a/dbus/rc.messagebus b/source/a/dbus/rc.messagebus
index fb035af5..9a1ffce9 100644
--- a/source/a/dbus/rc.messagebus
+++ b/source/a/dbus/rc.messagebus
@@ -6,7 +6,6 @@
# and other messages. See http://www.freedesktop.org/software/dbus/
#
# processname: dbus-daemon
-# pidfile: /var/run/dbus/pid
# This is a modified version of the rc.messagebus script distributed with the
# dbus sources. Thanks to Don Tanner of the GWare <http://gware.org> Project