summaryrefslogtreecommitdiffstats
path: root/source/a/dbus
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/dbus')
-rw-r--r--source/a/dbus/dbus-1.4.x-allow_root_globally.diff (renamed from source/a/dbus/dbus-1.2.x-allow_root_globally.diff)12
-rwxr-xr-xsource/a/dbus/dbus.SlackBuild20
-rw-r--r--source/a/dbus/doinst.sh2
3 files changed, 11 insertions, 23 deletions
diff --git a/source/a/dbus/dbus-1.2.x-allow_root_globally.diff b/source/a/dbus/dbus-1.4.x-allow_root_globally.diff
index 913a9d2b1..6bd84833f 100644
--- a/source/a/dbus/dbus-1.2.x-allow_root_globally.diff
+++ b/source/a/dbus/dbus-1.4.x-allow_root_globally.diff
@@ -1,10 +1,6 @@
-Allow root to do anything via dbus method calls, since users expect root
- to be, well, root. This removes the insanity of adding root to all sorts
- of system groups in /etc/group. --rworkman 20091031
-
-diff -Nur dbus-1.2.16.orig/bus/system.conf.in dbus-1.2.16/bus/system.conf.in
---- dbus-1.2.16.orig/bus/system.conf.in 2009-07-13 05:14:40.000000000 -0500
-+++ dbus-1.2.16/bus/system.conf.in 2009-10-31 00:47:34.338981143 -0500
+diff -Nur dbus-1.4.0.orig//bus/system.conf.in dbus-1.4.0//bus/system.conf.in
+--- dbus-1.4.0.orig//bus/system.conf.in 2010-08-31 16:44:19.000000000 -0500
++++ dbus-1.4.0//bus/system.conf.in 2010-09-14 09:17:56.080373096 -0500
@@ -70,6 +70,14 @@
send_member="UpdateActivationEnvironment"/>
</policy>
@@ -16,7 +12,7 @@ diff -Nur dbus-1.2.16.orig/bus/system.conf.in dbus-1.2.16/bus/system.conf.in
+ <allow send_destination="*"/>
+ <allow send_interface="*"/>
+ </policy>
-+
++
<!-- Config files are placed here that among other things, punch
holes in the above policy for specific services. -->
<includedir>system.d</includedir>
diff --git a/source/a/dbus/dbus.SlackBuild b/source/a/dbus/dbus.SlackBuild
index 533ccd897..b11340cd9 100755
--- a/source/a/dbus/dbus.SlackBuild
+++ b/source/a/dbus/dbus.SlackBuild
@@ -22,8 +22,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PKGNAM=dbus
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -68,7 +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.2.x-allow_root_globally.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/dbus-1.4.x-allow_root_globally.diff.gz | patch -p1 --verbose || exit 1
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -94,29 +94,23 @@ make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" \
| grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
# Install a custom init script for dbus - the included one is not good for us
rm $PKG/etc/rc.d/*
zcat $CWD/rc.messagebus.gz > $PKG/etc/rc.d/rc.messagebus.new
chmod 0755 $PKG/etc/rc.d/rc.messagebus.new
-# Let's not clobber existing config files
-mv $PKG/etc/dbus-1/session.conf $PKG/etc/dbus-1/session.conf.new
-mv $PKG/etc/dbus-1/system.conf $PKG/etc/dbus-1/system.conf.new
-
# Fix some directory ownership
chown messagebus $PKG/var/lib/dbus
# Add documentation
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
- AUTHORS COPYING HACKING INSTALL NEWS README doc/*.{txt,html,dtd} \
+ AUTHORS COPYING* HACKING INSTALL NEWS README* doc/*.{txt,html,dtd} \
$PKG/usr/doc/$PKGNAM-$VERSION
-find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 644 {} \;
+find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \;
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/a/dbus/doinst.sh b/source/a/dbus/doinst.sh
index 71c3d7a07..d12d7756a 100644
--- a/source/a/dbus/doinst.sh
+++ b/source/a/dbus/doinst.sh
@@ -18,7 +18,5 @@ 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/dbus-1/session.conf.new
-config etc/dbus-1/system.conf.new
config etc/rc.d/rc.messagebus.new