diff options
Diffstat (limited to 'source/a')
-rwxr-xr-x | source/a/dbus/dbus.SlackBuild | 6 | ||||
-rwxr-xr-x | source/a/udisks/udisks.SlackBuild | 9 | ||||
-rw-r--r-- | source/a/udisks2/20-plugdev-group-mount-override.rules | 16 | ||||
-rwxr-xr-x | source/a/udisks2/udisks2.SlackBuild | 6 |
4 files changed, 33 insertions, 4 deletions
diff --git a/source/a/dbus/dbus.SlackBuild b/source/a/dbus/dbus.SlackBuild index bb17338b..1ae1871c 100755 --- a/source/a/dbus/dbus.SlackBuild +++ b/source/a/dbus/dbus.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dbus VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -141,6 +141,10 @@ chmod 0755 $PKG/etc/rc.d/rc.messagebus.new # Fix some directory ownership chown messagebus $PKG/var/lib/dbus +# Create the local override directory since no other package will include it +# now that config files have been moved to the system location under /usr: +mkdir -p $PKG/etc/dbus-1/system.d + # Add documentation mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ diff --git a/source/a/udisks/udisks.SlackBuild b/source/a/udisks/udisks.SlackBuild index b2f75647..d8caa496 100755 --- a/source/a/udisks/udisks.SlackBuild +++ b/source/a/udisks/udisks.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for udisks -# Copyright 2010, 2011, 2014, 2015 Robby Workman, Northport, Alabama, USA +# Copyright 2010, 2011, 2014, 2015, 2020 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=udisks VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -117,6 +117,11 @@ mv $PKG/etc/profile.d/udisks-bash-completion.sh \ $PKG/usr/share/bash-completion/completions/udisks rmdir --parents $PKG/etc/profile.d +# Move the dbus config file to the system directory +mkdir -p $PKG/usr/share/dbus-1/system.d/ +mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/ +rmdir --parents $PKG/etc/dbus-1/system.d/ + 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 diff --git a/source/a/udisks2/20-plugdev-group-mount-override.rules b/source/a/udisks2/20-plugdev-group-mount-override.rules new file mode 100644 index 00000000..c47a66cf --- /dev/null +++ b/source/a/udisks2/20-plugdev-group-mount-override.rules @@ -0,0 +1,16 @@ +/* http://udisks.freedesktop.org/docs/latest/udisks-polkit-actions.html */ + +polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.udisks2.filesystem-mount" && + subject.isInGroup("plugdev")) { + return polkit.Result.YES; + } +}); + +polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.udisks2.eject-media" && + subject.isInGroup("plugdev")) { + return polkit.Result.YES; + } +}); + diff --git a/source/a/udisks2/udisks2.SlackBuild b/source/a/udisks2/udisks2.SlackBuild index 8886f015..734454f5 100755 --- a/source/a/udisks2/udisks2.SlackBuild +++ b/source/a/udisks2/udisks2.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=udisks2 SRCNAM=udisks VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -119,6 +119,10 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la # Don't overwrite config file, but leave mount_options.conf.example alone mv $PKG/etc/udisks2/udisks2.conf $PKG/etc/udisks2/udisks2.conf.new +# Add default policy files for udisks2 events: +mkdir -p $PKG/usr/share/polkit-1/rules.d/ +cat $CWD/20-plugdev-group-mount-override.rules > $PKG/usr/share/polkit-1/rules.d/20-plugdev-group-mount-override.rules + # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null |